@nx/angular 16.1.0-beta.0 → 16.1.0-rc.1

package/migrations.json

@@ -194,25 +194,16 @@
     },
     "remove-render-module-platform-server-exports": {
       "cli": "nx",
-      "version": "16.1.0-beta.0",
+      "version": "16.1.0-beta.1",
       "requires": {
         "@angular/core": ">=15.0.0"
       },
       "description": "Remove exported `@angular/platform-server` `renderModule` method. The `renderModule` method is now exported by the Angular CLI.",
       "factory": "./src/migrations/update-16-1-0/remove-render-module-platform-server-exports"
     },
-    "update-angular-cli-version-16-0-0-rc-4": {
-      "cli": "nx",
-      "version": "16.1.0-beta.0",
-      "requires": {
-        "@angular/core": ">=16.0.0-rc.4"
-      },
-      "description": "Update the @angular/cli package version to ~16.0.0-rc.4.",
-      "factory": "./src/migrations/update-16-1-0/update-angular-cli"
-    },
     "remove-ngcc-invocation": {
       "cli": "nx",
-      "version": "16.1.0-beta.0",
+      "version": "16.1.0-beta.1",
       "requires": {
         "@angular/core": ">=16.0.0-rc.4"
       },
@@ -221,7 +212,7 @@
     },
     "extract-app-config-for-standalone": {
       "cli": "nx",
-      "version": "16.1.0-beta.0",
+      "version": "16.1.0-beta.1",
       "requires": {
         "@angular/core": ">=16.0.0-rc.4"
       },
@@ -230,12 +221,21 @@
     },
     "update-server-executor-config": {
       "cli": "nx",
-      "version": "16.1.0-beta.0",
+      "version": "16.1.0-beta.1",
       "requires": {
         "@angular/core": ">=16.0.0-rc.4"
       },
       "description": "Update server executors' configuration to disable 'buildOptimizer' for non optimized builds.",
       "factory": "./src/migrations/update-16-1-0/update-server-executor-config"
+    },
+    "update-angular-cli-version-16-0-0": {
+      "cli": "nx",
+      "version": "16.1.0-beta.1",
+      "requires": {
+        "@angular/core": ">=16.0.0"
+      },
+      "description": "Update the @angular/cli package version to ~16.0.0.",
+      "factory": "./src/migrations/update-16-1-0/update-angular-cli"
     }
   },
   "packageJsonUpdates": {
@@ -1022,15 +1022,15 @@
       }
     },
     "16.1.0": {
-      "version": "16.1.0-beta.0",
+      "version": "16.1.0-beta.1",
       "x-prompt": "Do you want to update the Angular version to v16?",
       "requires": {
-        "@angular/core": "^15.2.0",
+        "@angular/core": ">=15.2.0 <16.0.0",
         "typescript": ">=4.9.3 <5.1"
       },
       "packages": {
         "@angular/core": {
-          "version": "~16.0.0-rc.4",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": true
         },
         "zone.js": {
@@ -1038,75 +1038,75 @@
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/architect": {
-          "version": "~0.1600.0-rc.4",
+          "version": "~0.1600.0",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/build-angular": {
-          "version": "~16.0.0-rc.4",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/build-webpack": {
-          "version": "~0.1600.0-rc.4",
+          "version": "~0.1600.0",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/core": {
-          "version": "~16.0.0-rc.4",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@angular-devkit/schematics": {
-          "version": "~16.0.0-rc.4",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@schematics/angular": {
-          "version": "~16.0.0-rc.4",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "ng-packagr": {
-          "version": "~16.0.0-rc.1",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@nguniversal/build-angular": {
-          "version": "~16.0.0-rc.2",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@nguniversal/builders": {
-          "version": "~16.0.0-rc.2",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@nguniversal/common": {
-          "version": "~16.0.0-rc.2",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@nguniversal/express-engine": {
-          "version": "~16.0.0-rc.2",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@angular/material": {
-          "version": "~16.0.0-rc.2",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@angular/cdk": {
-          "version": "~16.0.0-rc.2",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         }
       }
     },
     "16.1.0-angular-eslint": {
-      "version": "16.1.0-beta.0",
+      "version": "16.1.0-beta.1",
       "requires": {
         "eslint": "^7.20.0 || ^8.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {
-          "version": "~16.0.0-alpha.1",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@angular-eslint/eslint-plugin-template": {
-          "version": "~16.0.0-alpha.1",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         },
         "@angular-eslint/template-parser": {
-          "version": "~16.0.0-alpha.1",
+          "version": "~16.0.0",
           "alwaysAddToPackageJson": false
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.1.0-beta.0",
+  "version": "16.1.0-rc.1",
   "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": {
@@ -66,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.1.0-beta.0",
-    "@nx/cypress": "16.1.0-beta.0",
-    "@nx/devkit": "16.1.0-beta.0",
-    "@nx/jest": "16.1.0-beta.0",
-    "@nx/js": "16.1.0-beta.0",
-    "@nx/linter": "16.1.0-beta.0",
-    "@nx/webpack": "16.1.0-beta.0",
-    "@nx/workspace": "16.1.0-beta.0",
+    "@nrwl/angular": "16.1.0-rc.1",
+    "@nx/cypress": "16.1.0-rc.1",
+    "@nx/devkit": "16.1.0-rc.1",
+    "@nx/jest": "16.1.0-rc.1",
+    "@nx/js": "16.1.0-rc.1",
+    "@nx/linter": "16.1.0-rc.1",
+    "@nx/webpack": "16.1.0-rc.1",
+    "@nx/workspace": "16.1.0-rc.1",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -91,11 +91,11 @@
     "webpack-merge": "5.7.3"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": "^16.0.0-rc.4",
-    "@angular-devkit/core": "^16.0.0-rc.4",
-    "@angular-devkit/schematics": "^16.0.0-rc.4",
-    "@nguniversal/builders": "^16.0.0-rc.2",
-    "@schematics/angular": "^16.0.0-rc.4",
+    "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",
+    "@angular-devkit/core": ">= 14.0.0 < 17.0.0",
+    "@angular-devkit/schematics": ">= 14.0.0 < 17.0.0",
+    "@nguniversal/builders": ">= 14.0.0 < 17.0.0",
+    "@schematics/angular": ">= 14.0.0 < 17.0.0",
     "convert-source-map": "1.9.0",
     "rxjs": "^6.5.3 || ^7.5.0"
   },
@@ -110,5 +110,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "6c221eae40054e6b104f1d53a7baea632a28d28e"
+  "gitHead": "b59a0a1760e3feb1424bd1de9ac6909f0108c373"
 }

package/src/generators/component/lib/module.js

@@ -58,6 +58,6 @@ function findModule(tree, generateDir, projectRoot) {
         }
         dir = (0, path_1.dirname)(dir);
     }
-    return null;
+    throw new Error("Could not find a candidate module to add the component to. Please specify which module the component should be added to by using the '--module' option, or pass '--standalone' to generate a standalone component.");
 }
 //# sourceMappingURL=module.js.map

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

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

package/src/generators/ngrx/schema.json

@@ -7,12 +7,20 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nrwl/angular:ngrx --root --module=apps/my-app/src/app/app.module.ts --facade=false placeholder",
+      "command": "nx g @nrwl/angular:ngrx --root --parent=apps/my-app/src/app/app.module.ts --facade=false placeholder",
       "description": "Add root ngrx configration to the `my-app` application"
     },
     {
-      "command": "nx g @nrwl/angular:ngrx --module=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
+      "command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib/my-lib.module.ts --facade=true --root=false users",
       "description": "Add a `users` state with a facade to the `my-lib` library. It will be tracked under the default `+state` folder in the lib"
+    },
+    {
+      "command": "nx g @nrwl/angular:ngrx --parent=apps/my-app/src/app/app.config.ts --root",
+      "description": "Add a root state configuration to `my-app` when `my-app` uses Standalone APIs"
+    },
+    {
+      "command": "nx g @nrwl/angular:ngrx --parent=libs/my-lib/src/lib.routes.ts users",
+      "description": "Add a `users` feature state to the Route definition of a library using Standalone APIs"
     }
   ],
   "properties": {
@@ -33,7 +41,7 @@
     },
     "parent": {
       "type": "string",
-      "description": "The path to the `NgModule` or the `Routes` definition file (for Standalone API usage) where the feature state will be registered. The host directory will create/use the new state directory. _Note: The Standalone API usage is only supported in Angular versions >= 14.1.0_.",
+      "description": "The path to the file where the state will be registered. For NgModule usage, this will be your `app.module.ts` for your root state, or your Feature Module for feature state. For Standalone API usage, this will be your `app.config.ts` file for your root state, or the Routes definition file for your feature state. The host directory will create/use the new state directory. _Note: The Standalone API usage is only supported in Angular versions >= 14.1.0_.",
       "x-prompt": "What is the path to the module or Routes definition where this NgRx state should be registered?",
       "x-priority": "important"
     },

package/src/generators/setup-ssr/files/ngmodule/base/__serverFileName__

@@ -11,7 +11,7 @@ import {<%= rootModuleClassName %>} from './src/<%= main.slice(0, -3) %>';
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const distFolder = join(process.cwd(), 'dist/apps/<%= project %>/browser');
+  const distFolder = join(process.cwd(), '<%= browserBundleOutputPath %>');
   const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
 
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)
@@ -57,4 +57,4 @@ if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
   run();
 }
 
-export * from './src/<%= main.slice(0, -3) %>';
+export * from './src/<%= main.slice(0, -3) %>';

package/src/generators/setup-ssr/files/standalone/__serverFileName__

@@ -11,7 +11,7 @@ import bootstrap from './src/<%= main.slice(0, -3) %>';
 // The Express app is exported so that it can be used by serverless Functions.
 export function app(): express.Express {
   const server = express();
-  const distFolder = join(process.cwd(), 'dist/apps/<%= project %>/browser');
+  const distFolder = join(process.cwd(), '<%= browserBundleOutputPath %>');
   const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
 
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/main/modules/express-engine)

package/src/generators/setup-ssr/lib/generate-files.js

@@ -5,20 +5,22 @@ const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 function generateSSRFiles(tree, schema) {
-    const projectRoot = (0, devkit_1.readProjectConfiguration)(tree, schema.project).root;
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+    const projectRoot = projectConfig.root;
+    const browserBundleOutputPath = projectConfig.targets.build.options.outputPath;
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
     if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
         const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if (angularMajorVersion < 15) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'v14'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
         }
         if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, Object.assign(Object.assign({}, schema), { tpl: '' }));
+            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, Object.assign(Object.assign({}, schema), { browserBundleOutputPath, tpl: '' }));
         }
     }
 }

package/src/generators/setup-ssr/lib/generate-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AACpB,mCAA4B;AAC5B,6DAA2E;AAG3E,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAAc;IACzD,MAAM,WAAW,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;IAExE,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,kCAClE,MAAM,KACT,GAAG,EAAE,EAAE,IACP,CAAC;IAEH,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,YAAY,CAAC,EAC5C,WAAW,kCACN,MAAM,KAAE,GAAG,EAAE,EAAE,IACrB,CAAC;KACH;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,EAClD,WAAW,kCACN,MAAM,KAAE,GAAG,EAAE,EAAE,IACrB,CAAC;QAEF,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,GAC3D,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,mBAAmB,GAAG,EAAE,EAAE;YAC5B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,EACjD,WAAW,kCACN,MAAM,KAAE,GAAG,EAAE,EAAE,IACrB,CAAC;SACH;QACD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;YAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,WAAW,CAAC,EACvD,WAAW,kCACN,MAAM,KAAE,GAAG,EAAE,EAAE,IACrB,CAAC;SACH;KACF;AACH,CAAC;AA7CD,4CA6CC"}
+{"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AACpB,mCAA4B;AAC5B,6DAA2E;AAG3E,SAAgB,gBAAgB,CAAC,IAAU,EAAE,MAAc;IACzD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC;IACvC,MAAM,uBAAuB,GAC3B,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;IAEjD,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAEhE,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,WAAW,EAAE,MAAM,CAAC,EAAE,WAAW,kCAClE,MAAM,KACT,GAAG,EAAE,EAAE,IACP,CAAC;IAEH,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,YAAY,CAAC,EAC5C,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;KACH;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,EAClD,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;QAEF,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,cAAc,EAAE,GAC3D,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,mBAAmB,GAAG,EAAE,EAAE;YAC5B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,EACjD,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;SACH;QACD,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE;YAChC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,WAAW,EAAE,UAAU,EAAE,WAAW,CAAC,EACvD,WAAW,kCAEN,MAAM,KAAE,uBAAuB,EAAE,GAAG,EAAE,EAAE,IAC9C,CAAC;SACH;KACF;AACH,CAAC;AApDD,4CAoDC"}

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -6,7 +6,8 @@ function updateProjectConfig(tree, schema) {
     var _a;
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const buildTarget = projectConfig.targets.build;
-    buildTarget.options.outputPath = `dist/apps/${schema.project}/browser`;
+    const baseOutputPath = buildTarget.options.outputPath;
+    buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
     const buildConfigurations = projectConfig.targets.build.configurations;
     const configurations = {};
     if (buildConfigurations) {
@@ -17,7 +18,7 @@ function updateProjectConfig(tree, schema) {
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: '@angular-devkit/build-angular:server',
-        options: Object.assign({ outputPath: `dist/${projectConfig.root}/server`, main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName), tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json') }, (buildTarget.options ? getServerOptions(buildTarget.options) : {})),
+        options: Object.assign({ outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'), main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName), tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json') }, (buildTarget.options ? getServerOptions(buildTarget.options) : {})),
         configurations,
         defaultConfiguration: 'production',
     };

package/src/generators/setup-ssr/lib/update-project-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":";;;AAKA,uCAMoB;AAGpB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC;IAChD,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC;IACtD,WAAW,CAAC,OAAO,CAAC,UAAU,GAAG,IAAA,0BAAiB,EAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAE9E,MAAM,mBAAmB,GAAG,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC;IACvE,MAAM,cAAc,GAAuB,EAAE,CAAC;IAC9C,IAAI,mBAAmB,EAAE;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;YAChE,cAAc,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;SACjD;KACF;IAED,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG;QAC7B,SAAS,EAAE,CAAC,OAAO,CAAC;QACpB,QAAQ,EAAE,sCAAsC;QAChD,OAAO,kBACL,UAAU,EAAE,IAAA,0BAAiB,EAAC,cAAc,EAAE,QAAQ,CAAC,EACvD,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,EAClE,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC,IACpE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CACtE;QACD,cAAc;QACd,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG;QACnC,QAAQ,EAAE,sCAAsC;QAChD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,aAAa;KACpC,CAAC;IAEF,aAAa,CAAC,OAAO,CAAC,SAAS,GAAG;QAChC,QAAQ,EAAE,iCAAiC;QAC3C,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,GAAG,CAAC;SACd;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBACpD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,qBAAqB;aACrD;YACD,UAAU,EAAE;gBACV,aAAa,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;gBACnD,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;aACpD;SACF;QACD,oBAAoB,EAAE,YAAY;KACnC,CAAC;IAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAEhE,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IACE,CAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAE,OAAO;QAClC,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CACrE,QAAQ,CACT,EACD;QACA,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,GAAG;YAC9D,GAAG,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB;YAChE,QAAQ;SACT,CAAC;QACF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC5B;AACH,CAAC;AA3ED,kDA2EC;AAED,SAAS,gBAAgB,CACvB,UAA0C,EAAE;IAE5C,OAAO;QACL,cAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,cAAc;QACvC,aAAa,EACX,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,MAAK,KAAK;YAC9B,CAAC,CAAE,OAAe;YAClB,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa;QAC5B,gBAAgB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;QAC3C,YAAY,EACV,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,MAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA;QAC3E,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;QAC7B,wBAAwB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,wBAAwB;QAC3D,mBAAmB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB;QACjD,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;QAC7B,sBAAsB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,sBAAsB;QACvD,gBAAgB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,gBAAgB;QAC3C,eAAe,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe;QACzC,mBAAmB,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB;QACjD,WAAW,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;KAClC,CAAC;AACJ,CAAC"}

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

@@ -9,11 +9,11 @@ function setupSsr(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, lib_1.validateOptions)(tree, schema);
         const options = (0, lib_1.normalizeOptions)(tree, schema);
+        (0, lib_1.updateProjectConfig)(tree, options);
         (0, lib_1.generateSSRFiles)(tree, options);
         if (!options.standalone) {
             (0, lib_1.updateAppModule)(tree, options);
         }
-        (0, lib_1.updateProjectConfig)(tree, options);
         const pkgVersions = (0, version_utils_1.versions)(tree);
         (0, devkit_1.addDependenciesToPackageJson)(tree, {
             '@nguniversal/express-engine': pkgVersions.ngUniversalVersion,

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,uCAIoB;AACpB,0DAAkD;AAClD,+BAMe;AAGf,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,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;AAhCD,4BAgCC;AAED,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"setup-ssr.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AACpB,0DAAkD;AAClD,+BAMe;AAGf,SAAsB,QAAQ,CAAC,IAAU,EAAE,MAAc;;QACvD,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChC;QAED,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;AA/BD,4BA+BC;AAED,kBAAe,QAAQ,CAAC"}

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

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

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,uCAAoE;AAEpE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC7E,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;YAClD,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAjBD,wEAiBC"}
+{"version":3,"file":"generate-storybook-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/storybook-configuration/lib/generate-storybook-configuration.ts"],"names":[],"mappings":";;;;AAAA,uCAAoE;AAEpE,sDAAoD;AAEpD,SAAsB,8BAA8B,CAClD,IAAU,EACV,OAAsC;;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAA,sBAAa,EAAC,eAAe,EAAE,oBAAS,CAAC,CAAC;QAC7E,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,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;YAClD,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAhBD,wEAgBC"}

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

@@ -12,5 +12,4 @@ export interface StorybookConfigurationOptions {
   skipFormat?: boolean;
   ignorePaths?: string[];
   configureTestRunner?: boolean;
-  storybook7Configuration?: boolean;
 }

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

@@ -86,13 +86,6 @@
     "configureTestRunner": {
       "type": "boolean",
       "description": "Add a Storybook Test-Runner target."
-    },
-    "storybook7Configuration": {
-      "description": "Configure your workspace using Storybook version 7.",
-      "type": "boolean",
-      "default": true,
-      "hidden": true,
-      "aliases": ["storybook7betaConfiguration"]
     }
   },
   "additionalProperties": false,

package/src/migrations/update-16-1-0/update-angular-cli.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
-export declare const angularCliVersion = "~16.0.0-rc.4";
+export declare const angularCliVersion = "~16.0.0";
 export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-1-0/update-angular-cli.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-exports.angularCliVersion = '~16.0.0-rc.4';
+exports.angularCliVersion = '~16.0.0';
 function default_1(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let shouldFormat = false;

package/src/migrations/update-16-1-0/update-angular-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-1-0/update-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,uCAA2D;AAE9C,QAAA,iBAAiB,GAAG,cAAc,CAAC;AAEhD,mBAA+B,IAAU;;QACvC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,cAAc,CAAC,EAAE;gBAC1C,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,yBAAiB,CAAC;gBACzD,YAAY,GAAG,IAAI,CAAC;aACrB;iBAAM,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,cAAc,CAAC,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,yBAAiB,CAAC;gBACtD,YAAY,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,4BAkBC"}
+{"version":3,"file":"update-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-1-0/update-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,uCAA2D;AAE9C,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAE3C,mBAA+B,IAAU;;QACvC,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;;YACxC,IAAI,MAAA,IAAI,CAAC,eAAe,0CAAG,cAAc,CAAC,EAAE;gBAC1C,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,yBAAiB,CAAC;gBACzD,YAAY,GAAG,IAAI,CAAC;aACrB;iBAAM,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAG,cAAc,CAAC,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,yBAAiB,CAAC;gBACtD,YAAY,GAAG,IAAI,CAAC;aACrB;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAlBD,4BAkBC"}

package/src/utils/versions.d.ts

@@ -1,19 +1,19 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~16.0.0-rc.4";
-export declare const angularDevkitVersion = "~16.0.0-rc.4";
-export declare const ngPackagrVersion = "~16.0.0-rc.1";
+export declare const angularVersion = "~16.0.0";
+export declare const angularDevkitVersion = "~16.0.0";
+export declare const ngPackagrVersion = "~16.0.0";
 export declare const ngrxVersion = "~15.3.0";
 export declare const rxjsVersion = "~7.8.0";
-export declare const zoneJsVersion = "~0.12.0";
+export declare const zoneJsVersion = "~0.13.0";
 export declare const angularJsVersion = "1.7.9";
 export declare const tsLibVersion = "^2.3.0";
-export declare const ngUniversalVersion = "~16.0.0-rc.2";
+export declare const ngUniversalVersion = "~16.0.0";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "~4.18.2";
 export declare const typesExpressVersion = "4.17.14";
 export declare const moduleFederationNodeVersion = "~0.10.1";
-export declare const angularEslintVersion = "~16.0.0-alpha.1";
+export declare const angularEslintVersion = "~16.0.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";
 export declare const postcssImportVersion = "~14.1.0";

package/src/utils/versions.js

@@ -2,21 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.ngUniversalVersion = exports.tsLibVersion = exports.angularJsVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~16.0.0-rc.4';
-exports.angularDevkitVersion = '~16.0.0-rc.4';
-exports.ngPackagrVersion = '~16.0.0-rc.1';
+exports.angularVersion = '~16.0.0';
+exports.angularDevkitVersion = '~16.0.0';
+exports.ngPackagrVersion = '~16.0.0';
 exports.ngrxVersion = '~15.3.0';
 exports.rxjsVersion = '~7.8.0';
-exports.zoneJsVersion = '~0.12.0';
+exports.zoneJsVersion = '~0.13.0';
 exports.angularJsVersion = '1.7.9';
 exports.tsLibVersion = '^2.3.0';
-exports.ngUniversalVersion = '~16.0.0-rc.2';
+exports.ngUniversalVersion = '~16.0.0';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
 exports.moduleFederationNodeVersion = '~0.10.1';
-exports.angularEslintVersion = '~16.0.0-alpha.1';
+exports.angularEslintVersion = '~16.0.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';
 exports.postcssImportVersion = '~14.1.0';

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,cAAc,CAAC;AAChC,QAAA,oBAAoB,GAAG,cAAc,CAAC;AACtC,QAAA,gBAAgB,GAAG,cAAc,CAAC;AAClC,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,cAAc,CAAC;AACpC,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,2BAA2B,GAAG,SAAS,CAAC;AAExC,QAAA,oBAAoB,GAAG,iBAAiB,CAAC;AACzC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC;AAElD,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,gBAAgB,GAAG,OAAO,CAAC;AAC3B,QAAA,YAAY,GAAG,QAAQ,CAAC;AAExB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAC/B,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,2BAA2B,GAAG,SAAS,CAAC;AAExC,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,QAAQ,CAAC;AAEzB,QAAA,wBAAwB,GAAG,SAAS,CAAC;AACrC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC"}