Do not add the lazy routes to the entry points.

Author: hansl

addon/ng2/models/webpack-build-common.ts

@@ -9,13 +9,7 @@ import {findLazyModules} from './find-lazy-modules';
 
 export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
   const sourceRoot = path.resolve(projectRoot, `./${sourceDir}`);
-
   const lazyModules = findLazyModules(path.resolve(projectRoot, sourceDir));
-  const entries = Object.assign({
-    main: [path.join(sourceRoot, 'main.ts')],
-    polyfills: path.join(sourceRoot, 'polyfills.ts')
-  }, lazyModules);
-
 
   return {
     devtool: 'source-map',
@@ -24,31 +18,15 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
       root: path.resolve(projectRoot, `./${sourceDir}`)
     },
     context: path.resolve(__dirname, './'),
-    entry: entries,
+    entry: {
+      main: [path.join(sourceRoot, 'main.ts')],
+      polyfills: path.join(sourceRoot, 'polyfills.ts')
+    },
     output: {
       path: path.resolve(projectRoot, './dist'),
       filename: '[name].bundle.js'
     },
     module: {
-      preLoaders: [
-        {
-          test: /\.js$/,
-          loader: 'source-map-loader',
-          exclude: [
-            path.resolve(projectRoot, 'node_modules/rxjs'),
-            path.resolve(projectRoot, 'node_modules/@angular'),
-          ]
-        },
-        {
-          test: /(systemjs_component_resolver|system_js_ng_module_factory_loader)\.js$/,
-          loader: 'string-replace-loader',
-          query: {
-            search: '(lang_1(.*[\\n\\r]+\\s*\\.|\\.))?(global(.*[\\n\\r]+\\s*\\.|\\.))?(System|SystemJS)(.*[\\n\\r]+\\s*\\.|\\.)import\\(',
-            replace: 'System.import("" + ',
-            flags: 'g'
-          }
-        },
-      ],
       loaders: [
         {
           test: /\.ts$/,
@@ -75,13 +53,14 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
       ]
     },
     plugins: [
+      new webpack.ContextReplacementPlugin(/.*/, sourceRoot, lazyModules),
       new atl.ForkCheckerPlugin(),
       new HtmlWebpackPlugin({
         template: path.resolve(projectRoot, `./${sourceDir}/index.html`),
         chunksSortMode: 'dependency'
       }),
       new webpack.optimize.CommonsChunkPlugin({
-        name: 'polyfills'
+        name: ['polyfills']
       }),
       new webpack.optimize.CommonsChunkPlugin({
         minChunks: Infinity,
@@ -93,7 +72,7 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
         context: path.resolve(projectRoot, './public'),
         from: '**/*',
         to: path.resolve(projectRoot, './dist')
-      }]),
+      }])
     ],
     node: {
       fs: 'empty',