Actually allow the router to lazy load.

Author: hansl

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

@@ -4,17 +4,19 @@ import * as HtmlWebpackPlugin from 'html-webpack-plugin';
 import * as webpack from 'webpack';
 import * as atl from 'awesome-typescript-loader';
 
-import {SystemJSRegisterPublicModules} from './webpack-plugin-systemjs-registry';
 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.resolve(projectRoot, `./${sourceDir}/main.ts`)],
-    polyfills: path.resolve(projectRoot, `./${sourceDir}/polyfills.ts`)
+    main: [path.join(sourceRoot, 'main.ts')],
+    polyfills: path.join(sourceRoot, 'polyfills.ts')
   }, lazyModules);
 
+
   return {
     devtool: 'inline-source-map',
     resolve: {
@@ -41,7 +43,7 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
           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',
+            search: '(lang_1(.*[\\n\\r]+\\s*\\.|\\.))?(global(.*[\\n\\r]+\\s*\\.|\\.))?(System|SystemJS)(.*[\\n\\r]+\\s*\\.|\\.)import',
             replace: 'System.import',
             flags: 'g'
           }
@@ -54,7 +56,6 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
             {
               loader: 'awesome-typescript-loader',
               query: {
-                useForkChecker: true,
                 tsconfig: path.resolve(projectRoot, `./${sourceDir}/tsconfig.json`)
               }
             }, {
@@ -73,6 +74,11 @@ 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`),
@@ -92,34 +98,6 @@ export function getWebpackCommonConfig(projectRoot: string, sourceDir: string) {
         from: '**/*',
         to: path.resolve(projectRoot, './dist')
       }]),
-      // new SystemJSRegisterPublicModules({
-      //   // automatically configure SystemJS to load webpack chunks (defaults to true)
-      //   bundlesConfigForChunks: true,
-      //
-      //   // select which modules to expose as public modules
-      //   registerModules: [
-      //     // "default" filters provided are "local" and "public"
-      //     { filter: 'public' },
-      //     //
-      //     // // keyname allows a custom naming system for public modules
-      //     // {
-      //     //   filter: 'local',
-      //     //   keyname: 'app/[relPath]'
-      //     // },
-      //     //
-      //     // // keyname can be a function
-      //     // {
-      //     //   filter: 'public',
-      //     //   keyname: (module) => 'publicModule-' + module.id
-      //     // },
-      //     //
-      //     // // filter can also be a function
-      //     // {
-      //     //   filter: (m) => m.relPath.match(/src/),
-      //     //   keyname: 'random-naming-system-[id]'
-      //     // }
-      //   ]
-      // })
     ],
     node: {
       fs: 'empty',