Speed up build (#1852)

* single build webpack

* fix demo shell test

demo-shell-ng2/config/helpers.js

@@ -1,7 +1,10 @@
 var path = require('path');
+
 var _root = path.resolve(__dirname, '..');
+
 function root(args) {
   args = Array.prototype.slice.call(arguments, 0);
   return path.join.apply(path, [_root].concat(args));
 }
+
 exports.root = root;

demo-shell-ng2/config/karma.conf.js

@@ -1,37 +1,71 @@
 var webpackConfig = require('./webpack.test');
 
 module.exports = function (config) {
-  var _config = {
-    basePath: '',
+    var _config = {
+        basePath: '',
 
-    frameworks: ['jasmine'],
+        frameworks: ['jasmine'],
 
-    files: [
-      { pattern: './config/karma-test-shim.js', watched: false }
-    ],
+        files: [
+            { pattern: './config/karma-test-shim.js', watched: false }
+        ],
 
-    preprocessors: {
-      './config/karma-test-shim.js': ['webpack', 'sourcemap']
-    },
+        preprocessors: {
+            './config/karma-test-shim.js': ['webpack', 'sourcemap']
+        },
 
-    webpack: webpackConfig,
+        webpack: webpackConfig,
 
-    webpackMiddleware: {
-      stats: 'errors-only'
-    },
+        webpackMiddleware: {
+            stats: 'errors-only'
+        },
 
-    webpackServer: {
-      noInfo: true
-    },
+        port: 9876,
 
-    reporters: ['mocha'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: false,
-    browsers: ['Chrome'],
-    singleRun: true
-  };
+        // level of logging
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_INFO,
 
-  config.set(_config);
+        colors: true,
+
+        autoWatch: true,
+
+        captureTimeout: 180000,
+        browserDisconnectTimeout: 180000,
+        browserDisconnectTolerance: 3,
+        browserNoActivityTimeout: 300000,
+
+        browsers: ['Chrome'],
+
+        customLaunchers: {
+            Chrome_travis_ci: {
+                base: 'Chrome',
+                flags: ['--no-sandbox']
+            }
+        },
+
+        // Karma plugins loaded
+        plugins: [
+            require('../node_modules/karma-jasmine'),
+            require('../node_modules/karma-coverage'),
+            require('../node_modules/karma-sourcemap-loader'),
+            require('../node_modules/karma-chrome-launcher'),
+            require('../node_modules/karma-mocha-reporter'),
+            require('../node_modules/karma-webpack'),
+            require('../node_modules/karma-jasmine-html-reporter')
+        ],
+
+        webpackServer: {
+            noInfo: true
+        },
+
+        reporters: ['mocha']
+
+    };
+
+    if (process.env.TRAVIS) {
+        config.browsers = ['Chrome_travis_ci'];
+    }
+
+    config.set(_config);
 };

demo-shell-ng2/config/webpack.common.js

@@ -1,22 +1,27 @@
-var webpack = require('webpack');
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var helpers = require('./helpers');
-var path = require('path');
-var fs = require('fs');
-var glob = require('glob');
-var CopyWebpackPlugin = require('copy-webpack-plugin');
+const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const helpers = require('./helpers');
+const path = require('path');
 
-const rootPath = helpers.root('node_modules');
-
-var pattern = '+(alfresco-js-api|ng2-alfresco|ng2-activiti)*';
-var options = {
-    cwd: rootPath,
-    realpath: true
-};
-
-var alfrescoLibs = glob.sync(pattern, options);
-// console.dir(alfrescoLibs);
+const alfrescoLibs = [
+    'ng2-activiti-analytics',
+    'ng2-activiti-diagrams',
+    'ng2-activiti-form',
+    'ng2-activiti-processlist',
+    'ng2-activiti-tasklist',
+    'ng2-alfresco-core',
+    'ng2-alfresco-datatable',
+    'ng2-alfresco-documentlist',
+    'ng2-alfresco-login',
+    'ng2-alfresco-search',
+    'ng2-alfresco-tag',
+    'ng2-alfresco-upload',
+    'ng2-alfresco-userinfo',
+    'ng2-alfresco-viewer',
+    'ng2-alfresco-webscript'
+];
 
 module.exports = {
     entry: {
@@ -24,146 +29,108 @@ module.exports = {
         'vendor': './app/vendor.ts',
         'app': './app/main.ts'
     },
-
-    resolve: {
-        extensions: ['', '.ts', '.js'],
-        modules: [
-            helpers.root('app'),
-            helpers.root('node_modules')
-        ],
-        root: rootPath,
-        fallback: rootPath
-    },
-
-    resolveLoader: {
-        alias: {
-            'systemjs-loader': helpers.root('config', 'loaders', 'system.js'),
-            'debug-loader': helpers.root('config', 'loaders', 'debug.js')
-        },
-        fallback: rootPath
-    },
     module: {
-        preLoaders: [
+        rules: [
             {
+                enforce: 'pre',
                 test: /\.js$/,
-                include: [
-                    ...alfrescoLibs
-                ],
-                loader: 'source-map-loader'
-            }
-        ],
-        loaders: [
+                include: [helpers.root('app')],
+                loader: 'source-map-loader',
+                exclude: [ /node_modules/, /public/, /resources/, /dist/]
+            },
+            {
+                enforce: 'pre',
+                test: /\.ts$/,
+                loader: 'tslint-loader',
+                include: [helpers.root('app')],
+                options: {
+                    emitErrors: true
+                },
+                exclude: [ /node_modules/, /public/, /resources/, /dist/]
+            },
+            {
+                enforce: 'pre',
+                test: /\.ts$/,
+                use: 'source-map-loader',
+                exclude: [ /public/, /resources/, /dist/]
+            },
             {
                 test: /\.ts$/,
-                loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'],
-                exclude: ['node_modules','public']
-            },
-            {
-                test: /\.js$/,
-                include: [
-                    ...alfrescoLibs
+                include: [helpers.root('app')],
+                loader: [
+                    'ts-loader',
+                    'angular2-template-loader'
                 ],
-                loaders: ['angular2-template-loader', 'source-map-loader', 'systemjs-loader']
+                exclude: [ /node_modules/, /public/, /resources/, /dist/]
             },
             {
                 test: /\.html$/,
-                exclude: alfrescoLibs,
-                loader: 'html'
+                loader: 'html-loader',
+                exclude: [ /node_modules/, /public/, /resources/, /dist/]
             },
             {
-                test: /\.html$/,
-                include: alfrescoLibs,
-                loader: 'html',
-                query: {
-                    interpolate: true
-                }
+                test: /\.css$/,
+                exclude: helpers.root('app'),
+                loader: ExtractTextPlugin.extract({
+                    fallback: 'style-loader',
+                    use: 'css-loader?sourceMap'
+                })
+            },
+            {
+                test: /\.css$/,
+                include: helpers.root('app'),
+                loader: 'raw-loader'
             },
             {
                 test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-                loader: 'file?name=assets/[name].[hash].[ext]'
-            },
-            {
-                test: /\.css$/,
-                exclude: [
-                    helpers.root('app'),
-                    ...alfrescoLibs
-                ],
-                loader: ExtractTextPlugin.extract('style', 'css?sourceMap')
-            },
-            {
-                test: /\.css$/,
-                include: [
-                    helpers.root('app'),
-                    ...alfrescoLibs
-                ],
-                loader: 'raw'
+                loader: 'file-loader?name=assets/[name].[hash].[ext]'
             }
         ]
     },
-
+    resolve: {
+        extensions: ['.ts', '.js'],
+        modules: [helpers.root('../ng2-components'), helpers.root('node_modules')]
+    },
     plugins: [
-
-        new webpack.WatchIgnorePlugin([ new RegExp('^((?!(ng2-activiti|ng2-alfresco|demo-shell-ng2)).)((?!(src|app)).)*$')]),
+        // Workaround for angular/angular#11580
+        new webpack.ContextReplacementPlugin(
+            // The (\\|\/) piece accounts for path separators in *nix and Windows
+            /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
+            helpers.root('./app'), // location of your src
+            {} // a map of your routes
+        ),
+        new HtmlWebpackPlugin({
+            template: './index.html'
+        }),
 
         new CopyWebpackPlugin([
+            ... alfrescoLibs.map(lib => {
+                return {
+                    context: `../ng2-components/${lib}/bundles/assets/` ,
+                    from: '**/*',
+                    to: `bundles/assets/`
+                }
+            }),
+            {
+                context: 'resources/i18n',
+                from: '**/*.json',
+                to: 'resources/i18n'
+            },
+            ... alfrescoLibs.map(lib => {
+                return {
+                    context: 'node_modules',
+                    from: `${lib}/src/i18n/*.json`,
+                    to: 'node_modules'
+                }
+            }),
+            {
+                from: 'favicon-96x96.png'
+            },
+            {
+                from: 'node_modules/pdfjs-dist/build/pdf.worker.js',
+                to: 'pdf.worker.js'
+            },
             {
-                from: 'versions.json'
-            },{
-                context: 'node_modules',
-                from: 'element.scrollintoviewifneeded-polyfill/index.js',
-                to: 'js/element.scrollintoviewifneeded-polyfill.js',
-                flatten: true
-            },{
-                context: 'node_modules',
-                from: 'classlist-polyfill/src/index.js',
-                to: 'js/classlist-polyfill.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from: 'intl/dist/Intl.min.js',
-                to: 'js/Intl.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from: 'web-animations-js/web-animations.min.js',
-                to: 'js/web-animations.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from: 'core-js/client/shim.min.js',
-                to: 'js/shim.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from:  'es6-shim/es6-shim.min.js',
-                to: 'js/es6-shim.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from:  'es5-shim/es5-shim.min.js',
-                to: 'js/es5-shim.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from:  'systemjs/dist/system-polyfills.js',
-                to: 'js/system-polyfills.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from:  'material-design-lite/material.min.js',
-                to: 'js/material.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from:  'material-design-lite/material.min.js',
-                to: 'js/material.min.js',
-                flatten: true
-            }, {
-                context: 'node_modules',
-                from: 'material-design-icons/iconfont/',
-                to: 'css/iconfont/',
-                flatten: true
-            }, {
                 context: 'public',
                 from: '',
                 to: ''
@@ -172,15 +139,6 @@ module.exports = {
 
         new webpack.optimize.CommonsChunkPlugin({
             name: ['app', 'vendor', 'polyfills']
-        }),
-
-        new HtmlWebpackPlugin({
-            template: 'index.html'
         })
-    ],
-
-    node: {
-        fs: 'empty',
-        module: false
-    }
+    ]
 };

demo-shell-ng2/config/webpack.dev.js

@@ -1,11 +1,9 @@
-var webpackMerge = require('webpack-merge');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var commonConfig = require('./webpack.common.js');
-var helpers = require('./helpers');
-var CopyWebpackPlugin = require('copy-webpack-plugin');
+const webpackMerge = require('webpack-merge');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const commonConfig = require('./webpack.common.js');
+const helpers = require('./helpers');
 
 module.exports = webpackMerge(commonConfig, {
-
     devtool: 'cheap-module-eval-source-map',
 
     output: {
@@ -15,54 +13,15 @@ module.exports = webpackMerge(commonConfig, {
     },
 
     plugins: [
-        new ExtractTextPlugin('[name].css'),
-        new CopyWebpackPlugin([
-            {
-                from: 'favicon-96x96.png'
-            },
-            {
-                from: 'node_modules/pdfjs-dist/build/pdf.worker.js',
-                to: 'pdf.worker.js'
-            },
-            {
-                context: 'resources/i18n',
-                from: '**/*.json',
-                to: 'resources/i18n'
-            },
-            // Copy i18n folders for all modules with ng2-alfresco- prefix
-            {
-                context: 'node_modules',
-                from: 'ng2-alfresco-*/src/i18n/*.json',
-                to: 'node_modules'
-            },
-            // Copy i18n folders for all modules with ng2-activiti- prefix
-            {
-                context: 'node_modules',
-                from: 'ng2-activiti-*/src/i18n/*.json',
-                to: 'node_modules'
-            },
-            // Copy asstes folders for all modules with ng2-activiti- prefix
-            {
-                context: 'node_modules',
-                from: 'ng2-activiti-*/src/assets/images/*.*',
-                to: 'assets/images',
-                flatten: true
-            },
-            // Copy asstes folders for all modules with ng2-alfresco- prefix
-            {
-                context: 'node_modules',
-                from: 'ng2-alfresco-*/src/assets/images/*.*',
-                to: 'assets/images',
-                flatten: true
-            }
-        ])
+        new ExtractTextPlugin('[name].css')
     ],
 
     devServer: {
-        host: '0.0.0.0',
+        contentBase: helpers.root('dist'),
+        compress: true,
         port: 3000,
-        inline: true,
         historyApiFallback: true,
-        stats: 'minimal'
+        host: '0.0.0.0',
+        inline: true
     }
 });

demo-shell-ng2/config/webpack.prod.js

@@ -1,104 +1,45 @@
-var webpack = require('webpack');
-var webpackMerge = require('webpack-merge');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
-var CopyWebpackPlugin = require('copy-webpack-plugin');
-var commonConfig = require('./webpack.common.js');
-var helpers = require('./helpers');
+const webpack = require('webpack');
+const webpackMerge = require('webpack-merge');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const commonConfig = require('./webpack.common.js');
+const helpers = require('./helpers');
 
 const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
 
 module.exports = webpackMerge(commonConfig, {
-  devtool: 'source-map',
+    devtool: 'source-map',
 
-  output: {
-    path: helpers.root('dist'),
-    publicPath: '/',
-    filename: '[name].[hash].js',
-    chunkFilename: '[id].[hash].chunk.js'
-  },
+    output: {
+        path: helpers.root('dist'),
+        publicPath: '/',
+        filename: '[name].[hash].js',
+        chunkFilename: '[id].[hash].chunk.js'
+    },
 
-  htmlLoader: {
-    minimize: false // workaround for ng2
-  },
-
-  plugins: [
-    // Define env variables to help with builds
-    // Reference: https://webpack.github.io/docs/list-of-plugins.html#defineplugin
-    new webpack.DefinePlugin({
-      'process.env': {
-        'ENV': JSON.stringify(ENV)
-      }
-    }),
-
-    // Reference: http://webpack.github.io/docs/list-of-plugins.html#noerrorsplugin
-    // Only emit files when there are no errors
-    new webpack.NoErrorsPlugin(),
-
-    // Reference: http://webpack.github.io/docs/list-of-plugins.html#dedupeplugin
-    // Dedupe modules in the output
-    new webpack.optimize.DedupePlugin(),
-
-    // Reference: http://webpack.github.io/docs/list-of-plugins.html#uglifyjsplugin
-    // Minify all javascript, switch loaders to minimizing mode
-     new webpack.optimize.UglifyJsPlugin({
-       output:{
-         comments: false
-       },
-       mangle: {
-         keep_fnames: true
-       },
-       compressor: {
-         screw_ie8: true,
-         warnings: false
-       }
-     }),
-
-    // Extract css files
-    // Reference: https://github.com/webpack/extract-text-webpack-plugin
-    // Disabled when in test mode or not in build mode
-    new ExtractTextPlugin('[name].[hash].css'),
-
-    // Copy assets from the public folder
-    // Reference: https://github.com/kevlened/copy-webpack-plugin
-    new CopyWebpackPlugin([
-        {
-            from: 'favicon-96x96.png'
-        },
-        {
-            from: 'node_modules/pdfjs-dist/build/pdf.worker.js',
-            to: 'pdf.worker.js'
-        },
-        {
-            context: 'resources/i18n',
-            from: '**/*.json',
-            to: 'resources/i18n'
-        },
-        // Copy i18n folders for all modules with ng2-alfresco- prefix
-        {
-            context: 'node_modules',
-            from: 'ng2-alfresco-*/src/i18n/*.json',
-            to: 'node_modules'
-        },
-        // Copy i18n folders for all modules with ng2-activiti- prefix
-        {
-            context: 'node_modules',
-            from: 'ng2-activiti-*/src/i18n/*.json',
-            to: 'node_modules'
-        },
-        // Copy asstes folders for all modules with ng2-activiti- prefix
-        {
-            context: 'node_modules',
-            from: 'ng2-activiti-*/src/assets/images/*.*',
-            to: 'assets/images',
-            flatten : true
-        },
-        // Copy asstes folders for all modules with ng2-alfresco- prefix
-        {
-            context: 'node_modules',
-            from: 'ng2-alfresco-*/src/assets/images/*.*',
-            to: 'assets/images',
-            flatten : true
-        }
-    ])
-  ]
+    plugins: [
+        new webpack.NoEmitOnErrorsPlugin(),
+        new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
+            mangle: {
+                keep_fnames: true
+            },
+            compress: {
+                warnings: false
+            },
+            output: {
+                comments: false
+            },
+            sourceMap: true
+        }),
+        new ExtractTextPlugin('[name].[hash].css'),
+        new webpack.DefinePlugin({
+            'process.env': {
+                'ENV': JSON.stringify(ENV)
+            }
+        }),
+        new webpack.LoaderOptionsPlugin({
+            htmlLoader: {
+                minimize: false // workaround for ng2
+            }
+        })
+    ]
 });

demo-shell-ng2/config/webpack.test.js

@@ -1,78 +1,45 @@
-var helpers = require('./helpers');
-var fs = require('fs');
-var glob = require('glob');
-
-const rootPath = helpers.root('node_modules');
-
-var pattern = '+(alfresco-js-api|ng2-alfresco|ng2-activiti)*';
-var options = {
-    cwd: rootPath,
-    realpath: true
-};
-
-var alfrescoLibs = glob.sync(pattern, options);
+const webpack = require('webpack');
+const helpers = require('./helpers');
 
 module.exports = {
-  devtool: 'inline-source-map',
+    devtool: 'inline-source-map',
 
-  resolve: {
-    extensions: ['', '.ts', '.js'],
-    modules: [
-      helpers.root('app'),
-      helpers.root('node_modules')
-    ],
-    root: rootPath,
-    fallback: rootPath
-  },
+    resolve: {
+        extensions: ['.ts', '.js'],
+        modules: [helpers.root('../ng2-components'), helpers.root('node_modules')]
+    },
 
-  resolveLoader: {
-      alias: {
-          'systemjs-loader': helpers.root('config', 'loaders', 'system.js')
-      },
-      fallback: rootPath
-  },
+    module: {
+        rules: [
+            {
+                test: /\.ts$/,
+                loaders: ['ts-loader', 'angular2-template-loader'],
+                exclude: [ /public/, /resources/, /dist/]
+            },
+            {
+                test: /\.html$/,
+                loader: 'html-loader',
+                exclude: [ /public/, /resources/, /dist/]
 
-  module: {
-      preLoaders: [
-          {
-              test: /\.js$/,
-              include: [
-                  ...alfrescoLibs
-      ],
-      loader: 'source-map-loader'
-      }
-    ],
-    loaders: [
-        {
-            test: /\.ts$/,
-            loaders: ['awesome-typescript-loader', 'angular2-template-loader', 'systemjs-loader'],
-            exclude: ['node_modules','public']
-        },
-      {
-        test: /\.js$/,
-        include: [
-          ...alfrescoLibs
-        ],
-        loaders: ['angular2-template-loader', 'source-map-loader', 'systemjs-loader']
-      },
-      {
-        test: /\.html$/,
-        loader: 'html'
+            },
+            {
+                test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
+                loader: 'null-loader'
+            },
+            {
+                test: /\.css$/,
+                loader: ['to-string-loader', 'css-loader'],
+                exclude: [ /public/, /resources/, /dist/]
+            }
+        ]
+    },
 
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
-        loader: 'null'
-      },
-      {
-          test: /\.css$/,
-          loader: 'raw'
-      }
+    plugins: [
+        new webpack.ContextReplacementPlugin(
+            // The (\\|\/) piece accounts for path separators in *nix and Windows
+            /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
+            helpers.root('./src'), // location of your src
+            {} // a map of your routes
+        )
     ]
-  },
-
-  node: {
-      fs: 'empty',
-      module: false
-  }
 }