fix(@ngtools/webpack): NGCC should process secondary entry-points

packages/ngtools/webpack/src/ngcc_processor.ts

@@ -54,10 +54,7 @@ export class NgccProcessor {
     resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective,
   ): void {
     const resolvedFileName = resolvedModule.resolvedFileName;
-    if (
-      !resolvedFileName
-      || moduleName.startsWith('.')
-      || this._processedModules.has(moduleName)) {
+    if (!resolvedFileName || moduleName.startsWith('.') || this._processedModules.has(moduleName)) {
       // Skip when module is unknown, relative or NGCC compiler is not found or already processed.
       return;
     }
@@ -97,25 +94,19 @@ export class NgccProcessor {
    */
   private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {
     try {
-      let packageJsonPath = path.resolve(resolvedFileName, '../package.json');
-      if (existsSync(packageJsonPath)) {
-        return packageJsonPath;
-      }
-
       // This is based on the logic in the NGCC compiler
       // tslint:disable-next-line:max-line-length
       // See: https://github.com/angular/angular/blob/b93c1dffa17e4e6900b3ab1b9e554b6da92be0de/packages/compiler-cli/src/ngcc/src/packages/dependency_host.ts#L85-L121
-      packageJsonPath = require.resolve(`${moduleName}/package.json`,
-        {
-          paths: [resolvedFileName],
-        },
-      );
-
-      return packageJsonPath;
+      return require.resolve(`${moduleName}/package.json`, {
+        paths: [resolvedFileName],
+      });
     } catch {
       // if it fails this might be a deep import which doesn't have a package.json
       // Ex: @angular/compiler/src/i18n/i18n_ast/package.json
-      return undefined;
+      // or local libraries which don't reside in node_modules
+      const packageJsonPath = path.resolve(resolvedFileName, '../package.json');
+
+      return existsSync(packageJsonPath) ? packageJsonPath : undefined;
     }
   }
 
@@ -138,10 +129,9 @@ class NgccLogger implements Logger {
   constructor(
     private readonly compilationWarnings: (Error | string)[],
     private readonly compilationErrors: (Error | string)[],
-  ) {
-  }
+  ) {}
 
-  debug(..._args: string[]) { }
+  debug(..._args: string[]) {}
 
   info(...args: string[]) {
     // Log to stderr because it's a progress-like info message.

tests/legacy-cli/e2e/tests/ivy/ivy.ts

@@ -5,16 +5,28 @@
  * 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 { expectFileToExist, replaceInFile } from '../../utils/fs';
 import { request } from '../../utils/http';
-import { killAllProcesses } from '../../utils/process';
+import { killAllProcesses, ng } from '../../utils/process';
 import { createProject, ngServe } from '../../utils/project';
 
 export default async function() {
   try {
     await createProject('ivy-project', '--enable-ivy');
 
+    // Add in a reference to a secondary entry-point to check that ngcc processes it correctly
+    await replaceInFile(
+      'src/app/app.module.ts',
+      `import { AppComponent } from './app.component';`,
+      `import { AppComponent } from './app.component';\nimport { HttpClientModule } from '@angular/common/http';`,
+    );
+    await replaceInFile('src/app/app.module.ts', `imports: [`, `imports: [\n    HttpClientModule,`);
+
     await ngServe('--prod');
 
+    // Check that @angular/common/http was processed by ngcc
+    await expectFileToExist('node_modules/@angular/common/http/http.d.ts.__ivy_ngcc_bak');
+
     // Verify the index.html
     const body = await request('http://localhost:4200/');
     if (!body.match(/<app-root><\/app-root>/)) {
@@ -33,6 +45,6 @@ export default async function() {
       throw new Error('NgDevMode was not tree shaken away.');
     }
   } finally {
-    await killAllProcesses();
+    killAllProcesses();
   }
 }