Ivy libraries and workspace

.circleci/config.yml

@@ -340,7 +340,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_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,25 @@ 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';
 
+export const ivyEnabled = process.argv.includes('--ivy');
+if (ivyEnabled) {
+  // tslint:disable-next-line:no-console
+  console.warn('********* IVY Enabled ***********');
+}
+
 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 +40,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 +65,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/application/files/tsconfig.app.json.template

@@ -17,8 +17,5 @@
   ]<% } %><% if (enableIvy) { %>
   "include": [
     "src/**/*.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "enableIvy": true
-  }<% } %>
+  ]<% } %>
 }

packages/schematics/angular/application/files/tsconfig.spec.json.template

@@ -14,8 +14,5 @@
   "include": [
     "src/**/*.spec.ts",
     "src/**/*.d.ts"
-  ]<% if (enableIvy) { %>,
-  "angularCompilerOptions": {
-    "enableIvy": true
-  }<% } %>
+  ]
 }

packages/schematics/angular/application/index.ts

@@ -39,7 +39,7 @@ import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { validateProjectName } from '../utility/validation';
-import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { getWorkspace, isIvyWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as ApplicationOptions, Style } from './schema';
 
@@ -143,7 +143,7 @@ function mergeWithRootTsLint(parentHost: Tree) {
   };
 }
 
-function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rule {
+function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string, enableIvy: boolean): Rule {
   let projectRoot = appDir;
   if (projectRoot) {
     projectRoot += '/';
@@ -194,7 +194,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
           main: `${sourceRoot}/main.ts`,
           polyfills: `${sourceRoot}/polyfills.ts`,
           tsConfig: `${projectRoot}tsconfig.app.json`,
-          aot: !!options.enableIvy,
+          aot: enableIvy,
           assets: [
             `${sourceRoot}/favicon.ico`,
             `${sourceRoot}/assets`,
@@ -336,14 +336,17 @@ export default function (options: ApplicationOptions): Rule {
       rootSelector: appRootSelector,
     };
 
+    const enableIvy = isIvyWorkspace(host);
+
     return chain([
-      addAppToWorkspaceFile(options, appDir),
+      addAppToWorkspaceFile(options, appDir, enableIvy),
       mergeWith(
         apply(url('./files'), [
           options.minimal ? filter(minimalPathFilter) : noop(),
           applyTemplates({
             utils: strings,
             ...options,
+            enableIvy,
             relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(appDir),
             appName: options.name,
             isRootApp,

packages/schematics/angular/application/index_spec.ts

@@ -222,15 +222,6 @@ describe('Application Schematic', () => {
     expect(workspace.projects.foo.architect.build.options.aot).toEqual(false);
   });
 
-  it('should set AOT option to true for Ivy projects', async () => {
-    const options = { ...defaultOptions, enableIvy: true };
-
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
-      .toPromise();
-    const workspace = JSON.parse(tree.readContent('/angular.json'));
-    expect(workspace.projects.foo.architect.build.options.aot).toEqual(true);
-  });
-
   it('should set the right files, exclude, include in the tsconfig for VE projects', async () => {
     const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
       .toPromise();
@@ -241,18 +232,7 @@ describe('Application Schematic', () => {
     expect(tsConfig.include).toEqual(['src/**/*.ts']);
   });
 
-  it('should set the right files, exclude, include in the tsconfig for Ivy projects', async () => {
-    const options = { ...defaultOptions, enableIvy: true };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
-      .toPromise();
-    const path = '/projects/foo/tsconfig.app.json';
-    const tsConfig = JSON.parse(tree.readContent(path));
-    expect(tsConfig.files).toEqual(['src/main.ts', 'src/polyfills.ts']);
-    expect(tsConfig.exclude).toBeUndefined();
-    expect(tsConfig.include).toEqual(['src/**/*.d.ts']);
-  });
-
-  describe(`update package.json`, () => {
+  describe('update package.json', () => {
     it(`should add build-angular to devDependencies`, async () => {
       const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
         .toPromise();
@@ -427,4 +407,30 @@ describe('Application Schematic', () => {
       expect(specTsConfig.extends).toEqual('../tsconfig.json');
     });
   });
+
+  describe('IVY application', () => {
+    beforeEach(() => {
+      // Enable an Ivy workspace
+      const tsconfig = JSON.parse(workspaceTree.readContent('./tsconfig.json'));
+      tsconfig.angularCompilerOptions.enableIvy = true;
+      workspaceTree.overwrite('./tsconfig.json', JSON.stringify(tsconfig, undefined, 2));
+    });
+
+    it('should set the right files, exclude, include in the tsconfig for Ivy projects', async () => {
+      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+        .toPromise();
+      const path = '/projects/foo/tsconfig.app.json';
+      const tsConfig = JSON.parse(tree.readContent(path));
+      expect(tsConfig.files).toEqual(['src/main.ts', 'src/polyfills.ts']);
+      expect(tsConfig.exclude).toBeUndefined();
+      expect(tsConfig.include).toEqual(['src/**/*.d.ts']);
+    });
+
+    it('should set AOT option to true for Ivy projects', async () => {
+      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+        .toPromise();
+      const workspace = JSON.parse(tree.readContent('/angular.json'));
+      expect(workspace.projects.foo.architect.build.options.aot).toEqual(true);
+    });
+  });
 });

packages/schematics/angular/application/schema.json

@@ -19,12 +19,6 @@
       },
       "x-prompt": "What name would you like to use for the application?"
     },
-    "enableIvy": {
-      "description": "**EXPERIMENTAL** True to create a new app that uses the Ivy rendering engine.",
-      "type": "boolean",
-      "default": false,
-      "x-user-analytics": 8
-    },
     "inlineStyle": {
       "description": "When true, includes styles inline in the root component.ts file. Only CSS styles can be included inline. Default is false, meaning that an external styles file is created and referenced in the root component.ts file.",
       "type": "boolean",

packages/schematics/angular/library/files/tsconfig.lib.json.template

@@ -12,12 +12,10 @@
     ]
   },
   "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
+    "annotateForClosureCompiler": true<% if (!enableIvy) { %>,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true<% } %>
   },
   "exclude": [
     "src/test.ts",

packages/schematics/angular/library/files/tsconfig.lib.prod.json.template

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "enableResourceInlining": true,
+    "enableIvy": false
+  }
+}

packages/schematics/angular/library/index.ts

@@ -14,6 +14,7 @@ import {
   apply,
   applyTemplates,
   chain,
+  filter,
   mergeWith,
   move,
   noop,
@@ -26,7 +27,7 @@ import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { validateProjectName } from '../utility/validation';
-import { getWorkspace, updateWorkspace } from '../utility/workspace';
+import { getWorkspace, isIvyWorkspace, updateWorkspace } from '../utility/workspace';
 import { Builders, ProjectType } from '../utility/workspace-models';
 import { Schema as LibraryOptions } from './schema';
 
@@ -124,10 +125,11 @@ function addDependenciesToPackageJson() {
   };
 }
 
-function addAppToWorkspaceFile(
+function addLibToWorkspaceFile(
   options: LibraryOptions,
   projectRoot: string,
   projectName: string,
+  enableIvy: boolean,
 ): Rule {
   return updateWorkspace(workspace => {
     if (workspace.projects.size === 0) {
@@ -147,6 +149,11 @@ function addAppToWorkspaceFile(
             tsConfig: `${projectRoot}/tsconfig.lib.json`,
             project: `${projectRoot}/ng-package.json`,
           },
+          configurations: enableIvy ? {
+            production: {
+              tsConfig: `${projectRoot}/tsconfig.lib.prod.json`,
+            },
+          } : undefined,
         },
         test: {
           builder: Builders.Karma,
@@ -199,16 +206,18 @@ export default function (options: LibraryOptions): Rule {
     const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;
     const projectRoot = join(normalize(newProjectRoot), folderName);
     const distRoot = `dist/${folderName}`;
-
     const sourceDir = `${projectRoot}/src/lib`;
+    const enableIvy = isIvyWorkspace(host);
 
     const templateSource = apply(url('./files'), [
+      enableIvy ? noop() : filter(f => !f.endsWith('tsconfig.lib.prod.json.template')),
       applyTemplates({
         ...strings,
         ...options,
         packageName,
         projectRoot,
         distRoot,
+        enableIvy,
         relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(projectRoot),
         prefix,
         angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
@@ -219,7 +228,7 @@ export default function (options: LibraryOptions): Rule {
 
     return chain([
       mergeWith(templateSource),
-      addAppToWorkspaceFile(options, projectRoot, projectName),
+      addLibToWorkspaceFile(options, projectRoot, projectName, enableIvy),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
       options.skipTsConfig ? noop() : updateTsConfig(packageName, distRoot),
       schematic('module', {