angular · hansl · Jul 12, 2018 · Jul 11, 2018 · Jul 11, 2018
diff --git a/packages/angular_devkit/build_angular/test/utils.ts b/packages/angular_devkit/build_angular/test/utils.ts
@@ -11,7 +11,7 @@ import { join, normalize } from '@angular-devkit/core';
 
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-const workspaceRoot = join(devkitRoot, 'tests/@angular_devkit/build_angular/hello-world-app/');
+const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_angular/hello-world-app/');
 export const host = new TestProjectHost(workspaceRoot);
 export const outputPath = normalize('dist');
 

diff --git a/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts b/packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts
@@ -13,7 +13,7 @@ import { tap } from 'rxjs/operators';
 
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-const workspaceRoot = join(devkitRoot, 'tests/@angular_devkit/build_ng_packagr/ng-packaged/');
+const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_ng_packagr/ng-packaged/');
 export const host = new TestProjectHost(workspaceRoot);
 
 describe('NgPackagr Builder', () => {

diff --git a/packages/angular_devkit/build_webpack/src/test-utils.ts b/packages/angular_devkit/build_webpack/src/test-utils.ts
@@ -11,7 +11,7 @@ import { join, normalize } from '@angular-devkit/core';
 
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-const basicWorkspaceRoot = join(devkitRoot, 'tests/@angular_devkit/build_webpack/basic-app/');
+const basicWorkspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_webpack/basic-app/');
 export const basicHost = new TestProjectHost(basicWorkspaceRoot);
-const angularWorkspaceRoot = join(devkitRoot, 'tests/@angular_devkit/build_webpack/angular-app/');
+const angularWorkspaceRoot = join(devkitRoot, 'tests/angular_devkit/build_webpack/angular-app/');
 export const angularHost = new TestProjectHost(angularWorkspaceRoot);
diff --git a/packages/angular_devkit/core/src/workspace/workspace_spec.ts b/packages/angular_devkit/core/src/workspace/workspace_spec.ts
@@ -23,7 +23,7 @@ describe('Workspace', () => {
   const host = new NodeJsSyncHost();
   const root = normalize(__dirname);
   // The content of this JSON object should be kept in sync with the path below:
-  // tests/@angular_devkit/workspace/angular-workspace.json
+  // tests/angular_devkit/core/workspace/angular-workspace.json
   const workspaceJson: WorkspaceSchema = {
     version: 1,
     newProjectRoot: './projects',
@@ -118,7 +118,7 @@ describe('Workspace', () => {
 
   it('loads workspace from host', (done) => {
     const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
-    const workspaceRoot = join(devkitRoot, 'tests/@angular_devkit/core/workspace');
+    const workspaceRoot = join(devkitRoot, 'tests/angular_devkit/core/workspace');
     const workspace = new Workspace(workspaceRoot, host);
     workspace.loadWorkspaceFromHost(normalize('angular-workspace.json')).pipe(
       tap((ws) => expect(ws.getProject('app').root).toEqual(workspaceJson.projects['app'].root)),

diff --git a/packages/angular_devkit/schematics/tools/file-system-engine-host_spec.ts b/packages/angular_devkit/schematics/tools/file-system-engine-host_spec.ts
@@ -17,7 +17,7 @@ describe('FileSystemEngineHost', () => {
   const devkitRoot = (global as any)._DevKitRoot;
   const root = path.join(
     devkitRoot,
-    'tests/@angular_devkit/schematics/tools/file-system-engine-host',
+    'tests/angular_devkit/schematics/tools/file-system-engine-host',
   );
 
   it('works', () => {

diff --git a/packages/ngtools/webpack/src/paths-plugin.ts b/packages/ngtools/webpack/src/paths-plugin.ts
@@ -160,15 +160,40 @@ export function resolveWithPaths(
     const jsFilePath = `${pathNoExtension}.js`;
 
     if (host.fileExists(pathNoExtension)) {
-        // This is mainly for secondary entry points
-        // ex: 'node_modules/@angular/core/testing.d.ts' -> 'node_modules/@angular/core/testing'
-        request.request = pathNoExtension;
-    } else if (host.fileExists(packageRootPath)) {
-        // Let webpack resolve the correct module format
-        request.request = pathDirName;
-    } else if (host.fileExists(jsFilePath)) {
+      // This is mainly for secondary entry points
+      // ex: 'node_modules/@angular/core/testing.d.ts' -> 'node_modules/@angular/core/testing'
+      request.request = pathNoExtension;
+    } else {
+      const packageJsonContent = host.readFile(packageRootPath);
+      let newRequest: string | undefined;
+
+      if (packageJsonContent) {
+        try {
+          const packageJson = JSON.parse(packageJsonContent);
+
+          // Let webpack resolve the correct module format IIF there is a module resolution field
+          // in the package.json. These are all official fields that Angular uses.
+          if (typeof packageJson.main == 'string'
+              || typeof packageJson.browser == 'string'
+              || typeof packageJson.module == 'string'
+              || typeof packageJson.es2015 == 'string'
+              || typeof packageJson.fesm5 == 'string'
+              || typeof packageJson.fesm2015 == 'string') {
+            newRequest = pathDirName;
+          }
+        } catch {
+          // Ignore exceptions and let it fall through (ie. if package.json file is invalid).
+        }
+      }
+
+      if (newRequest === undefined && host.fileExists(jsFilePath)) {
         // Otherwise, if there is a file with a .js extension use that
-        request.request = jsFilePath;
+        newRequest = jsFilePath;
+      }
+
+      if (newRequest !== undefined) {
+        request.request = newRequest;
+      }
     }
 
     callback(null, request);

diff --git a/tests/@angular/schematics/assets/1/hello b/tests/@angular/schematics/assets/1/hello
diff --git a/tests/@angular/schematics/assets/1/sub/directory/file2 b/tests/@angular/schematics/assets/1/sub/directory/file2
diff --git a/tests/@angular/schematics/assets/1/sub/file1 b/tests/@angular/schematics/assets/1/sub/file1
diff --git a/...ild_angular/hello-world-app/.editorconfig → ...ild_angular/hello-world-app/.editorconfig b/...ild_angular/hello-world-app/.editorconfig → ...ild_angular/hello-world-app/.editorconfig
diff --git a/.../build_angular/hello-world-app/.gitignore → .../build_angular/hello-world-app/.gitignore b/.../build_angular/hello-world-app/.gitignore → .../build_angular/hello-world-app/.gitignore
diff --git a/...t/build_angular/hello-world-app/README.md → ...t/build_angular/hello-world-app/README.md b/...t/build_angular/hello-world-app/README.md → ...t/build_angular/hello-world-app/README.md
diff --git a/...uild_angular/hello-world-app/angular.json → ...uild_angular/hello-world-app/angular.json b/...uild_angular/hello-world-app/angular.json → ...uild_angular/hello-world-app/angular.json
diff --git a/...uild_angular/hello-world-app/browserslist → ...uild_angular/hello-world-app/browserslist b/...uild_angular/hello-world-app/browserslist → ...uild_angular/hello-world-app/browserslist
diff --git a/...gular/hello-world-app/e2e/app.e2e-spec.ts → ...gular/hello-world-app/e2e/app.e2e-spec.ts b/...gular/hello-world-app/e2e/app.e2e-spec.ts → ...gular/hello-world-app/e2e/app.e2e-spec.ts
diff --git a/...ild_angular/hello-world-app/e2e/app.po.ts → ...ild_angular/hello-world-app/e2e/app.po.ts b/...ild_angular/hello-world-app/e2e/app.po.ts → ...ild_angular/hello-world-app/e2e/app.po.ts
diff --git a/...lar/hello-world-app/e2e/tsconfig.e2e.json → ...lar/hello-world-app/e2e/tsconfig.e2e.json b/...lar/hello-world-app/e2e/tsconfig.e2e.json → ...lar/hello-world-app/e2e/tsconfig.e2e.json
diff --git a/...ild_angular/hello-world-app/karma.conf.js → ...ild_angular/hello-world-app/karma.conf.js b/...ild_angular/hello-world-app/karma.conf.js → ...ild_angular/hello-world-app/karma.conf.js
diff --git a/...uild_angular/hello-world-app/package.json → ...uild_angular/hello-world-app/package.json b/...uild_angular/hello-world-app/package.json → ...uild_angular/hello-world-app/package.json
diff --git a/...ngular/hello-world-app/protractor.conf.js → ...ngular/hello-world-app/protractor.conf.js b/...ngular/hello-world-app/protractor.conf.js → ...ngular/hello-world-app/protractor.conf.js
diff --git a/...hello-world-app/src/app/app.component.css → ...hello-world-app/src/app/app.component.css b/...hello-world-app/src/app/app.component.css → ...hello-world-app/src/app/app.component.css
diff --git a/...ello-world-app/src/app/app.component.html → ...ello-world-app/src/app/app.component.html b/...ello-world-app/src/app/app.component.html → ...ello-world-app/src/app/app.component.html
diff --git a/...o-world-app/src/app/app.component.spec.ts → ...o-world-app/src/app/app.component.spec.ts b/...o-world-app/src/app/app.component.spec.ts → ...o-world-app/src/app/app.component.spec.ts
diff --git a/.../hello-world-app/src/app/app.component.ts → .../hello-world-app/src/app/app.component.ts b/.../hello-world-app/src/app/app.component.ts → .../hello-world-app/src/app/app.component.ts
diff --git a/...lar/hello-world-app/src/app/app.module.ts → ...lar/hello-world-app/src/app/app.module.ts b/...lar/hello-world-app/src/app/app.module.ts → ...lar/hello-world-app/src/app/app.module.ts
diff --git a/...lo-world-app/src/app/app.server.module.ts → ...lo-world-app/src/app/app.server.module.ts b/...lo-world-app/src/app/app.server.module.ts → ...lo-world-app/src/app/app.server.module.ts
diff --git a/...gular/hello-world-app/src/assets/.gitkeep → ...gular/hello-world-app/src/assets/.gitkeep b/...gular/hello-world-app/src/assets/.gitkeep → ...gular/hello-world-app/src/assets/.gitkeep
diff --git a/...-app/src/environments/environment.prod.ts → ...-app/src/environments/environment.prod.ts b/...-app/src/environments/environment.prod.ts → ...-app/src/environments/environment.prod.ts
diff --git a/...world-app/src/environments/environment.ts → ...world-app/src/environments/environment.ts b/...world-app/src/environments/environment.ts → ...world-app/src/environments/environment.ts
diff --git a/...d_angular/hello-world-app/src/favicon.ico → ...d_angular/hello-world-app/src/favicon.ico b/...d_angular/hello-world-app/src/favicon.ico → ...d_angular/hello-world-app/src/favicon.ico
diff --git a/...ld_angular/hello-world-app/src/index.html → ...ld_angular/hello-world-app/src/index.html b/...ld_angular/hello-world-app/src/index.html → ...ld_angular/hello-world-app/src/index.html
diff --git a/...ngular/hello-world-app/src/main.server.ts → ...ngular/hello-world-app/src/main.server.ts b/...ngular/hello-world-app/src/main.server.ts → ...ngular/hello-world-app/src/main.server.ts
diff --git a/...build_angular/hello-world-app/src/main.ts → ...build_angular/hello-world-app/src/main.ts b/...build_angular/hello-world-app/src/main.ts → ...build_angular/hello-world-app/src/main.ts
diff --git a/..._angular/hello-world-app/src/polyfills.ts → ..._angular/hello-world-app/src/polyfills.ts b/..._angular/hello-world-app/src/polyfills.ts → ..._angular/hello-world-app/src/polyfills.ts
diff --git a/..._angular/hello-world-app/src/spectrum.png → ..._angular/hello-world-app/src/spectrum.png b/..._angular/hello-world-app/src/spectrum.png → ..._angular/hello-world-app/src/spectrum.png
diff --git a/...llo-world-app/src/src/locale/messages.xlf → ...llo-world-app/src/src/locale/messages.xlf b/...llo-world-app/src/src/locale/messages.xlf → ...llo-world-app/src/src/locale/messages.xlf
diff --git a/...ld_angular/hello-world-app/src/styles.css → ...ld_angular/hello-world-app/src/styles.css b/...ld_angular/hello-world-app/src/styles.css → ...ld_angular/hello-world-app/src/styles.css
diff --git a/...build_angular/hello-world-app/src/test.ts → ...build_angular/hello-world-app/src/test.ts b/...build_angular/hello-world-app/src/test.ts → ...build_angular/hello-world-app/src/test.ts
diff --git a/...lar/hello-world-app/src/tsconfig.app.json → ...lar/hello-world-app/src/tsconfig.app.json b/...lar/hello-world-app/src/tsconfig.app.json → ...lar/hello-world-app/src/tsconfig.app.json
diff --git a/.../hello-world-app/src/tsconfig.server.json → .../hello-world-app/src/tsconfig.server.json b/.../hello-world-app/src/tsconfig.server.json → .../hello-world-app/src/tsconfig.server.json
diff --git a/...ar/hello-world-app/src/tsconfig.spec.json → ...ar/hello-world-app/src/tsconfig.spec.json b/...ar/hello-world-app/src/tsconfig.spec.json → ...ar/hello-world-app/src/tsconfig.spec.json
diff --git a/..._angular/hello-world-app/src/typings.d.ts → ..._angular/hello-world-app/src/typings.d.ts b/..._angular/hello-world-app/src/typings.d.ts → ..._angular/hello-world-app/src/typings.d.ts
diff --git a/...ild_angular/hello-world-app/tsconfig.json → ...ild_angular/hello-world-app/tsconfig.json b/...ild_angular/hello-world-app/tsconfig.json → ...ild_angular/hello-world-app/tsconfig.json
diff --git a/...build_angular/hello-world-app/tslint.json → ...build_angular/hello-world-app/tslint.json b/...build_angular/hello-world-app/tslint.json → ...build_angular/hello-world-app/tslint.json
diff --git a/...t/build_ng_packagr/ng-packaged/.gitignore → ...t/build_ng_packagr/ng-packaged/.gitignore b/...t/build_ng_packagr/ng-packaged/.gitignore → ...t/build_ng_packagr/ng-packaged/.gitignore
diff --git a/...build_ng_packagr/ng-packaged/angular.json → ...build_ng_packagr/ng-packaged/angular.json b/...build_ng_packagr/ng-packaged/angular.json → ...build_ng_packagr/ng-packaged/angular.json
diff --git a/...gr/ng-packaged/projects/lib/karma.conf.js → ...gr/ng-packaged/projects/lib/karma.conf.js b/...gr/ng-packaged/projects/lib/karma.conf.js → ...gr/ng-packaged/projects/lib/karma.conf.js
diff --git a/.../ng-packaged/projects/lib/ng-package.json → .../ng-packaged/projects/lib/ng-package.json b/.../ng-packaged/projects/lib/ng-package.json → .../ng-packaged/projects/lib/ng-package.json
diff --git a/...agr/ng-packaged/projects/lib/package.json → ...agr/ng-packaged/projects/lib/package.json b/...agr/ng-packaged/projects/lib/package.json → ...agr/ng-packaged/projects/lib/package.json
diff --git a/...rojects/lib/src/lib/lib.component.spec.ts → ...rojects/lib/src/lib/lib.component.spec.ts b/...rojects/lib/src/lib/lib.component.spec.ts → ...rojects/lib/src/lib/lib.component.spec.ts
diff --git a/...ged/projects/lib/src/lib/lib.component.ts → ...ged/projects/lib/src/lib/lib.component.ts b/...ged/projects/lib/src/lib/lib.component.ts → ...ged/projects/lib/src/lib/lib.component.ts
diff --git a/...ckaged/projects/lib/src/lib/lib.module.ts → ...ckaged/projects/lib/src/lib/lib.module.ts b/...ckaged/projects/lib/src/lib/lib.module.ts → ...ckaged/projects/lib/src/lib/lib.module.ts
diff --git a/.../projects/lib/src/lib/lib.service.spec.ts → .../projects/lib/src/lib/lib.service.spec.ts b/.../projects/lib/src/lib/lib.service.spec.ts → .../projects/lib/src/lib/lib.service.spec.ts
diff --git a/...kaged/projects/lib/src/lib/lib.service.ts → ...kaged/projects/lib/src/lib/lib.service.ts b/...kaged/projects/lib/src/lib/lib.service.ts → ...kaged/projects/lib/src/lib/lib.service.ts
diff --git a/...g-packaged/projects/lib/src/public_api.ts → ...g-packaged/projects/lib/src/public_api.ts b/...g-packaged/projects/lib/src/public_api.ts → ...g-packaged/projects/lib/src/public_api.ts
diff --git a/...kagr/ng-packaged/projects/lib/src/test.ts → ...kagr/ng-packaged/projects/lib/src/test.ts b/...kagr/ng-packaged/projects/lib/src/test.ts → ...kagr/ng-packaged/projects/lib/src/test.ts
diff --git a/...g-packaged/projects/lib/tsconfig.lib.json → ...g-packaged/projects/lib/tsconfig.lib.json b/...g-packaged/projects/lib/tsconfig.lib.json → ...g-packaged/projects/lib/tsconfig.lib.json
diff --git a/...-packaged/projects/lib/tsconfig.spec.json → ...-packaged/projects/lib/tsconfig.spec.json b/...-packaged/projects/lib/tsconfig.spec.json → ...-packaged/projects/lib/tsconfig.spec.json
diff --git a/...uild_ng_packagr/ng-packaged/tsconfig.json → ...uild_ng_packagr/ng-packaged/tsconfig.json b/...uild_ng_packagr/ng-packaged/tsconfig.json → ...uild_ng_packagr/ng-packaged/tsconfig.json
diff --git a/.../build_ng_packagr/ng-packaged/tslint.json → .../build_ng_packagr/ng-packaged/tslint.json b/.../build_ng_packagr/ng-packaged/tslint.json → .../build_ng_packagr/ng-packaged/tslint.json
diff --git a/...vkit/build_webpack/angular-app/.gitignore → ...vkit/build_webpack/angular-app/.gitignore b/...vkit/build_webpack/angular-app/.gitignore → ...vkit/build_webpack/angular-app/.gitignore
diff --git a/...it/build_webpack/angular-app/angular.json → ...it/build_webpack/angular-app/angular.json b/...it/build_webpack/angular-app/angular.json → ...it/build_webpack/angular-app/angular.json
diff --git a/...ack/angular-app/src/app/app.component.css → ...ack/angular-app/src/app/app.component.css b/...ack/angular-app/src/app/app.component.css → ...ack/angular-app/src/app/app.component.css
diff --git a/...ck/angular-app/src/app/app.component.html → ...ck/angular-app/src/app/app.component.html b/...ck/angular-app/src/app/app.component.html → ...ck/angular-app/src/app/app.component.html
diff --git a/...angular-app/src/app/app.component.spec.ts → ...angular-app/src/app/app.component.spec.ts b/...angular-app/src/app/app.component.spec.ts → ...angular-app/src/app/app.component.spec.ts
diff --git a/...pack/angular-app/src/app/app.component.ts → ...pack/angular-app/src/app/app.component.ts b/...pack/angular-app/src/app/app.component.ts → ...pack/angular-app/src/app/app.component.ts
diff --git a/...webpack/angular-app/src/app/app.module.ts → ...webpack/angular-app/src/app/app.module.ts b/...webpack/angular-app/src/app/app.module.ts → ...webpack/angular-app/src/app/app.module.ts
diff --git a/.../angular-app/src/app/app.server.module.ts → .../angular-app/src/app/app.server.module.ts b/.../angular-app/src/app/app.server.module.ts → .../angular-app/src/app/app.server.module.ts
diff --git a/...d_webpack/angular-app/src/assets/.gitkeep → ...d_webpack/angular-app/src/assets/.gitkeep b/...d_webpack/angular-app/src/assets/.gitkeep → ...d_webpack/angular-app/src/assets/.gitkeep
diff --git a/...-app/src/environments/environment.prod.ts → ...-app/src/environments/environment.prod.ts b/...-app/src/environments/environment.prod.ts → ...-app/src/environments/environment.prod.ts
diff --git a/...gular-app/src/environments/environment.ts → ...gular-app/src/environments/environment.ts b/...gular-app/src/environments/environment.ts → ...gular-app/src/environments/environment.ts
diff --git a/...kit/build_webpack/angular-app/src/main.ts → ...kit/build_webpack/angular-app/src/main.ts b/...kit/build_webpack/angular-app/src/main.ts → ...kit/build_webpack/angular-app/src/main.ts
diff --git a/...uild_webpack/angular-app/src/polyfills.ts → ...uild_webpack/angular-app/src/polyfills.ts b/...uild_webpack/angular-app/src/polyfills.ts → ...uild_webpack/angular-app/src/polyfills.ts
diff --git a/...k/angular-app/src/src/locale/messages.xlf → ...k/angular-app/src/src/locale/messages.xlf b/...k/angular-app/src/src/locale/messages.xlf → ...k/angular-app/src/src/locale/messages.xlf
diff --git a/.../build_webpack/angular-app/src/styles.css → .../build_webpack/angular-app/src/styles.css b/.../build_webpack/angular-app/src/styles.css → .../build_webpack/angular-app/src/styles.css
diff --git a/...webpack/angular-app/src/tsconfig.app.json → ...webpack/angular-app/src/tsconfig.app.json b/...webpack/angular-app/src/tsconfig.app.json → ...webpack/angular-app/src/tsconfig.app.json
diff --git a/...t/build_webpack/angular-app/tsconfig.json → ...t/build_webpack/angular-app/tsconfig.json b/...t/build_webpack/angular-app/tsconfig.json → ...t/build_webpack/angular-app/tsconfig.json
diff --git a/...ild_webpack/angular-app/webpack.config.js → ...ild_webpack/angular-app/webpack.config.js b/...ild_webpack/angular-app/webpack.config.js → ...ild_webpack/angular-app/webpack.config.js
diff --git a/...devkit/build_webpack/basic-app/.gitignore → ...devkit/build_webpack/basic-app/.gitignore b/...devkit/build_webpack/basic-app/.gitignore → ...devkit/build_webpack/basic-app/.gitignore
diff --git a/...vkit/build_webpack/basic-app/angular.json → ...vkit/build_webpack/basic-app/angular.json b/...vkit/build_webpack/basic-app/angular.json → ...vkit/build_webpack/basic-app/angular.json
diff --git a/...evkit/build_webpack/basic-app/src/main.js → ...evkit/build_webpack/basic-app/src/main.js b/...evkit/build_webpack/basic-app/src/main.js → ...evkit/build_webpack/basic-app/src/main.js
diff --git a/...build_webpack/basic-app/webpack.config.js → ...build_webpack/basic-app/webpack.config.js b/...build_webpack/basic-app/webpack.config.js → ...build_webpack/basic-app/webpack.config.js
diff --git a/...schema/serializers/0.0.javascript_spec.ts → ...schema/serializers/0.0.javascript_spec.ts b/...schema/serializers/0.0.javascript_spec.ts → ...schema/serializers/0.0.javascript_spec.ts
diff --git a/...ore/json/schema/serializers/0.schema.json → ...ore/json/schema/serializers/0.schema.json b/...ore/json/schema/serializers/0.schema.json → ...ore/json/schema/serializers/0.schema.json
diff --git a/...schema/serializers/1.0.javascript_spec.ts → ...schema/serializers/1.0.javascript_spec.ts b/...schema/serializers/1.0.javascript_spec.ts → ...schema/serializers/1.0.javascript_spec.ts
diff --git a/...ore/json/schema/serializers/1.schema.json → ...ore/json/schema/serializers/1.schema.json b/...ore/json/schema/serializers/1.schema.json → ...ore/json/schema/serializers/1.schema.json
diff --git a/.../schema/serializers/schema_benchmark.json → .../schema/serializers/schema_benchmark.json b/.../schema/serializers/schema_benchmark.json → .../schema/serializers/schema_benchmark.json
diff --git a/...kit/core/workspace/angular-workspace.json → ...kit/core/workspace/angular-workspace.json b/...kit/core/workspace/angular-workspace.json → ...kit/core/workspace/angular-workspace.json
diff --git a/...-engine-host/aliases-dupe/collection.json → ...-engine-host/aliases-dupe/collection.json b/...-engine-host/aliases-dupe/collection.json → ...-engine-host/aliases-dupe/collection.json
diff --git a/...-engine-host/aliases-many/collection.json → ...-engine-host/aliases-many/collection.json b/...-engine-host/aliases-many/collection.json → ...-engine-host/aliases-many/collection.json
diff --git a/...ystem-engine-host/aliases/collection.json → ...ystem-engine-host/aliases/collection.json b/...ystem-engine-host/aliases/collection.json → ...ystem-engine-host/aliases/collection.json
diff --git a/...host/extends-basic-string/collection.json → ...host/extends-basic-string/collection.json b/...host/extends-basic-string/collection.json → ...host/extends-basic-string/collection.json
diff --git a/...engine-host/extends-basic/collection.json → ...engine-host/extends-basic/collection.json b/...engine-host/extends-basic/collection.json → ...engine-host/extends-basic/collection.json
diff --git a/...ost/extends-circular-deep/collection.json → ...ost/extends-circular-deep/collection.json b/...ost/extends-circular-deep/collection.json → ...ost/extends-circular-deep/collection.json
diff --git a/...t/extends-circular-middle/collection.json → ...t/extends-circular-middle/collection.json b/...t/extends-circular-middle/collection.json → ...t/extends-circular-middle/collection.json
diff --git a/...extends-circular-multiple/collection.json → ...extends-circular-multiple/collection.json b/...extends-circular-multiple/collection.json → ...extends-circular-multiple/collection.json
diff --git a/...ine-host/extends-circular/collection.json → ...ine-host/extends-circular/collection.json b/...ine-host/extends-circular/collection.json → ...ine-host/extends-circular/collection.json
diff --git a/...-engine-host/extends-deep/collection.json → ...-engine-host/extends-deep/collection.json b/...-engine-host/extends-deep/collection.json → ...-engine-host/extends-deep/collection.json
diff --git a/...ine-host/extends-multiple/collection.json → ...ine-host/extends-multiple/collection.json b/...ine-host/extends-multiple/collection.json → ...ine-host/extends-multiple/collection.json
diff --git a/...gine-host/extends-replace/collection.json → ...gine-host/extends-replace/collection.json b/...gine-host/extends-replace/collection.json → ...gine-host/extends-replace/collection.json
diff --git a/...ine-host/extra-properties/collection.json → ...ine-host/extra-properties/collection.json b/...ine-host/extra-properties/collection.json → ...ine-host/extra-properties/collection.json
diff --git a/...m-engine-host/extra-properties/factory.ts → ...m-engine-host/extra-properties/factory.ts b/...m-engine-host/extra-properties/factory.ts → ...m-engine-host/extra-properties/factory.ts
diff --git a/...ne-host/hidden-schematics/collection.json → ...ne-host/hidden-schematics/collection.json b/...ne-host/hidden-schematics/collection.json → ...ne-host/hidden-schematics/collection.json
diff --git a/...ne-host/invalid-aliases-2/collection.json → ...ne-host/invalid-aliases-2/collection.json b/...ne-host/invalid-aliases-2/collection.json → ...ne-host/invalid-aliases-2/collection.json
diff --git a/...gine-host/invalid-aliases/collection.json → ...gine-host/invalid-aliases/collection.json b/...gine-host/invalid-aliases/collection.json → ...gine-host/invalid-aliases/collection.json
diff --git a/...s/file-system-engine-host/null-factory.ts → ...s/file-system-engine-host/null-factory.ts b/...s/file-system-engine-host/null-factory.ts → ...s/file-system-engine-host/null-factory.ts
diff --git a/...e-host/private-schematics/collection.json → ...e-host/private-schematics/collection.json b/...e-host/private-schematics/collection.json → ...e-host/private-schematics/collection.json
diff --git a/...-system-engine-host/works/collection.json → ...-system-engine-host/works/collection.json b/...-system-engine-host/works/collection.json → ...-system-engine-host/works/collection.json
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/aotplugin.config.json b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/aotplugin.config.json
@@ -0,0 +1,4 @@
+{
+  "tsConfigPath": "./src/tsconfig.json",
+  "mainPath": "app/main.jit.ts"
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "test",
+  "license": "MIT",
+  "dependencies": {
+    "@angular/common": "^5.0.0-rc.8",
+    "@angular/compiler": "^5.0.0-rc.8",
+    "@angular/compiler-cli": "^5.0.0-rc.8",
+    "@angular/core": "^5.0.0-rc.8",
+    "@angular/http": "^5.0.0-rc.8",
+    "@angular/platform-browser": "^5.0.0-rc.8",
+    "@angular/platform-browser-dynamic": "^5.0.0-rc.8",
+    "@angular/platform-server": "^5.0.0-rc.8",
+    "@angular/router": "^5.0.0-rc.8",
+    "@ngtools/webpack": "0.0.0",
+    "core-js": "^2.4.1",
+    "rxjs": "^5.5.0",
+    "zone.js": "^0.8.14"
+  },
+  "devDependencies": {
+    "node-sass": "^4.7.0",
+    "performance-now": "^0.2.0",
+    "preprocess-loader": "^0.2.2",
+    "raw-loader": "^0.5.1",
+    "sass-loader": "^6.0.0",
+    "typescript": "~2.4.2",
+    "webpack": "~4.0.1",
+    "webpack-cli": "~2.0.9"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/app/app.module.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/app/app.module.ts
@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Component, NgModule } from '@angular/core';
+import { BrowserModule  } from '@angular/platform-browser';
+import { Foo } from 'foo/foo';
+
+console.log(Foo);  // Make sure it's used.
+
+@Component({
+  selector: 'home-view',
+  template: 'home!',
+})
+export class HomeView {}
+
+@NgModule({
+  declarations: [
+    HomeView,
+  ],
+  imports: [
+    BrowserModule,
+  ],
+  bootstrap: [HomeView],
+})
+export class AppModule { }
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/app/main.jit.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/app/main.jit.ts
@@ -0,0 +1,5 @@
+import 'core-js/es7/reflect';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
+import {AppModule} from './app.module';
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/foo.d.ts b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/foo.d.ts
@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export class Foo {}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/foo.js b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/foo.js
@@ -0,0 +1,6 @@
+
+console.log('NGTOOLS_WEBPACK_TEST_WRONG_FILE');
+
+module.exports = {
+  Foo: () => {},  // Empty "class".
+};
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/package.json b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "right/foo.js"
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/right/foo.js b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/foo/right/foo.js
@@ -0,0 +1,6 @@
+
+console.log('NGTOOLS_WEBPACK_TEST_RIGHT_FILE');
+
+module.exports = {
+  Foo: () => {},  // Empty "class".
+};
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/index.html b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/index.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>Document</title>
+  <base href="">
+</head>
+<body>
+  <app-root></app-root>
+  <script src="node_modules/zone.js/dist/zone.js"></script>
+  <script src="dist/app.main.js"></script>
+</body>
+</html>
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/tsconfig.json b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/src/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "compilerOptions": {
+    "module": "es2015",
+    "moduleResolution": "node",
+    "target": "es5",
+    "baseUrl": ".",
+    "noImplicitAny": false,
+    "sourceMap": true,
+    "mapRoot": "",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2017",
+      "dom"
+    ],
+    "outDir": "lib",
+    "skipLibCheck": true,
+    "rootDir": ".",
+    "paths": {
+      "foo/*": [
+        "./foo/*",
+        "*"
+      ]
+    }
+  },
+  "angularCompilerOptions": {
+    "genDir": "app/generated/",
+    "entryModule": "app/app.module#AppModule"
+  }
+}
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/webpack.config.js b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/webpack.config.js
@@ -0,0 +1,45 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+const ngToolsWebpack = require('@ngtools/webpack');
+const path = require('path');
+
+const flags = require('./webpack.flags.json');
+
+const preprocessLoader = 'preprocess-loader' + (flags.DEBUG ? '?+DEBUG' : '');
+
+
+module.exports = {
+  resolve: {
+    extensions: ['.ts', '.js']
+  },
+  entry: './src/app/main.jit.ts',
+  output: {
+    path: path.resolve('./dist'),
+    publicPath: 'dist/',
+    filename: 'app.main.js'
+  },
+  plugins: [
+    new ngToolsWebpack.AngularCompilerPlugin(require('./aotplugin.config.json'))
+  ],
+  module: {
+    rules: [
+      { test: /\.scss$/, loaders: ['raw-loader', 'sass-loader', preprocessLoader] },
+      { test: /\.css$/, loader: 'raw-loader' },
+      { test: /\.html$/, loaders: ['raw-loader', preprocessLoader] },
+      // Use preprocess to remove DEBUG only code.
+      // @ngtools/webpack must be the first (right most) loader.
+      { test: /\.ts$/, use: [
+        { loader: preprocessLoader },
+        { loader: '@ngtools/webpack' }
+      ] }
+    ]
+  },
+  devServer: {
+    historyApiFallback: true
+  }
+};
diff --git a/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/webpack.flags.json b/tests/legacy-cli/e2e/assets/webpack/test-app-path-mapping/webpack.flags.json
@@ -0,0 +1,3 @@
+{
+  "DEBUG": false
+}
diff --git a/tests/legacy-cli/e2e/tests/packages/webpack/test-path-mapping.ts b/tests/legacy-cli/e2e/tests/packages/webpack/test-path-mapping.ts
@@ -0,0 +1,13 @@
+import {normalize} from 'path';
+import {createProjectFromAsset} from '../../../utils/assets';
+import {exec} from '../../../utils/process';
+import {expectFileSizeToBeUnder, replaceInFile, expectFileToMatch} from '../../../utils/fs';
+
+
+export default function(skipCleaning: () => void) {
+  return Promise.resolve()
+    .then(() => createProjectFromAsset('webpack/test-app-path-mapping'))
+    .then(() => exec(normalize('node_modules/.bin/webpack-cli')))
+    .then(() => expectFileToMatch('dist/app.main.js', 'NGTOOLS_WEBPACK_TEST_RIGHT_FILE'))
+    .then(() => skipCleaning());
+}