docs(demo-apps): fix webpack bundling

ng-table is incorrectly being added to main bundle
esvit · Dec 4, 2016 · 9ca75ad · 9ca75ad
1 parent 50d3cdf
commit 9ca75ad
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/demo-apps/es6-webpack/webpack.config.js b/demo-apps/es6-webpack/webpack.config.js
@@ -10,14 +10,15 @@ module.exports = (env = { prod: false, debug: false, port: 8080, host: 'localhos
             'vendor-styles': path.join(__dirname, 'src', 'shared', 'vendor-styles.scss')
         }
     };
-
     return merge(
         {
             entry: {
                 main: path.join(__dirname, 'src', 'main.js')
             }
         },
-        parts.asAppBundle(),
+        parts.asAppBundle({
+            vendorSelector: parts.isNotAppModuleSelector
+        }),
         vendorStyles,
         parts.isDevServer ? parts.sass() : parts.extractSassChunks(vendorStyles.entry),
         parts.es6(),

diff --git a/demo-apps/ts-webpack/webpack.config.js b/demo-apps/ts-webpack/webpack.config.js
@@ -18,6 +18,9 @@ module.exports = (env = { prod: false, debug: false, port: 8080, host: 'localhos
                 main: path.join(__dirname, 'src', 'main.ts')
             }
         },
+        parts.asAppBundle({
+            vendorSelector: parts.isNotAppModuleSelector
+        }),
         parts.asAppBundle(),
         extactedStyles,
         parts.isDevServer ? parts.sass() : parts.extractSassChunks(extactedStyles.entry),

diff --git a/scripts/webpack/appParts.js b/scripts/webpack/appParts.js
@@ -18,22 +18,27 @@ function createAppParts(rootDir, env = {}) {
     const loadCssWithSourceMaps = ['css-loader?sourceMap', 'resolve-url-loader', 'sass-loader?sourceMap'];
     const loadCss = ['css-loader', 'resolve-url-loader', 'sass-loader?sourceMap'];
 
+    const isNodeModuleSelector = (function () {
+        const isNodeModule = new RegExp('node_modules');
+        return (module) => isNodeModule.test(module.resource);
+    })();
+
     return Object.assign({}, commonParts, {
         asAppBundle,
         extractSassChunks,
         inlineImages,
         inlineHtmlTemplates,
         inlineNgTableHtmlTemplates,
         isDevServer,
+        isNotAppModuleSelector,
         sass,
         useHtmlPlugin
     });
 
     /////
 
 
-    function asAppBundle() {
-        const isNodeModule = new RegExp('node_modules');
+    function asAppBundle({ vendorSelector = isNodeModuleSelector } = {}) {
 
         const common = merge(
             {
@@ -47,7 +52,7 @@ function createAppParts(rootDir, env = {}) {
                     // include node_modules requested in a seperate bundle
                     new webpack.optimize.CommonsChunkPlugin({
                         name: 'vendor',
-                        minChunks: module => isNodeModule.test(module.resource)
+                        minChunks: vendorSelector
                     }),
                     // extract webpack manifest file into it's own chunk to ensure vendor hash does not change 
                     // (as per solution discussed here https://github.com/webpack/webpack/issues/1315)
@@ -102,6 +107,9 @@ function createAppParts(rootDir, env = {}) {
         };
     }
 
+    function isNotAppModuleSelector(module) {
+        return !(module.resource && module.resource.startsWith(rootDir));
+    }
 
     function useHtmlPlugin() {
         var HtmlWebpackPlugin = require('html-webpack-plugin');