From 05966646e7f20635d9120f93ddd2856cc5477064 Mon Sep 17 00:00:00 2001 From: Filipe Silva Date: Tue, 26 Feb 2019 11:49:09 +0000 Subject: [PATCH] feat(@schematics/angular): rename experimentalIvy to enableIvy Followup to https://github.com/angular/angular/pull/28569#discussion_r259558085 --- .../angular/application/files/root/tsconfig.app.json.template | 2 +- packages/schematics/angular/application/index.ts | 2 +- packages/schematics/angular/application/index_spec.ts | 4 ++-- packages/schematics/angular/application/schema.json | 2 +- packages/schematics/angular/ng-new/index.ts | 2 +- packages/schematics/angular/ng-new/schema.json | 4 ++-- tests/legacy-cli/e2e/setup/500-create-project.ts | 2 +- tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts | 2 +- tests/legacy-cli/e2e/tests/experimental/ivy.ts | 2 +- tests/legacy-cli/e2e/utils/project.ts | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/schematics/angular/application/files/root/tsconfig.app.json.template b/packages/schematics/angular/application/files/root/tsconfig.app.json.template index 34720be127..e8911503de 100644 --- a/packages/schematics/angular/application/files/root/tsconfig.app.json.template +++ b/packages/schematics/angular/application/files/root/tsconfig.app.json.template @@ -7,7 +7,7 @@ "exclude": [ "test.ts", "**/*.spec.ts" - ]<% if (experimentalIvy) { %>, + ]<% if (enableIvy) { %>, "angularCompilerOptions": { "enableIvy": true }<% } %> diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts index 97b02484cf..6163f83c7e 100644 --- a/packages/schematics/angular/application/index.ts +++ b/packages/schematics/angular/application/index.ts @@ -430,7 +430,7 @@ export default function (options: ApplicationOptions): Rule { move(sourceDir), ]), MergeStrategy.Overwrite), options.minimal ? noop() : schematic('e2e', e2eOptions), - options.experimentalIvy ? addPostInstallScript() : noop(), + options.enableIvy ? addPostInstallScript() : noop(), options.skipPackageJson ? noop() : addDependenciesToPackageJson(options), options.lintFix ? applyLintFix(sourceDir) : noop(), ]); diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts index 352d318548..5ba5a1a415 100644 --- a/packages/schematics/angular/application/index_spec.ts +++ b/packages/schematics/angular/application/index_spec.ts @@ -208,8 +208,8 @@ describe('Application Schematic', () => { expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript); }); - it(`should add a postinstall in package.json when 'experimentalIvy'`, () => { - const tree = schematicRunner.runSchematic('application', { ...defaultOptions, experimentalIvy: true }, workspaceTree); + it(`should add a postinstall in package.json when 'enableIvy'`, () => { + const tree = schematicRunner.runSchematic('application', { ...defaultOptions, enableIvy: true }, workspaceTree); const pkg = JSON.parse(tree.readContent('/package.json')); expect(pkg.scripts.postinstall).toEqual('ivy-ngcc'); }); diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json index 8041d438a8..39fde448dc 100644 --- a/packages/schematics/angular/application/schema.json +++ b/packages/schematics/angular/application/schema.json @@ -19,7 +19,7 @@ }, "x-prompt": "What name would you like to use for the application?" }, - "experimentalIvy": { + "enableIvy": { "description": "EXPERIMENTAL: True to create a new app that uses the Ivy rendering engine.", "type": "boolean", "default": false diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts index 9e7d926ee4..055eb09231 100644 --- a/packages/schematics/angular/ng-new/index.ts +++ b/packages/schematics/angular/ng-new/index.ts @@ -46,7 +46,7 @@ export default function (options: NgNewOptions): Rule { const applicationOptions: ApplicationOptions = { projectRoot: '', name: options.name, - experimentalIvy: options.experimentalIvy, + enableIvy: options.enableIvy, inlineStyle: options.inlineStyle, inlineTemplate: options.inlineTemplate, prefix: options.prefix, diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json index ea4c18bd22..4aa1ee2b9b 100644 --- a/packages/schematics/angular/ng-new/schema.json +++ b/packages/schematics/angular/ng-new/schema.json @@ -18,8 +18,8 @@ }, "x-prompt": "What name would you like to use for the new workspace and initial project?" }, - "experimentalIvy": { - "description": "EXPERIMENTAL: When true, creates a new app that uses the Ivy rendering engine.", + "enableIvy": { + "description": "When true, creates a new app that uses the Ivy rendering engine.", "type": "boolean", "default": false }, diff --git a/tests/legacy-cli/e2e/setup/500-create-project.ts b/tests/legacy-cli/e2e/setup/500-create-project.ts index 7a2bf8d31c..f995bbbd2a 100644 --- a/tests/legacy-cli/e2e/setup/500-create-project.ts +++ b/tests/legacy-cli/e2e/setup/500-create-project.ts @@ -11,7 +11,7 @@ export default async function() { const extraArgs = []; if (argv['ivy']) { - extraArgs.push('--experimentalIvy'); + extraArgs.push('--enable-ivy'); } if (argv.noproject) { diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts index f4225a3821..d23d1b26a5 100644 --- a/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts +++ b/tests/legacy-cli/e2e/tests/experimental/ivy-lazy-load.ts @@ -11,7 +11,7 @@ import { ng } from '../../utils/process'; import { createProject } from '../../utils/project'; export default async function() { - await createProject('ivy-project', '--experimental-ivy'); + await createProject('ivy-project', '--enable-ivy'); await ng('generate', 'module', 'lazy', '--routing'); await prependToFile('src/app/app.module.ts', `import { RouterModule } from '@angular/router';`); diff --git a/tests/legacy-cli/e2e/tests/experimental/ivy.ts b/tests/legacy-cli/e2e/tests/experimental/ivy.ts index c085986a85..c80a2e0bfc 100644 --- a/tests/legacy-cli/e2e/tests/experimental/ivy.ts +++ b/tests/legacy-cli/e2e/tests/experimental/ivy.ts @@ -17,7 +17,7 @@ export default async function() { return; } try { - await createProject('ivy-project', '--experimental-ivy'); + await createProject('ivy-project', '--enable-ivy'); await ngServe('--prod'); diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts index 073b010362..6d63c6792f 100644 --- a/tests/legacy-cli/e2e/utils/project.ts +++ b/tests/legacy-cli/e2e/utils/project.ts @@ -38,7 +38,7 @@ export async function createProject(name: string, ...args: string[]) { const extraArgs = []; if (argv['ivy']) { - extraArgs.push('--experimentalIvy'); + extraArgs.push('--enableIvy'); } process.chdir(getGlobalVariable('tmp-root'));