fix(scripts): allow using same lib inside app

Fix angular#2141

Author: filipesilva

packages/angular-cli/models/webpack-build-common.ts

@@ -57,13 +57,9 @@ export function getWebpackCommonConfig(
 
     // add entry points and lazy chunks
     globalScripts.forEach(script => {
+      let scriptPath = `script-loader!${script.path}`;
       if (script.lazy) { lazyChunks.push(script.entry); }
-      entryPoints[script.entry] = (entryPoints[script.entry] || []).concat(script.path);
-    });
-
-    // load global scripts using script-loader
-    extraRules.push({
-      include: globalScripts.map((script) => script.path), test: /\.js$/, loader: 'script-loader'
+      entryPoints[script.entry] = (entryPoints[script.entry] || []).concat(scriptPath);
     });
   }
 
@@ -101,7 +97,7 @@ export function getWebpackCommonConfig(
     extraPlugins.push(new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
       chunks: ['main'],
-      minChunks: (module: any) => module.userRequest && module.userRequest.startsWith(nodeModules)
+      minChunks: (module: any) => module.resource && module.resource.startsWith(nodeModules)
     }));
   }
 

tests/e2e/tests/build/scripts-array.ts

@@ -1,6 +1,7 @@
 import {
   writeMultipleFiles,
-  expectFileToMatch
+  expectFileToMatch,
+  appendToFile
 } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
@@ -16,6 +17,7 @@ export default function () {
     'src/common-entry-script.js': 'console.log(\'common-entry-script\');',
     'src/common-entry-style.css': '.common-entry-style { color: red }',
   })
+    .then(() => appendToFile('src/main.ts', 'import \'./string-script.js\';'))
     .then(() => updateJsonFile('angular-cli.json', configJson => {
       const app = configJson['apps'][0];
       app['scripts'] = [
@@ -48,5 +50,7 @@ export default function () {
       <script type="text/javascript" src="scripts.bundle.js"></script>
       <script type="text/javascript" src="vendor.bundle.js"></script>
       <script type="text/javascript" src="main.bundle.js"></script>
-    `));
+    `))
+     // ensure scripts aren't using script-loader when imported from the app
+    .then(() => expectFileToMatch('dist/main.bundle.js', 'console.log(\'string-script\');'));
 }