Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge pull request #30 from ckeditor/t/ckeditor5-ui/144
Browse files Browse the repository at this point in the history
Other: Changed the webpack configuration so the styles are processed using PostCSS instead of SASS (see ckeditor/ckeditor5-ui#144).
  • Loading branch information
oleq authored Nov 30, 2017
2 parents fd32264 + 90ac822 commit 040b92f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@
"@ckeditor/ckeditor5-link": "^1.0.0-alpha.2",
"@ckeditor/ckeditor5-list": "^1.0.0-alpha.2",
"@ckeditor/ckeditor5-paragraph": "^1.0.0-alpha.2",
"@ckeditor/ckeditor5-theme-lark": "^1.0.0-alpha.2",
"@ckeditor/ckeditor5-upload": "^1.0.0-alpha.2",
"babel-minify-webpack-plugin": "^0.2.0",
"css-loader": "^0.28.7",
"node-sass": "^4.5.3",
"postcss-loader": "^2.0.8",
"raw-loader": "^0.5.1",
"sass-loader": "^6.0.6",
"style-loader": "^0.18.2",
"webpack": "^3.6.0",
"webpack": "^3.8.1",
"webpack-sources": "1.0.1"
},
"engines": {
Expand Down
18 changes: 13 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
const path = require( 'path' );
const webpack = require( 'webpack' );
const { bundler } = require( '@ckeditor/ckeditor5-dev-utils' );
const { getPostCssConfig } = require( '@ckeditor/ckeditor5-dev-utils' ).styles;
const CKEditorWebpackPlugin = require( '@ckeditor/ckeditor5-dev-webpack-plugin' );
const BabiliPlugin = require( 'babel-minify-webpack-plugin' );
const buildConfig = require( './build-config' );
Expand Down Expand Up @@ -49,16 +50,23 @@ module.exports = {
use: [ 'raw-loader' ]
},
{
test: /\.scss$/,
test: /\.css$/,
use: [
'style-loader',
{
loader: 'css-loader',
loader: 'style-loader',
options: {
minimize: true
singleton: true
}
},
'sass-loader'
{
loader: 'postcss-loader',
options: getPostCssConfig( {
themeImporter: {
themePath: require.resolve( '@ckeditor/ckeditor5-theme-lark' )
},
minify: true
} )
},
]
}
]
Expand Down

0 comments on commit 040b92f

Please sign in to comment.