fix(angular): do not use ngcc for new workspaces and projects #12386

nrwl · Oct 11, 2022 · 19818ca · 19818ca
1 parent eedbd9d
commit 19818ca
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 69 deletions.
diff --git a/docs/generated/packages/angular.json b/docs/generated/packages/angular.json
@@ -718,11 +718,6 @@
             "type": "boolean",
             "default": false,
             "description": "Do not add dependencies to `package.json`."
-          },
-          "skipPostInstall": {
-            "type": "boolean",
-            "default": false,
-            "description": "Do not add or append `ngcc` to the `postinstall` script in `package.json`."
           }
         },
         "additionalProperties": false,

diff --git a/packages/angular/src/generators/init/init.spec.ts b/packages/angular/src/generators/init/init.spec.ts
@@ -4,7 +4,6 @@ import { Linter } from '@nrwl/linter';
 
 import init from './init';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
-import { Styles } from '../utils/types';
 
 describe('init', () => {
   let host: Tree;
@@ -42,37 +41,6 @@ describe('init', () => {
     expect(devDependencies['codelyzer']).toBeUndefined();
   });
 
-  it('should add a postinstall script for ngcc by default', async () => {
-    // ACT
-    await init(host, {
-      unitTestRunner: UnitTestRunner.Karma,
-      linter: Linter.EsLint,
-      skipFormat: false,
-    });
-
-    const packageJson = readJson(host, 'package.json');
-
-    // ASSERT
-    expect(packageJson.scripts.postinstall).toEqual(
-      'ngcc --properties es2020 browser module main'
-    );
-  });
-
-  it('should not add a postinstall script for ngcc if skipPostInstall=true', async () => {
-    // ACT
-    await init(host, {
-      unitTestRunner: UnitTestRunner.Karma,
-      linter: Linter.EsLint,
-      skipFormat: false,
-      skipPostInstall: true,
-    });
-
-    const packageJson = readJson(host, 'package.json');
-
-    // ASSERT
-    expect(packageJson?.scripts?.postinstall).toBeFalsy();
-  });
-
   describe('--unit-test-runner', () => {
     describe('karma', () => {
       it('should add karma dependencies', async () => {

diff --git a/packages/angular/src/generators/init/init.ts b/packages/angular/src/generators/init/init.ts
@@ -1,29 +1,30 @@
 import { cypressInitGenerator } from '@nrwl/cypress';
-import { GeneratorCallback, logger, Tree } from '@nrwl/devkit';
 import {
   addDependenciesToPackageJson,
   formatFiles,
+  GeneratorCallback,
+  logger,
   readWorkspaceConfiguration,
-  updateJson,
+  Tree,
   updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
 import { jestInitGenerator } from '@nrwl/jest';
 import { Linter } from '@nrwl/linter';
 import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import {
-  angularVersion,
   angularDevkitVersion,
+  angularVersion,
+  jasmineCoreVersion,
+  jasmineSpecReporterVersion,
   jestPresetAngularVersion,
+  protractorVersion,
   rxjsVersion,
-  tsNodeVersion,
   tsLibVersion,
-  zoneJsVersion,
-  protractorVersion,
-  jasmineCoreVersion,
-  jasmineSpecReporterVersion,
+  tsNodeVersion,
   typesJasmineVersion,
   typesJasminewd2Version,
+  zoneJsVersion,
 } from '../../utils/versions';
 import { karmaGenerator } from '../karma/karma';
 import { Schema } from './schema';
@@ -35,10 +36,6 @@ export async function angularInitGenerator(
   const options = normalizeOptions(rawOptions);
   setDefaults(host, options);
 
-  if (!options.skipPostInstall) {
-    addPostInstall(host);
-  }
-
   const depsTask = !options.skipPackageJson
     ? updateDependencies(host)
     : () => {};
@@ -59,7 +56,6 @@ function normalizeOptions(options: Schema): Required<Schema> {
     linter: options.linter ?? Linter.EsLint,
     skipFormat: options.skipFormat ?? false,
     skipInstall: options.skipInstall ?? false,
-    skipPostInstall: options.skipPostInstall ?? false,
     skipPackageJson: options.skipPackageJson ?? false,
     style: options.style ?? 'css',
     unitTestRunner: options.unitTestRunner ?? UnitTestRunner.Jest,
@@ -90,19 +86,6 @@ function setDefaults(host: Tree, options: Schema) {
   updateWorkspaceConfiguration(host, workspace);
 }
 
-function addPostInstall(host: Tree) {
-  updateJson(host, 'package.json', (pkgJson) => {
-    pkgJson.scripts = pkgJson.scripts ?? {};
-    const command = 'ngcc --properties es2020 browser module main';
-    if (!pkgJson.scripts.postinstall) {
-      pkgJson.scripts.postinstall = command;
-    } else if (!pkgJson.scripts.postinstall.includes('ngcc')) {
-      pkgJson.scripts.postinstall = `${pkgJson.scripts.postinstall} && ${command}`;
-    }
-    return pkgJson;
-  });
-}
-
 function updateDependencies(host: Tree): GeneratorCallback {
   return addDependenciesToPackageJson(
     host,

diff --git a/packages/angular/src/generators/init/schema.d.ts b/packages/angular/src/generators/init/schema.d.ts
@@ -10,5 +10,4 @@ export interface Schema {
   style?: Styles;
   linter?: Linter;
   skipPackageJson?: boolean;
-  skipPostInstall?: boolean;
 }
diff --git a/packages/angular/src/generators/init/schema.json b/packages/angular/src/generators/init/schema.json
@@ -72,11 +72,6 @@
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`."
-    },
-    "skipPostInstall": {
-      "type": "boolean",
-      "default": false,
-      "description": "Do not add or append `ngcc` to the `postinstall` script in `package.json`."
     }
   },
   "additionalProperties": false