@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/generators/init/angular-v14/init.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularInitGenerator = void 0;
+const tslib_1 = require("tslib");
+const cypress_1 = require("@nrwl/cypress");
+const devkit_1 = require("@nrwl/devkit");
+const jest_1 = require("@nrwl/jest");
+const linter_1 = require("@nrwl/linter");
+const js_1 = require("@nrwl/js");
+const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
+const test_runners_1 = require("../../../utils/test-runners");
+const version_utils_1 = require("../../utils/version-utils");
+function angularInitGenerator(host, rawOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = normalizeOptions(rawOptions);
+        setDefaults(host, options);
+        const tasks = [];
+        const peerDepsToInstall = [
+            '@angular-devkit/core',
+            '@angular-devkit/schematics',
+            '@schematics/angular',
+        ];
+        let devkitVersion;
+        peerDepsToInstall.forEach((pkg) => {
+            var _a;
+            const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(host, pkg);
+            if (!packageVersion) {
+                devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(host, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion);
+                try {
+                    (0, devkit_1.ensurePackage)(pkg, devkitVersion);
+                }
+                catch (_b) {
+                    // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
+                }
+                if (!options.skipPackageJson) {
+                    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, { [pkg]: devkitVersion }));
+                }
+            }
+        });
+        const jsTask = yield (0, js_1.initGenerator)(host, Object.assign(Object.assign({}, options), { js: false, tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', skipFormat: true }));
+        tasks.push(jsTask);
+        if (!options.skipPackageJson) {
+            tasks.push(updateDependencies(host));
+        }
+        const unitTestTask = yield addUnitTestRunner(host, options);
+        tasks.push(unitTestTask);
+        const e2eTask = yield addE2ETestRunner(host, options);
+        tasks.push(e2eTask);
+        addGitIgnoreEntry(host, '.angular');
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(host);
+        }
+        return (0, devkit_1.runTasksInSerial)(...tasks);
+    });
+}
+exports.angularInitGenerator = angularInitGenerator;
+function normalizeOptions(options) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return {
+        e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : test_runners_1.E2eTestRunner.Cypress,
+        linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint,
+        skipFormat: (_c = options.skipFormat) !== null && _c !== void 0 ? _c : false,
+        skipInstall: (_d = options.skipInstall) !== null && _d !== void 0 ? _d : false,
+        skipPackageJson: (_e = options.skipPackageJson) !== null && _e !== void 0 ? _e : false,
+        style: (_f = options.style) !== null && _f !== void 0 ? _f : 'css',
+        unitTestRunner: (_g = options.unitTestRunner) !== null && _g !== void 0 ? _g : test_runners_1.UnitTestRunner.Jest,
+        rootProject: options.rootProject,
+    };
+}
+function setDefaults(host, options) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    nxJson.generators = nxJson.generators || {};
+    nxJson.generators['@nrwl/angular:application'] = Object.assign({ style: options.style, linter: options.linter, unitTestRunner: options.unitTestRunner, e2eTestRunner: options.e2eTestRunner }, (nxJson.generators['@nrwl/angular:application'] || {}));
+    nxJson.generators['@nrwl/angular:library'] = Object.assign({ linter: options.linter, unitTestRunner: options.unitTestRunner }, (nxJson.generators['@nrwl/angular:library'] || {}));
+    nxJson.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nrwl/angular:component'] || {}));
+    (0, devkit_1.updateNxJson)(host, nxJson);
+}
+function updateDependencies(tree) {
+    var _a, _b;
+    const angularVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularVersion;
+    const angularDevkitVersion = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion;
+    return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
+        '@angular/animations': angularVersion,
+        '@angular/common': angularVersion,
+        '@angular/compiler': angularVersion,
+        '@angular/core': angularVersion,
+        '@angular/forms': angularVersion,
+        '@angular/platform-browser': angularVersion,
+        '@angular/platform-browser-dynamic': angularVersion,
+        '@angular/router': angularVersion,
+        rxjs: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.rxjsVersion,
+        tslib: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.tsLibVersion,
+        'zone.js': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.zoneJsVersion,
+    }, {
+        '@angular/cli': angularDevkitVersion,
+        '@angular/compiler-cli': angularVersion,
+        '@angular/language-service': angularVersion,
+        '@angular-devkit/build-angular': angularDevkitVersion,
+    });
+}
+function addUnitTestRunner(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (options.unitTestRunner) {
+            case test_runners_1.UnitTestRunner.Jest:
+                if (!options.skipPackageJson) {
+                    (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+                        'jest-preset-angular': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jestPresetAngularVersion,
+                    });
+                }
+                return (0, jest_1.jestInitGenerator)(tree, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            default:
+                return () => { };
+        }
+    });
+}
+function addE2ETestRunner(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (options.e2eTestRunner) {
+            case test_runners_1.E2eTestRunner.Protractor:
+                return !options.skipPackageJson
+                    ? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+                        protractor: backward_compatible_versions_1.backwardCompatibleVersions.angularV14.protractorVersion,
+                        'jasmine-core': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jasmineCoreVersion,
+                        'jasmine-spec-reporter': backward_compatible_versions_1.backwardCompatibleVersions.angularV14
+                            .jasmineSpecReporterVersion,
+                        'ts-node': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.tsNodeVersion,
+                        '@types/jasmine': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.typesJasmineVersion,
+                        '@types/jasminewd2': backward_compatible_versions_1.backwardCompatibleVersions.angularV14.typesJasminewd2Version,
+                    })
+                    : () => { };
+            case test_runners_1.E2eTestRunner.Cypress:
+                return yield (0, cypress_1.cypressInitGenerator)(tree, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            default:
+                return () => { };
+        }
+    });
+}
+function addGitIgnoreEntry(host, entry) {
+    if (host.exists('.gitignore')) {
+        let content = host.read('.gitignore', 'utf-8');
+        if (/^\.angular$/gm.test(content)) {
+            return;
+        }
+        content = `${content}\n${entry}\n`;
+        host.write('.gitignore', content);
+    }
+    else {
+        devkit_1.logger.warn(`Couldn't find .gitignore file to update`);
+    }
+}
+exports.default = angularInitGenerator;
+//# sourceMappingURL=init.js.map

package/src/generators/init/angular-v14/init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/init/angular-v14/init.ts"],"names":[],"mappings":"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"}

package/src/generators/init/angular-v14/schema.d.ts

@@ -0,0 +1,14 @@
+import { Linter } from '@nrwl/linter';
+import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
+import type { Styles } from '../utils/types';
+
+export interface Schema {
+  unitTestRunner?: UnitTestRunner;
+  e2eTestRunner?: E2eTestRunner;
+  skipFormat?: boolean;
+  skipInstall?: boolean;
+  style?: Styles;
+  linter?: Linter;
+  skipPackageJson?: boolean;
+  rootProject?: boolean;
+}

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
 import { GeneratorCallback, Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
-export declare function angularInitGenerator(host: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
+export declare function angularInitGenerator(tree: Tree, rawOptions: Schema): Promise<GeneratorCallback>;
 export default angularInitGenerator;

package/src/generators/init/init.js

@@ -4,125 +4,147 @@ exports.angularInitGenerator = void 0;
 const tslib_1 = require("tslib");
 const cypress_1 = require("@nrwl/cypress");
 const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
 const jest_1 = require("@nrwl/jest");
 const linter_1 = require("@nrwl/linter");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const js_1 = require("@nrwl/js");
+const path_1 = require("path");
 const test_runners_1 = require("../../utils/test-runners");
 const versions_1 = require("../../utils/versions");
-const karma_1 = require("../karma/karma");
-function angularInitGenerator(host, rawOptions) {
+const version_utils_1 = require("../utils/version-utils");
+function angularInitGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const generatorDirectory = (0, version_utils_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
+        if (generatorDirectory) {
+            let previousGenerator = yield (_a = (0, path_1.join)(__dirname, generatorDirectory, 'init'), Promise.resolve().then(() => require(_a)));
+            yield previousGenerator.default(tree, rawOptions);
+            return;
+        }
+        const tasks = [];
         const options = normalizeOptions(rawOptions);
-        setDefaults(host, options);
-        if (!options.skipPostInstall) {
-            addPostInstall(host);
+        const peerDepsToInstall = [
+            '@angular-devkit/core',
+            '@angular-devkit/schematics',
+            '@schematics/angular',
+        ];
+        let devkitVersion;
+        peerDepsToInstall.forEach((pkg) => {
+            var _a;
+            const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
+            if (!packageVersion) {
+                devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : versions_1.angularDevkitVersion);
+                try {
+                    (0, devkit_1.ensurePackage)(pkg, devkitVersion);
+                }
+                catch (_b) {
+                    // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
+                }
+                if (!options.skipPackageJson) {
+                    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
+                }
+            }
+        });
+        setDefaults(tree, options);
+        const jsTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
+        tasks.push(jsTask);
+        if (!options.skipPackageJson) {
+            tasks.push(updateDependencies(tree));
         }
-        const depsTask = !options.skipPackageJson
-            ? updateDependencies(host)
-            : () => { };
-        const unitTestTask = addUnitTestRunner(host, options);
-        const e2eTask = addE2ETestRunner(host, options);
-        addGitIgnoreEntry(host, '.angular');
+        const unitTestTask = yield addUnitTestRunner(tree, options);
+        tasks.push(unitTestTask);
+        const e2eTask = yield addE2ETestRunner(tree, options);
+        tasks.push(e2eTask);
+        addGitIgnoreEntry(tree, '.angular');
         if (!options.skipFormat) {
-            yield (0, devkit_2.formatFiles)(host);
+            yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(depsTask, unitTestTask, e2eTask);
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.angularInitGenerator = angularInitGenerator;
 function normalizeOptions(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
         e2eTestRunner: (_a = options.e2eTestRunner) !== null && _a !== void 0 ? _a : test_runners_1.E2eTestRunner.Cypress,
         linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint,
         skipFormat: (_c = options.skipFormat) !== null && _c !== void 0 ? _c : false,
         skipInstall: (_d = options.skipInstall) !== null && _d !== void 0 ? _d : false,
-        skipPostInstall: (_e = options.skipPostInstall) !== null && _e !== void 0 ? _e : false,
-        skipPackageJson: (_f = options.skipPackageJson) !== null && _f !== void 0 ? _f : false,
-        style: (_g = options.style) !== null && _g !== void 0 ? _g : 'css',
-        unitTestRunner: (_h = options.unitTestRunner) !== null && _h !== void 0 ? _h : test_runners_1.UnitTestRunner.Jest,
+        skipPackageJson: (_e = options.skipPackageJson) !== null && _e !== void 0 ? _e : false,
+        style: (_f = options.style) !== null && _f !== void 0 ? _f : 'css',
+        unitTestRunner: (_g = options.unitTestRunner) !== null && _g !== void 0 ? _g : test_runners_1.UnitTestRunner.Jest,
+        rootProject: options.rootProject,
     };
 }
 function setDefaults(host, options) {
-    const workspace = (0, devkit_2.readWorkspaceConfiguration)(host);
-    workspace.generators = workspace.generators || {};
-    workspace.generators['@nrwl/angular:application'] = Object.assign({ style: options.style, linter: options.linter, unitTestRunner: options.unitTestRunner, e2eTestRunner: options.e2eTestRunner }, (workspace.generators['@nrwl/angular:application'] || {}));
-    workspace.generators['@nrwl/angular:library'] = Object.assign({ linter: options.linter, unitTestRunner: options.unitTestRunner }, (workspace.generators['@nrwl/angular:library'] || {}));
-    workspace.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (workspace.generators['@nrwl/angular:component'] || {}));
-    (0, devkit_2.updateWorkspaceConfiguration)(host, workspace);
-}
-function addPostInstall(host) {
-    (0, devkit_2.updateJson)(host, 'package.json', (pkgJson) => {
-        var _a;
-        pkgJson.scripts = (_a = pkgJson.scripts) !== null && _a !== void 0 ? _a : {};
-        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;
-    });
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    nxJson.generators = nxJson.generators || {};
+    nxJson.generators['@nrwl/angular:application'] = Object.assign({ style: options.style, linter: options.linter, unitTestRunner: options.unitTestRunner, e2eTestRunner: options.e2eTestRunner }, (nxJson.generators['@nrwl/angular:application'] || {}));
+    nxJson.generators['@nrwl/angular:library'] = Object.assign({ linter: options.linter, unitTestRunner: options.unitTestRunner }, (nxJson.generators['@nrwl/angular:library'] || {}));
+    nxJson.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nrwl/angular:component'] || {}));
+    (0, devkit_1.updateNxJson)(host, nxJson);
 }
-function updateDependencies(host) {
-    return (0, devkit_2.addDependenciesToPackageJson)(host, {
-        '@angular/animations': versions_1.angularVersion,
-        '@angular/common': versions_1.angularVersion,
-        '@angular/compiler': versions_1.angularVersion,
-        '@angular/core': versions_1.angularVersion,
-        '@angular/forms': versions_1.angularVersion,
-        '@angular/platform-browser': versions_1.angularVersion,
-        '@angular/platform-browser-dynamic': versions_1.angularVersion,
-        '@angular/router': versions_1.angularVersion,
+function updateDependencies(tree) {
+    var _a, _b;
+    const angularVersionToInstall = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : versions_1.angularVersion;
+    const angularDevkitVersionToInstall = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : versions_1.angularDevkitVersion;
+    return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
+        '@angular/animations': angularVersionToInstall,
+        '@angular/common': angularVersionToInstall,
+        '@angular/compiler': angularVersionToInstall,
+        '@angular/core': angularVersionToInstall,
+        '@angular/forms': angularVersionToInstall,
+        '@angular/platform-browser': angularVersionToInstall,
+        '@angular/platform-browser-dynamic': angularVersionToInstall,
+        '@angular/router': angularVersionToInstall,
         rxjs: versions_1.rxjsVersion,
         tslib: versions_1.tsLibVersion,
         'zone.js': versions_1.zoneJsVersion,
     }, {
-        '@angular/cli': versions_1.angularDevkitVersion,
-        '@angular/compiler-cli': versions_1.angularVersion,
-        '@angular/language-service': versions_1.angularVersion,
-        '@angular-devkit/build-angular': versions_1.angularDevkitVersion,
+        '@angular/cli': angularDevkitVersionToInstall,
+        '@angular/compiler-cli': angularVersionToInstall,
+        '@angular/language-service': angularVersionToInstall,
+        '@angular-devkit/build-angular': angularDevkitVersionToInstall,
     });
 }
-function addUnitTestRunner(host, options) {
-    switch (options.unitTestRunner) {
-        case test_runners_1.UnitTestRunner.Karma:
-            return (0, karma_1.karmaGenerator)(host, { skipPackageJson: options.skipPackageJson });
-        case test_runners_1.UnitTestRunner.Jest:
-            if (!options.skipPackageJson) {
-                (0, devkit_2.addDependenciesToPackageJson)(host, {}, {
-                    'jest-preset-angular': versions_1.jestPresetAngularVersion,
+function addUnitTestRunner(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (options.unitTestRunner) {
+            case test_runners_1.UnitTestRunner.Jest:
+                if (!options.skipPackageJson) {
+                    (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+                        'jest-preset-angular': versions_1.jestPresetAngularVersion,
+                    });
+                }
+                return (0, jest_1.jestInitGenerator)(tree, {
+                    skipPackageJson: options.skipPackageJson,
                 });
-            }
-            return (0, jest_1.jestInitGenerator)(host, {
-                skipPackageJson: options.skipPackageJson,
-            });
-        default:
-            return () => { };
-    }
+            default:
+                return () => { };
+        }
+    });
 }
-function addE2ETestRunner(host, options) {
-    switch (options.e2eTestRunner) {
-        case test_runners_1.E2eTestRunner.Protractor:
-            return !options.skipPackageJson
-                ? (0, devkit_2.addDependenciesToPackageJson)(host, {}, {
-                    protractor: versions_1.protractorVersion,
-                    'jasmine-core': versions_1.jasmineCoreVersion,
-                    'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
-                    'ts-node': versions_1.tsNodeVersion,
-                    '@types/jasmine': versions_1.typesJasmineVersion,
-                    '@types/jasminewd2': versions_1.typesJasminewd2Version,
-                })
-                : () => { };
-        case test_runners_1.E2eTestRunner.Cypress:
-            return (0, cypress_1.cypressInitGenerator)(host, {
-                skipPackageJson: options.skipPackageJson,
-            });
-        default:
-            return () => { };
-    }
+function addE2ETestRunner(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (options.e2eTestRunner) {
+            case test_runners_1.E2eTestRunner.Protractor:
+                return !options.skipPackageJson
+                    ? (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+                        protractor: versions_1.protractorVersion,
+                        'jasmine-core': versions_1.jasmineCoreVersion,
+                        'jasmine-spec-reporter': versions_1.jasmineSpecReporterVersion,
+                        'ts-node': versions_1.tsNodeVersion,
+                        '@types/jasmine': versions_1.typesJasmineVersion,
+                        '@types/jasminewd2': versions_1.typesJasminewd2Version,
+                    })
+                    : () => { };
+            case test_runners_1.E2eTestRunner.Cypress:
+                return (0, cypress_1.cypressInitGenerator)(tree, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            default:
+                return () => { };
+        }
+    });
 }
 function addGitIgnoreEntry(host, entry) {
     if (host.exists('.gitignore')) {

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}

package/src/generators/init/schema.d.ts

@@ -8,7 +8,7 @@ export interface Schema {
   skipFormat?: boolean;
   skipInstall?: boolean;
   style?: Styles;
-  linter?: Exclude<Linter, Linter.TsLint>;
+  linter?: Linter;
   skipPackageJson?: boolean;
-  skipPostInstall?: boolean;
+  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -5,34 +5,45 @@
   "title": "Init Angular Plugin",
   "description": "Initializes the `@nrwl/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
   "type": "object",
+  "examples": [
+    {
+      "command": "nx g @nrwl/angular:init --style=scss",
+      "description": "Installs angular dependencies and initializes the `@nrwl/angular` plugin with the `scss` stylesheet format."
+    }
+  ],
   "properties": {
     "unitTestRunner": {
       "type": "string",
-      "enum": ["karma", "jest", "none"],
+      "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "jest",
+      "x-priority": "important"
     },
     "e2eTestRunner": {
       "type": "string",
       "enum": ["protractor", "cypress", "none"],
       "description": "Test runner to use for end to end (e2e) tests.",
-      "default": "cypress"
+      "default": "cypress",
+      "x-priority": "important"
     },
     "skipInstall": {
       "type": "boolean",
       "description": "Skip installing after adding `@nrwl/workspace`.",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "eslint",
+      "x-priority": "important"
     },
     "style": {
       "description": "The file extension to be used for style files.",
@@ -65,12 +76,8 @@
     "skipPackageJson": {
       "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`."
+      "description": "Do not add dependencies to `package.json`.",
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false

package/src/generators/library/lib/add-children.js

@@ -2,31 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addChildren = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
-const ts = require("typescript");
-const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
-const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
+const js_1 = require("@nrwl/js");
+const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function addChildren(tree, options) {
-    if (!tree.exists(options.parentModule)) {
-        throw new Error(`Cannot find '${options.parentModule}'`);
+    if (!tree.exists(options.parent)) {
+        throw new Error(`Cannot find '${options.parent}'`);
     }
-    const moduleSource = tree.read(options.parentModule, 'utf-8');
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const routeFileSource = tree.read(options.parent, 'utf-8');
     const constName = options.standalone
-        ? `${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES`
+        ? `${(0, devkit_1.names)(options.name).propertyName}Routes`
         : `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
     const importPath = options.importPath;
-    let sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
+    let sourceFile = tsModule.createSourceFile(options.parent, routeFileSource, tsModule.ScriptTarget.Latest, true);
     if (!options.standalone) {
-        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.parentModule, options.moduleName);
+        sourceFile = (0, ast_utils_1.addImportToModule)(tree, sourceFile, options.parent, options.moduleName);
     }
-    sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.parentModule, options.standalone ? constName : `${options.moduleName}, ${constName}`, importPath);
+    sourceFile = (0, js_1.insertImport)(tree, sourceFile, options.parent, options.standalone ? constName : `${options.moduleName}, ${constName}`, importPath);
     const route = `{ path: '${(0, devkit_1.names)(options.fileName).fileName}', children: ${constName} }`;
-    if (moduleSource.includes('@NgModule')) {
-        sourceFile = (0, ast_utils_2.addRoute)(tree, options.parentModule, sourceFile, route);
-    }
-    else {
-        (0, standalone_utils_1.addStandaloneRoute)(tree, options.parentModule, route, false, constName, importPath);
-    }
+    (0, route_utils_1.addRoute)(tree, options.parent, route, false, constName, importPath);
 }
 exports.addChildren = addChildren;
 //# sourceMappingURL=add-children.js.map

package/src/generators/library/lib/add-children.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,iCAAiC;AACjC,kEAG4C;AAE5C,gFAA+E;AAE/E,SAAgB,WAAW,CACzB,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS;QACzD,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtC,UAAU,GAAG,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KACtE;SAAM;QACL,IAAA,qCAAkB,EAChB,IAAI,EACJ,OAAO,CAAC,YAAY,EACpB,KAAK,EACL,KAAK,EACL,SAAS,EACT,UAAU,CACX,CAAC;KACH;AACH,CAAC;AArDD,kCAqDC"}
+{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAwC;AACxC,kEAAuE;AAEvE,sEAAgE;AAChE,uFAAmF;AAEnF,IAAI,QAAqC,CAAC;AAE1C,SAAgB,WAAW,CACzB,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IACD,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,OAAO,CAAC,MAAM,EACd,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,iBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC;AA7CD,kCA6CC"}

package/src/generators/library/lib/add-lazy-loaded-router-configuration.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from './normalized-schema';
-export declare function addLazyLoadedRouterConfiguration(host: Tree, options: NormalizedSchema['libraryOptions']): void;
+export declare function addLazyLoadedRouterConfiguration(tree: Tree, options: NormalizedSchema['libraryOptions']): void;