Attempt to fix build.

src/Squidex/app-config/webpack.config.js

@@ -44,63 +44,61 @@ module.exports = {
          *
          * See: https://webpack.js.org/configuration/module/#module-rules
          */
-        rules: [
-            {
-                test: /\.ts$/,
-                use: [{
-                    loader: 'awesome-typescript-loader'
-                }, {
-                    loader: 'angular2-router-loader'
-                }, {
-                    loader: 'angular2-template-loader'
-                }, {
-                    loader: 'tslint-loader'
-                }],
-                exclude: /node_modules/
-            }, {
-                test: /\.ts$/,
-                use: [{
-                    loader: 'awesome-typescript-loader'
-                }],
-                include: /node_modules/
-            }, {
-                test: /\.js\.flow$/,
-                use: [{
-                    loader: 'ignore-loader'
-                }],
-                include: /node_modules/
-            }, {
-                test: /\.html$/,
-                use: [{
-                    loader: 'raw-loader'
-                }]
+        rules: [{
+            test: /\.ts$/,
+            use: [{
+                loader: 'awesome-typescript-loader'
             }, {
-                test: /\.(woff|woff2|ttf|eot)(\?.*$|$)/,
-                use: [{
-                    loader: 'file-loader?name=assets/[name].[hash].[ext]'
-                }]
+                loader: 'angular-router-loader'
             }, {
-                test: /\.(png|jpe?g|gif|svg|ico)(\?.*$|$)/,
-                use: [{
-                    loader: 'file-loader?name=assets/[name].[hash].[ext]'
-                }]
+                loader: 'angular2-template-loader'
             }, {
-                test: /\.css$/,
-                use: [
-                    plugins.MiniCssExtractPlugin.loader,
-                {
-                    loader: 'css-loader'
-                }]
+                loader: 'tslint-loader'
+            }],
+            exclude: /node_modules/
+        }, {
+            test: /\.ts$/,
+            use: [{
+                loader: 'awesome-typescript-loader'
+            }],
+            include: /node_modules/
+        }, {
+            test: /\.js\.flow$/,
+            use: [{
+                loader: 'ignore-loader'
+            }],
+            include: /node_modules/
+        }, {
+            test: /\.html$/,
+            use: [{
+                loader: 'raw-loader'
+            }]
+        }, {
+            test: /\.(woff|woff2|ttf|eot)(\?.*$|$)/,
+            use: [{
+                loader: 'file-loader?name=assets/[name].[hash].[ext]'
+            }]
+        }, {
+            test: /\.(png|jpe?g|gif|svg|ico)(\?.*$|$)/,
+            use: [{
+                loader: 'file-loader?name=assets/[name].[hash].[ext]'
+            }]
+        }, {
+            test: /\.css$/,
+            use: [
+                plugins.MiniCssExtractPlugin.loader,
+            {
+                loader: 'css-loader'
+            }]
+        }, {
+            test: /\.scss$/,
+            use: [{
+                loader: 'raw-loader'
             }, {
-                test: /\.scss$/,
-                use: [{
-                    loader: 'raw-loader'
-                }, {
-                    loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
-                }],
-                exclude: helpers.root('app', 'theme')
-            }
-        ]
+                loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
+            }],
+            exclude: helpers.root('app', 'theme')
+        }]
     },
 
     plugins: [

src/Squidex/app-config/webpack.run.dev.js

@@ -27,19 +27,17 @@ module.exports = webpackMerge(runConfig, {
          *
          * See: https://webpack.js.org/configuration/module/#module-rules
          */
-        rules: [
-            {
-                test: /\.scss$/,
-                use: [{
-                    loader: 'style-loader'
-                }, {
-                    loader: 'css-loader'
-                }, {
-                    loader: 'sass-loader?sourceMap', options: { includePaths: [helpers.root('app', 'theme')] }
-                }],
-                include: helpers.root('app', 'theme')
-            }
-        ]
+        rules: [{
+            test: /\.scss$/,
+            use: [{
+                loader: 'style-loader'
+            }, {
+                loader: 'css-loader'
+            }, {
+                loader: 'sass-loader?sourceMap', options: { includePaths: [helpers.root('app', 'theme')] }
+            }],
+            include: helpers.root('app', 'theme')
+        }]
     },
 
     devServer: {

src/Squidex/app-config/webpack.run.prod.js

@@ -54,40 +54,38 @@ module.exports = webpackMerge(runConfig, {
          *
          * See: https://webpack.js.org/configuration/module/#module-rules
          */
-        rules: [
+        rules: [{
+            test: /\.scss$/,
+            /*
+             * Extract the content from a bundle to a file
+             * 
+             * See: https://github.com/webpack-contrib/extract-text-webpack-plugin
+             */
+            use: [
+                plugins.MiniCssExtractPlugin.loader,
             {
-                test: /\.scss$/,
-                /*
-                 * Extract the content from a bundle to a file
-                 * 
-                 * See: https://github.com/webpack-contrib/extract-text-webpack-plugin
-                 */
-                use: [
-                    plugins.MiniCssExtractPlugin.loader,
-                {
-                    loader: 'css-loader', options: { minimize: true },
-                }, {
-                    loader: 'sass-loader'
-                }],
-                /*
-                 * Do not include component styles
-                 */
-                include: helpers.root('app', 'theme'),
+                loader: 'css-loader', options: { minimize: true },
             }, {
-                test: /\.scss$/,
-                use: [{
-                    loader: 'raw-loader'
-                }, {
-                    loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
-                }],
-                exclude: helpers.root('app', 'theme'),
+                loader: 'sass-loader'
+            }],
+            /*
+             * Do not include component styles
+             */
+            include: helpers.root('app', 'theme'),
+        }, {
+            test: /\.scss$/,
+            use: [{
+                loader: 'raw-loader'
             }, {
-                test: /\.ts/, 
-                use: [{
-                    loader: '@ngtools/webpack'
-                }]
-            }
-        ]
+                loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] }
+            }],
+            exclude: helpers.root('app', 'theme'),
+        }, { 
+            test: /\.ts/, 
+            use: [{
+                loader: '@ngtools/webpack'
+            }]
+        }]
     },
 
     plugins: [

src/Squidex/app-config/webpack.test.coverage.js

@@ -13,27 +13,25 @@ module.exports = webpackMerge(testConfig, {
          *
          * See: https://webpack.js.org/configuration/module/#module-rules
          */
-        rules: [
-            {
-                test: /\.ts$/,
-                use: [{
-                    loader: 'awesome-typescript-loader'
-                }],
-                include: [/\.(e2e|spec)\.ts$/],
+        rules: [{
+            test: /\.ts$/,
+            use: [{
+                loader: 'awesome-typescript-loader'
+            }],
+            include: [/\.(e2e|spec)\.ts$/],
             
+        }, {
+            test: /\.ts$/,
+            use: [{
+                loader: 'istanbul-instrumenter-loader'
+            },{
+                loader: 'awesome-typescript-loader'
             }, {
-                test: /\.ts$/,
-                use: [{
-                    loader: 'istanbul-instrumenter-loader'
-                },{
-                    loader: 'awesome-typescript-loader'
-                }, {
-                    loader: 'angular2-router-loader'
-                }, {
-                    loader: 'angular2-template-loader'
-                }],
-                exclude: [/\.(e2e|spec)\.ts$/]
-            }
-        ]
+                loader: 'angular-router-loader'
+            }, {
+                loader: 'angular2-template-loader'
+            }],
+            exclude: [/\.(e2e|spec)\.ts$/]
+        }]
     }
 });

src/Squidex/package.json

@@ -55,7 +55,7 @@
     "@types/node": "10.1.2",
     "@types/react": "16.3.16",
     "@types/react-dom": "16.0.5",
-    "angular2-router-loader": "0.3.5",
+    "angular-router-loader": "0.8.5",
     "angular2-template-loader": "0.6.2",
     "awesome-typescript-loader": "5.0.0",
     "codelyzer": "4.3.0",