@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/generators/utils/storybook-ast/module-info.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModuleFilePaths = exports.getModuleDeclaredComponents = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const typescript_1 = require("nx/src/utils/typescript");
 const path_1 = require("path");
-const typescript_2 = require("typescript");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function getModuleDeclaredComponents(file, moduleFilePath, projectName) {
     const ngModuleDecorator = getNgModuleDecorator(file, moduleFilePath);
     const declarationsPropertyAssignment = getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName);
@@ -38,9 +38,11 @@ function getModuleFilePaths(tree, entryPoint) {
 }
 exports.getModuleFilePaths = getModuleFilePaths;
 function hasNgModule(tree, filePath) {
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
     const fileContent = tree.read(filePath, 'utf-8');
-    const ast = tsquery_1.tsquery.ast(fileContent);
-    const ngModule = (0, tsquery_1.tsquery)(ast, 'ClassDeclaration > Decorator > CallExpression > Identifier[name=NgModule]', { visitAllChildren: true });
+    const ast = tsquery.ast(fileContent);
+    const ngModule = tsquery(ast, 'ClassDeclaration > Decorator > CallExpression > Identifier[name=NgModule]', { visitAllChildren: true });
     return ngModule.length > 0;
 }
 function getDeclaredComponentsInDeclarations(declarationsArray) {
@@ -49,24 +51,27 @@ function getDeclaredComponentsInDeclarations(declarationsArray) {
         .filter((name) => name.endsWith('Component'));
 }
 function getDeclaredComponentNodes(declarationsArray) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const cmps = declarationsArray
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.SyntaxList)
+        .find((node) => node.kind === tsModule.SyntaxKind.SyntaxList)
         .getChildren()
         .map((node) => {
-        if (node.kind === typescript_2.SyntaxKind.Identifier) {
+        if (node.kind === tsModule.SyntaxKind.Identifier) {
             return node;
         }
         // if the node is a destructuring, follow the variable
-        if (node.kind === typescript_2.SyntaxKind.SpreadElement) {
+        if (node.kind === tsModule.SyntaxKind.SpreadElement) {
             const declarationVariableNode = node
                 .getChildren()
-                .find((node) => node.kind === typescript_2.SyntaxKind.Identifier);
+                .find((node) => node.kind === tsModule.SyntaxKind.Identifier);
             // try to find the variable declaration in the same component
             const declarationVariable = getVariableDeclaration(declarationVariableNode.getText(), declarationVariableNode.getSourceFile());
             if (declarationVariable &&
                 declarationVariable.initializer.kind ===
-                    typescript_2.SyntaxKind.ArrayLiteralExpression) {
+                    tsModule.SyntaxKind.ArrayLiteralExpression) {
                 const nodes = getDeclaredComponentNodes(declarationVariable.initializer);
                 return nodes;
             }
@@ -89,9 +94,12 @@ function flatten(arr) {
     return flattened;
 }
 function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePath, projectName) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     let declarationArray = declarationsPropertyAssignment
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
+        .find((node) => node.kind === tsModule.SyntaxKind.ArrayLiteralExpression);
     if (declarationArray) {
         return declarationArray;
     }
@@ -111,9 +119,12 @@ function getDeclarationsArray(file, declarationsPropertyAssignment, moduleFilePa
  * Try to get declared components like `declarations: someComponentsArrayConst`
  */
 function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssignment) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     let declarationsVariable = declarationsPropertyAssignment
         .getChildren()
-        .filter((node) => node.kind === typescript_2.SyntaxKind.Identifier)[1];
+        .filter((node) => node.kind === tsModule.SyntaxKind.Identifier)[1];
     if (!declarationsVariable) {
         return undefined;
     }
@@ -124,7 +135,7 @@ function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssig
     }
     const declarationArray = variableDeclaration
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
+        .find((node) => node.kind === tsModule.SyntaxKind.ArrayLiteralExpression);
     return declarationArray;
 }
 /**
@@ -132,16 +143,19 @@ function getModuleDeclaredComponentsFromVariable(file, declarationsPropertyAssig
  * https://github.com/nrwl/nx/issues/7276.
  */
 function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignment) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const propertyAccessExpression = declarationsPropertyAssignment
         .getChildren()
-        .filter((node) => node.kind === typescript_2.SyntaxKind.PropertyAccessExpression)[0];
+        .filter((node) => node.kind === tsModule.SyntaxKind.PropertyAccessExpression)[0];
     if (!propertyAccessExpression) {
         return undefined;
     }
     // Should contain 2 identifiers [SomeClass, components]
     const [clazz, componentsProperty] = propertyAccessExpression
         .getChildren()
-        .filter((node) => node.kind === typescript_2.SyntaxKind.Identifier);
+        .filter((node) => node.kind === tsModule.SyntaxKind.Identifier);
     if (!clazz || !componentsProperty) {
         return undefined;
     }
@@ -151,35 +165,46 @@ function getModuleDeclaredComponentsFromClass(file, declarationsPropertyAssignme
         return undefined;
     }
     const declarationArray = classDeclaration.members
-        .filter((node) => node.kind === typescript_2.SyntaxKind.PropertyDeclaration)
+        .filter((node) => node.kind === tsModule.SyntaxKind.PropertyDeclaration)
         .find((propertyDeclaration) => propertyDeclaration
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.Identifier &&
+        .find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
         node.getText() === componentsProperty.getText()))
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.ArrayLiteralExpression);
+        .find((node) => node.kind === tsModule.SyntaxKind.ArrayLiteralExpression);
     return declarationArray;
 }
 function getClassDeclaration(className, file) {
-    const classDeclaration = (0, typescript_1.findNodes)(file, typescript_2.SyntaxKind.ClassDeclaration).find((classDeclaration) => classDeclaration
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const classDeclaration = (0, typescript_1.findNodes)(file, tsModule.SyntaxKind.ClassDeclaration).find((classDeclaration) => classDeclaration
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.Identifier && node.getText() === className));
+        .find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
+        node.getText() === className));
     return classDeclaration;
 }
 function getVariableDeclaration(variableName, file) {
-    const variableDeclaration = (0, typescript_1.findNodes)(file, typescript_2.SyntaxKind.VariableDeclaration).find((variableDeclaration) => variableDeclaration
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const variableDeclaration = (0, typescript_1.findNodes)(file, tsModule.SyntaxKind.VariableDeclaration).find((variableDeclaration) => variableDeclaration
         .getChildren()
-        .find((node) => node.kind === typescript_2.SyntaxKind.Identifier && node.getText() === variableName));
+        .find((node) => node.kind === tsModule.SyntaxKind.Identifier &&
+        node.getText() === variableName));
     return variableDeclaration;
 }
 function getNgModuleDeclarationsPropertyAssignment(ngModuleDecorator, moduleFilePath, projectName) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const syntaxList = ngModuleDecorator.getChildren().find((node) => {
-        return node.kind === typescript_2.SyntaxKind.SyntaxList;
+        return node.kind === tsModule.SyntaxKind.SyntaxList;
     });
     const declarationsPropertyAssignment = syntaxList
         .getChildren()
         .find((node) => {
-        return (node.kind === typescript_2.SyntaxKind.PropertyAssignment &&
+        return (node.kind === tsModule.SyntaxKind.PropertyAssignment &&
             node.getChildren()[0].getText() === 'declarations');
     });
     if (!declarationsPropertyAssignment) {

package/src/generators/utils/storybook-ast/module-info.js.map

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

package/src/generators/utils/storybook-ast/storybook-inputs.d.ts

@@ -1,6 +1,6 @@
 import type { Tree } from '@nrwl/devkit';
 import type { PropertyDeclaration } from 'typescript';
-export declare type KnobType = 'text' | 'boolean' | 'number' | 'select';
+export type KnobType = 'text' | 'boolean' | 'number' | 'select';
 export interface InputDescriptor {
     name: string;
     type: KnobType;

package/src/generators/utils/storybook-ast/storybook-inputs.js

@@ -1,20 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getArgsDefaultValue = exports.getKnobType = exports.getComponentProps = exports.getInputPropertyDeclarations = void 0;
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-const typescript_2 = require("typescript");
+const typescript_1 = require("nx/src/utils/typescript");
+const js_1 = require("@nrwl/js");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+let tsModule;
 function getInputPropertyDeclarations(tree, path) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const file = (0, ast_utils_1.getTsSourceFile)(tree, path);
-    const decorators = (0, typescript_1.getSourceNodes)(file).filter((node) => node.kind === typescript_2.SyntaxKind.Decorator);
+    const decorators = (0, js_1.getSourceNodes)(file).filter((node) => node.kind === tsModule.SyntaxKind.Decorator);
     return decorators
-        .filter((decorator) => (0, typescript_1.findNodes)(decorator, typescript_2.SyntaxKind.Identifier).some((node) => node.getText() === 'Input'))
+        .filter((decorator) => (0, typescript_1.findNodes)(decorator, tsModule.SyntaxKind.Identifier).some((node) => node.getText() === 'Input'))
         .map((node) => node.parent);
 }
 exports.getInputPropertyDeclarations = getInputPropertyDeclarations;
 function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsDefaultValue, useDecoratorName = true) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     const props = getInputPropertyDeclarations(tree, componentPath).map((node) => {
-        const decoratorContent = (0, typescript_1.findNodes)((0, typescript_1.findNodes)(node, typescript_2.SyntaxKind.Decorator).find((n) => n.getText().startsWith('@Input')), typescript_2.SyntaxKind.StringLiteral);
+        const decoratorContent = (0, typescript_1.findNodes)((0, typescript_1.findNodes)(node, tsModule.SyntaxKind.Decorator).find((n) => n.getText().startsWith('@Input')), tsModule.SyntaxKind.StringLiteral);
         const name = useDecoratorName && decoratorContent.length
             ? !decoratorContent[0].getText().includes('.')
                 ? decoratorContent[0].getText().slice(1, -1)
@@ -32,6 +40,9 @@ function getComponentProps(tree, componentPath, getArgsDefaultValueFn = getArgsD
 }
 exports.getComponentProps = getComponentProps;
 function getKnobType(property) {
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
     if (property.type) {
         const typeName = property.type.getText();
         const typeNameToKnobType = {
@@ -43,10 +54,10 @@ function getKnobType(property) {
     }
     if (property.initializer) {
         const initializerKindToKnobType = {
-            [typescript_2.SyntaxKind.StringLiteral]: 'text',
-            [typescript_2.SyntaxKind.NumericLiteral]: 'number',
-            [typescript_2.SyntaxKind.TrueKeyword]: 'boolean',
-            [typescript_2.SyntaxKind.FalseKeyword]: 'boolean',
+            [tsModule.SyntaxKind.StringLiteral]: 'text',
+            [tsModule.SyntaxKind.NumericLiteral]: 'number',
+            [tsModule.SyntaxKind.TrueKeyword]: 'boolean',
+            [tsModule.SyntaxKind.FalseKeyword]: 'boolean',
         };
         return initializerKindToKnobType[property.initializer.kind] || 'text';
     }

package/src/generators/utils/storybook-ast/storybook-inputs.js.map

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

package/src/generators/utils/testing.d.ts

@@ -1,2 +1,10 @@
 import type { Tree } from '@nrwl/devkit';
+import type { Schema as ApplicationOptions } from '../application/schema';
+import type { Schema as HostOptions } from '../host/schema';
+import type { Schema as LibraryOptions } from '../library/schema';
+import type { Schema as RemoteOptions } from '../remote/schema';
+export declare function generateTestApplication(tree: Tree, options: ApplicationOptions): Promise<void>;
+export declare function generateTestHostApplication(tree: Tree, options: HostOptions): Promise<void>;
+export declare function generateTestRemoteApplication(tree: Tree, options: RemoteOptions): Promise<void>;
+export declare function generateTestLibrary(tree: Tree, options: LibraryOptions): Promise<void>;
 export declare function createStorybookTestWorkspaceForLib(libName: string): Promise<Tree>;

package/src/generators/utils/testing.js

@@ -1,23 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createStorybookTestWorkspaceForLib = void 0;
+exports.createStorybookTestWorkspaceForLib = exports.generateTestLibrary = exports.generateTestRemoteApplication = exports.generateTestHostApplication = exports.generateTestApplication = void 0;
 const tslib_1 = require("tslib");
-const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
+const devkit_1 = require("@nrwl/devkit");
 const testing_1 = require("@nrwl/devkit/testing");
 const linter_1 = require("@nrwl/linter");
 const test_runners_1 = require("../../utils/test-runners");
+const versions_1 = require("../../utils/versions");
+const application_1 = require("../application/application");
+const host_1 = require("../host/host");
 const library_1 = require("../library/library");
+const remote_1 = require("../remote/remote");
+function generateTestApplication(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        addAngularPluginPeerDeps(tree);
+        yield (0, application_1.applicationGenerator)(tree, options);
+    });
+}
+exports.generateTestApplication = generateTestApplication;
+function generateTestHostApplication(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        addAngularPluginPeerDeps(tree);
+        yield (0, host_1.host)(tree, options);
+    });
+}
+exports.generateTestHostApplication = generateTestHostApplication;
+function generateTestRemoteApplication(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        addAngularPluginPeerDeps(tree);
+        yield (0, remote_1.remote)(tree, options);
+    });
+}
+exports.generateTestRemoteApplication = generateTestRemoteApplication;
+function generateTestLibrary(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        addAngularPluginPeerDeps(tree);
+        yield (0, library_1.libraryGenerator)(tree, options);
+    });
+}
+exports.generateTestLibrary = generateTestLibrary;
 function createStorybookTestWorkspaceForLib(libName) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let tree = (0, testing_1.createTreeWithEmptyV1Workspace)();
-        const moduleGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'module');
-        const componentGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
-        yield (0, library_1.default)(tree, {
+        let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
+        addAngularPluginPeerDeps(tree);
+        const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
+        const moduleGenerator = wrapAngularDevkitSchematic('@schematics/angular', 'module');
+        const componentGenerator = wrapAngularDevkitSchematic('@schematics/angular', 'component');
+        yield (0, library_1.libraryGenerator)(tree, {
             name: libName,
             buildable: false,
             linter: linter_1.Linter.EsLint,
             publishable: false,
-            simpleModuleName: false,
+            simpleName: false,
             skipFormat: false,
             unitTestRunner: test_runners_1.UnitTestRunner.Jest,
         });
@@ -187,4 +221,7 @@ export class StaticMemberDeclarationsModule {
     });
 }
 exports.createStorybookTestWorkspaceForLib = createStorybookTestWorkspaceForLib;
+function addAngularPluginPeerDeps(tree) {
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => (Object.assign(Object.assign({}, json), { devDependencies: Object.assign(Object.assign({}, json.devDependencies), { '@angular-devkit/core': versions_1.angularDevkitVersion, '@angular-devkit/schematics': versions_1.angularDevkitVersion, '@schematics/angular': versions_1.angularDevkitVersion }) })));
+}
 //# sourceMappingURL=testing.js.map

package/src/generators/utils/testing.js.map

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

package/src/generators/utils/types.d.ts

@@ -1 +1 @@
-export declare type Styles = 'css' | 'less' | 'scss' | 'sass';
+export type Styles = 'css' | 'less' | 'scss' | 'sass';

package/src/generators/utils/version-utils.d.ts

@@ -0,0 +1,14 @@
+import type { GeneratorCallback, Tree } from '@nrwl/devkit';
+export declare function getGeneratorDirectoryForInstalledAngularVersion(tree: Tree): string | null;
+export declare function getInstalledAngularVersion(tree: Tree): string;
+export declare function getInstalledAngularMajorVersion(tree: Tree): number;
+export declare function getInstalledAngularVersionInfo(tree: Tree): {
+    version: string;
+    major: number;
+};
+export declare function getInstalledPackageVersion(tree: Tree, pkgName: string): string | null;
+export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: string): {
+    major: number;
+    version: string;
+};
+export declare function addDependenciesToPackageJsonIfDontExist(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string): GeneratorCallback;

package/src/generators/utils/version-utils.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDependenciesToPackageJsonIfDontExist = exports.getInstalledPackageVersionInfo = exports.getInstalledPackageVersion = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const semver_1 = require("semver");
+const versions_1 = require("../../utils/versions");
+function getGeneratorDirectoryForInstalledAngularVersion(tree) {
+    var _a;
+    const majorAngularVersion = getInstalledAngularMajorVersion(tree);
+    const directoryDictionary = {
+        14: 'angular-v14',
+    };
+    return (_a = directoryDictionary[majorAngularVersion]) !== null && _a !== void 0 ? _a : null;
+}
+exports.getGeneratorDirectoryForInstalledAngularVersion = getGeneratorDirectoryForInstalledAngularVersion;
+function getInstalledAngularVersion(tree) {
+    var _a, _b;
+    const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
+    if (!installedAngularVersion ||
+        installedAngularVersion === 'latest' ||
+        installedAngularVersion === 'next') {
+        return (_a = (0, semver_1.clean)(versions_1.angularVersion)) !== null && _a !== void 0 ? _a : (0, semver_1.coerce)(versions_1.angularVersion).version;
+    }
+    return ((_b = (0, semver_1.clean)(installedAngularVersion)) !== null && _b !== void 0 ? _b : (0, semver_1.coerce)(installedAngularVersion).version);
+}
+exports.getInstalledAngularVersion = getInstalledAngularVersion;
+function getInstalledAngularMajorVersion(tree) {
+    return (0, semver_1.major)(getInstalledAngularVersion(tree));
+}
+exports.getInstalledAngularMajorVersion = getInstalledAngularMajorVersion;
+function getInstalledAngularVersionInfo(tree) {
+    const installedVersion = getInstalledAngularVersion(tree);
+    return {
+        version: installedVersion,
+        major: (0, semver_1.major)(installedVersion),
+    };
+}
+exports.getInstalledAngularVersionInfo = getInstalledAngularVersionInfo;
+function getInstalledPackageVersion(tree, pkgName) {
+    var _a;
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    const version = (_a = dependencies === null || dependencies === void 0 ? void 0 : dependencies[pkgName]) !== null && _a !== void 0 ? _a : devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[pkgName];
+    return version;
+}
+exports.getInstalledPackageVersion = getInstalledPackageVersion;
+function getInstalledPackageVersionInfo(tree, pkgName) {
+    const version = getInstalledPackageVersion(tree, pkgName);
+    return version ? { major: (0, semver_1.major)((0, semver_1.coerce)(version)), version } : null;
+}
+exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
+function addDependenciesToPackageJsonIfDontExist(tree, dependencies, devDependencies, packageJsonPath = 'package.json') {
+    const packageJson = (0, devkit_1.readJson)(tree, packageJsonPath);
+    function filterExisting(deps) {
+        return Object.keys(deps)
+            .filter((d) => { var _a, _b; return !((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[d]) && !((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[d]); })
+            .reduce((acc, d) => (Object.assign(Object.assign({}, acc), { [d]: deps[d] })), {});
+    }
+    const depsToAdd = filterExisting(dependencies);
+    const devDepsToAdd = filterExisting(devDependencies);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, depsToAdd, devDepsToAdd, packageJsonPath);
+}
+exports.addDependenciesToPackageJsonIfDontExist = addDependenciesToPackageJsonIfDontExist;
+//# sourceMappingURL=version-utils.js.map

package/src/generators/utils/version-utils.js.map

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

package/src/generators/web-worker/lib/update-tsconfig.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const js_1 = require("@nrwl/js");
 function updateTsConfig(tree, project) {
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
     const workerTsConfigPath = (0, devkit_1.joinPathFragments)(root, 'tsconfig.worker.json');
     (0, devkit_1.updateJson)(tree, workerTsConfigPath, (json) => {
-        json.extends = (0, typescript_1.getRelativePathToRootTsConfig)(tree, root);
+        json.extends = (0, js_1.getRelativePathToRootTsConfig)(tree, root);
         return json;
     });
 }

package/src/generators/web-worker/lib/update-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/web-worker/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,yEAAyF;AAEzF,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAe;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC3E,IAAA,mBAAU,EAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAA,0CAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,wCAOC"}
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/web-worker/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,iCAAyD;AAEzD,SAAgB,cAAc,CAAC,IAAU,EAAE,OAAe;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAC3E,IAAA,mBAAU,EAAC,IAAI,EAAE,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAA,kCAA6B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,wCAOC"}

package/src/generators/web-worker/schema.json

@@ -14,7 +14,12 @@
     "project": {
       "type": "string",
       "description": "The name of the project.",
-      "x-dropdown": "projects"
+      "$default": {
+        "$source": "projectName",
+        "index": 0
+      },
+      "x-dropdown": "projects",
+      "x-priority": "important"
     },
     "name": {
       "type": "string",
@@ -23,7 +28,8 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the worker?"
+      "x-prompt": "What name would you like to use for the worker?",
+      "x-priority": "important"
     },
     "snippet": {
       "type": "boolean",
@@ -33,9 +39,11 @@
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,
-  "required": ["name", "project"]
+  "required": ["name", "project"],
+  "examplesFile": "../../../docs/web-worker-examples.md"
 }

package/src/generators/web-worker/web-worker.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webWorkerGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
 const lib_1 = require("./lib");
 function webWorkerGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const options = (0, lib_1.normalizeOptions)(rawOptions);
         const { skipFormat } = options, schematicOptions = tslib_1.__rest(options, ["skipFormat"]);
-        const webWorkerSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'web-worker');
+        const { wrapAngularDevkitSchematic } = require('@nrwl/devkit/ngcli-adapter');
+        const webWorkerSchematic = wrapAngularDevkitSchematic('@schematics/angular', 'web-worker');
         yield webWorkerSchematic(tree, schematicOptions);
         (0, lib_1.updateTsConfig)(tree, options.project);
         if (!skipFormat) {

package/src/generators/web-worker/web-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-worker.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/web-worker/web-worker.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,8DAAwE;AACxE,+BAAyD;AAGzD,SAAsB,kBAAkB,CACtC,IAAU,EACV,UAAqC;;QAErC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,EAAE,UAAU,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAA7C,cAAmC,CAAU,CAAC;QACpD,MAAM,kBAAkB,GAAG,IAAA,0CAA0B,EACnD,qBAAqB,EACrB,YAAY,CACb,CAAC;QACF,MAAM,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAEjD,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAjBD,gDAiBC;AAED,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"web-worker.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/web-worker/web-worker.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAAyD;AAGzD,SAAsB,kBAAkB,CACtC,IAAU,EACV,UAAqC;;QAErC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,EAAE,UAAU,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAA7C,cAAmC,CAAU,CAAC;QACpD,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;QAC7E,MAAM,kBAAkB,GAAG,0BAA0B,CACnD,qBAAqB,EACrB,YAAY,CACb,CAAC;QACF,MAAM,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAEjD,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,gDAkBC;AAED,kBAAe,kBAAkB,CAAC"}

package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
 const executors = [
     '@angular-devkit/build-angular:browser',
     '@angular-devkit/build-angular:server',

package/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-show-circular-dependencies-option.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,iGAA8F;AAE9F,MAAM,SAAS,GAAG;IAChB,uCAAuC;IACvC,sCAAsC;IACtC,+BAA+B;CAChC,CAAC;AAEF,mBAA+B,IAAU;;QACvC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC7B,IAAA,+CAAsB,EACpB,IAAI,EACJ,QAAQ,EACR,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;gBACvD,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,WAAW,CACZ,CAAC;gBACF,MAAM,MAAM,GAAG,iBAAiB;oBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;oBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;gBACrD,OAAO,MAAM,CAAC,wBAAwB,CAAC;gBACvC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;YACtE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtBD,4BAsBC"}
+{"version":3,"file":"remove-show-circular-dependencies-option.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,+FAA4F;AAE5F,MAAM,SAAS,GAAG;IAChB,uCAAuC;IACvC,sCAAsC;IACtC,+BAA+B;CAChC,CAAC;AAEF,mBAA+B,IAAU;;QACvC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC7B,IAAA,+CAAsB,EACpB,IAAI,EACJ,QAAQ,EACR,CAAC,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE,EAAE;gBACvD,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,WAAW,CACZ,CAAC;gBACF,MAAM,MAAM,GAAG,iBAAiB;oBAC9B,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CACrD,iBAAiB,CAClB;oBACH,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;gBACrD,OAAO,MAAM,CAAC,wBAAwB,CAAC;gBACvC,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAC;YACtE,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtBD,4BAsBC"}

package/src/migrations/update-14-2-0/update-router-initial-navigation.js

@@ -48,7 +48,11 @@ function getProjectsWithAngularRouter(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
         return Object.entries(projectGraph.dependencies)
-            .filter(([, dep]) => dep.some(({ target }) => target === 'npm:@angular/router'))
+            .filter(([node, dep]) => dep.some(({ target }) => {
+            var _a;
+            return target === 'npm:@angular/router' &&
+                !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]);
+        }))
             .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName));
     });
 }