refactor(@angular/cli): simplify module resolution options

Author: clydin

packages/@angular/cli/models/webpack-configs/common.ts

@@ -197,17 +197,23 @@ export function getCommonConfig(wco: WebpackConfigOptions) {
     alias = rxPaths(nodeModules);
   } catch (e) { }
 
+  // Allow loaders to be in a node_modules nested inside the CLI package
+  const loaderNodeModules = ['node_modules'];
+  const potentialNodeModules = path.join(__dirname, '..', '..', 'node_modules');
+  if (isDirectory(potentialNodeModules)) {
+    loaderNodeModules.push(potentialNodeModules);
+  }
+
   return {
     resolve: {
       extensions: ['.ts', '.js'],
-      modules: ['node_modules', nodeModules],
       symlinks: !buildOptions.preserveSymlinks,
       alias
     },
     resolveLoader: {
-      modules: [nodeModules, 'node_modules']
+      modules: loaderNodeModules
     },
-    context: __dirname,
+    context: projectRoot,
     entry: entryPoints,
     output: {
       path: path.resolve(buildOptions.outputPath),

packages/@angular/cli/tasks/eject.ts

@@ -288,7 +288,6 @@ class JsonWebpackSerializer {
   private _resolveReplacer(value: any) {
     this.variableImports['rxjs/_esm5/path-mapping'] = 'rxPaths';
     return Object.assign({}, value, {
-      modules: value.modules.map((x: string) => './' + path.relative(this._root, x)),
       alias: this._escape('rxPaths()')
     });
   }