Ivy build_ng_packagr (#15262)

* test: update ng-packagr builder tests to work on Windows

* build: add ng packagr test large for ivy

* test: fix web-worker test in ivy

Previously, we were not testing web workers under Ivy as we were overriding tsconfig.app.json entirely without including enableIvy.

When enabling Ivy we are getting warning of files that are part of the compilation which causing a warning to show and break the test.

* build: update ng-packagr to `^5.4.0`

* test: display ivy mode message once

Author: alan-agius4

.circleci/config.yml

@@ -350,7 +350,7 @@ workflows:
       - test-large:
           name: test-large-ivy
           ivy: true
-          glob: "packages/angular_devkit/build_angular/test/browser/*_spec_large.ts"
+          glob: "packages/angular_devkit/@(build_angular|build_ng_packagr)/@(src|test)/@(build|browser)/*_spec_large.ts"
           requires:
             - build
       - e2e-cli:

packages/angular_devkit/build_angular/test/browser/web-worker_spec_large.ts

@@ -77,11 +77,9 @@ describe('Browser Builder Web Worker support', () => {
           "outDir": "../out-tsc/worker",
           "types": []
         },
-        "exclude": [
-          "test.ts",
-          "**/*.spec.ts",
-          "**/*.worker.ts",
-          "app/dep.ts",
+        "files": [
+          "main.ts",
+          "polyfills.ts"
         ]
       }`,
   };

packages/angular_devkit/build_angular/test/utils.ts

@@ -21,10 +21,6 @@ import {
 import { BrowserBuilderOutput } from '../src/browser';
 
 export const ivyEnabled = process.argv.includes('--ivy');
-if (ivyEnabled) {
-  // tslint:disable-next-line:no-console
-  console.warn('********* IVY Enabled ***********');
-}
 
 const devkitRoot = normalize((global as any)._DevKitRoot); // tslint:disable-line:no-any
 export const workspaceRoot = join(

packages/angular_devkit/build_ng_packagr/package.json

@@ -17,7 +17,7 @@
     "@angular/compiler": "~8.2.0-rc.0",
     "@angular/compiler-cli": "~8.2.0-rc.0",
     "@angular-devkit/core": "0.0.0",
-    "ng-packagr": "^5.3.0",
+    "ng-packagr": "^5.4.0",
     "tslib": "^1.10.0"
   }
 }

packages/angular_devkit/build_ng_packagr/src/build/index_spec_large.ts

@@ -9,18 +9,21 @@ import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
 import {
+  experimental,
+  getSystemPath,
   join,
   normalize,
   schema,
   virtualFs,
-  workspaces,
 } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
 import { map, take, tap } from 'rxjs/operators';
 
+const ivyEnabled = process.argv.includes('--ivy');
+
 const devkitRoot = (global as unknown as { _DevKitRoot: string})._DevKitRoot;
 const workspaceRoot = join(
   normalize(devkitRoot),
-  'tests/angular_devkit/build_ng_packagr/ng-packaged/',
+  `tests/angular_devkit/build_ng_packagr/ng-packaged${ivyEnabled ? '-ivy' : ''}/`,
 );
 
 describe('NgPackagr Builder', () => {
@@ -33,15 +36,14 @@ describe('NgPackagr Builder', () => {
     const registry = new schema.CoreSchemaRegistry();
     registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
-    const { workspace } = await workspaces.readWorkspace(
-      host.root(),
-      workspaces.createWorkspaceHost(host),
-    );
+    const workspaceSysPath = getSystemPath(host.root());
+    const workspace = await experimental.workspace.Workspace.fromPath(host, host.root(), registry);
     const architectHost = new TestingArchitectHost(
-      host.root(),
-      host.root(),
-      new WorkspaceNodeModulesArchitectHost(workspace, host.root()),
+      workspaceSysPath,
+      workspaceSysPath,
+      new WorkspaceNodeModulesArchitectHost(workspace, workspaceSysPath),
     );
+
     architect = new Architect(architectHost, registry);
   });
 
@@ -59,6 +61,12 @@ describe('NgPackagr Builder', () => {
       host.scopedSync().read(normalize('./dist/lib/fesm5/lib.js')),
     );
     expect(content).toContain('lib works');
+
+    if (ivyEnabled) {
+      expect(content).toContain('ngComponentDef');
+    } else {
+      expect(content).not.toContain('ngComponentDef');
+    }
   });
 
   it('rebuilds on TS file changes', async () => {

packages/schematics/angular/utility/latest-versions.ts

@@ -21,5 +21,5 @@ export const latestVersions = {
   AngularPWA: '~0.803.0-next.1',
 
   tsickle: '^0.36.0',
-  ngPackagr: '^5.3.0',
+  ngPackagr: '^5.4.0',
 };

scripts/test.ts

@@ -89,6 +89,11 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
   const specGlob = args.large ? '*_spec_large.ts' : '*_spec.ts';
   const regex = args.glob ? args.glob : `packages/**/${specGlob}`;
 
+  if (args['ivy']) {
+    // tslint:disable-next-line:no-console
+    console.warn('********* IVY Enabled ***********');
+  }
+
   if (args.large) {
     // Default timeout for large specs is 2.5 minutes.
     jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;

tests/angular_devkit/build_ng_packagr/ng-packaged-ivy/.gitignore

@@ -0,0 +1,42 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

tests/angular_devkit/build_ng_packagr/ng-packaged-ivy/angular.json

@@ -0,0 +1,47 @@
+{
+  "$schema": "../../../../packages/angular_devkit/core/src/workspace/workspace-schema.json",
+  "version": 1,
+  "projects": {
+    "lib": {
+      "root": "projects/lib",
+      "projectType": "library",
+      "targets": {
+        "build": {
+          "builder": "../../../../packages/angular_devkit/build_ng_packagr:build",
+          "options": {
+            "project": "projects/lib/ng-package.json",
+            "tsConfig": "projects/lib/tsconfig.lib.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/lib/tsconfig.lib.prod.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "../../../../packages/angular_devkit/build_angular:karma",
+          "options": {
+            "main": "projects/lib/src/test.ts",
+            "tsConfig": "projects/lib/tsconfig.spec.json",
+            "karmaConfig": "projects/lib/karma.conf.js",
+            "browsers": "ChromeHeadlessCI",
+            "progress": false,
+            "watch": false
+          }
+        },
+        "lint": {
+          "builder": "../../../../packages/angular_devkit/build_angular:tslint",
+          "options": {
+            "tsConfig": [
+              "projects/lib/tsconfig.lib.json",
+              "projects/lib/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  }
+}

tests/angular_devkit/build_ng_packagr/ng-packaged-ivy/projects/lib/karma.conf.js

@@ -0,0 +1,44 @@
+/**
+ * @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
+ */
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, 'coverage'),
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--disable-gpu']
+      }
+    },
+    singleRun: false
+  });
+};