@nrwl/angular 15.9.0-beta.8 → 15.9.0-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.9.0-beta.8",
+  "version": "15.9.0-beta.9",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -63,13 +63,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "15.9.0-beta.8",
-    "@nrwl/devkit": "15.9.0-beta.8",
-    "@nrwl/jest": "15.9.0-beta.8",
-    "@nrwl/js": "15.9.0-beta.8",
-    "@nrwl/linter": "15.9.0-beta.8",
-    "@nrwl/webpack": "15.9.0-beta.8",
-    "@nrwl/workspace": "15.9.0-beta.8",
+    "@nrwl/cypress": "15.9.0-beta.9",
+    "@nrwl/devkit": "15.9.0-beta.9",
+    "@nrwl/jest": "15.9.0-beta.9",
+    "@nrwl/js": "15.9.0-beta.9",
+    "@nrwl/linter": "15.9.0-beta.9",
+    "@nrwl/webpack": "15.9.0-beta.9",
+    "@nrwl/workspace": "15.9.0-beta.9",
     "@phenomnomnominal/tsquery": "4.1.1",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -108,5 +108,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "e744f0429fab28464bd20f9733132aea664e0957"
+  "gitHead": "f1dc1520243ccb061993186c5793653cacd31ed6"
 }

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -2,14 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
-const backward_compatible_versions_1 = require("../../../utils/backward-compatible-versions");
 function addAngularEsLintDependencies(tree) {
-    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    const angularEslintVersionToInstall = installedAngularVersionInfo.major === 14
-        ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularEslintVersion
-        : versions_1.angularEslintVersion;
+    const angularEslintVersionToInstall = (0, version_utils_1.versions)(tree).angularEslintVersion;
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@angular-eslint/eslint-plugin': angularEslintVersionToInstall,
         '@angular-eslint/eslint-plugin-template': angularEslintVersionToInstall,

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,sDAA+D;AAC/D,6DAA2E;AAC3E,8FAAyF;AAEzF,SAAgB,4BAA4B,CAAC,IAAU;IACrD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IACzE,MAAM,6BAA6B,GACjC,2BAA2B,CAAC,KAAK,KAAK,EAAE;QACtC,CAAC,CAAC,yDAA0B,CAAC,UAAU,CAAC,oBAAoB;QAC5D,CAAC,CAAC,+BAAoB,CAAC;IAC3B,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,6BAA6B;QAC9D,wCAAwC,EAAE,6BAA6B;QACvE,iCAAiC,EAAE,6BAA6B;KACjE,CACF,CAAC;AACJ,CAAC;AAfD,oEAeC"}
+{"version":3,"file":"add-angular-eslint-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,6DAAqD;AAErD,SAAgB,4BAA4B,CAAC,IAAU;IACrD,MAAM,6BAA6B,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC;IAC1E,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,+BAA+B,EAAE,6BAA6B;QAC9D,wCAAwC,EAAE,6BAA6B;QACvE,iCAAiC,EAAE,6BAA6B;KACjE,CACF,CAAC;AACJ,CAAC;AAXD,oEAWC"}

package/src/generators/application/lib/add-e2e.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
 const cypress_1 = require("@nrwl/cypress");
 const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
 function addE2e(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options, options.ngCliSchematicE2ERoot);
         if (options.e2eTestRunner === 'cypress') {
+            // TODO: This can call `@nrwl/web:static-config` generator once we merge `@nrwl/angular:file-server` into `@nrwl/web:file-server`.
+            addFileServerTarget(tree, options, 'serve-static');
             yield (0, cypress_1.cypressProjectGenerator)(tree, {
                 name: options.e2eProjectName,
                 directory: options.directory,
@@ -22,4 +25,15 @@ function addE2e(tree, options) {
     });
 }
 exports.addE2e = addE2e;
+function addFileServerTarget(tree, options, targetName) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    projectConfig.targets[targetName] = {
+        executor: '@nrwl/angular:file-server',
+        options: {
+            buildTarget: `${options.name}:build`,
+            port: options.port,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.name, projectConfig);
+}
 //# sourceMappingURL=add-e2e.js.map

package/src/generators/application/lib/add-e2e.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AACxD,mEAA8D;AAE9D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAClE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAdD,wBAcC"}
+{"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,yCAGsB;AACtB,2CAAwD;AACxD,mEAA8D;AAE9D,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAyB;;QAChE,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,kIAAkI;YAClI,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;YAEnD,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,WAAW,EAAE,OAAO,CAAC,WAAW;aACjC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAlBD,wBAkBC;AAED,SAAS,mBAAmB,CAC1B,IAAU,EACV,OAAyB,EACzB,UAAkB;IAElB,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG;QAClC,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,QAAQ;YACpC,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB;KACF,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAChE,CAAC"}

package/src/generators/init/init.js

@@ -8,14 +8,13 @@ const jest_1 = require("@nrwl/jest");
 const linter_1 = require("@nrwl/linter");
 const js_1 = require("@nrwl/js");
 const test_runners_1 = require("../../utils/test-runners");
-const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../utils/version-utils");
-const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 function angularInitGenerator(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         const tasks = [];
         const options = normalizeOptions(rawOptions);
+        const pkgVersions = (0, version_utils_1.versions)(tree);
         const peerDepsToInstall = [
             '@angular-devkit/core',
             '@angular-devkit/schematics',
@@ -26,9 +25,7 @@ function angularInitGenerator(tree, rawOptions) {
             var _a;
             const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
             if (!packageVersion) {
-                devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : (installedAngularVersionInfo.major === 14
-                    ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion
-                    : versions_1.angularDevkitVersion));
+                devkitVersion !== null && devkitVersion !== void 0 ? devkitVersion : (devkitVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _a !== void 0 ? _a : pkgVersions.angularDevkitVersion);
                 try {
                     (0, devkit_1.ensurePackage)(pkg, devkitVersion);
                 }
@@ -44,9 +41,9 @@ function angularInitGenerator(tree, rawOptions) {
         const jsTask = yield (0, js_1.initGenerator)(tree, Object.assign(Object.assign({}, options), { tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json', js: false, skipFormat: true }));
         tasks.push(jsTask);
         if (!options.skipPackageJson) {
-            tasks.push(updateDependencies(tree, installedAngularVersionInfo.major));
+            tasks.push(updateDependencies(tree, pkgVersions));
         }
-        const unitTestTask = yield addUnitTestRunner(tree, options, installedAngularVersionInfo.major);
+        const unitTestTask = yield addUnitTestRunner(tree, options, pkgVersions.jestPresetAngularVersion);
         tasks.push(unitTestTask);
         const e2eTask = yield addE2ETestRunner(tree, options);
         tasks.push(e2eTask);
@@ -79,48 +76,39 @@ function setDefaults(host, options) {
     nxJson.generators['@nrwl/angular:component'] = Object.assign({ style: options.style }, (nxJson.generators['@nrwl/angular:component'] || {}));
     (0, devkit_1.updateNxJson)(host, nxJson);
 }
-function updateDependencies(tree, angularMajorVersion) {
-    var _a, _b;
-    const angularVersionToInstall = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : (angularMajorVersion === 14
-        ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularVersion
-        : versions_1.angularVersion);
-    const angularDevkitVersionToInstall = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : (angularMajorVersion === 14
-        ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.angularDevkitVersion
-        : versions_1.angularDevkitVersion);
+function updateDependencies(tree, versions) {
+    var _a, _b, _c, _d, _e;
+    const angularVersion = (_a = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core')) !== null && _a !== void 0 ? _a : versions.angularVersion;
+    const angularDevkitVersion = (_b = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular')) !== null && _b !== void 0 ? _b : versions.angularDevkitVersion;
+    const rxjsVersion = (_c = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs')) !== null && _c !== void 0 ? _c : versions.rxjsVersion;
+    const tsLibVersion = (_d = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib')) !== null && _d !== void 0 ? _d : versions.tsLibVersion;
+    const zoneJsVersion = (_e = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js')) !== null && _e !== void 0 ? _e : versions.zoneJsVersion;
     return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
-        '@angular/animations': angularVersionToInstall,
-        '@angular/common': angularVersionToInstall,
-        '@angular/compiler': angularVersionToInstall,
-        '@angular/core': angularVersionToInstall,
-        '@angular/forms': angularVersionToInstall,
-        '@angular/platform-browser': angularVersionToInstall,
-        '@angular/platform-browser-dynamic': angularVersionToInstall,
-        '@angular/router': angularVersionToInstall,
-        rxjs: angularMajorVersion === 14
-            ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.rxjsVersion
-            : versions_1.rxjsVersion,
-        tslib: angularMajorVersion === 14
-            ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.tsLibVersion
-            : versions_1.tsLibVersion,
-        'zone.js': angularMajorVersion === 14
-            ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.zoneJsVersion
-            : versions_1.zoneJsVersion,
+        '@angular/animations': angularVersion,
+        '@angular/common': angularVersion,
+        '@angular/compiler': angularVersion,
+        '@angular/core': angularVersion,
+        '@angular/forms': angularVersion,
+        '@angular/platform-browser': angularVersion,
+        '@angular/platform-browser-dynamic': angularVersion,
+        '@angular/router': angularVersion,
+        rxjs: rxjsVersion,
+        tslib: tsLibVersion,
+        'zone.js': zoneJsVersion,
     }, {
-        '@angular/cli': angularDevkitVersionToInstall,
-        '@angular/compiler-cli': angularVersionToInstall,
-        '@angular/language-service': angularVersionToInstall,
-        '@angular-devkit/build-angular': angularDevkitVersionToInstall,
+        '@angular/cli': angularDevkitVersion,
+        '@angular/compiler-cli': angularVersion,
+        '@angular/language-service': angularVersion,
+        '@angular-devkit/build-angular': angularDevkitVersion,
     });
 }
-function addUnitTestRunner(tree, options, angularMajorVersion) {
+function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         switch (options.unitTestRunner) {
             case test_runners_1.UnitTestRunner.Jest:
                 if (!options.skipPackageJson) {
                     (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
-                        'jest-preset-angular': angularMajorVersion === 14
-                            ? backward_compatible_versions_1.backwardCompatibleVersions.angularV14.jestPresetAngularVersion
-                            : versions_1.jestPresetAngularVersion,
+                        'jest-preset-angular': jestPresetAngularVersion,
                     });
                 }
                 return (0, jest_1.jestInitGenerator)(tree, {

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAUsB;AACtB,qCAA+C;AAC/C,yCAAsC;AACtC,iCAA4D;AAC5D,2DAAyE;AACzE,0DAKgC;AAIhC,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAkB;;QAElB,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QACzE,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAE7C,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,IAAI,aAAqB,CAAC;QAC1B,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;YAChC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE7D,IAAI,CAAC,cAAc,EAAE;gBACnB,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GACX,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,WAAW,CAAC,oBAAoB,EAAC;gBAEnC,IAAI;oBACF,IAAA,sBAAa,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;iBACnC;gBAAC,WAAM;oBACN,iHAAiH;iBAClH;gBAED,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC5B,KAAK,CAAC,IAAI,CACR,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,CAAC,CACjE,CAAC;iBACH;aACF;QACH,CAAC,CAAC,CAAC;QACH,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACpC,OAAO,KACV,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,EAC1E,EAAE,EAAE,KAAK,EACT,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;SACnD;QACD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAC1C,IAAI,EACJ,OAAO,EACP,WAAW,CAAC,wBAAwB,CACrC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAlED,oDAkEC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACvC,OAAO;QACL,aAAa,EAAE,MAAA,OAAO,CAAC,aAAa,mCAAI,4BAAa,CAAC,OAAO;QAC7D,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM;QACvC,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK;QACvC,WAAW,EAAE,MAAA,OAAO,CAAC,WAAW,mCAAI,KAAK;QACzC,eAAe,EAAE,MAAA,OAAO,CAAC,eAAe,mCAAI,KAAK;QACjD,KAAK,EAAE,MAAA,OAAO,CAAC,KAAK,mCAAI,KAAK;QAC7B,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,6BAAc,CAAC,IAAI;QAC7D,WAAW,EAAE,OAAO,CAAC,WAAW;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC;IAC5C,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC5C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC1D,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBACxC,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,MAAM,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACtD,CAAC;IACF,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC1C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,MAAM,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CACxD,CAAC;IAEF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAU,EACV,QAAyB;;IAEzB,MAAM,cAAc,GAClB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,mCACjD,QAAQ,CAAC,cAAc,CAAC;IAC1B,MAAM,oBAAoB,GACxB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,+BAA+B,CAAC,mCACjE,QAAQ,CAAC,oBAAoB,CAAC;IAChC,MAAM,WAAW,GACf,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,mCAAI,QAAQ,CAAC,WAAW,CAAC;IACnE,MAAM,YAAY,GAChB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,mCAAI,QAAQ,CAAC,YAAY,CAAC;IACrE,MAAM,aAAa,GACjB,MAAA,IAAA,0CAA0B,EAAC,IAAI,EAAE,SAAS,CAAC,mCAAI,QAAQ,CAAC,aAAa,CAAC;IAExE,OAAO,IAAA,uDAAuC,EAC5C,IAAI,EACJ;QACE,qBAAqB,EAAE,cAAc;QACrC,iBAAiB,EAAE,cAAc;QACjC,mBAAmB,EAAE,cAAc;QACnC,eAAe,EAAE,cAAc;QAC/B,gBAAgB,EAAE,cAAc;QAChC,2BAA2B,EAAE,cAAc;QAC3C,mCAAmC,EAAE,cAAc;QACnD,iBAAiB,EAAE,cAAc;QACjC,IAAI,EAAE,WAAW;QACjB,KAAK,EAAE,YAAY;QACnB,SAAS,EAAE,aAAa;KACzB,EACD;QACE,cAAc,EAAE,oBAAoB;QACpC,uBAAuB,EAAE,cAAc;QACvC,2BAA2B,EAAE,cAAc;QAC3C,+BAA+B,EAAE,oBAAoB;KACtD,CACF,CAAC;AACJ,CAAC;AAED,SAAe,iBAAiB,CAC9B,IAAU,EACV,OAAe,EACf,wBAAgC;;QAEhC,QAAQ,OAAO,CAAC,cAAc,EAAE;YAC9B,KAAK,6BAAc,CAAC,IAAI;gBACtB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC5B,IAAA,uDAAuC,EACrC,IAAI,EACJ,EAAE,EACF;wBACE,qBAAqB,EAAE,wBAAwB;qBAChD,CACF,CAAC;iBACH;gBAED,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE;oBAC7B,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;YACL;gBACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACnB;IACH,CAAC;CAAA;AAED,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,QAAQ,OAAO,CAAC,aAAa,EAAE;YAC7B,KAAK,4BAAa,CAAC,OAAO;gBACxB,OAAO,IAAA,8BAAoB,EAAC,IAAI,EAAE;oBAChC,eAAe,EAAE,OAAO,CAAC,eAAe;iBACzC,CAAC,CAAC;YACL;gBACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;SACnB;IACH,CAAC;CAAA;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO;SACR;QAED,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC"}

package/src/generators/library/library.js

@@ -9,10 +9,9 @@ const js_1 = require("@nrwl/js");
 const semver_1 = require("semver");
 const init_1 = require("../../generators/init/init");
 const test_runners_1 = require("../../utils/test-runners");
-const version_utils_1 = require("../../utils/version-utils");
 const add_linting_1 = require("../add-linting/add-linting");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
-const version_utils_2 = require("../utils/version-utils");
+const version_utils_1 = require("../utils/version-utils");
 const dependencies_1 = require("../utils/dependencies");
 const add_module_1 = require("./lib/add-module");
 const add_standalone_component_1 = require("./lib/add-standalone-component");
@@ -34,12 +33,13 @@ function libraryGenerator(tree, schema) {
         if (schema.addTailwind && !schema.buildable && !schema.publishable) {
             throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
         }
-        const userInstalledAngularVersion = (0, version_utils_2.getInstalledAngularVersionInfo)(tree);
+        const userInstalledAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
             throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
         }
         const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
         const { libraryOptions } = options;
+        const pkgVersions = (0, version_utils_1.versions)(tree);
         yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
         const project = (0, add_project_1.addProject)(tree, libraryOptions);
         (0, create_files_1.createFiles)(tree, options, project);
@@ -63,7 +63,7 @@ function libraryGenerator(tree, schema) {
         if (libraryOptions.buildable || libraryOptions.publishable) {
             (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['ng-packagr']);
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                'ng-packagr': (0, version_utils_1.getPkgVersionForAngularMajorVersion)('ngPackagrVersion', userInstalledAngularVersion.major),
+                'ng-packagr': pkgVersions.ngPackagrVersion,
             });
             (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(tree);
         }

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/ngrx/lib/add-ngrx-to-package-json.js

@@ -4,9 +4,8 @@ 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 version_utils_1 = require("../../../utils/version-utils");
 const versions_1 = require("../../../utils/versions");
-const version_utils_2 = require("../../utils/version-utils");
+const version_utils_1 = require("../../utils/version-utils");
 function addNgRxToPackageJson(tree) {
     let rxjsVersion;
     try {
@@ -16,8 +15,7 @@ function addNgRxToPackageJson(tree) {
         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';
-    const angularMajorVersion = (0, version_utils_2.getInstalledAngularMajorVersion)(tree);
-    const ngrxVersion = (0, version_utils_1.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularMajorVersion);
+    const ngrxVersion = (0, version_utils_1.versions)(tree).ngrxVersion;
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         '@ngrx/store': ngrxVersion,
         '@ngrx/effects': 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,gEAAmF;AACnF,sDAA4E;AAC5E,6DAA4E;AAE5E,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;IACD,MAAM,qBAAqB,GAAG,IAAA,YAAG,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAE9E,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,IAAA,mDAAmC,EACrD,aAAa,EACb,mBAAmB,CACpB,CAAC;IAEF,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;AAjCD,oDAiCC"}
+{"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"}

package/src/generators/setup-ssr/setup-ssr.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsr = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const version_utils_1 = require("../../utils/version-utils");
-const version_utils_2 = require("../utils/version-utils");
+const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 function setupSsr(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -12,13 +11,12 @@ function setupSsr(tree, schema) {
         (0, lib_1.generateSSRFiles)(tree, options);
         (0, lib_1.updateAppModule)(tree, options);
         (0, lib_1.updateProjectConfig)(tree, options);
-        const installedAngularVersion = (0, version_utils_2.getInstalledAngularVersionInfo)(tree);
-        const { angularVersion: ngPlatformServerVersion, ngUniversalVersion } = (0, version_utils_1.getPkgVersionsForAngularMajorVersion)(installedAngularVersion.major);
+        const pkgVersions = (0, version_utils_1.versions)(tree);
         (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@nguniversal/express-engine': ngUniversalVersion,
-            '@angular/platform-server': ngPlatformServerVersion,
+            '@nguniversal/express-engine': pkgVersions.ngUniversalVersion,
+            '@angular/platform-server': pkgVersions.angularVersion,
         }, {
-            '@nguniversal/builders': ngUniversalVersion,
+            '@nguniversal/builders': pkgVersions.ngUniversalVersion,
         });
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

package/src/generators/setup-ssr/setup-ssr.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,6DAAiF;AACjF,0DAAwE;AACxE,+BAKe;AAGf,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,MAAM,uBAAuB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QACrE,MAAM,EAAE,cAAc,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,GACnE,IAAA,oDAAoC,EAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAEtE,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,6BAA6B,EAAE,kBAAkB;YACjD,0BAA0B,EAAE,uBAAuB;SACpD,EACD;YACE,uBAAuB,EAAE,kBAAkB;SAC5C,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AA7BD,4BA6BC;AAED,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,0DAAkD;AAClD,+BAKe;AAGf,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;QAEnC,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,6BAA6B,EAAE,WAAW,CAAC,kBAAkB;YAC7D,0BAA0B,EAAE,WAAW,CAAC,cAAc;SACvD,EACD;YACE,uBAAuB,EAAE,WAAW,CAAC,kBAAkB;SACxD,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AA3BD,4BA2BC;AAED,kBAAe,QAAQ,CAAC"}

package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addTailwindRequiredPackages = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("../../../utils/versions");
+const version_utils_1 = require("../../utils/version-utils");
 function addTailwindRequiredPackages(tree) {
+    const pkgVersions = (0, version_utils_1.versions)(tree);
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        autoprefixer: versions_1.autoprefixerVersion,
-        postcss: versions_1.postcssVersion,
-        tailwindcss: versions_1.tailwindVersion,
+        autoprefixer: pkgVersions.autoprefixerVersion,
+        postcss: pkgVersions.postcssVersion,
+        tailwindcss: pkgVersions.tailwindVersion,
     });
 }
 exports.addTailwindRequiredPackages = addTailwindRequiredPackages;

package/src/generators/setup-tailwind/lib/add-tailwind-required-packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-tailwind-required-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/add-tailwind-required-packages.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,sDAIiC;AAEjC,SAAgB,2BAA2B,CAAC,IAAU;IACpD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,YAAY,EAAE,8BAAmB;QACjC,OAAO,EAAE,yBAAc;QACvB,WAAW,EAAE,0BAAe;KAC7B,CACF,CAAC;AACJ,CAAC;AAVD,kEAUC"}
+{"version":3,"file":"add-tailwind-required-packages.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-tailwind/lib/add-tailwind-required-packages.ts"],"names":[],"mappings":";;;AAAA,yCAIsB;AACtB,6DAAqD;AAErD,SAAgB,2BAA2B,CAAC,IAAU;IACpD,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;IACnC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;QACE,YAAY,EAAE,WAAW,CAAC,mBAAmB;QAC7C,OAAO,EAAE,WAAW,CAAC,cAAc;QACnC,WAAW,EAAE,WAAW,CAAC,eAAe;KACzC,CACF,CAAC;AACJ,CAAC;AAXD,kEAWC"}

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js

@@ -16,6 +16,7 @@ function generateStorybookConfiguration(tree, options) {
             tsConfiguration: options.tsConfiguration,
             configureTestRunner: options.configureTestRunner,
             storybook7Configuration: options.storybook7Configuration,
+            configureStaticServe: options.configureStaticServe,
         });
     });
 }

package/src/generators/storybook-configuration/lib/generate-storybook-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QACF,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;SACzD,CAAC,CAAC;IACL,CAAC;CAAA;AAlBD,wEAkBC"}
+{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,yCAAsE;AAEtE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAC9C,iBAAiB,EACjB,oBAAS,CACV,CAAC;QACF,OAAO,MAAM,sBAAsB,CAAC,IAAI,EAAE;YACxC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,WAAW,EAAE,oBAAoB;YACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;YAChD,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;YACxD,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;SACnD,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,wEAmBC"}

package/src/generators/storybook-configuration/schema.d.ts

@@ -2,6 +2,7 @@ import type { Linter } from '@nrwl/linter';
 
 export interface StorybookConfigurationOptions {
   configureCypress: boolean;
+  configureStaticServe?: boolean;
   generateCypressSpecs: boolean;
   generateStories: boolean;
   linter: Linter;

package/src/generators/storybook-configuration/schema.json

@@ -39,6 +39,13 @@
       "default": true,
       "x-priority": "important"
     },
+    "configureStaticServe": {
+      "type": "boolean",
+      "description": "Specifies whether to configure a static file server target for serving storybook. Helpful for speeding up CI build/test times.",
+      "x-prompt": "Configure a static file server for the storybook instance?",
+      "default": true,
+      "x-priority": "important"
+    },
     "cypressDirectory": {
       "type": "string",
       "description": "A directory where the Cypress project will be placed. Placed at the root by default."

package/src/generators/utils/dependencies.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addBuildableLibrariesPostCssDependencies = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const versions_1 = require("../../utils/versions");
+const version_utils_1 = require("./version-utils");
 function addBuildableLibrariesPostCssDependencies(tree) {
+    const pkgVersions = (0, version_utils_1.versions)(tree);
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        postcss: versions_1.postcssVersion,
-        'postcss-import': versions_1.postcssImportVersion,
-        'postcss-preset-env': versions_1.postcssPresetEnvVersion,
-        'postcss-url': versions_1.postcssUrlVersion,
+        postcss: pkgVersions.postcssVersion,
+        'postcss-import': pkgVersions.postcssImportVersion,
+        'postcss-preset-env': pkgVersions.postcssPresetEnvVersion,
+        'postcss-url': pkgVersions.postcssUrlVersion,
     });
 }
 exports.addBuildableLibrariesPostCssDependencies = addBuildableLibrariesPostCssDependencies;

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

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,mDAK8B;AAE9B,SAAgB,wCAAwC,CAAC,IAAU;IACjE,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;QACE,OAAO,EAAE,yBAAc;QACvB,gBAAgB,EAAE,+BAAoB;QACtC,oBAAoB,EAAE,kCAAuB;QAC7C,aAAa,EAAE,4BAAiB;KACjC,CACF,CAAC;AACJ,CAAC;AAXD,4FAWC"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,mDAA2C;AAE3C,SAAgB,wCAAwC,CAAC,IAAU;IACjE,MAAM,WAAW,GAAG,IAAA,wBAAQ,EAAC,IAAI,CAAC,CAAC;IACnC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;QACE,OAAO,EAAE,WAAW,CAAC,cAAc;QACnC,gBAAgB,EAAE,WAAW,CAAC,oBAAoB;QAClD,oBAAoB,EAAE,WAAW,CAAC,uBAAuB;QACzD,aAAa,EAAE,WAAW,CAAC,iBAAiB;KAC7C,CACF,CAAC;AACJ,CAAC;AAZD,4FAYC"}

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

@@ -1,4 +1,5 @@
 import type { GeneratorCallback, Tree } from '@nrwl/devkit';
+import * as latestVersions from '../../utils/versions';
 export declare function getGeneratorDirectoryForInstalledAngularVersion(tree: Tree): string | null;
 export declare function getInstalledAngularVersion(tree: Tree): string;
 export declare function getInstalledAngularMajorVersion(tree: Tree): number;
@@ -12,3 +13,4 @@ export declare function getInstalledPackageVersionInfo(tree: Tree, pkgName: stri
     version: string;
 };
 export declare function addDependenciesToPackageJsonIfDontExist(tree: Tree, dependencies: Record<string, string>, devDependencies: Record<string, string>, packageJsonPath?: string): GeneratorCallback;
+export declare function versions(tree: Tree): typeof latestVersions | import("../../utils/backward-compatible-versions").PackageVersions;

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addDependenciesToPackageJsonIfDontExist = exports.getInstalledPackageVersionInfo = exports.getInstalledPackageVersion = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
+exports.versions = 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 latestVersions = require("../../utils/versions");
 const versions_1 = require("../../utils/versions");
+const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
 function getGeneratorDirectoryForInstalledAngularVersion(tree) {
     var _a;
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
@@ -61,4 +63,14 @@ function addDependenciesToPackageJsonIfDontExist(tree, dependencies, devDependen
     return (0, devkit_1.addDependenciesToPackageJson)(tree, depsToAdd, devDepsToAdd, packageJsonPath);
 }
 exports.addDependenciesToPackageJsonIfDontExist = addDependenciesToPackageJsonIfDontExist;
+function versions(tree) {
+    const majorAngularVersion = getInstalledAngularMajorVersion(tree);
+    switch (majorAngularVersion) {
+        case 14:
+            return backward_compatible_versions_1.backwardCompatibleVersions.angularV14;
+        default:
+            return latestVersions;
+    }
+}
+exports.versions = versions;
 //# sourceMappingURL=version-utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/version-utils.ts"],"names":[],"mappings":";;;AACA,yCAAsE;AACtE,mCAA8C;AAC9C,uDAAuD;AACvD,mDAAsD;AACtD,2FAAsF;AAEtF,SAAgB,+CAA+C,CAC7D,IAAU;;IAEV,MAAM,mBAAmB,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC;IAElE,MAAM,mBAAmB,GAAG;QAC1B,EAAE,EAAE,aAAa;KAClB,CAAC;IAEF,OAAO,MAAA,mBAAmB,CAAC,mBAAmB,CAAC,mCAAI,IAAI,CAAC;AAC1D,CAAC;AAVD,0GAUC;AAED,SAAgB,0BAA0B,CAAC,IAAU;;IACnD,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,uBAAuB,GAC3B,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAEhE,IACE,CAAC,uBAAuB;QACxB,uBAAuB,KAAK,QAAQ;QACpC,uBAAuB,KAAK,MAAM,EAClC;QACA,OAAO,MAAA,IAAA,cAAK,EAAC,yBAAc,CAAC,mCAAI,IAAA,eAAM,EAAC,yBAAc,CAAC,CAAC,OAAO,CAAC;KAChE;IAED,OAAO,CACL,MAAA,IAAA,cAAK,EAAC,uBAAuB,CAAC,mCAAI,IAAA,eAAM,EAAC,uBAAuB,CAAC,CAAC,OAAO,CAC1E,CAAC;AACJ,CAAC;AAhBD,gEAgBC;AAED,SAAgB,+BAA+B,CAAC,IAAU;IACxD,OAAO,IAAA,cAAK,EAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,0EAEC;AAED,SAAgB,8BAA8B,CAAC,IAAU;IACvD,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO;QACL,OAAO,EAAE,gBAAgB;QACzB,KAAK,EAAE,IAAA,cAAK,EAAC,gBAAgB,CAAC;KAC/B,CAAC;AACJ,CAAC;AAPD,wEAOC;AAED,SAAgB,0BAA0B,CACxC,IAAU,EACV,OAAe;;IAEf,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,OAAO,CAAC,mCAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,OAAO,CAAC,CAAC;IAEtE,OAAO,OAAO,CAAC;AACjB,CAAC;AARD,gEAQC;AAED,SAAgB,8BAA8B,CAAC,IAAU,EAAE,OAAe;IACxE,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1D,OAAO,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAJD,wEAIC;AAED,SAAgB,uCAAuC,CACrD,IAAU,EACV,YAAoC,EACpC,eAAuC,EACvC,kBAA0B,cAAc;IAExC,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAEpD,SAAS,cAAc,CACrB,IAA4B;QAE5B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aACrB,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,eACJ,OAAA,CAAC,CAAA,MAAA,WAAW,CAAC,YAAY,0CAAG,CAAC,CAAC,CAAA,IAAI,CAAC,CAAA,MAAA,WAAW,CAAC,eAAe,0CAAG,CAAC,CAAC,CAAA,CAAA,EAAA,CACtE;aACA,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,GAAG,KAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,IAAG,EAAE,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;IAErD,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,eAAe,CAChB,CAAC;AACJ,CAAC;AA5BD,0FA4BC;AAED,SAAgB,QAAQ,CAAC,IAAU;IACjC,MAAM,mBAAmB,GAAG,+BAA+B,CAAC,IAAI,CAAC,CAAC;IAClE,QAAQ,mBAAmB,EAAE;QAC3B,KAAK,EAAE;YACL,OAAO,yDAA0B,CAAC,UAAU,CAAC;QAC/C;YACE,OAAO,cAAc,CAAC;KACzB;AACH,CAAC;AARD,4BAQC"}