Minor improvements to logging and webpack.

src/Squidex.Infrastructure/Log/ConsoleLogChannel.cs

@@ -13,6 +13,12 @@ namespace Squidex.Infrastructure.Log
     public sealed class ConsoleLogChannel : ILogChannel, IDisposable
     {
         private readonly ConsoleLogProcessor processor = new ConsoleLogProcessor();
+        private readonly bool useColors;
+
+        public ConsoleLogChannel(bool useColors = false)
+        {
+            this.useColors = useColors;
+        }
 
         public void Dispose()
         {
@@ -23,13 +29,16 @@ namespace Squidex.Infrastructure.Log
         {
             var color = 0;
 
-            if (logLevel == SemanticLogLevel.Warning)
+            if (useColors)
-            {
-                color = 0xffff00;
-            }
-            else if (logLevel >= SemanticLogLevel.Error)
             {
-                color = 0xff0000;
+                if (logLevel == SemanticLogLevel.Warning)
+                {
+                    color = 0xffff00;
+                }
+                else if (logLevel >= SemanticLogLevel.Error)
+                {
+                    color = 0xff0000;
+                }
             }
 
             processor.EnqueueMessage(new LogMessageEntry { Message = message, Color = color });

src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs

@@ -18,6 +18,10 @@ namespace Squidex.Infrastructure.Log.Internal
             this.logToStdError = logToStdError;
         }
 
+        public void Reset()
+        {
+        }
+
         public void WriteLine(int color, string message)
         {
             if (color != 0 && logToStdError)

src/Squidex.Infrastructure/Log/Internal/ConsoleLogProcessor.cs

@@ -86,6 +86,10 @@ namespace Squidex.Infrastructure.Log.Internal
                 {
                     Debug.WriteLine($"Failed to shutdown log queue grateful: {ex}.");
                 }
+                finally
+                {
+                    console.Reset();
+                }
             }
         }
     }

src/Squidex.Infrastructure/Log/Internal/IConsole.cs

@@ -10,5 +10,7 @@ namespace Squidex.Infrastructure.Log.Internal
     public interface IConsole
     {
         void WriteLine(int color, string message);
+
+        void Reset();
     }
 }

src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs

@@ -18,6 +18,11 @@ namespace Squidex.Infrastructure.Log.Internal
             this.logToStdError = logToStdError;
         }
 
+        public void Reset()
+        {
+            Console.ResetColor();
+        }
+
         public void WriteLine(int color, string message)
         {
             if (color != 0)

src/Squidex/Config/Domain/LoggingServices.cs

@@ -42,6 +42,13 @@ namespace Squidex.Config.Domain
                     .As<IInitializable>();
             }
 
+            var useColors = config.GetValue<bool>("logging:colors");
+
+            if (console == null)
+            {
+                console = new ConsoleLogChannel(useColors);
+            }
+
             services.AddSingletonAs(console)
                 .As<ILogChannel>();
 

src/Squidex/app-config/karma.coverage.conf.js

@@ -1,4 +1,4 @@
-var webpackConfig = require('./webpack.test');
+var webpackConfig = require('./webpack.test.coverage');
 
 module.exports = function (config) {
     var _config = {

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

@@ -1,9 +1,13 @@
-var webpack = require('webpack'),
+const webpack = require('webpack'),
-    path = require('path'),
+         path = require('path'),
-    HtmlWebpackPlugin = require('html-webpack-plugin'),
+      helpers = require('./helpers');
-    MiniCssExtractPlugin = require('mini-css-extract-plugin'),
+
-    TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'),
+const plugins = {
-    helpers = require('./helpers');
+    // https://github.com/webpack-contrib/mini-css-extract-plugin
+    MiniCssExtractPlugin: require('mini-css-extract-plugin'),
+    // https://github.com/dividab/tsconfig-paths-webpack-plugin
+    TsconfigPathsPlugin: require('tsconfig-paths-webpack-plugin')
+};
 
 module.exports = {
     /**
@@ -25,7 +29,7 @@ module.exports = {
         ],
 
         plugins: [
-            new TsconfigPathsPlugin()
+            new plugins.TsconfigPathsPlugin()
         ]
     },
 
@@ -83,7 +87,7 @@ module.exports = {
             }, {
                 test: /\.css$/,
                 use: [
-                    MiniCssExtractPlugin.loader,
+                    plugins.MiniCssExtractPlugin.loader,
                 {
                     loader: 'css-loader'
                 }]
@@ -100,6 +104,13 @@ module.exports = {
     },
 
     plugins: [
+        /*
+         * 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 plugins.MiniCssExtractPlugin('[name].css'),
+
         new webpack.LoaderOptionsPlugin({
             options: {
                 tslint: {

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

@@ -1,8 +1,11 @@
-      var webpack = require('webpack'),
+const webpack = require('webpack'),
-     webpackMerge = require('webpack-merge'),
+ webpackMerge = require('webpack-merge'),
-HtmlWebpackPlugin = require('html-webpack-plugin'),
+ commonConfig = require('./webpack.config.js'),
-     commonConfig = require('./webpack.config.js'),
+      helpers = require('./helpers');
-          helpers = require('./helpers');
+
+const plugins = {
+    HtmlWebpackPlugin: require('html-webpack-plugin')
+};
 
 module.exports = webpackMerge(commonConfig, {
     /**
@@ -17,21 +20,14 @@ module.exports = webpackMerge(commonConfig, {
     },
 
     plugins: [
-        /**
+        new plugins.HtmlWebpackPlugin({
-         * Simplifies creation of HTML files to serve your webpack bundles.
-         * This is especially useful for webpack bundles that include a hash in the filename
-         * which changes every compilation.
-         *
-         * See: https://github.com/ampedandwired/html-webpack-plugin
-         */
-        new HtmlWebpackPlugin({
             hash: true,
             chunks: ['shims', 'app'],
             chunksSortMode: 'manual',
             template: 'wwwroot/index.html'
         }),
         
-        new HtmlWebpackPlugin({
+        new plugins.HtmlWebpackPlugin({
             template: 'wwwroot/theme.html', hash: true, chunksSortMode: 'none', filename: 'theme.html'
         })
     ]

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

@@ -1,13 +1,13 @@
-    var webpackMerge = require('webpack-merge'),
+const webpackMerge = require('webpack-merge'),
-MiniCssExtractPlugin = require('mini-css-extract-plugin'),
+         runConfig = require('./webpack.run.base.js'),
-           runConfig = require('./webpack.run.base.js'),
+           helpers = require('./helpers');
-             helpers = require('./helpers');
 
 module.exports = webpackMerge(runConfig, {
     mode: 'development',
 
     output: {
         filename: '[name].js',
+
         // Set the public path, because we are running the website from another port (5000)
         publicPath: 'http://localhost:3000/'
     },
@@ -37,20 +37,10 @@ module.exports = webpackMerge(runConfig, {
             }
         ]
     },
-
-    plugins: [
-        /*
-         * 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: {
-        historyApiFallback: true, stats: 'minimal',
         headers: {
             'Access-Control-Allow-Origin': '*'
-        }
+        },
+        historyApiFallback: true
     }
 });

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

@@ -1,10 +1,15 @@
-         var webpack = require('webpack'),
+const webpack = require('webpack'),
-        webpackMerge = require('webpack-merge'),
+ webpackMerge = require('webpack-merge'),
-MiniCssExtractPlugin = require('mini-css-extract-plugin'),
+    runConfig = require('./webpack.run.base.js'),
-      ngToolsWebpack = require('@ngtools/webpack'),
+      helpers = require('./helpers');
-           runConfig = require('./webpack.run.base.js'),
-             helpers = require('./helpers');
 
+const plugins = {
+    // https://www.npmjs.com/package/@ngtools/webpack
+    NgToolsWebpack: require('@ngtools/webpack'),
+    // https://github.com/webpack-contrib/mini-css-extract-plugin
+    MiniCssExtractPlugin: require('mini-css-extract-plugin'),
+};
+            
 helpers.removeLoaders(runConfig, ['scss', 'ts']);
 
 module.exports = webpackMerge(runConfig, {
@@ -57,9 +62,9 @@ module.exports = webpackMerge(runConfig, {
                  * See: https://github.com/webpack-contrib/extract-text-webpack-plugin
                  */
                 use: [
-                    MiniCssExtractPlugin.loader,
+                    plugins.MiniCssExtractPlugin.loader,
                 {
-                    loader: 'css-loader'
+                    loader: 'css-loader', options: { minimize: true },
                 }, {
                     loader: 'sass-loader'
                 }],
@@ -85,16 +90,11 @@ module.exports = webpackMerge(runConfig, {
     },
 
     plugins: [
-        /*
+        new plugins.NgToolsWebpack.AngularCompilerPlugin({
-         * Puts each bundle into a file and appends the hash of the file to the path.
+            entryModule: 'app/app.module#AppModule',
-         * 
+            sourceMap: false,
-         * See: https://github.com/webpack-contrib/mini-css-extract-plugin
+            skipSourceGeneration: false,
-         */
+            tsConfigPath: './tsconfig.json'
-        new MiniCssExtractPlugin('[name].css'),
-
-        new ngToolsWebpack.AngularCompilerPlugin({
-            tsConfigPath: './tsconfig.json',
-            entryModule: 'app/app.module#AppModule'
         })
     ]
 });

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

@@ -0,0 +1,38 @@
+var webpackMerge = require('webpack-merge'),
+            path = require('path'),
+         helpers = require('./helpers'),
+      testConfig = require('./webpack.test.js');
+
+helpers.removeLoaders(testConfig, ['ts']);
+
+module.exports = webpackMerge(testConfig, {
+    module: {        
+        /**
+         * An array of Rules which are matched to requests when modules are created.
+         *
+         * See: https://webpack.js.org/configuration/module/#module-rules
+         */
+        rules: [
+            {
+                test: /\.ts$/,
+                use: [{
+                    loader: 'awesome-typescript-loader'
+                }],
+                include: [/\.(e2e|spec)\.ts$/],
+                
+            }, {
+                test: /\.ts$/,
+                use: [{
+                    loader: 'istanbul-instrumenter-loader'
+                },{
+                    loader: 'awesome-typescript-loader'
+                }, {
+                    loader: 'angular2-router-loader'
+                }, {
+                    loader: 'angular2-template-loader'
+                }],
+                exclude: [/\.(e2e|spec)\.ts$/]
+            }
+        ]
+    }
+});

src/Squidex/appsettings.json

@@ -53,7 +53,11 @@
     /*
      * Setting the flag to true, enables well formatteds json logs.
      */
-    "human": true
+    "human": true,
+    /*
+     * Set to true, to use colors.
+     */
+    "colors": true
   },
 
   "assetStore": {

src/Squidex/package.json

@@ -9,6 +9,7 @@
     "test:coverage": "karma start karma.coverage.conf.js",
     "test:clean": "rimraf _test-output",
     "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
+    "start": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
     "build": "webpack --config app-config/webpack.run.prod.js",
     "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
     "build:clean": "rimraf wwwroot/build",