@nrwl/angular 15.9.1 → 15.9.3

package/src/generators/karma-project/karma-project.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.karmaProjectGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const check_test_target_1 = require("./lib/check-test-target");
+const generate_karma_project_files_1 = require("./lib/generate-karma-project-files");
+const update_tsconfig_1 = require("./lib/update-tsconfig");
+const update_workspace_config_1 = require("./lib/update-workspace-config");
+const karma_1 = require("../karma/karma");
+function karmaProjectGenerator(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const installTask = yield (0, karma_1.karmaGenerator)(tree, options);
+        (0, check_test_target_1.checkProjectTestTarget)(tree, options.project);
+        (0, generate_karma_project_files_1.generateKarmaProjectFiles)(tree, options.project);
+        (0, update_tsconfig_1.updateTsConfigs)(tree, options.project);
+        (0, update_workspace_config_1.updateWorkspaceConfig)(tree, options.project);
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        return installTask;
+    });
+}
+exports.karmaProjectGenerator = karmaProjectGenerator;
+exports.default = karmaProjectGenerator;
+//# sourceMappingURL=karma-project.js.map

package/src/generators/karma-project/karma-project.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"karma-project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/karma-project/karma-project.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+DAAiE;AACjE,qFAA+E;AAC/E,2DAAwD;AACxD,2EAAsE;AAEtE,0CAAgD;AAEhD,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA4B;;QAE5B,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,IAAA,0CAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAA,wDAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACjD,IAAA,iCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACvC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAfD,sDAeC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/generators/karma-project/lib/check-test-target.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function checkProjectTestTarget(tree: Tree, project: string): void;

package/src/generators/karma-project/lib/check-test-target.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkProjectTestTarget = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function checkProjectTestTarget(tree, project) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+    if (projectConfig.targets.test) {
+        throw new Error(`"${project}" already has a test target.`);
+    }
+}
+exports.checkProjectTestTarget = checkProjectTestTarget;
+//# sourceMappingURL=check-test-target.js.map

package/src/generators/karma-project/lib/check-test-target.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"check-test-target.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/check-test-target.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AAExD,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAe;IAChE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,8BAA8B,CAAC,CAAC;KAC5D;AACH,CAAC;AALD,wDAKC"}

package/src/generators/karma-project/lib/generate-karma-project-files.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function generateKarmaProjectFiles(tree: Tree, project: string): void;

package/src/generators/karma-project/lib/generate-karma-project-files.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateKarmaProjectFiles = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("../../utils/version-utils");
+const v14_test_file_1 = require("./v14-test-file");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
+function generateKarmaProjectFiles(tree, project) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), projectConfig.root, {
+        tmpl: '',
+        projectRoot: projectConfig.root,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+    });
+    if (projectConfig.root === '' || projectConfig.root === '.') {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'root-project'), projectConfig.root, {
+            tmpl: '',
+            projectName: project,
+        });
+    }
+    else if (isWorkspaceWithProjectAtRoot(tree)) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'workspace-with-root-project'), projectConfig.root, {
+            tmpl: '',
+            projectRoot: projectConfig.root,
+            offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+            rootProjectWithConfigSet: isUsingConfigSetInBaseKarmaConfig(tree),
+        });
+    }
+    const installedAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (installedAngularVersion.major === 14) {
+        tree.write((0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'test.ts'), (0, v14_test_file_1.v14TestFile)({ isLibrary: projectConfig.projectType === 'library' }));
+    }
+}
+exports.generateKarmaProjectFiles = generateKarmaProjectFiles;
+function isWorkspaceWithProjectAtRoot(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [, project] of projects) {
+        if (project.root === '.' || project.root === '') {
+            return true;
+        }
+    }
+    return false;
+}
+function isUsingConfigSetInBaseKarmaConfig(tree) {
+    if (!tree.exists('karma.conf.js')) {
+        return false;
+    }
+    (0, ensure_typescript_1.ensureTypescript)();
+    const { tsquery } = require('@phenomnomnominal/tsquery');
+    const CONFIG_SET_SELECTOR = 'PropertyAccessExpression:has(Identifier[name=config], Identifier[name=set])';
+    const ast = tsquery.ast(tree.read('karma.conf.js', 'utf-8'));
+    const nodes = tsquery(ast, CONFIG_SET_SELECTOR, { visitAllChildren: true });
+    return nodes.length > 0;
+}
+//# sourceMappingURL=generate-karma-project-files.js.map

package/src/generators/karma-project/lib/generate-karma-project-files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-karma-project-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/generate-karma-project-files.ts"],"names":[],"mappings":";;;AACA,yCAMsB;AACtB,6DAA2E;AAC3E,mDAA8C;AAC9C,uFAAmF;AAEnF,SAAgB,yBAAyB,CAAC,IAAU,EAAE,OAAe;IACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,aAAa,CAAC,IAAI,EAClB;QACE,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;KACnD,CACF,CAAC;IAEF,IAAI,aAAa,CAAC,IAAI,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,EAAE;QAC3D,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,EAC3D,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,OAAO;SACrB,CACF,CAAC;KACH;SAAM,IAAI,4BAA4B,CAAC,IAAI,CAAC,EAAE;QAC7C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EACf,SAAS,EACT,IAAI,EACJ,OAAO,EACP,6BAA6B,CAC9B,EACD,aAAa,CAAC,IAAI,EAClB;YACE,IAAI,EAAE,EAAE;YACR,WAAW,EAAE,aAAa,CAAC,IAAI;YAC/B,cAAc,EAAE,IAAA,uBAAc,EAAC,aAAa,CAAC,IAAI,CAAC;YAClD,wBAAwB,EAAE,iCAAiC,CAAC,IAAI,CAAC;SAClE,CACF,CAAC;KACH;IAED,MAAM,uBAAuB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACrE,IAAI,uBAAuB,CAAC,KAAK,KAAK,EAAE,EAAE;QACxC,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,EACtD,IAAA,2BAAW,EAAC,EAAE,SAAS,EAAE,aAAa,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC,CACpE,CAAC;KACH;AACH,CAAC;AAjDD,8DAiDC;AAED,SAAS,4BAA4B,CAAC,IAAU;IAC9C,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QAClC,IAAI,OAAO,CAAC,IAAI,KAAK,GAAG,IAAI,OAAO,CAAC,IAAI,KAAK,EAAE,EAAE;YAC/C,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,iCAAiC,CAAC,IAAU;IACnD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC;KACd;IACD,IAAA,oCAAgB,GAAE,CAAC;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAEzD,MAAM,mBAAmB,GACvB,6EAA6E,CAAC;IAEhF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5E,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1B,CAAC"}

package/src/generators/karma-project/lib/update-tsconfig.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function updateTsConfigs(tree: Tree, project: string): void;

package/src/generators/karma-project/lib/update-tsconfig.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateTsConfigs = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("../../utils/version-utils");
+function updateTsConfigs(tree, project) {
+    var _a, _b;
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
+        return Object.assign(Object.assign({}, json), { references: [
+                ...(json.references || []),
+                {
+                    path: './tsconfig.spec.json',
+                },
+            ] });
+    });
+    const installedAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    let extraFiles = installedAngularVersion.major === 14 ? ['src/test.ts'] : [];
+    if (projectConfig.projectType == 'application' &&
+        ((_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.polyfills) &&
+        typeof projectConfig.targets.build.options.polyfills === 'string') {
+        let polyfillsPath = projectConfig.targets.build.options.polyfills;
+        polyfillsPath = polyfillsPath.startsWith(projectConfig.root)
+            ? polyfillsPath.replace(`${projectConfig.root}/`, '')
+            : polyfillsPath;
+        extraFiles = [...extraFiles, polyfillsPath];
+    }
+    if (!extraFiles.length) {
+        return;
+    }
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'), (json) => {
+        var _a;
+        return Object.assign(Object.assign({}, json), { files: [...((_a = json.files) !== null && _a !== void 0 ? _a : []), ...extraFiles] });
+    });
+}
+exports.updateTsConfigs = updateTsConfigs;
+//# sourceMappingURL=update-tsconfig.js.map

package/src/generators/karma-project/lib/update-tsconfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,6DAA2E;AAE3E,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE9D,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;QACP,uCACK,IAAI,KACP,UAAU,EAAE;gBACV,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;gBAC1B;oBACE,IAAI,EAAE,sBAAsB;iBAC7B;aACF,IACD;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,uBAAuB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACrE,IAAI,UAAU,GACZ,uBAAuB,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,IACE,aAAa,CAAC,WAAW,IAAI,aAAa;SAC1C,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,SAAS,CAAA;QAC/C,OAAO,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EACjE;QACA,IAAI,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAClE,aAAa,GAAG,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC;YAC1D,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,aAAa,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC;YACrD,CAAC,CAAC,aAAa,CAAC;QAClB,UAAU,GAAG,CAAC,GAAG,UAAU,EAAE,aAAa,CAAC,CAAC;KAC7C;IAED,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,OAAO;KACR;IAED,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;;QACP,uCACK,IAAI,KACP,KAAK,EAAE,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,KAAK,mCAAI,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC,IAC7C;IACJ,CAAC,CACF,CAAC;AACJ,CAAC;AAhDD,0CAgDC"}

package/src/generators/karma-project/lib/update-workspace-config.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function updateWorkspaceConfig(tree: Tree, project: string): void;

package/src/generators/karma-project/lib/update-workspace-config.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateWorkspaceConfig = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("../../utils/version-utils");
+function updateWorkspaceConfig(tree, project) {
+    var _a, _b;
+    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
+    projectConfig.targets.test = {
+        executor: '@angular-devkit/build-angular:karma',
+        options: Object.assign(Object.assign({}, (installedAngularVersionInfo.major === 14
+            ? { main: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'test.ts') }
+            : {})), { tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'), karmaConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'karma.conf.js'), polyfills: ['zone.js', 'zone.js/testing'] }),
+    };
+    if (projectConfig.projectType === 'application') {
+        const polyfills = (_b = (_a = projectConfig.targets.build) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.polyfills;
+        let polyfillsPath = polyfills && typeof polyfills === 'string' ? polyfills : undefined;
+        projectConfig.targets.test.options = Object.assign(Object.assign({}, projectConfig.targets.test.options), { polyfills: polyfillsPath !== null && polyfillsPath !== void 0 ? polyfillsPath : projectConfig.targets.test.options.polyfills, styles: [], scripts: [], assets: [] });
+    }
+    if (projectConfig.targets.lint &&
+        projectConfig.targets.lint.executor ===
+            '@angular-devkit/build-angular:tslint') {
+        projectConfig.targets.lint.options.tsConfig = [
+            ...projectConfig.targets.lint.options.tsConfig,
+            (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.spec.json'),
+        ];
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
+}
+exports.updateWorkspaceConfig = updateWorkspaceConfig;
+//# sourceMappingURL=update-workspace-config.js.map

package/src/generators/karma-project/lib/update-workspace-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-workspace-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/update-workspace-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AACtB,6DAA2E;AAE3E,SAAgB,qBAAqB,CAAC,IAAU,EAAE,OAAe;;IAC/D,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,aAAa,CAAC,OAAO,CAAC,IAAI,GAAG;QAC3B,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,kCACF,CAAC,2BAA2B,CAAC,KAAK,KAAK,EAAE;YAC1C,CAAC,CAAC,EAAE,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE;YAClE,CAAC,CAAC,EAAE,CAAC,KACP,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC,EACrE,WAAW,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACnE,SAAS,EAAE,CAAC,SAAS,EAAE,iBAAiB,CAAC,GAC1C;KACF,CAAC;IAEF,IAAI,aAAa,CAAC,WAAW,KAAK,aAAa,EAAE;QAC/C,MAAM,SAAS,GAAG,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,0CAAE,OAAO,0CAAE,SAAS,CAAC;QAClE,IAAI,aAAa,GACf,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;QAErE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,mCAC7B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,KACrC,SAAS,EAAE,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EACxE,MAAM,EAAE,EAAE,EACV,OAAO,EAAE,EAAE,EACX,MAAM,EAAE,EAAE,GACX,CAAC;KACH;IAED,IACE,aAAa,CAAC,OAAO,CAAC,IAAI;QAC1B,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;YACjC,sCAAsC,EACxC;QACA,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG;YAC5C,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC9C,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,oBAAoB,CAAC;SAC5D,CAAC;KACH;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AAzCD,sDAyCC"}

package/src/generators/karma-project/lib/v14-test-file.d.ts

@@ -0,0 +1,3 @@
+export declare const v14TestFile: (opts: {
+    isLibrary: boolean;
+}) => string;

package/src/generators/karma-project/lib/v14-test-file.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.v14TestFile = void 0;
+const v14TestFile = (opts) => `// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+${opts.isLibrary
+    ? `
+import 'zone.js/dist/zone';
+`
+    : ``}
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);`;
+exports.v14TestFile = v14TestFile;
+//# sourceMappingURL=v14-test-file.js.map

package/src/generators/karma-project/lib/v14-test-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"v14-test-file.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/karma-project/lib/v14-test-file.ts"],"names":[],"mappings":";;;AAAO,MAAM,WAAW,GAAG,CAAC,IAE3B,EAAE,EAAE,CAAC;EAEJ,IAAI,CAAC,SAAS;IACZ,CAAC,CAAC;;CAEL;IACG,CAAC,CAAC,EACN;;;;;;;;;;;;;;;;;;6BAkB6B,CAAC;AA3BjB,QAAA,WAAW,eA2BM"}

package/src/generators/karma-project/schema.d.ts

@@ -0,0 +1,5 @@
+export interface KarmaProjectOptions {
+  project: string;
+  skipFormat?: boolean;
+  skipPackageJson?: boolean;
+}

package/src/generators/karma-project/schema.json

@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxKarmaProjectGenerator",
+  "title": "Create Karma Configuration for a project",
+  "description": "Add Karma configuration to an angular project.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the project.",
+      "x-dropdown": "projects",
+      "x-priority": "important"
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    },
+    "skipPackageJson": {
+      "description": "Skip updating package.json.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": false,
+  "required": ["project"],
+  "examplesFile": "../../../docs/karma-project-examples.md"
+}

package/src/generators/library/files/base/tsconfig.lib.json__tpl__

@@ -8,7 +8,7 @@
     "types": []
   },
   "exclude": [
-    "src/**/*.spec.ts",<% if(unitTesting) { %>
+    "src/**/*.spec.ts",<% if(unitTesting === 'jest') { %>
     "src/test-setup.ts",<% } %>
     "jest.config.ts",
     "src/**/*.test.ts"

package/src/generators/library/lib/create-files.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const test_runners_1 = require("../../../utils/test-runners");
 const js_1 = require("@nrwl/js");
 function createFiles(tree, options, project) {
     const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
@@ -16,7 +15,7 @@ function createFiles(tree, options, project) {
         libFileName: options.libraryOptions.fileName,
         libClassName: libNames.className,
         libPropertyName: libNames.propertyName,
-        unitTesting: options.libraryOptions.unitTestRunner !== test_runners_1.UnitTestRunner.None,
+        unitTesting: options.libraryOptions.unitTestRunner,
         rootTsConfig: (0, devkit_1.joinPathFragments)(rootOffset, (0, js_1.getRootTsConfigFileName)(tree)),
         skipModule: options.libraryOptions.skipModule,
         projectRoot: options.libraryOptions.projectRoot,

package/src/generators/library/lib/create-files.js.map

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

package/src/generators/library/library.js

@@ -10,6 +10,7 @@ const semver_1 = require("semver");
 const init_1 = require("../../generators/init/init");
 const test_runners_1 = require("../../utils/test-runners");
 const add_linting_1 = require("../add-linting/add-linting");
+const karma_project_1 = require("../karma-project/karma-project");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const version_utils_1 = require("../utils/version-utils");
 const dependencies_1 = require("../utils/dependencies");
@@ -89,6 +90,12 @@ function addUnitTestRunner(host, options) {
                 skipPackageJson: options.skipPackageJson,
             });
         }
+        else if (options.unitTestRunner === 'karma') {
+            yield (0, karma_project_1.default)(host, {
+                project: options.name,
+                skipFormat: true,
+            });
+        }
     });
 }
 function updateNpmScopeIfBuildableOrPublishable(host, options) {

package/src/generators/library/library.js.map

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

package/src/generators/library/schema.json

@@ -4,6 +4,7 @@
   "title": "Create a library",
   "description": "Creates an Angular library.",
   "type": "object",
+
   "cli": "nx",
   "properties": {
     "name": {
@@ -95,7 +96,7 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": ["karma", "jest", "none"],
       "description": "Test runner to use for unit tests.",
       "default": "jest"
     },

package/src/generators/ngrx/files/{latest → base}/__directory__/__fileName__.effects.ts__tmpl__

@@ -1,11 +1,11 @@
 import { Injectable, inject } from '@angular/core';
-import { createEffect, Actions, ofType } from '@ngrx/effects';
-
+import { createEffect, Actions, ofType } from '@ngrx/effects';<% if (!importFromOperators) { %>
+import { switchMap, catchError, of } from 'rxjs';<% } else { %>
+import { of } from 'rxjs';
+import { switchMap, catchError } from 'rxjs/operators';<% } %>
 import * as <%= className %>Actions from './<%= fileName %>.actions';
 import * as <%= className %>Feature from './<%= fileName %>.reducer';
 
-import {switchMap, catchError, of} from 'rxjs';
-
 @Injectable()
 export class <%= className %>Effects {
   private actions$ = inject(Actions);

package/src/generators/ngrx/lib/add-ngrx-to-package-json.d.ts

@@ -1,2 +1,3 @@
 import type { GeneratorCallback, Tree } from '@nrwl/devkit';
-export declare function addNgRxToPackageJson(tree: Tree): GeneratorCallback;
+import { NormalizedNgRxGeneratorOptions } from './normalize-options';
+export declare function addNgRxToPackageJson(tree: Tree, options: NormalizedNgRxGeneratorOptions): GeneratorCallback;

package/src/generators/ngrx/lib/add-ngrx-to-package-json.js

@@ -2,19 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNgRxToPackageJson = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const semver_1 = require("@nrwl/devkit/src/utils/semver");
-const semver_2 = require("semver");
-const versions_1 = require("../../../utils/versions");
+const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
-function addNgRxToPackageJson(tree) {
-    let rxjsVersion;
-    try {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
-    }
-    catch (_a) {
-        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
-    }
-    const jasmineMarblesVersion = (0, semver_2.gte)(rxjsVersion, '7.0.0') ? '~0.9.1' : '~0.8.3';
+function addNgRxToPackageJson(tree, options) {
+    const jasmineMarblesVersion = (0, semver_1.gte)(options.rxjsVersion, '7.0.0')
+        ? '~0.9.1'
+        : '~0.8.3';
     const ngrxVersion = (0, version_utils_1.versions)(tree).ngrxVersion;
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@ngrx/store': ngrxVersion,

package/src/generators/ngrx/lib/add-ngrx-to-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,0DAAwE;AACxE,mCAA6B;AAC7B,sDAA4E;AAC5E,6DAAqD;AAErD,SAAgB,oBAAoB,CAAC,IAAU;IAC7C,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IAED,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC9E,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,CAAC;IAE/C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AA7BD,oDA6BC"}
+{"version":3,"file":"add-ngrx-to-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-ngrx-to-package-json.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,mCAA6B;AAC7B,6DAAqD;AAGrD,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAAuC;IAEvC,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC;QAC7D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ,CAAC;IACb,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,CAAC;IAE/C,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,WAAW;QAC5B,cAAc,EAAE,WAAW;QAC3B,oBAAoB,EAAE,WAAW;QACjC,uBAAuB,EAAE,WAAW;KACrC,EACD;QACE,kBAAkB,EAAE,WAAW;QAC/B,sBAAsB,EAAE,WAAW;QACnC,iBAAiB,EAAE,qBAAqB;KACzC,CACF,CAAC;AACJ,CAAC;AAxBD,oDAwBC"}

package/src/generators/ngrx/lib/generate-files.js

@@ -10,7 +10,7 @@ const version_utils_1 = require("../../utils/version-utils");
 function generateNgrxFilesFromTemplates(tree, options) {
     const name = options.name;
     const projectNames = (0, devkit_1.names)(name);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'latest'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'base'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { importFromOperators: (0, semver_1.lt)(options.rxjsVersion, '7.2.0'), tmpl: '' }));
     const angularVersion = (0, version_utils_1.getInstalledAngularVersion)(tree);
     if ((0, semver_1.lt)(angularVersion, '14.1.0')) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'no-inject'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));

package/src/generators/ngrx/lib/generate-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AACvE,mCAA4B;AAC5B,6DAAuE;AAGvE;;GAEG;AACH,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAuC;IAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,CAAC,CAAC;IACxD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;QAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EACxD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,YAAY,CACrC,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,iBAAiB,CAC1C,CACF,CAAC;KACH;AACH,CAAC;AAhDD,wEAgDC"}
+{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AACvE,mCAA4B;AAC5B,6DAAuE;AAGvE;;GAEG;AACH,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAuC;IAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EACnD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,mBAAmB,EAAE,IAAA,WAAE,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,EACrD,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,CAAC,CAAC;IACxD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;QAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EACxD,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,YAAY,CACrC,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,iBAAiB,CAC1C,CACF,CAAC;KACH;AACH,CAAC;AAjDD,wEAiDC"}

package/src/generators/ngrx/lib/normalize-options.d.ts

@@ -1,5 +1,7 @@
+import { Tree } from '@nrwl/devkit';
 import type { NgRxGeneratorOptions } from '../schema';
 export type NormalizedNgRxGeneratorOptions = NgRxGeneratorOptions & {
     parentDirectory: string;
+    rxjsVersion: string;
 };
-export declare function normalizeOptions(options: NgRxGeneratorOptions): NormalizedNgRxGeneratorOptions;
+export declare function normalizeOptions(tree: Tree, options: NgRxGeneratorOptions): NormalizedNgRxGeneratorOptions;

package/src/generators/ngrx/lib/normalize-options.js

@@ -2,14 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const semver_1 = require("@nrwl/devkit/src/utils/semver");
 const path_1 = require("path");
-function normalizeOptions(options) {
+const versions_1 = require("../../../utils/versions");
+function normalizeOptions(tree, options) {
     var _a;
+    let rxjsVersion;
+    try {
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', (0, devkit_1.readJson)(tree, 'package.json').dependencies['rxjs']);
+    }
+    catch (_b) {
+        rxjsVersion = (0, semver_1.checkAndCleanWithSemver)('rxjs', versions_1.rxjsVersion);
+    }
     return Object.assign(Object.assign({}, options), { parentDirectory: options.module
             ? (0, path_1.dirname)(options.module)
             : options.parent
                 ? (0, path_1.dirname)(options.parent)
-                : undefined, route: options.route === '' ? `''` : (_a = options.route) !== null && _a !== void 0 ? _a : `''`, directory: (0, devkit_1.names)(options.directory).fileName });
+                : undefined, route: options.route === '' ? `''` : (_a = options.route) !== null && _a !== void 0 ? _a : `''`, directory: (0, devkit_1.names)(options.directory).fileName, rxjsVersion });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

package/src/generators/ngrx/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,+BAA+B;AAM/B,SAAgB,gBAAgB,CAC9B,OAA6B;;IAE7B,uCACK,OAAO,KACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC7B,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;gBACzB,CAAC,CAAC,SAAS,EACb,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,EAC1D,SAAS,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAC5C;AACJ,CAAC;AAbD,4CAaC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqD;AACrD,0DAAwE;AACxE,+BAA+B;AAC/B,sDAA4E;AAQ5E,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAA6B;;IAE7B,IAAI,WAAmB,CAAC;IACxB,IAAI;QACF,WAAW,GAAG,IAAA,gCAAuB,EACnC,MAAM,EACN,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CACpD,CAAC;KACH;IAAC,WAAM;QACN,WAAW,GAAG,IAAA,gCAAuB,EAAC,MAAM,EAAE,sBAAkB,CAAC,CAAC;KACnE;IAED,uCACK,OAAO,KACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC7B,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;gBACzB,CAAC,CAAC,SAAS,EACb,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,IAAI,EAC1D,SAAS,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,EAC5C,WAAW,IACX;AACJ,CAAC;AAzBD,4CAyBC"}

package/src/generators/ngrx/ngrx.js

@@ -7,7 +7,7 @@ const lib_1 = require("./lib");
 function ngrxGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, lib_1.validateOptions)(tree, schema);
-        const options = (0, lib_1.normalizeOptions)(schema);
+        const options = (0, lib_1.normalizeOptions)(tree, schema);
         if (!options.minimal || !options.root) {
             (0, lib_1.generateNgrxFilesFromTemplates)(tree, options);
         }
@@ -17,7 +17,7 @@ function ngrxGenerator(tree, schema) {
         }
         let packageInstallationTask = () => { };
         if (!options.skipPackageJson) {
-            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree);
+            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

package/src/generators/ngrx/ngrx.js.map

@@ -1 +1 @@
-{"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAOe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,MAA4B;;QAE5B,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,IAAA,oCAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/C;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AA1BD,sCA0BC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAOe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,MAA4B;;QAE5B,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,IAAA,oCAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/C;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/D;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AA1BD,sCA0BC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/remote/remote.js

@@ -22,7 +22,8 @@ function remote(tree, options) {
         if (options.host && !projects.has(options.host)) {
             throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
         }
-        const appName = (0, project_1.normalizeProjectName)(options.name, options.directory);
+        const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
+        const appName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
         const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
         const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port, skipFormat: true }));
         const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;

package/src/generators/remote/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAEtB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EACJ,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AArDD,wBAqDC;AAED,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AAEtB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EACJ,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AAtDD,wBAsDC;AAED,kBAAe,MAAM,CAAC"}

package/src/generators/remote/schema.json

@@ -100,7 +100,7 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": ["karma", "jest", "none"],
       "description": "Test runner to use for unit tests.",
       "default": "jest"
     },

package/src/generators/setup-mf/lib/update-host-app-routes.js

@@ -19,8 +19,12 @@ function updateHostAppRoutes(tree, options) {
 </ul>
 <router-outlet></router-outlet>
 `);
-    const pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
-    const hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
+    let pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
+    let hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
+    if (!hostRootRoutingFile) {
+        pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app-routing.module.ts');
+        hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
+    }
     let sourceFile = tsModule.createSourceFile(pathToHostRootRoutingFile, hostRootRoutingFile, tsModule.ScriptTarget.Latest, true);
     (0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
       path: '',

package/src/generators/setup-mf/lib/update-host-app-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-host-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts"],"names":[],"mappings":";;;AACA,yFAAyF;AACzF,yCAAuE;AACvE,uFAAmF;AACnF,sEAAgE;AAGhE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,gDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvE,MAAM,YAAY,GAChB,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/C,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CACpB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CACjB,GAAG,MAAM,wBAAwB,MAAM,KACrC,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC,SAChB,WAAW,EACb,EAAE,CACH;QACH,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,UAAU,EAAE,wBAAwB,CAAC,EACvD;qCACiC,YAAY;;;CAGhD,CACE,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAA,0BAAiB,EACjD,UAAU,EACV,mBAAmB,CACpB,CAAC;IAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IAE1E,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,yBAAyB,EACzB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAA,sBAAQ,EACN,IAAI,EACJ,yBAAyB,EACzB;;;MAGE,CACH,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,yBAAyB,EACzB;MACE,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,EAAE,CAClD,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACnD,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,EACpC;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AAjED,kDAiEC"}
+{"version":3,"file":"update-host-app-routes.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/update-host-app-routes.ts"],"names":[],"mappings":";;;AACA,yFAAyF;AACzF,yCAAuE;AACvE,uFAAmF;AACnF,sEAAgE;AAGhE,IAAI,QAAqC,CAAC;AAE1C,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IAED,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,gDAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAEvE,MAAM,YAAY,GAChB,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC/C,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CACpB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,CACjB,GAAG,MAAM,wBAAwB,MAAM,KACrC,IAAA,cAAK,EAAC,MAAM,CAAC,CAAC,SAChB,WAAW,EACb,EAAE,CACH;QACH,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,UAAU,EAAE,wBAAwB,CAAC,EACvD;qCACiC,YAAY;;;CAGhD,CACE,CAAC;IAEF,IAAI,yBAAyB,GAAG,IAAA,0BAAiB,EAC/C,UAAU,EACV,mBAAmB,CACpB,CAAC;IAEF,IAAI,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;IAExE,IAAI,CAAC,mBAAmB,EAAE;QACxB,yBAAyB,GAAG,IAAA,0BAAiB,EAC3C,UAAU,EACV,2BAA2B,CAC5B,CAAC;QACF,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,CAAC;KACrE;IAED,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,yBAAyB,EACzB,mBAAmB,EACnB,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,IAAA,sBAAQ,EACN,IAAI,EACJ,yBAAyB,EACzB;;;MAGE,CACH,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,yBAAyB,EACzB;MACE,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,OAAO,CAAC,EAAE,CAClD,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,qBAAqB,CAAC,EACnD,IAAA,0BAAiB,EAAC,UAAU,EAAE,KAAK,CAAC,EACpC;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,EAAE;KACT,CACF,CAAC;AACJ,CAAC;AAzED,kDAyEC"}