@nrwl/angular 15.3.0-beta.1 → 15.3.0-beta.11

package/src/generators/ngrx/files/__directory__/__fileName__.facade.ts__tmpl__

@@ -10,15 +10,15 @@ export class <%= className %>Facade {
   private readonly store = inject(Store);
 
   /**
-   * Combine pieces of state using createSelector, 
+   * Combine pieces of state using createSelector,
    * and expose them as observables through the facade.
    */
-  loaded$ = this.store.pipe(select(<%= className %>Selectors.get<%= className %>Loaded));
-  all<%= className %>$ = this.store.pipe(select(<%= className %>Selectors.getAll<%= className %>));
-  selected<%= className %>$ = this.store.pipe(select(<%= className %>Selectors.getSelected));
+  loaded$ = this.store.pipe(select(<%= className %>Selectors.select<%= className %>Loaded));
+  all<%= className %>$ = this.store.pipe(select(<%= className %>Selectors.selectAll<%= className %>));
+  selected<%= className %>$ = this.store.pipe(select(<%= className %>Selectors.selectEntity));
 
   /**
-   * Use the initialization action to perform one 
+   * Use the initialization action to perform one
    * or more tasks in your Effects.
    */
   init() {

package/src/generators/ngrx/files/__directory__/__fileName__.selectors.spec.ts__tmpl__

@@ -28,29 +28,29 @@ describe('<%= className %> Selectors', () => {
   });
 
   describe('<%= className %> Selectors', () => {
-    it('getAll<%= className %>() should return the list of <%= className %>', () => {
-      const results = <%= className %>Selectors.getAll<%= className %>(state);
+    it('selectAll<%= className %>() should return the list of <%= className %>', () => {
+      const results = <%= className %>Selectors.selectAll<%= className %>(state);
       const selId = get<%= className %>Id(results[1]);
 
       expect(results.length).toBe(3);
       expect(selId).toBe('PRODUCT-BBB');
     });
 
-    it('getSelected() should return the selected Entity', () => {
-      const result = <%= className %>Selectors.getSelected(state) as <%= className %>Entity;
+    it('selectEntity() should return the selected Entity', () => {
+      const result = <%= className %>Selectors.selectEntity(state) as <%= className %>Entity;
       const selId = get<%= className %>Id(result);
 
       expect(selId).toBe('PRODUCT-BBB');
     });
 
-    it('get<%= className %>Loaded() should return the current "loaded" status', () => {
-      const result = <%= className %>Selectors.get<%= className %>Loaded(state);
+    it('select<%= className %>Loaded() should return the current "loaded" status', () => {
+      const result = <%= className %>Selectors.select<%= className %>Loaded(state);
 
       expect(result).toBe(true);
     });
 
-    it('get<%= className %>Error() should return the current "error" state', () => {
-      const result = <%= className %>Selectors.get<%= className %>Error(state);
+    it('select<%= className %>Error() should return the current "error" state', () => {
+      const result = <%= className %>Selectors.select<%= className %>Error(state);
 
       expect(result).toBe(ERROR_MSG);
     });

package/src/generators/ngrx/files/__directory__/__fileName__.selectors.ts__tmpl__

@@ -2,37 +2,37 @@ import { createFeatureSelector, createSelector } from '@ngrx/store';
 import { <%= constantName %>_FEATURE_KEY, <%= className %>State, <%= propertyName %>Adapter } from './<%= fileName %>.reducer';
 
 // Lookup the '<%= className %>' feature state managed by NgRx
-export const get<%= className %>State = createFeatureSelector<<%= className %>State>(<%= constantName %>_FEATURE_KEY);
+export const select<%= className %>State = createFeatureSelector<<%= className %>State>(<%= constantName %>_FEATURE_KEY);
 
 const { selectAll, selectEntities } = <%= propertyName %>Adapter.getSelectors();
 
-export const get<%= className %>Loaded = createSelector(
-  get<%= className %>State,
+export const select<%= className %>Loaded = createSelector(
+  select<%= className %>State,
   (state: <%= className %>State) => state.loaded
 );
 
-export const get<%= className %>Error = createSelector(
-  get<%= className %>State,
+export const select<%= className %>Error = createSelector(
+  select<%= className %>State,
   (state: <%= className %>State) => state.error
 );
 
-export const getAll<%= className %> = createSelector(
-  get<%= className %>State,
+export const selectAll<%= className %> = createSelector(
+  select<%= className %>State,
   (state: <%= className %>State) => selectAll(state)
 );
 
-export const get<%= className %>Entities = createSelector(
-  get<%= className %>State,
+export const select<%= className %>Entities = createSelector(
+  select<%= className %>State,
   (state: <%= className %>State) => selectEntities(state)
 );
 
-export const getSelectedId = createSelector(
-  get<%= className %>State,
+export const selectSelectedId = createSelector(
+  select<%= className %>State,
   (state: <%= className %>State) => state.selectedId
 );
 
-export const getSelected = createSelector(
-  get<%= className %>Entities,
-  getSelectedId,
+export const selectEntity = createSelector(
+  select<%= className %>Entities,
+  selectSelectedId,
   (entities, selectedId) => (selectedId ? entities[selectedId] : undefined)
 );

package/src/generators/remote/files/src/main.server.ts__tmpl__

@@ -58,6 +58,14 @@ function run(): void {
   const server = app();
   server.listen(port, () => {
     console.log(`Node Express server listening on http://localhost:${port}`);
+
+    /**
+     * DO NOT REMOVE IF USING @nrwl/angular:module-federation-dev-ssr executor
+     * to serve your Host application with this Remote application.
+     * This message allows Nx to determine when the Remote is ready to be
+     * consumed by the Host.
+     */
+    process.send && process.send('nx.server.ready');
   });
 }
 

package/src/generators/remote/lib/add-ssr.d.ts

@@ -1,3 +1,5 @@
 import type { Tree } from '@nrwl/devkit';
-import type { Schema } from '../schema';
-export declare function addSsr(tree: Tree, options: Schema, appName: string): Promise<import("@nrwl/devkit").GeneratorCallback>;
+export declare function addSsr(tree: Tree, { appName, port }: {
+    appName: string;
+    port: number;
+}): Promise<import("@nrwl/devkit").GeneratorCallback>;

package/src/generators/remote/lib/add-ssr.js

@@ -5,7 +5,8 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
 const versions_1 = require("../../../utils/versions");
-function addSsr(tree, options, appName) {
+function addSsr(tree, { appName, port }) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
         yield (0, setup_ssr_1.default)(tree, {
@@ -17,13 +18,20 @@ function addSsr(tree, options, appName) {
             appName,
             tmpl: '',
         });
-        console.log('after generate files');
         // update project.json
         project = (0, devkit_1.readProjectConfiguration)(tree, appName);
         project.targets.server.executor = '@nrwl/angular:webpack-server';
         project.targets.server.options.customWebpackConfig = {
             path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
         };
+        project.targets['serve-ssr'].options = Object.assign(Object.assign({}, ((_a = project.targets['serve-ssr'].options) !== null && _a !== void 0 ? _a : {})), { port });
+        project.targets['static-server'] = {
+            dependsOn: ['build', 'server'],
+            executor: 'nx:run-commands',
+            options: {
+                command: `PORT=${port} node ${(0, devkit_1.joinPathFragments)(project.targets.server.options.outputPath, 'main.js')}`,
+            },
+        };
         (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
         const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
             cors: versions_1.corsVersion,

package/src/generators/remote/lib/add-ssr.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAGtB,yDAAiD;AACjD,sDAIiC;AAEjC,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe,EAAE,OAAe;;QACvE,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAEpC,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,8BAA8B,CAAC;QACjE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AA3CD,wBA2CC"}
+{"version":3,"file":"add-ssr.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/remote/lib/add-ssr.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,yDAAiD;AACjD,sDAIiC;AAEjC,SAAsB,MAAM,CAC1B,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAqC;;;QAEpD,IAAI,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEtD,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EACvD,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAC7D,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,EAC5C,8BAA8B,CAC/B,CAAC;QAEF,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1E,OAAO;YACP,IAAI,EAAE,EAAE;SACT,CAAC,CAAC;QAEH,sBAAsB;QACtB,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,8BAA8B,CAAC;QACjE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,GAAG;YACnD,IAAI,EAAE,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,0BAA0B,CAAC;SAClE,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,mCAC/B,CAAC,MAAA,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,mCAAI,EAAE,CAAC,KAC/C,IAAI,GACL,CAAC;QAEF,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG;YACjC,SAAS,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC9B,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE;gBACP,OAAO,EAAE,QAAQ,IAAI,SAAS,IAAA,0BAAiB,EAC7C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EACzC,SAAS,CACV,EAAE;aACJ;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ;YACE,IAAI,EAAE,sBAAW;YACjB,OAAO,EAAE,yBAAc;YACvB,yBAAyB,EAAE,sCAA2B;SACvD,EACD,EAAE,CACH,CAAC;QAEF,OAAO,WAAW,CAAC;;CACpB;AA5DD,wBA4DC"}

package/src/generators/remote/remote.js

@@ -34,7 +34,7 @@ function remote(tree, options) {
         });
         let installTasks = [appInstallTask];
         if (options.ssr) {
-            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, options, appName);
+            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, { appName, port });
             installTasks.push(ssrInstallTask);
         }
         if (!options.skipFormat) {

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,yCAA8D;AAE9D,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AACtD,2FAAqF;AAErF,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,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,OAAO,EAAE,IAAI,EACb,kBAAkB,EAAE,IAAI,EACxB,IAAI,IACJ,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,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,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,sCAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AA7CD,wBA6CC;AAED,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,yCAA8D;AAE9D,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AACtD,2FAAqF;AAErF,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,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,OAAO,EAAE,IAAI,EACb,kBAAkB,EAAE,IAAI,EACxB,IAAI,IACJ,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,sCAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AA7CD,wBA6CC;AAED,kBAAe,MAAM,CAAC"}

package/src/generators/setup-ssr/files/src/main.ts__tpl__

@@ -9,7 +9,7 @@ function bootstrap() {
 };
 
 
- if (document.readyState === 'complete') {
+ if (document.readyState !== 'loading') {
    bootstrap();
  } else {
    document.addEventListener('DOMContentLoaded', bootstrap);

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

@@ -8,6 +8,7 @@ function updateProjectConfig(tree, schema) {
     projectConfig.targets.build.options.outputPath = `dist/apps/${schema.project}/browser`;
     const buildTargetFileReplacements = (_b = (_a = projectConfig.targets.build.configurations) === null || _a === void 0 ? void 0 : _a.production) === null || _b === void 0 ? void 0 : _b.fileReplacements;
     projectConfig.targets.server = {
+        dependsOn: ['build'],
         executor: '@angular-devkit/build-angular:server',
         options: {
             outputPath: `dist/${projectConfig.root}/server`,

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":";;;AACA,yCAIsB;AAGtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,aAAa,MAAM,CAAC,OAAO,UAAU,CAAC;IAEvF,MAAM,2BAA2B,GAC/B,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,0CAAE,UAAU,0CAAE,gBAAgB,CAAC;IAE3E,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG;QAC7B,QAAQ,EAAE,sCAAsC;QAChD,OAAO,EAAE;YACP,UAAU,EAAE,QAAQ,aAAa,CAAC,IAAI,SAAS;YAC/C,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC;YAClE,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC;SACxE;QACD,cAAc,EAAE;YACd,UAAU,kBACR,aAAa,EAAE,OAAO,IACnB,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,EAAE,gBAAgB,EAAE,2BAA2B,EAAE;gBACnD,CAAC,CAAC,EAAE,CAAC,CACR;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,IAAI;gBACf,eAAe,EAAE,KAAK;aACvB;SACF;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;AAClE,CAAC;AAjED,kDAiEC"}
+{"version":3,"file":"update-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-ssr/lib/update-project-config.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAGtB,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;IAC5D,IAAI,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnE,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,GAAG,aAAa,MAAM,CAAC,OAAO,UAAU,CAAC;IAEvF,MAAM,2BAA2B,GAC/B,MAAA,MAAA,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,cAAc,0CAAE,UAAU,0CAAE,gBAAgB,CAAC;IAE3E,aAAa,CAAC,OAAO,CAAC,MAAM,GAAG;QAC7B,SAAS,EAAE,CAAC,OAAO,CAAC;QACpB,QAAQ,EAAE,sCAAsC;QAChD,OAAO,EAAE;YACP,UAAU,EAAE,QAAQ,aAAa,CAAC,IAAI,SAAS;YAC/C,IAAI,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC;YAClE,QAAQ,EAAE,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,sBAAsB,CAAC;SACxE;QACD,cAAc,EAAE;YACd,UAAU,kBACR,aAAa,EAAE,OAAO,IACnB,CAAC,2BAA2B;gBAC7B,CAAC,CAAC,EAAE,gBAAgB,EAAE,2BAA2B,EAAE;gBACnD,CAAC,CAAC,EAAE,CAAC,CACR;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,KAAK;gBACnB,SAAS,EAAE,IAAI;gBACf,eAAe,EAAE,KAAK;aACvB;SACF;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;AAClE,CAAC;AAlED,kDAkEC"}

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

@@ -72,8 +72,7 @@
     },
     "configureTestRunner": {
       "type": "boolean",
-      "description": "Add a Storybook Test-Runner target.",
-      "x-prompt": "Add a Storybook Test-Runner target?"
+      "description": "Add a Storybook Test-Runner target."
     }
   },
   "additionalProperties": false,

package/src/utils/get-generator-directory-for-ng-version.d.ts

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

package/src/utils/get-generator-directory-for-ng-version.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGeneratorDirectoryForInstalledAngularVersion = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const semver_1 = require("semver");
+function getGeneratorDirectoryForInstalledAngularVersion(tree) {
+    var _a;
+    const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const angularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
+    if (!angularVersion) {
+        return null;
+    }
+    const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
+    const directoryDictionary = {
+        14: 'angular-v14',
+    };
+    return (_a = directoryDictionary[majorAngularVersion]) !== null && _a !== void 0 ? _a : null;
+}
+exports.getGeneratorDirectoryForInstalledAngularVersion = getGeneratorDirectoryForInstalledAngularVersion;
+//# sourceMappingURL=get-generator-directory-for-ng-version.js.map

package/src/utils/get-generator-directory-for-ng-version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-generator-directory-for-ng-version.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-generator-directory-for-ng-version.ts"],"names":[],"mappings":";;;AACA,yCAAwC;AACxC,mCAAuC;AAEvC,SAAgB,+CAA+C,CAAC,IAAU;;IACxE,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,cAAc,GAClB,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAEhE,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAE1D,MAAM,mBAAmB,GAAG;QAC1B,EAAE,EAAE,aAAa;KAClB,CAAC;IAEF,OAAO,MAAA,mBAAmB,CAAC,mBAAmB,CAAC,mCAAI,IAAI,CAAC;AAC1D,CAAC;AAhBD,0GAgBC"}

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~15.0.0";
 export declare const angularDevkitVersion = "~15.0.0";
 export declare const ngPackagrVersion = "~15.0.0";
-export declare const ngrxVersion = "~15.0.0-beta.0";
+export declare const ngrxVersion = "~15.0.0";
 export declare const rxjsVersion = "~7.5.0";
 export declare const zoneJsVersion = "~0.11.4";
 export declare const angularJsVersion = "1.7.9";
@@ -19,7 +19,7 @@ export declare const postcssPresetEnvVersion = "~7.5.0";
 export declare const postcssUrlVersion = "~10.1.3";
 export declare const autoprefixerVersion = "^10.4.0";
 export declare const tsNodeVersion = "10.9.1";
-export declare const jestPresetAngularVersion = "~12.2.2";
+export declare const jestPresetAngularVersion = "~12.2.3";
 export declare const protractorVersion = "~7.0.0";
 export declare const karmaVersion = "~6.4.0";
 export declare const karmaChromeLauncherVersion = "~3.1.0";
@@ -32,3 +32,40 @@ export declare const typesJasmineVersion = "~4.0.0";
 export declare const typesJasminewd2Version = "~2.0.3";
 export declare const typesNodeVersion = "16.11.7";
 export declare const jasmineMarblesVersion = "^0.9.2";
+export declare const versions: {
+    angularV14: {
+        angularVersion: string;
+        angularDevkitVersion: string;
+        ngPackagrVersion: string;
+        ngrxVersion: string;
+        rxjsVersion: string;
+        zoneJsVersion: string;
+        angularJsVersion: string;
+        tsLibVersion: string;
+        ngUniversalVersion: string;
+        corsVersion: string;
+        expressVersion: string;
+        moduleFederationNodeVersion: string;
+        angularEslintVersion: string;
+        tailwindVersion: string;
+        postcssVersion: string;
+        postcssImportVersion: string;
+        postcssPresetEnvVersion: string;
+        postcssUrlVersion: string;
+        autoprefixerVersion: string;
+        tsNodeVersion: string;
+        jestPresetAngularVersion: string;
+        protractorVersion: string;
+        karmaVersion: string;
+        karmaChromeLauncherVersion: string;
+        karmaCoverageVersion: string;
+        karmaJasmineVersion: string;
+        karmaJasmineHtmlReporterVersion: string;
+        jasmineCoreVersion: string;
+        jasmineSpecReporterVersion: string;
+        typesJasmineVersion: string;
+        typesJasminewd2Version: string;
+        typesNodeVersion: string;
+        jasmineMarblesVersion: string;
+    };
+};

package/src/utils/versions.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.expressVersion = 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.versions = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.typesJasminewd2Version = exports.typesJasmineVersion = exports.jasmineSpecReporterVersion = exports.jasmineCoreVersion = exports.karmaJasmineHtmlReporterVersion = exports.karmaJasmineVersion = exports.karmaCoverageVersion = exports.karmaChromeLauncherVersion = exports.karmaVersion = exports.protractorVersion = exports.jestPresetAngularVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssPresetEnvVersion = exports.postcssImportVersion = exports.postcssVersion = exports.tailwindVersion = exports.angularEslintVersion = exports.moduleFederationNodeVersion = exports.expressVersion = 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 = '~15.0.0';
 exports.angularDevkitVersion = '~15.0.0';
 exports.ngPackagrVersion = '~15.0.0';
-exports.ngrxVersion = '~15.0.0-beta.0';
+exports.ngrxVersion = '~15.0.0';
 exports.rxjsVersion = '~7.5.0';
 exports.zoneJsVersion = '~0.11.4';
 exports.angularJsVersion = '1.7.9';
@@ -22,7 +22,7 @@ exports.postcssPresetEnvVersion = '~7.5.0';
 exports.postcssUrlVersion = '~10.1.3';
 exports.autoprefixerVersion = '^10.4.0';
 exports.tsNodeVersion = '10.9.1';
-exports.jestPresetAngularVersion = '~12.2.2';
+exports.jestPresetAngularVersion = '~12.2.3';
 exports.protractorVersion = '~7.0.0';
 exports.karmaVersion = '~6.4.0';
 exports.karmaChromeLauncherVersion = '~3.1.0';
@@ -35,4 +35,41 @@ exports.typesJasmineVersion = '~4.0.0';
 exports.typesJasminewd2Version = '~2.0.3';
 exports.typesNodeVersion = '16.11.7';
 exports.jasmineMarblesVersion = '^0.9.2';
+exports.versions = {
+    angularV14: {
+        angularVersion: '~14.2.0',
+        angularDevkitVersion: '~14.2.0',
+        ngPackagrVersion: '~14.2.0',
+        ngrxVersion: '~14.0.0',
+        rxjsVersion: '~7.5.0',
+        zoneJsVersion: '~0.11.4',
+        angularJsVersion: '1.7.9',
+        tsLibVersion: '^2.3.0',
+        ngUniversalVersion: '~14.2.0',
+        corsVersion: '~2.8.5',
+        expressVersion: '~4.18.2',
+        moduleFederationNodeVersion: '~0.9.6',
+        angularEslintVersion: '~14.0.4',
+        tailwindVersion: '^3.0.2',
+        postcssVersion: '^8.4.5',
+        postcssImportVersion: '~14.1.0',
+        postcssPresetEnvVersion: '~7.5.0',
+        postcssUrlVersion: '~10.1.3',
+        autoprefixerVersion: '^10.4.0',
+        tsNodeVersion: '10.9.1',
+        jestPresetAngularVersion: '~12.2.3',
+        protractorVersion: '~7.0.0',
+        karmaVersion: '~6.4.0',
+        karmaChromeLauncherVersion: '~3.1.0',
+        karmaCoverageVersion: '~2.2.0',
+        karmaJasmineVersion: '~5.1.0',
+        karmaJasmineHtmlReporterVersion: '~2.0.0',
+        jasmineCoreVersion: '~4.2.0',
+        jasmineSpecReporterVersion: '~7.0.0',
+        typesJasmineVersion: '~4.0.0',
+        typesJasminewd2Version: '~2.0.3',
+        typesNodeVersion: '16.11.7',
+        jasmineMarblesVersion: '^0.9.2',
+    },
+};
 //# sourceMappingURL=versions.js.map

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,SAAS,CAAC;AAC3B,QAAA,oBAAoB,GAAG,SAAS,CAAC;AACjC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,WAAW,GAAG,gBAAgB,CAAC;AAC/B,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,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AAEvC,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,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,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,cAAc,GAAG,SAAS,CAAC;AAC3B,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AAEvC,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,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,+BAA+B,GAAG,QAAQ,CAAC;AAC3C,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AACtC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,qBAAqB,GAAG,QAAQ,CAAC;AAEjC,QAAA,QAAQ,GAAG;IACtB,UAAU,EAAE;QACV,cAAc,EAAE,SAAS;QACzB,oBAAoB,EAAE,SAAS;QAC/B,gBAAgB,EAAE,SAAS;QAC3B,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,QAAQ;QACrB,aAAa,EAAE,SAAS;QACxB,gBAAgB,EAAE,OAAO;QACzB,YAAY,EAAE,QAAQ;QACtB,kBAAkB,EAAE,SAAS;QAC7B,WAAW,EAAE,QAAQ;QACrB,cAAc,EAAE,SAAS;QACzB,2BAA2B,EAAE,QAAQ;QACrC,oBAAoB,EAAE,SAAS;QAC/B,eAAe,EAAE,QAAQ;QACzB,cAAc,EAAE,QAAQ;QACxB,oBAAoB,EAAE,SAAS;QAC/B,uBAAuB,EAAE,QAAQ;QACjC,iBAAiB,EAAE,SAAS;QAC5B,mBAAmB,EAAE,SAAS;QAC9B,aAAa,EAAE,QAAQ;QACvB,wBAAwB,EAAE,SAAS;QACnC,iBAAiB,EAAE,QAAQ;QAC3B,YAAY,EAAE,QAAQ;QACtB,0BAA0B,EAAE,QAAQ;QACpC,oBAAoB,EAAE,QAAQ;QAC9B,mBAAmB,EAAE,QAAQ;QAC7B,+BAA+B,EAAE,QAAQ;QACzC,kBAAkB,EAAE,QAAQ;QAC5B,0BAA0B,EAAE,QAAQ;QACpC,mBAAmB,EAAE,QAAQ;QAC7B,sBAAsB,EAAE,QAAQ;QAChC,gBAAgB,EAAE,SAAS;QAC3B,qBAAqB,EAAE,QAAQ;KAChC;CACF,CAAC"}