Repository: ignite Updated Branches: refs/heads/master 8b2fe0f92 -> ed05d31fe
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed05d31f/modules/web-console/frontend/package.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json index 9e591db..2bff755 100644 --- a/modules/web-console/frontend/package.json +++ b/modules/web-console/frontend/package.json @@ -78,7 +78,6 @@ "eslint-loader": "1.9.0", "eslint-plugin-babel": "4.1.1", "expose-loader": "0.7.5", - "extract-text-webpack-plugin": "^4.0.0-beta.0", "file-loader": "1.1.11", "file-saver": "1.3.3", "font-awesome": "4.7.0", @@ -120,6 +119,7 @@ "@types/angular-strap": "^2.3.1", "@types/chai": "^4.1.2", "@types/lodash": "^4.14.77", + "@types/mini-css-extract-plugin": "^0.2.0", "@types/mocha": "^2.2.48", "@types/sinon": "^4.0.0", "@types/ui-grid": "0.0.38", @@ -140,6 +140,7 @@ "karma-mocha-reporter": "2.2.3", "karma-teamcity-reporter": "1.0.0", "karma-webpack": "4.0.0-beta.0", + "mini-css-extract-plugin": "^0.4.0", "mocha": "3.4.2", "mocha-teamcity-reporter": "1.1.1", "node-fetch": "1.7.3", http://git-wip-us.apache.org/repos/asf/ignite/blob/ed05d31f/modules/web-console/frontend/tsconfig.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/tsconfig.json b/modules/web-console/frontend/tsconfig.json index df18120..382c9a5 100644 --- a/modules/web-console/frontend/tsconfig.json +++ b/modules/web-console/frontend/tsconfig.json @@ -6,5 +6,8 @@ "allowJs": true, "checkJs": true, "baseUrl": "." - } + }, + "exclude": [ + "build" + ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/ed05d31f/modules/web-console/frontend/webpack/webpack.common.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/webpack/webpack.common.js b/modules/web-console/frontend/webpack/webpack.common.js index 452206a..e1dd1f0 100644 --- a/modules/web-console/frontend/webpack/webpack.common.js +++ b/modules/web-console/frontend/webpack/webpack.common.js @@ -23,7 +23,6 @@ import presetEs2015 from 'babel-preset-es2015'; import presetStage1 from 'babel-preset-stage-1'; import CopyWebpackPlugin from 'copy-webpack-plugin'; -import ExtractTextPlugin from 'extract-text-webpack-plugin'; import HtmlWebpackPlugin from 'html-webpack-plugin'; import ProgressBarPlugin from 'progress-bar-webpack-plugin'; @@ -185,7 +184,6 @@ export default { new HtmlWebpackPlugin({ template: './views/index.pug' }), - new ExtractTextPlugin({filename: 'assets/css/[name].[hash].css', allChunks: true}), new CopyWebpackPlugin([ { context: 'public', from: '**/*.png' }, { context: 'public', from: '**/*.svg' }, http://git-wip-us.apache.org/repos/asf/ignite/blob/ed05d31f/modules/web-console/frontend/webpack/webpack.dev.babel.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/webpack/webpack.dev.babel.js b/modules/web-console/frontend/webpack/webpack.dev.babel.js index f70d3a0..b0b6553 100644 --- a/modules/web-console/frontend/webpack/webpack.dev.babel.js +++ b/modules/web-console/frontend/webpack/webpack.dev.babel.js @@ -22,7 +22,7 @@ import path from 'path'; import commonCfg from './webpack.common'; -import ExtractTextPlugin from 'extract-text-webpack-plugin'; +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const backendPort = process.env.BACKEND_PORT || 3000; const devServerPort = process.env.PORT || 9000; @@ -41,27 +41,27 @@ export default merge(commonCfg, { }, { test: /\.scss$/, - // Version without extract plugin fails on some machines. https://github.com/sass/node-sass/issues/1895 - use: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: [ - { - loader: 'css', - options: { - sourceMap: true - } - }, - { - loader: 'sass', - options: { - sourceMap: true - } + use: [ + MiniCssExtractPlugin.loader, // style-loader does not work with styles in IgniteModules + { + loader: 'css-loader', + options: { + sourceMap: true } - ] - }) + }, + { + loader: 'sass-loader', + options: { + sourceMap: true + } + } + ] } ] }, + plugins: [ + new MiniCssExtractPlugin({filename: 'assets/css/[name].css'}) + ], devServer: { headers: { 'Content-Security-Policy': `script-src 'self' 'unsafe-inline' 'unsafe-eval' data: http: https:;` http://git-wip-us.apache.org/repos/asf/ignite/blob/ed05d31f/modules/web-console/frontend/webpack/webpack.prod.babel.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/webpack/webpack.prod.babel.js b/modules/web-console/frontend/webpack/webpack.prod.babel.js index cced53d..aaca632 100644 --- a/modules/web-console/frontend/webpack/webpack.prod.babel.js +++ b/modules/web-console/frontend/webpack/webpack.prod.babel.js @@ -17,7 +17,7 @@ import merge from 'webpack-merge'; -import ExtractTextPlugin from 'extract-text-webpack-plugin'; +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); import UglifyJSPlugin from 'uglifyjs-webpack-plugin'; import commonCfg from './webpack.common'; @@ -29,20 +29,17 @@ export default merge(commonCfg, { rules: [ { test: /\.css$/, - use: ExtractTextPlugin.extract({ - fallback: 'style', - use: ['css'] - }) + use: [MiniCssExtractPlugin.loader, 'css-loader'] }, { test: /\.scss$/, - use: ExtractTextPlugin.extract({ - fallback: 'style-loader', - use: ['css', 'sass'] - }) + use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'] } ] }, + plugins: [ + new MiniCssExtractPlugin({filename: 'assets/css/[name].[hash].css'}) + ], optimization: { minimizer: [ new UglifyJSPlugin({
