@nrwl/angular 15.3.0-beta.9 → 15.3.0

package/src/generators/application/lib/update-config-files.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const cli_config_utils_1 = require("@nrwl/workspace/src/utils/cli-config-utils");
 const test_runners_1 = require("../../../utils/test-runners");
+const create_ts_config_1 = require("../../utils/create-ts-config");
+const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 function updateConfigFiles(host, options) {
     updateTsConfigOptions(host, options);
     updateAppAndE2EProjectConfigurations(host, options);
@@ -16,12 +18,12 @@ function updateTsConfigOptions(host, options) {
             ...new Set([
                 ...(json.exclude || []),
                 'jest.config.ts',
-                '**/*.test.ts',
-                '**/*.spec.ts',
+                'src/**/*.test.ts',
+                'src/**/*.spec.ts',
             ]),
         ] })));
     // tsconfig.json
-    (0, devkit_1.updateJson)(host, `${options.appProjectRoot}/tsconfig.json`, (json) => (Object.assign(Object.assign({}, json), { compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { target: 'es2022', useDefineForClassFields: false }) })));
+    (0, create_ts_config_1.createTsConfig)(host, options.appProjectRoot, 'app', options, (0, typescript_1.getRelativePathToRootTsConfig)(host, options.appProjectRoot));
 }
 function updateAppAndE2EProjectConfigurations(host, options) {
     // workspace.json

package/src/generators/application/lib/update-config-files.js.map

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

package/src/generators/change-storybook-targets/change-storybook-targets.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularChangeStorybookTargestGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const storybook_1 = require("@nrwl/storybook");
+const versions_1 = require("../../utils/versions");
 function angularChangeStorybookTargestGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, storybook_1.changeStorybookTargetsGenerator)(tree);
+        yield (0, devkit_1.ensurePackage)(tree, '@nrwl/storybook', versions_1.nxVersion);
+        const { changeStorybookTargetsGenerator } = yield Promise.resolve().then(() => require('@nrwl/storybook'));
+        yield changeStorybookTargetsGenerator(tree);
         if (!schema.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

package/src/generators/change-storybook-targets/change-storybook-targets.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+CAAkE;AAIlE,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAc;;QAEd,MAAM,IAAA,2CAA+B,EAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AATD,wFASC;AAED,kBAAe,sCAAsC,CAAC"}
+{"version":3,"file":"change-storybook-targets.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/change-storybook-targets/change-storybook-targets.ts"],"names":[],"mappings":";;;;AACA,yCAA0D;AAC1D,mDAAiD;AAIjD,SAAsB,sCAAsC,CAC1D,IAAU,EACV,MAAc;;QAEd,MAAM,IAAA,sBAAa,EAAC,IAAI,EAAE,iBAAiB,EAAE,oBAAS,CAAC,CAAC;QACxD,MAAM,EAAE,+BAA+B,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;QAC5E,MAAM,+BAA+B,CAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,wFAWC;AAED,kBAAe,sCAAsC,CAAC"}

package/src/generators/component/angular-v14/component.d.ts

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

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.componentGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
+const path_1 = require("../../utils/path");
+const component_1 = require("./lib/component");
+const normalize_options_1 = require("./lib/normalize-options");
+function componentGenerator(tree, rawOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
+        const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
+        checkPathUnderProjectRoot(tree, options);
+        const angularComponentSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'component');
+        yield angularComponentSchematic(tree, schematicOptions);
+        (0, component_1.exportComponentInEntryPoint)(tree, options);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.componentGenerator = componentGenerator;
+function checkPathUnderProjectRoot(tree, schema) {
+    var _a;
+    if (!schema.path) {
+        return;
+    }
+    const project = (_a = schema.project) !== null && _a !== void 0 ? _a : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
+    const { root } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    let pathToComponent = (0, devkit_1.normalizePath)(schema.path);
+    pathToComponent = pathToComponent.startsWith('/')
+        ? pathToComponent.slice(1)
+        : pathToComponent;
+    if (!(0, path_1.pathStartsWith)(pathToComponent, root)) {
+        throw new Error(`The path provided for the component (${schema.path}) does not exist under the project root (${root}). ` +
+            `Please make sure to provide a path that exists under the project root.`);
+    }
+}
+exports.default = componentGenerator;
+//# sourceMappingURL=component.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/component/angular-v14/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,2CAAkD;AAClD,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAfD,gDAeC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}

package/src/generators/component/angular-v14/lib/component.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { NormalizedSchema } from '../schema';
+export declare function exportComponentInEntryPoint(tree: Tree, schema: NormalizedSchema): void;

package/src/generators/component/angular-v14/lib/component.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exportComponentInEntryPoint = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const file_info_1 = require("../../../utils/file-info");
+const entry_point_1 = require("../../../utils/entry-point");
+const path_1 = require("../../../utils/path");
+const entry_point_2 = require("./entry-point");
+const module_1 = require("./module");
+function exportComponentInEntryPoint(tree, schema) {
+    if (!schema.export || (schema.skipImport && !schema.standalone)) {
+        return;
+    }
+    const { root, projectType } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    if (projectType === 'application') {
+        return;
+    }
+    const { directory, filePath } = (0, file_info_1.getComponentFileInfo)(tree, schema);
+    const entryPointPath = (0, entry_point_1.locateLibraryEntryPointFromDirectory)(tree, directory, root, schema.projectSourceRoot);
+    if (!entryPointPath) {
+        devkit_1.logger.warn(`Unable to determine whether the component should be exported in the library entry point file. ` +
+            `The library's entry point file could not be found. Skipping exporting the component in the entry point file.`);
+        return;
+    }
+    if (!schema.standalone) {
+        const modulePath = (0, module_1.findModuleFromOptions)(tree, schema, root);
+        if (!(0, entry_point_2.shouldExportInEntryPoint)(tree, entryPointPath, modulePath)) {
+            return;
+        }
+    }
+    const relativePathFromEntryPoint = (0, path_1.getRelativeImportToFile)(entryPointPath, filePath);
+    const updateEntryPointContent = (0, devkit_1.stripIndents) `${tree.read(entryPointPath, 'utf-8')}
+    export * from "${relativePathFromEntryPoint}";`;
+    tree.write(entryPointPath, updateEntryPointContent);
+}
+exports.exportComponentInEntryPoint = exportComponentInEntryPoint;
+//# sourceMappingURL=component.js.map

package/src/generators/component/angular-v14/lib/component.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/component.ts"],"names":[],"mappings":";;;AACA,yCAA8E;AAC9E,wDAAgE;AAChE,4DAAkF;AAClF,8CAA8D;AAE9D,+CAAyD;AACzD,qCAAiD;AAEjD,SAAgB,2BAA2B,CACzC,IAAU,EACV,MAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC/D,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAE7E,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,OAAO;KACR;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEnE,MAAM,cAAc,GAAG,IAAA,kDAAoC,EACzD,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,MAAM,CAAC,iBAAiB,CACzB,CAAC;IACF,IAAI,CAAC,cAAc,EAAE;QACnB,eAAM,CAAC,IAAI,CACT,gGAAgG;YAC9F,8GAA8G,CACjH,CAAC;QAEF,OAAO;KACR;IAED,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAA,sCAAwB,EAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE;YAC/D,OAAO;SACR;KACF;IAED,MAAM,0BAA0B,GAAG,IAAA,8BAAuB,EACxD,cAAc,EACd,QAAQ,CACT,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,qBAAY,EAAA,GAAG,IAAI,CAAC,IAAI,CACtD,cAAc,EACd,OAAO,CACR;qBACkB,0BAA0B,IAAI,CAAC;IAElD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;AACtD,CAAC;AAjDD,kEAiDC"}

package/src/generators/component/angular-v14/lib/entry-point.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function shouldExportInEntryPoint(tree: Tree, entryPoint: string, modulePath: string): boolean;

package/src/generators/component/angular-v14/lib/entry-point.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldExportInEntryPoint = void 0;
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const path_1 = require("../../../utils/path");
+function shouldExportInEntryPoint(tree, entryPoint, modulePath) {
+    if (!modulePath) {
+        return false;
+    }
+    const moduleImportPath = (0, path_1.getRelativeImportToFile)(entryPoint, modulePath);
+    const entryPointContent = tree.read(entryPoint, 'utf-8');
+    const entryPointAst = tsquery_1.tsquery.ast(entryPointContent);
+    const moduleExport = (0, tsquery_1.tsquery)(entryPointAst, `ExportDeclaration StringLiteral[value='${moduleImportPath}']`, { visitAllChildren: true })[0];
+    return Boolean(moduleExport);
+}
+exports.shouldExportInEntryPoint = shouldExportInEntryPoint;
+//# sourceMappingURL=entry-point.js.map

package/src/generators/component/angular-v14/lib/entry-point.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/entry-point.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAEpD,8CAA8D;AAE9D,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAAkB,EAClB,UAAkB;IAElB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,IAAA,8BAAuB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACzE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzD,MAAM,aAAa,GAAG,iBAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,IAAA,iBAAO,EAC1B,aAAa,EACb,0CAA0C,gBAAgB,IAAI,EAC9D,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAkB,CAAC;IAEtB,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AAC/B,CAAC;AAnBD,4DAmBC"}

package/src/generators/component/angular-v14/lib/module.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { NormalizedSchema } from '../schema';
+export declare function findModuleFromOptions(tree: Tree, options: NormalizedSchema, projectRoot: string): string | null;

package/src/generators/component/angular-v14/lib/module.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findModuleFromOptions = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+// Adapted from https://github.com/angular/angular-cli/blob/main/packages/schematics/angular/utility/find-module.ts#L29
+// to match the logic in the component schematic. It doesn't throw if it can't
+// find a module since the schematic would have thrown before getting here.
+const moduleExt = '.module.ts';
+const routingModuleExt = '-routing.module.ts';
+function findModuleFromOptions(tree, options, projectRoot) {
+    if (!options.module) {
+        const pathToCheck = (0, devkit_1.joinPathFragments)(options.path, options.name);
+        return (0, devkit_1.normalizePath)(findModule(tree, pathToCheck, projectRoot));
+    }
+    else {
+        const modulePath = (0, devkit_1.joinPathFragments)(options.path, options.module);
+        const componentPath = (0, devkit_1.joinPathFragments)(options.path, options.name);
+        const moduleBaseName = (0, path_1.basename)(modulePath);
+        const candidateSet = new Set([options.path]);
+        const projectRootParent = (0, path_1.dirname)(projectRoot);
+        for (let dir = modulePath; dir !== projectRootParent; dir = (0, path_1.dirname)(dir)) {
+            candidateSet.add(dir);
+        }
+        for (let dir = componentPath; dir !== projectRoot; dir = (0, path_1.dirname)(dir)) {
+            candidateSet.add(dir);
+        }
+        const candidatesDirs = [...candidateSet].sort((a, b) => b.length - a.length);
+        for (const c of candidatesDirs) {
+            const candidateFiles = [
+                '',
+                `${moduleBaseName}.ts`,
+                `${moduleBaseName}${moduleExt}`,
+            ].map((x) => (0, devkit_1.joinPathFragments)(c, x));
+            for (const sc of candidateFiles) {
+                if (tree.isFile(sc)) {
+                    return (0, devkit_1.normalizePath)(sc);
+                }
+            }
+        }
+        return null;
+    }
+}
+exports.findModuleFromOptions = findModuleFromOptions;
+function findModule(tree, generateDir, projectRoot) {
+    let dir = generateDir;
+    const projectRootParent = (0, path_1.dirname)(projectRoot);
+    while (dir !== projectRootParent) {
+        const allMatches = tree
+            .children(dir)
+            .map((path) => (0, devkit_1.joinPathFragments)(dir, path))
+            .filter((path) => tree.isFile(path) && path.endsWith(moduleExt));
+        const filteredMatches = allMatches.filter((path) => !path.endsWith(routingModuleExt));
+        if (filteredMatches.length == 1) {
+            return filteredMatches[0];
+        }
+        else if (filteredMatches.length > 1) {
+            return null;
+        }
+        dir = (0, path_1.dirname)(dir);
+    }
+    return null;
+}
+//# sourceMappingURL=module.js.map

package/src/generators/component/angular-v14/lib/module.js.map

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

package/src/generators/component/angular-v14/lib/normalize-options.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nrwl/devkit';
+import type { NormalizedSchema, Schema } from '../schema';
+export declare function normalizeOptions(tree: Tree, options: Schema): Promise<NormalizedSchema>;

package/src/generators/component/angular-v14/lib/normalize-options.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
+function findProjectFromOptions(options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
+        const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
+        return (0, find_project_for_path_1.findProjectForPath)(options.path, projectRootMappings);
+    });
+}
+function normalizeOptions(tree, options) {
+    var _a, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const project = (_b = (_a = options.project) !== null && _a !== void 0 ? _a : (yield findProjectFromOptions(options))) !== null && _b !== void 0 ? _b : (0, devkit_1.readWorkspaceConfiguration)(tree).defaultProject;
+        const { projectType, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
+        const projectSourceRoot = sourceRoot !== null && sourceRoot !== void 0 ? sourceRoot : (0, devkit_1.joinPathFragments)(root, 'src');
+        const path = (_c = options.path) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(projectSourceRoot, projectType === 'application' ? 'app' : 'lib');
+        return Object.assign(Object.assign({}, options), { path,
+            project,
+            projectSourceRoot });
+    });
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/component/angular-v14/lib/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/component/angular-v14/lib/normalize-options.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,4FAG0D;AAE1D,SAAe,sBAAsB,CAAC,OAAe;;QACnD,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAA,iDAAyB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC1E,OAAO,IAAA,0CAAkB,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAC/D,CAAC;CAAA;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAAe;;;QAEf,MAAM,OAAO,GACX,MAAA,MAAA,OAAO,CAAC,OAAO,mCACf,CAAC,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC,mCACvC,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;QAClD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CACR,CAAC;QACF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAC9C,CAAC;QAEJ,uCACK,OAAO,KACV,IAAI;YACJ,OAAO;YACP,iBAAiB,IACjB;;CACH;AA1BD,4CA0BC"}

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

@@ -0,0 +1,26 @@
+export interface Schema {
+  name: string;
+  path?: string;
+  project?: string;
+  displayBlock?: boolean;
+  inlineStyle?: boolean;
+  inlineTemplate?: boolean;
+  standalone?: boolean;
+  viewEncapsulation?: 'Emulated' | 'None' | 'ShadowDom';
+  changeDetection?: 'Default' | 'OnPush';
+  style?: 'css' | 'scss' | 'sass' | 'less' | 'none';
+  skipTests?: boolean;
+  type?: string;
+  flat?: boolean;
+  skipImport?: boolean;
+  selector?: string;
+  module?: string;
+  skipSelector?: boolean;
+  export?: boolean;
+}
+
+export interface NormalizedSchema extends Schema {
+  path: string;
+  project: string;
+  projectSourceRoot: string;
+}

package/src/generators/component/component.js

@@ -7,8 +7,16 @@ const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
 const path_1 = require("../utils/path");
 const component_1 = require("./lib/component");
 const normalize_options_1 = require("./lib/normalize-options");
+const get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
+const path_2 = require("path");
 function componentGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
+        if (generatorDirectory) {
+            let previousGenerator = yield Promise.resolve().then(() => require((0, path_2.join)(__dirname, generatorDirectory, 'component')));
+            yield previousGenerator.default(tree, rawOptions);
+            return;
+        }
         const options = yield (0, normalize_options_1.normalizeOptions)(tree, rawOptions);
         const { projectSourceRoot } = options, schematicOptions = tslib_1.__rest(options, ["projectSourceRoot"]);
         checkPathUnderProjectRoot(tree, options);

package/src/generators/component/component.js.map

@@ -1 +1 @@
-{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;AAG3D,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAfD,gDAeC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}
+{"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/component/component.ts"],"names":[],"mappings":";;;;AACA,yCAKsB;AACtB,8DAAwE;AACxE,wCAA+C;AAC/C,+CAA8D;AAC9D,+DAA2D;AAE3D,+GAAqH;AACrH,+BAA4B;AAE5B,SAAsB,kBAAkB,CAAC,IAAU,EAAE,UAAkB;;QACrE,MAAM,kBAAkB,GACtB,IAAA,wFAA+C,EAAC,IAAI,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACtB,IAAI,iBAAiB,GAAG,2CACtB,IAAA,WAAI,EAAC,SAAS,EAAE,kBAAkB,EAAE,WAAW,CAAC,EACjD,CAAC;YACF,MAAM,iBAAiB,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClD,OAAO;SACR;QAED,MAAM,OAAO,GAAG,MAAM,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACzD,MAAM,EAAE,iBAAiB,KAA0B,OAAO,EAA5B,gBAAgB,kBAAK,OAAO,EAApD,qBAA0C,CAAU,CAAC;QAE3D,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,yBAAyB,GAAG,IAAA,0CAA0B,EAC1D,qBAAqB,EACrB,WAAW,CACZ,CAAC;QACF,MAAM,yBAAyB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAExD,IAAA,uCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAzBD,gDAyBC;AAED,SAAS,yBAAyB,CAAC,IAAU,EAAE,MAAwB;;IACrE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,OAAO,GACX,MAAA,MAAM,CAAC,OAAO,mCAAI,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC,cAAc,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjD,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,wCAAwC,MAAM,CAAC,IAAI,4CAA4C,IAAI,KAAK;YACtG,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAC"}

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

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

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

@@ -0,0 +1,126 @@
+"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 run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const test_runners_1 = require("../../../utils/test-runners");
+const karma_1 = require("../../karma/karma");
+const versions_1 = require("../../../utils/versions");
+function angularInitGenerator(host, rawOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const options = normalizeOptions(rawOptions);
+        setDefaults(host, options);
+        const depsTask = !options.skipPackageJson
+            ? updateDependencies(host)
+            : () => { };
+        const unitTestTask = yield addUnitTestRunner(host, options);
+        const e2eTask = addE2ETestRunner(host, options);
+        addGitIgnoreEntry(host, '.angular');
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(host);
+        }
+        return (0, run_tasks_in_serial_1.runTasksInSerial)(depsTask, unitTestTask, e2eTask);
+    });
+}
+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,
+    };
+}
+function setDefaults(host, options) {
+    const workspace = (0, devkit_1.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_1.updateWorkspaceConfiguration)(host, workspace);
+}
+function updateDependencies(host) {
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {
+        '@angular/animations': versions_1.versions.angularV14.angularVersion,
+        '@angular/common': versions_1.versions.angularV14.angularVersion,
+        '@angular/compiler': versions_1.versions.angularV14.angularVersion,
+        '@angular/core': versions_1.versions.angularV14.angularVersion,
+        '@angular/forms': versions_1.versions.angularV14.angularVersion,
+        '@angular/platform-browser': versions_1.versions.angularV14.angularVersion,
+        '@angular/platform-browser-dynamic': versions_1.versions.angularV14.angularVersion,
+        '@angular/router': versions_1.versions.angularV14.angularVersion,
+        rxjs: versions_1.versions.angularV14.rxjsVersion,
+        tslib: versions_1.versions.angularV14.tsLibVersion,
+        'zone.js': versions_1.versions.angularV14.zoneJsVersion,
+    }, {
+        '@angular/cli': versions_1.versions.angularV14.angularDevkitVersion,
+        '@angular/compiler-cli': versions_1.versions.angularV14.angularVersion,
+        '@angular/language-service': versions_1.versions.angularV14.angularVersion,
+        '@angular-devkit/build-angular': versions_1.versions.angularV14.angularDevkitVersion,
+    });
+}
+function addUnitTestRunner(host, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (options.unitTestRunner) {
+            case test_runners_1.UnitTestRunner.Karma:
+                return yield (0, karma_1.karmaGenerator)(host, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            case test_runners_1.UnitTestRunner.Jest:
+                if (!options.skipPackageJson) {
+                    (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+                        'jest-preset-angular': versions_1.versions.angularV14.jestPresetAngularVersion,
+                    });
+                }
+                return (0, jest_1.jestInitGenerator)(host, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            default:
+                return () => { };
+        }
+    });
+}
+function addE2ETestRunner(host, options) {
+    switch (options.e2eTestRunner) {
+        case test_runners_1.E2eTestRunner.Protractor:
+            return !options.skipPackageJson
+                ? (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+                    protractor: versions_1.versions.angularV14.protractorVersion,
+                    'jasmine-core': versions_1.versions.angularV14.jasmineCoreVersion,
+                    'jasmine-spec-reporter': versions_1.versions.angularV14.jasmineSpecReporterVersion,
+                    'ts-node': versions_1.versions.angularV14.tsNodeVersion,
+                    '@types/jasmine': versions_1.versions.angularV14.typesJasmineVersion,
+                    '@types/jasminewd2': versions_1.versions.angularV14.typesJasminewd2Version,
+                })
+                : () => { };
+        case test_runners_1.E2eTestRunner.Cypress:
+            return (0, cypress_1.cypressInitGenerator)(host, {
+                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,13 @@
+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;
+}

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

@@ -10,18 +10,26 @@ const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-i
 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 get_generator_directory_for_ng_version_1 = require("../../utils/get-generator-directory-for-ng-version");
+const path_1 = require("path");
+function angularInitGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const generatorDirectory = (0, get_generator_directory_for_ng_version_1.getGeneratorDirectoryForInstalledAngularVersion)(tree);
+        if (generatorDirectory) {
+            let previousGenerator = yield Promise.resolve().then(() => require((0, path_1.join)(__dirname, generatorDirectory, 'init')));
+            yield previousGenerator.default(tree, rawOptions);
+            return;
+        }
         const options = normalizeOptions(rawOptions);
-        setDefaults(host, options);
+        setDefaults(tree, options);
         const depsTask = !options.skipPackageJson
-            ? updateDependencies(host)
+            ? updateDependencies(tree)
             : () => { };
-        const unitTestTask = addUnitTestRunner(host, options);
-        const e2eTask = addE2ETestRunner(host, options);
-        addGitIgnoreEntry(host, '.angular');
+        const unitTestTask = yield addUnitTestRunner(tree, options);
+        const e2eTask = addE2ETestRunner(tree, options);
+        addGitIgnoreEntry(tree, '.angular');
         if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
+            yield (0, devkit_1.formatFiles)(tree);
         }
         return (0, run_tasks_in_serial_1.runTasksInSerial)(depsTask, unitTestTask, e2eTask);
     });
@@ -68,21 +76,25 @@ function updateDependencies(host) {
     });
 }
 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_1.addDependenciesToPackageJson)(host, {}, {
-                    'jest-preset-angular': versions_1.jestPresetAngularVersion,
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        switch (options.unitTestRunner) {
+            case test_runners_1.UnitTestRunner.Karma:
+                return yield (0, karma_1.karmaGenerator)(host, {
+                    skipPackageJson: options.skipPackageJson,
                 });
-            }
-            return (0, jest_1.jestInitGenerator)(host, {
-                skipPackageJson: options.skipPackageJson,
-            });
-        default:
-            return () => { };
-    }
+            case test_runners_1.UnitTestRunner.Jest:
+                if (!options.skipPackageJson) {
+                    (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+                        'jest-preset-angular': versions_1.jestPresetAngularVersion,
+                    });
+                }
+                return (0, jest_1.jestInitGenerator)(host, {
+                    skipPackageJson: options.skipPackageJson,
+                });
+            default:
+                return () => { };
+        }
+    });
 }
 function addE2ETestRunner(host, options) {
     switch (options.e2eTestRunner) {