Some progress

Squidex · Jun 1, 2018 · c177b1d · c177b1d
1 parent 68c2048
commit c177b1d
Show file tree

Hide file tree

Showing 5 changed files with 17,264 additions and 44 deletions.
diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js
@@ -1,9 +1,9 @@
-        var webpack = require('webpack'),
-               path = require('path'),
-  HtmlWebpackPlugin = require('html-webpack-plugin'),
-  ExtractTextPlugin = require('extract-text-webpack-plugin'),
-TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'),
-            helpers = require('./helpers');
+var webpack = require('webpack'),
+    path = require('path'),
+    HtmlWebpackPlugin = require('html-webpack-plugin'),
+    MiniCssExtractPlugin = require('mini-css-extract-plugin'),
+    TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'),
+    helpers = require('./helpers');
 
 module.exports = {
     /**
@@ -21,7 +21,6 @@ module.exports = {
         modules: [
             helpers.root('app'),
             helpers.root('app', 'theme'),
-            helpers.root('app-libs'),
             helpers.root('node_modules')
         ],
 
@@ -45,19 +44,19 @@ module.exports = {
             {
                 test: /\.ts$/,
                 use: [{
-                    loader: 'awesome-typescript-loader' 
+                    loader: 'awesome-typescript-loader'
                 }, {
                     loader: 'angular2-router-loader'
                 }, {
                     loader: 'angular2-template-loader'
                 }, {
-                    loader: 'tslint-loader' 
+                    loader: 'tslint-loader'
                 }],
                 exclude: /node_modules/
             }, {
                 test: /\.ts$/,
                 use: [{
-                    loader: 'awesome-typescript-loader' 
+                    loader: 'awesome-typescript-loader'
                 }],
                 include: /node_modules/
             }, {
@@ -83,21 +82,17 @@ module.exports = {
                 }]
             }, {
                 test: /\.css$/,
-                /*
-                 * Extract the content from a bundle to a file
-                 * 
-                 * See: https://github.com/webpack-contrib/extract-text-webpack-plugin
-                 */
-                use: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader?sourceMap' })
+                use: [
+                    MiniCssExtractPlugin.loader,
+                {
+                    loader: 'css-loader'
+                }]
             }, {
                 test: /\.scss$/,
                 use: [{
                     loader: 'raw-loader'
                 }, {
-                    loader: 'sass-loader',
-                    options: {
-                        includePaths: [helpers.root('app', 'theme')]
-                    }
+                    loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
                 }],
                 exclude: helpers.root('app', 'theme')
             }

diff --git a/src/Squidex/app-config/webpack.run.dev.js b/src/Squidex/app-config/webpack.run.dev.js
@@ -1,7 +1,7 @@
-     var webpackMerge = require('webpack-merge'),
-    ExtractTextPlugin = require('extract-text-webpack-plugin'),
-            runConfig = require('./webpack.run.base.js'),
-              helpers = require('./helpers');
+    var webpackMerge = require('webpack-merge'),
+MiniCssExtractPlugin = require('mini-css-extract-plugin'),
+           runConfig = require('./webpack.run.base.js'),
+             helpers = require('./helpers');
 
 module.exports = webpackMerge(runConfig, {
     mode: 'development',
@@ -31,18 +31,20 @@ module.exports = webpackMerge(runConfig, {
                 }, {
                     loader: 'css-loader'
                 }, {
-                    loader: 'sass-loader?sourceMap',
-                    options: {
-                        includePaths: [helpers.root('app', 'theme')]
-                    }
+                    loader: 'sass-loader?sourceMap', options: { includePaths: [helpers.root('app', 'theme')] }
                 }],
                 include: helpers.root('app', 'theme')
             }
         ]
     },
 
     plugins: [
-        new ExtractTextPlugin('[name].css')
+        /*
+         * Puts each bundle into a file and appends the hash of the file to the path.
+         * 
+         * See: https://github.com/webpack-contrib/mini-css-extract-plugin
+         */
+        new MiniCssExtractPlugin('[name].css'),
     ],
 
     devServer: {

diff --git a/src/Squidex/app-config/webpack.run.prod.js b/src/Squidex/app-config/webpack.run.prod.js
@@ -1,9 +1,9 @@
-      var webpack = require('webpack'),
-     webpackMerge = require('webpack-merge'),
-ExtractTextPlugin = require('extract-text-webpack-plugin'),
-   ngToolsWebpack = require('@ngtools/webpack'),
-        runConfig = require('./webpack.run.base.js'),
-          helpers = require('./helpers');
+         var webpack = require('webpack'),
+        webpackMerge = require('webpack-merge'),
+MiniCssExtractPlugin = require('mini-css-extract-plugin'),
+      ngToolsWebpack = require('@ngtools/webpack'),
+           runConfig = require('./webpack.run.base.js'),
+             helpers = require('./helpers');
 
 helpers.removeLoaders(runConfig, ['scss', 'ts']);
 
@@ -56,7 +56,13 @@ module.exports = webpackMerge(runConfig, {
                  * 
                  * See: https://github.com/webpack-contrib/extract-text-webpack-plugin
                  */
-                use: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader?minimize!sass-loader?sourceMap' }),
+                use: [
+                    MiniCssExtractPlugin.loader,
+                {
+                    loader: 'css-loader'
+                }, {
+                    loader: 'sass-loader'
+                }],
                 /*
                  * Do not include component styles
                  */
@@ -66,10 +72,7 @@ module.exports = webpackMerge(runConfig, {
                 use: [{
                     loader: 'raw-loader'
                 }, {
-                    loader: 'sass-loader',
-                    options: {
-                        includePaths: [helpers.root('app', 'theme')]
-                    }
+                    loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
                 }],
                 exclude: helpers.root('app', 'theme'),
             }, { 
@@ -85,9 +88,9 @@ module.exports = webpackMerge(runConfig, {
         /*
          * Puts each bundle into a file and appends the hash of the file to the path.
          * 
-         * See: https://github.com/webpack/extract-text-webpack-plugin
+         * See: https://github.com/webpack-contrib/mini-css-extract-plugin
          */
-        new ExtractTextPlugin('[name].css'),
+        new MiniCssExtractPlugin('[name].css'),
 
         new ngToolsWebpack.AngularCompilerPlugin({
             tsConfigPath: './tsconfig.json',