npm - @nrwl/angular - Versions diffs - 15.4.2 → 15.4.3-beta.2 - Mend

@nrwl/angular 15.4.2 → 15.4.3-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-## [15.4.2](https://github.com/nrwl/nx/compare/15.4.1...15.4.2) (2022-12-27)
+## [15.4.3-beta.2](https://github.com/nrwl/nx/compare/15.4.3...15.4.3-beta.2) (2023-01-03)
 **Note:** Version bump only for package @nrwl/angular

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.4.2",
+  "version": "15.4.3-beta.2",
   "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, Cypress, Karma, and Protractor. \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": {
@@ -68,12 +68,12 @@
   "dependencies": {
     "@angular-devkit/schematics": "~15.0.1",
     "@nguniversal/builders": "~15.0.0",
-    "@nrwl/cypress": "15.4.2",
-    "@nrwl/devkit": "15.4.2",
-    "@nrwl/jest": "15.4.2",
-    "@nrwl/linter": "15.4.2",
-    "@nrwl/webpack": "15.4.2",
-    "@nrwl/workspace": "15.4.2",
+    "@nrwl/cypress": "15.4.3-beta.2",
+    "@nrwl/devkit": "15.4.3-beta.2",
+    "@nrwl/jest": "15.4.3-beta.2",
+    "@nrwl/linter": "15.4.3-beta.2",
+    "@nrwl/webpack": "15.4.3-beta.2",
+    "@nrwl/workspace": "15.4.3-beta.2",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~15.0.1",
     "chalk": "4.1.0",
@@ -84,7 +84,7 @@
     "minimatch": "3.0.5",
     "semver": "7.3.4",
     "ts-node": "10.9.1",
-    "tsconfig-paths": "^3.9.0",
+    "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
     "webpack": "^5.75.0",
     "webpack-merge": "5.7.3"
@@ -99,5 +99,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "f038a34d4e0ca83ca9e6ca2be4aba12a3e435346"
+  "gitHead": "3b7b04c4780fb737904d14bd25a3652c857d926f"
 }

package/plugins/component-testing.js CHANGED Viewed

@@ -83,7 +83,7 @@ function getBuildableTarget(ctContext) {
     if (!cypressCtOptions.devServerTarget) {
         throw new Error(`Unable to find the 'devServerTarget' executor option in the '${ctContext.targetName}' target of the '${ctContext.projectName}' project`);
     }
-    return (0, devkit_1.parseTargetString)(cypressCtOptions.devServerTarget);
+    return (0, devkit_1.parseTargetString)(cypressCtOptions.devServerTarget, ctContext.projectGraph);
 }
 function normalizeBuildTargetOptions(buildContext, ctContext, offset) {
     var _a, _b;

package/plugins/component-testing.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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~~EAAC~~,gBAAgB,CAAC,eAAe,CAAC,CAAC;~~AAC7D~~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"}
1	+ {"version":3,"file":"component-testing.js","sourceRoot":"","sources":["../../../../packages/angular/plugins/component-testing.ts"],"names":[],"mappings":"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"}

package/src/builders/webpack-dev-server/webpack-dev-server.impl.js CHANGED Viewed

@@ -16,7 +16,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
     var _a, _b, _c, _d, _e;
     process.env.NX_TSCONFIG_PATH = (0, devkit_1.joinPathFragments)(context.workspaceRoot, 'tsconfig.base.json');
     const options = (0, lib_1.normalizeOptions)(rawOptions);
-    const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget);
+    const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
     const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
     const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
     const buildTargetConfiguration = parsedBrowserTarget.configuration

package/src/builders/webpack-dev-server/webpack-dev-server.impl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,iEAGuC;AAEvC,~~yCAAoE~~;~~AACpE~~,yHAAkH;AAElH,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,kDAAgE;AAChE,+BAAyC;AAEzC,gEAAgF;AAEhF,SAAgB,8BAA8B,CAC5C,UAAkB,EAClB,OAAuB;;IAEvB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,~~EAAC~~,OAAO,CAAC,aAAa,~~CAAC~~,CAAC;~~IACrE~~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~~AAlHD~~,~~wEAkHC~~;AAED,kBAAe,IAAA,yBAAa,EAC1B,8BAA8B,CACxB,CAAC"}
1	+ {"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/delegate-build/delegate-build.impl.js CHANGED Viewed

@@ -12,7 +12,7 @@ function delegateBuildExecutor(options, context) {
             return yield tslib_1.__await({ success: false });
         }
         const { buildTarget } = options, targetOptions = tslib_1.__rest(options, ["buildTarget"]);
-        const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget);
+        const delegateTarget = (0, devkit_1.parseTargetString)(buildTarget, context.projectGraph);
         yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(delegateTarget, targetOptions, context)))));
     });
 }

package/src/executors/delegate-build/delegate-build.impl.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"delegate-build.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/delegate-build/delegate-build.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,6FAI4D;AAG5D,SAAuB,qBAAqB,CAC1C,OAAoC,EACpC,OAAwB;;QAExB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,mDAA4B,EAC3D,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,IAAA,wCAAiB,EAClC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EACjD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,IAAI,CAAC,IAAI,EAChB,YAAY,CACb,CAAC;QAEF,IACE,CAAC,IAAA,0DAAmC,EAClC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,EACD;YACA,6BAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC;SAC3B;QAED,MAAM,EAAE,WAAW,KAAuB,OAAO,EAAzB,aAAa,kBAAK,OAAO,EAA3C,eAAiC,CAAU,CAAC;QAClD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,CAAC,CAAC;~~QAEtD~~,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,sBAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAA,CAAC;IACnE,CAAC;CAAA;AAlCD,sDAkCC;AAED,kBAAe,qBAAqB,CAAC"}
1	+ {"version":3,"file":"delegate-build.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/executors/delegate-build/delegate-build.impl.ts"],"names":[],"mappings":";;;;AACA,yCAIsB;AACtB,6FAI4D;AAG5D,SAAuB,qBAAqB,CAC1C,OAAoC,EACpC,OAAwB;;QAExB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,mDAA4B,EAC3D,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,IAAA,wCAAiB,EAClC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,EACjD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,IAAI,CAAC,IAAI,EAChB,YAAY,CACb,CAAC;QAEF,IACE,CAAC,IAAA,0DAAmC,EAClC,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,YAAY,CACb,EACD;YACA,6BAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC;SAC3B;QAED,MAAM,EAAE,WAAW,KAAuB,OAAO,EAAzB,aAAa,kBAAK,OAAO,EAA3C,eAAiC,CAAU,CAAC;QAClD,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAE5E,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,sBAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAA,CAAC;IACnE,CAAC;CAAA;AAlCD,sDAkCC;AAED,kBAAe,qBAAqB,CAAC"}

package/src/generators/ngrx/lib/add-exports-barrel.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { Tree } from '@nrwl/devkit';
-import type { NgRxGeneratorOptions } from '../schema';
+import type { NormalizedNgRxGeneratorOptions } from './normalize-options';
 /**
  * Add ngrx feature exports to the public barrel in the feature library
  */
-export declare function addExportsToBarrel(tree: Tree, options: NgRxGeneratorOptions): void;
+export declare function addExportsToBarrel(tree: Tree, options: NormalizedNgRxGeneratorOptions): void;

package/src/generators/ngrx/lib/add-exports-barrel.js CHANGED Viewed

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addExportsToBarrel = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
-const path_1 = require("path");
 const typescript_1 = require("typescript");
 /**
  * Add ngrx feature exports to the public barrel in the feature library
@@ -13,7 +12,7 @@ function addExportsToBarrel(tree, options) {
     if (options.root) {
         return;
     }
-    const indexFilePath = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.module), '..', 'index.ts');
+    const indexFilePath = (0, devkit_1.joinPathFragments)(options.parentDirectory, '..', 'index.ts');
     if (!tree.exists(indexFilePath)) {
         return;
     }

package/src/generators/ngrx/lib/add-exports-barrel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-exports-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-exports-barrel.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAoE;AACpE~~,+BAA+B;AAC/B~~,2CAA4D;AAG5D;;GAEG;AACH,SAAgB,kBAAkB,CAChC,IAAU,EACV,~~OAA6B~~;~~IAE7B~~,6EAA6E;IAC7E,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,~~IAAA,cAAO,EAAC,~~OAAO,CAAC,~~MAAM~~,~~CAAC,~~EACvB,IAAI,EACJ,UAAU,CACX,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,IAAA,6BAAgB,EAC/B,aAAa,EACb,eAAe,EACf,yBAAY,CAAC,MAAM,EACnB,IAAI,CACL,CAAC;IAEF,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC;IAE3D,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,mBAAmB,SAAS,cAAc;QACpE,CAAC,CAAC,kBAAkB,SAAS,cAAc,CAC9C,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,YAAY,SAAS,YAAY,SAAS,YAAY,SAAS,cAAc,CAC9E,CAAC;KACH;IAED,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;KACH;AACH,CAAC;AA/ED,gDA+EC"}
1	+ {"version":3,"file":"add-exports-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-exports-barrel.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAoE;AACpE,2CAA4D;AAG5D;;GAEG;AACH,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAAuC;IAEvC,6EAA6E;IAC7E,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,aAAa,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,UAAU,CACX,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,UAAU,GAAG,IAAA,6BAAgB,EAC/B,aAAa,EACb,eAAe,EACf,yBAAY,CAAC,MAAM,EACnB,IAAI,CACL,CAAC;IAEF,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,OAAO,CAAC,SAAS,IAAI,QAAQ,EAAE,CAAC;IAE3D,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,iBAAiB,SAAS,YAAY;QAChE,CAAC,CAAC,kBAAkB,SAAS,YAAY,CAC5C,CAAC;IACF,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,OAAO,CAAC,OAAO;QACb,CAAC,CAAC,eAAe,SAAS,mBAAmB,SAAS,cAAc;QACpE,CAAC,CAAC,kBAAkB,SAAS,cAAc,CAC9C,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,YAAY,SAAS,YAAY,SAAS,YAAY,SAAS,cAAc,CAC9E,CAAC;KACH;IAED,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,UAAU,GAAG,IAAA,qBAAS,EACpB,IAAI,EACJ,UAAU,EACV,aAAa,EACb,kBAAkB,SAAS,WAAW,CACvC,CAAC;KACH;AACH,CAAC;AA/ED,gDA+EC"}

package/src/generators/ngrx/lib/add-imports-to-module.d.ts CHANGED Viewed

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

package/src/generators/ngrx/lib/add-imports-to-module.js CHANGED Viewed

@@ -6,11 +6,12 @@ const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
 const typescript_1 = require("typescript");
 const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
 function addImportsToModule(tree, options) {
-    const modulePath = options.module;
-    const sourceText = tree.read(modulePath, 'utf-8');
-    let sourceFile = (0, typescript_1.createSourceFile)(modulePath, sourceText, typescript_1.ScriptTarget.Latest, true);
+    var _a;
+    const parentPath = (_a = options.module) !== null && _a !== void 0 ? _a : options.parent;
+    const sourceText = tree.read(parentPath, 'utf-8');
+    let sourceFile = (0, typescript_1.createSourceFile)(parentPath, sourceText, typescript_1.ScriptTarget.Latest, true);
     const addImport = (source, symbolName, fileName, isDefault = false) => {
-        return (0, ast_utils_1.insertImport)(tree, source, modulePath, symbolName, fileName, isDefault);
+        return (0, ast_utils_1.insertImport)(tree, source, parentPath, symbolName, fileName, isDefault);
     };
     const dir = `./${(0, devkit_1.names)(options.directory).fileName}`;
     const pathPrefix = `${dir}/${(0, devkit_1.names)(options.name).fileName}`;
@@ -41,11 +42,11 @@ function addImportsToModule(tree, options) {
     sourceFile = addImport(sourceFile, 'StoreModule', '@ngrx/store');
     sourceFile = addImport(sourceFile, 'EffectsModule', '@ngrx/effects');
     if (options.minimal && options.root) {
-        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeForRoot);
-        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, effectsForEmptyRoot);
+        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, storeForRoot);
+        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, effectsForEmptyRoot);
         if (hasRouter) {
             sourceFile = addImport(sourceFile, 'StoreRouterConnectingModule', '@ngrx/router-store');
-            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeRouterModule);
+            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, storeRouterModule);
         }
     }
     else {
@@ -54,24 +55,24 @@ function addImportsToModule(tree, options) {
             sourceFile = addImport(sourceFile, effectsName, effectsPath);
             if (options.facade) {
                 sourceFile = addImport(sourceFile, facadeName, facadePath);
-                sourceFile = (0, ast_utils_2.addProviderToModule)(tree, sourceFile, modulePath, facadeName);
+                sourceFile = (0, ast_utils_2.addProviderToModule)(tree, sourceFile, parentPath, facadeName);
             }
             return sourceFile;
         };
         if (options.root) {
             sourceFile = addCommonImports();
-            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeForRoot);
-            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, effectsForRoot);
+            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, storeForRoot);
+            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, effectsForRoot);
             if (hasRouter) {
                 sourceFile = addImport(sourceFile, 'StoreRouterConnectingModule', '@ngrx/router-store');
-                sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeRouterModule);
+                sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, storeRouterModule);
             }
-            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeForFeature);
+            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, storeForFeature);
         }
         else {
             sourceFile = addCommonImports();
-            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeForFeature);
-            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, effectsForFeature);
+            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, storeForFeature);
+            sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, parentPath, effectsForFeature);
         }
     }
 }

package/src/generators/ngrx/lib/add-imports-to-module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAAuE;AAEvE,2CAA4D;AAC5D,kEAG4C;AAG5C,SAAgB,kBAAkB,CAChC,IAAU,EACV,~~OAA6B;IAE7B~~,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;~~IAClC~~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"}
1	+ {"version":3,"file":"add-imports-to-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/add-imports-to-module.ts"],"names":[],"mappings":"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"}

package/src/generators/ngrx/lib/generate-files.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import type { Tree } from '@nrwl/devkit';
-import type { NgRxGeneratorOptions } from '../schema';
+import { NormalizedNgRxGeneratorOptions } from './normalize-options';
 /**
  * Generate 'feature' scaffolding: actions, reducer, effects, interfaces, selectors, facade
  */
-export declare function generateNgrxFilesFromTemplates(tree: Tree, options: NgRxGeneratorOptions): void;
+export declare function generateNgrxFilesFromTemplates(tree: Tree, options: NormalizedNgRxGeneratorOptions): void;

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

@@ -2,18 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateNgrxFilesFromTemplates = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("path");
 /**
  * Generate 'feature' scaffolding: actions, reducer, effects, interfaces, selectors, facade
  */
 function generateNgrxFilesFromTemplates(tree, options) {
     const name = options.name;
-    const moduleDir = (0, path_1.dirname)(options.module);
     const projectNames = (0, devkit_1.names)(name);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), moduleDir, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.parentDirectory, Object.assign(Object.assign(Object.assign({}, options), projectNames), { tmpl: '' }));
     if (!options.facade) {
-        tree.delete((0, devkit_1.joinPathFragments)(moduleDir, options.directory, `${projectNames.fileName}.facade.ts`));
-        tree.delete((0, devkit_1.joinPathFragments)(moduleDir, options.directory, `${projectNames.fileName}.facade.spec.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.ts`));
+        tree.delete((0, devkit_1.joinPathFragments)(options.parentDirectory, options.directory, `${projectNames.fileName}.facade.spec.ts`));
     }
 }
 exports.generateNgrxFilesFromTemplates = generateNgrxFilesFromTemplates;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAAuE;~~AACvE,+BAA+B;AAG/B~~;;GAEG;AACH,SAAgB,8BAA8B,CAC5C,IAAU,EACV,~~OAA6B~~;~~IAE7B~~,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,~~SAAS,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,~~YAAY,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAA,sBAAa,~~EAAC~~,IAAI,~~EAAE~~,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,~~EAAE~~,~~SAAS~~,~~gDACrE~~,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,~~IACR~~,CAAC;~~IAEH~~,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,~~SAAS~~,~~EACT~~,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,YAAY,CACrC,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,~~SAAS~~,~~EACT~~,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,iBAAiB,CAC1C,CACF,CAAC;KACH;AACH,CAAC;~~AA9BD~~,~~wEA8BC~~"}
1	+ {"version":3,"file":"generate-files.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/generate-files.ts"],"names":[],"mappings":";;;AACA,yCAAuE;AAGvE;;GAEG;AACH,SAAgB,8BAA8B,CAC5C,IAAU,EACV,OAAuC;IAEvC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,YAAY,GAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,OAAO,CAAC,eAAe,gDAElB,OAAO,GACP,YAAY,KACf,IAAI,EAAE,EAAE,IAEX,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,YAAY,CACrC,CACF,CAAC;QACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,SAAS,EACjB,GAAG,YAAY,CAAC,QAAQ,iBAAiB,CAC1C,CACF,CAAC;KACH;AACH,CAAC;AAlCD,wEAkCC"}

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

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

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

@@ -2,8 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
 function normalizeOptions(options) {
-    return Object.assign(Object.assign({}, options), { directory: (0, devkit_1.names)(options.directory).fileName });
+    return Object.assign(Object.assign({}, options), { parentDirectory: options.module
+            ? (0, path_1.dirname)(options.module)
+            : options.parent
+                ? (0, path_1.dirname)(options.parent)
+                : undefined, directory: (0, devkit_1.names)(options.directory).fileName });
 }
 exports.normalizeOptions = normalizeOptions;
 //# sourceMappingURL=normalize-options.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;~~AAGrC~~,SAAgB,gBAAgB,CAC9B,OAA6B;IAE7B,uCACK,OAAO,KACV,SAAS,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAC5C;AACJ,CAAC;~~AAPD~~,~~4CAOC~~"}
1	+ {"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx/lib/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,+BAA+B;AAM/B,SAAgB,gBAAgB,CAC9B,OAA6B;IAE7B,uCACK,OAAO,KACV,eAAe,EAAE,OAAO,CAAC,MAAM;YAC7B,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,MAAM;gBAChB,CAAC,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,CAAC;gBACzB,CAAC,CAAC,SAAS,EACb,SAAS,EAAE,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAC5C;AACJ,CAAC;AAZD,4CAYC"}

package/src/generators/ngrx/ngrx.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { GeneratorCallback, Tree } from '@nrwl/devkit';
 import type { NgRxGeneratorOptions } from './schema';
-export declare function ngrxGenerator(tree: Tree, options: NgRxGeneratorOptions): Promise<GeneratorCallback>;
+export declare function ngrxGenerator(tree: Tree, schema: NgRxGeneratorOptions): Promise<GeneratorCallback>;
 export default ngrxGenerator;

package/src/generators/ngrx/ngrx.js CHANGED Viewed

@@ -4,24 +4,30 @@ exports.ngrxGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const lib_1 = require("./lib");
-function ngrxGenerator(tree, options) {
+function ngrxGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const normalizedOptions = (0, lib_1.normalizeOptions)(options);
-        if (!tree.exists(normalizedOptions.module)) {
-            throw new Error(`Module does not exist: ${normalizedOptions.module}.`);
+        if (!schema.module && !schema.parent) {
+            throw new Error('Please provide a value for `--parent`!');
         }
-        if (!normalizedOptions.minimal || !normalizedOptions.root) {
-            (0, lib_1.generateNgrxFilesFromTemplates)(tree, normalizedOptions);
+        if (schema.module && !tree.exists(schema.module)) {
+            throw new Error(`Module does not exist: ${schema.module}.`);
         }
-        if (!normalizedOptions.skipImport) {
-            (0, lib_1.addImportsToModule)(tree, normalizedOptions);
-            (0, lib_1.addExportsToBarrel)(tree, normalizedOptions);
+        if (schema.parent && !tree.exists(schema.parent)) {
+            throw new Error(`Parent does not exist: ${schema.parent}.`);
+        }
+        const options = (0, lib_1.normalizeOptions)(schema);
+        if (!options.minimal || !options.root) {
+            (0, lib_1.generateNgrxFilesFromTemplates)(tree, options);
+        }
+        if (!options.skipImport) {
+            (0, lib_1.addImportsToModule)(tree, options);
+            (0, lib_1.addExportsToBarrel)(tree, options);
         }
         let packageInstallationTask = () => { };
-        if (!normalizedOptions.skipPackageJson) {
+        if (!options.skipPackageJson) {
             packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree);
         }
-        if (!normalizedOptions.skipFormat) {
+        if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
         return packageInstallationTask;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAMe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,~~OAA6B~~;;~~QAE7B~~,MAAM,~~iBAAiB~~,~~GAAG~~,~~IAAA~~,~~sBAAgB~~,~~EAAC~~,~~OAAO~~,CAAC,CAAC;~~QAEpD~~,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,~~iBAAiB~~,CAAC,MAAM,CAAC,EAAE;~~YAC1C~~,MAAM,IAAI,KAAK,CAAC,0BAA0B,~~iBAAiB~~,CAAC,MAAM,GAAG,CAAC,CAAC;~~SACxE~~;QAED,IAAI,CAAC,~~iBAAiB~~,CAAC,OAAO,IAAI,CAAC,~~iBAAiB~~,CAAC,IAAI,EAAE;~~YACzD~~,IAAA,oCAA8B,EAAC,IAAI,EAAE,~~iBAAiB~~,CAAC,CAAC;~~SACzD~~;QAED,IAAI,CAAC,~~iBAAiB~~,CAAC,UAAU,EAAE;~~YACjC~~,IAAA,wBAAkB,EAAC,IAAI,EAAE,~~iBAAiB~~,CAAC,CAAC;~~YAC5C~~,IAAA,wBAAkB,EAAC,IAAI,EAAE,~~iBAAiB~~,CAAC,CAAC;~~SAC7C~~;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,~~iBAAiB~~,CAAC,eAAe,EAAE;~~YACtC~~,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,~~iBAAiB~~,CAAC,UAAU,EAAE;~~YACjC~~,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;~~AA7BD~~,~~sCA6BC~~;AAED,kBAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"ngrx.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx/ngrx.ts"],"names":[],"mappings":";;;;AACA,yCAA2C;AAC3C,+BAMe;AAGf,SAAsB,aAAa,CACjC,IAAU,EACV,MAA4B;;QAE5B,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACpC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;SAC3D;QAED,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;SAC7D;QAED,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;SAC7D;QAED,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACrC,IAAA,oCAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/C;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,CAAC,CAAC;SACtD;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AArCD,sCAqCC;AAED,kBAAe,aAAa,CAAC"}

package/src/generators/ngrx/schema.d.ts CHANGED Viewed

@@ -1,7 +1,8 @@
 export interface NgRxGeneratorOptions {
   directory: string;
   minimal: boolean;
-  module: string;
+  module?: string;
+  parent?: string;
   name: string;
   barrels?: boolean;
   facade?: boolean;

package/src/generators/ngrx/schema.json CHANGED Viewed

@@ -26,6 +26,12 @@
       "x-prompt": "What name would you like to use for the NgRx feature state? An example would be `users`."
     },
     "module": {
+      "type": "string",
+      "description": "The path to the `NgModule` where the feature state will be registered. The host directory will create/use the new state directory.",
+      "x-prompt": "What is the path to the module where this NgRx state should be registered?",
+      "x-deprecated": "This option will be removed in a future version of Nx. Please switch to using --parent instead."
+    },
+    "parent": {
       "type": "string",
       "description": "The path to the `NgModule` where the feature state will be registered. The host directory will create/use the new state directory.",
       "x-prompt": "What is the path to the module where this NgRx state should be registered?"
@@ -74,5 +80,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["module", "name"]
+  "required": ["name"]
 }

package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js CHANGED Viewed

@@ -9,11 +9,11 @@ function convertWebpackBrowserBuildTargetToDelegateBuild(host) {
             const webpackBrowserTargets = Object.values(project.targets || {}).filter((target) => target.executor === '@nrwl/angular:webpack-browser');
             for (const target of webpackBrowserTargets) {
                 const configurationOptions = getTargetConfigurationOptions(target);
-                const buildTargetName = getBuildTargetNameFromOptions(target.options, configurationOptions);
+                const buildTargetName = yield getBuildTargetNameFromOptions(target.options, configurationOptions);
                 if (buildTargetName) {
                     target.executor = '@nrwl/angular:delegate-build';
                     updateTargetsOptions(project, target, buildTargetName);
-                    updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions);
+                    yield updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions);
                 }
             }
             (0, devkit_1.updateProjectConfiguration)(host, projectName, project);
@@ -28,25 +28,30 @@ function cleanupBuildTargetProperties(options) {
 }
 function extractConfigurationBuildTarget(project, target, configuration, buildTarget) {
     var _a;
-    if (buildTarget) {
-        const buildTargetObj = (0, devkit_1.parseTargetString)(buildTarget);
-        return Object.assign(Object.assign({}, buildTargetObj), { configuration: (_a = buildTargetObj.configuration) !== null && _a !== void 0 ? _a : configuration });
-    }
-    return {
-        project: project,
-        target: target,
-        configuration: configuration,
-    };
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (buildTarget) {
+            const buildTargetObj = (0, devkit_1.parseTargetString)(buildTarget, yield (0, devkit_1.createProjectGraphAsync)());
+            return Object.assign(Object.assign({}, buildTargetObj), { configuration: (_a = buildTargetObj.configuration) !== null && _a !== void 0 ? _a : configuration });
+        }
+        return {
+            project: project,
+            target: target,
+            configuration: configuration,
+        };
+    });
 }
 function getBuildTargetNameFromOptions(baseOptions, configurationOptions) {
-    if (baseOptions.buildTarget) {
-        return (0, devkit_1.parseTargetString)(baseOptions.buildTarget).target;
-    }
-    for (const [, options] of configurationOptions) {
-        if (options.buildTarget) {
-            return (0, devkit_1.parseTargetString)(options.buildTarget).target;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const pg = yield (0, devkit_1.createProjectGraphAsync)();
+        if (baseOptions.buildTarget) {
+            return (0, devkit_1.parseTargetString)(baseOptions.buildTarget, pg).target;
         }
-    }
+        for (const [, options] of configurationOptions) {
+            if (options.buildTarget) {
+                return (0, devkit_1.parseTargetString)(options.buildTarget, pg).target;
+            }
+        }
+    });
 }
 function getTargetConfigurationOptions(target) {
     const targets = new Map();
@@ -60,24 +65,26 @@ function getTargetConfigurationOptions(target) {
     return targets;
 }
 function updateTargetsConfigurations(project, projectName, target, buildTargetName, configurationOptions) {
-    for (const [configurationName, options] of configurationOptions) {
-        const { buildTarget, tsConfig, outputPath } = options, delegateTargetOptions = tslib_1.__rest(options, ["buildTarget", "tsConfig", "outputPath"]);
-        const configurationBuildTarget = extractConfigurationBuildTarget(projectName, buildTargetName, configurationName, buildTarget);
-        if (!project.targets[buildTargetName].configurations) {
-            project.targets[buildTargetName].configurations = {};
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        for (const [configurationName, options] of configurationOptions) {
+            const { buildTarget, tsConfig, outputPath } = options, delegateTargetOptions = tslib_1.__rest(options, ["buildTarget", "tsConfig", "outputPath"]);
+            const configurationBuildTarget = yield extractConfigurationBuildTarget(projectName, buildTargetName, configurationName, buildTarget);
+            if (!project.targets[buildTargetName].configurations) {
+                project.targets[buildTargetName].configurations = {};
+            }
+            // Update build target configuration options by overwriting them
+            const buildTargetConfigurations = project.targets[buildTargetName].configurations;
+            buildTargetConfigurations[configurationBuildTarget.configuration] = Object.assign(Object.assign({}, buildTargetConfigurations[configurationBuildTarget.configuration]), delegateTargetOptions);
+            // Delete options already present in the source target
+            cleanupBuildTargetProperties(buildTargetConfigurations[configurationBuildTarget.configuration]);
+            // Update source target configuration with buildTarget
+            target.configurations[configurationName] = {
+                buildTarget: (0, devkit_1.targetToTargetString)(configurationBuildTarget),
+                tsConfig,
+                outputPath,
+            };
         }
-        // Update build target configuration options by overwriting them
-        const buildTargetConfigurations = project.targets[buildTargetName].configurations;
-        buildTargetConfigurations[configurationBuildTarget.configuration] = Object.assign(Object.assign({}, buildTargetConfigurations[configurationBuildTarget.configuration]), delegateTargetOptions);
-        // Delete options already present in the source target
-        cleanupBuildTargetProperties(buildTargetConfigurations[configurationBuildTarget.configuration]);
-        // Update source target configuration with buildTarget
-        target.configurations[configurationName] = {
-            buildTarget: (0, devkit_1.targetToTargetString)(configurationBuildTarget),
-            tsConfig,
-            outputPath,
-        };
-    }
+    });
 }
 function updateTargetsOptions(project, target, buildTargetName) {
     if (target.options) {

package/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"convert-webpack-browser-build-target-to-delegate-build.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.ts"],"names":[],"mappings":";;;AAAA,~~yCAUsB~~;AAEtB,SAA8B,+CAA+C,CAC3E,IAAU;;QAEV,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;YAC7C,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CACvE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,KAAK,+BAA+B,CAChE,CAAC;YACF,KAAK,MAAM,MAAM,IAAI,qBAAqB,EAAE;gBAC1C,MAAM,oBAAoB,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;gBACnE,MAAM,eAAe,GAAG,6BAA6B,~~CACnD~~,MAAM,CAAC,OAAO,EACd,oBAAoB,CACrB,CAAC;gBACF,IAAI,eAAe,EAAE;oBACnB,MAAM,CAAC,QAAQ,GAAG,8BAA8B,CAAC;oBACjD,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;oBACvD,2BAA2B,~~CACzB~~,OAAO,EACP,WAAW,EACX,MAAM,EACN,eAAe,EACf,oBAAoB,CACrB,CAAC;iBACH;aACF;YAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;SACxD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAhCD,kEAgCC;AAED,SAAS,4BAA4B,CAAC,OAGrC;IACC,OAAO,OAAO,CAAC,QAAQ,CAAC;IACxB,OAAO,OAAO,CAAC,UAAU,CAAC;AAC5B,CAAC;AAED,~~SAAS~~,+BAA+B,~~CACtC~~,OAAe,EACf,MAAc,EACd,aAAqB,EACrB,WAAmB~~;;IAEnB~~,IAAI,WAAW,EAAE;~~QACf~~,MAAM,cAAc,GAAG,IAAA,0BAAiB,~~EAAC~~,WAAW,~~CAAC~~,CAAC;~~QACtD~~,uCACK,cAAc,KACjB,aAAa,EAAE,MAAA,cAAc,CAAC,aAAa,mCAAI,aAAa,IAC5D;~~KACH~~;~~IAED~~,OAAO;~~QACL~~,OAAO,EAAE,OAAO;~~QAChB~~,MAAM,EAAE,MAAM;~~QACd~~,aAAa,EAAE,aAAa;~~KAC7B~~,CAAC;~~AACJ,CAAC;~~AAED,~~SAAS~~,6BAA6B,~~CACpC~~,WAAgB,EAChB,oBAAsC;~~IAEtC~~,IAAI,WAAW,CAAC,WAAW,EAAE;~~QAC3B~~,OAAO,IAAA,0BAAiB,EAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;~~KAC1D~~;~~IACD~~,KAAK,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,oBAAoB,EAAE;~~QAC9C~~,IAAI,OAAO,CAAC,WAAW,EAAE;~~YACvB~~,OAAO,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;~~SACtD~~;~~KACF~~;~~AACH~~,CAAC;AAED,SAAS,6BAA6B,CACpC,MAA2B;IAE3B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAe,CAAC;IACvC,IAAI,MAAM,CAAC,cAAc,EAAE;QACzB,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YACnE,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAC5B;SACF;KACF;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,~~SAAS~~,2BAA2B,~~CAClC~~,OAA6B,EAC7B,WAAmB,EACnB,MAA2B,EAC3B,eAAuB,EACvB,oBAAyB~~;IAEzB~~,KAAK,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,IAAI,oBAAoB,EAAE;~~QAC~~/D,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,KACvC,OAAO,EADqC,qBAAqB,kBACjE,OAAO,EADH,yCAA+D,CAC5D,CAAC;~~QAEV~~,MAAM,wBAAwB,GAAG,+BAA+B,~~CAC9D~~,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,WAAW,CACZ,CAAC;~~QACF~~,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,cAAc,EAAE;~~YACpD~~,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,cAAc,GAAG,EAAE,CAAC;~~SACtD~~;~~QACD~~,gEAAgE;~~QAChE~~,MAAM,yBAAyB,GAC7B,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,cAAc,CAAC;~~QAClD~~,yBAAyB,CAAC,wBAAwB,CAAC,aAAa,CAAC,mCAC5D,yBAAyB,CAAC,wBAAwB,CAAC,aAAa,CAAC,GACjE,qBAAqB,CACzB,CAAC;~~QACF~~,sDAAsD;~~QACtD~~,4BAA4B,CAC1B,yBAAyB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAClE,CAAC;~~QACF~~,sDAAsD;~~QACtD~~,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG;~~YACzC~~,WAAW,EAAE,IAAA,6BAAoB,EAAC,wBAAwB,CAAC;~~YAC3D~~,QAAQ;~~YACR~~,UAAU;~~SACX~~,CAAC;~~KACH~~;~~AACH~~,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAA6B,EAC7B,MAA2B,EAC3B,eAAuB;IAEvB,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,KACJ,MAAM,CAAC,OAAO,EADV,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,OACzB,EAD8B,qBAAqB,sBAA7D,yCAA+D,CACrD,CAAC;QACjB,kDAAkD;QAClD,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,mCACnC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,GACxC,qBAAqB,CACzB,CAAC;QACF,sDAAsD;QACtD,4BAA4B,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC;QACvE,6DAA6D;QAC7D,MAAM,CAAC,OAAO,GAAG;YACf,WAAW;YACX,QAAQ;YACR,UAAU;SACX,CAAC;KACH;AACH,CAAC"}
1	+ {"version":3,"file":"convert-webpack-browser-build-target-to-delegate-build.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-12-3-0/convert-webpack-browser-build-target-to-delegate-build.ts"],"names":[],"mappings":"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"}

package/src/utils/nx-devkit/ast-utils.d.ts CHANGED Viewed

@@ -2,6 +2,9 @@ import * as ts from 'typescript';
 import { Tree } from '@nrwl/devkit';
 export declare function getDecoratorMetadata(source: ts.SourceFile, identifier: string, module: string): ts.Node[];
 export declare function removeFromNgModule(host: Tree, source: ts.SourceFile, modulePath: string, property: string): ts.SourceFile;
+export declare function addImportToComponent(host: Tree, source: ts.SourceFile, componentPath: string, symbolName: string): ts.SourceFile;
+export declare function addImportToDirective(host: Tree, source: ts.SourceFile, directivePath: string, symbolName: string): ts.SourceFile;
+export declare function addImportToPipe(host: Tree, source: ts.SourceFile, pipePath: string, symbolName: string): ts.SourceFile;
 export declare function addImportToModule(host: Tree, source: ts.SourceFile, modulePath: string, symbolName: string): ts.SourceFile;
 export declare function addImportToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string): ts.SourceFile;
 export declare function addDeclarationsToTestBed(host: Tree, source: ts.SourceFile, specPath: string, symbolName: string[]): ts.SourceFile;

package/src/utils/nx-devkit/ast-utils.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.removeFromNgModule = exports.getDecoratorMetadata = void 0;
+exports.getTsSourceFile = exports.getDecoratorPropertyValueNode = exports.readBootstrapInfo = exports.addEntryComponents = exports.addDeclarationToModule = exports.addProviderToModule = exports.addRouteToNgModule = exports.getBootstrapComponent = exports.replaceIntoToTestBed = exports.addDeclarationsToTestBed = exports.addImportToTestBed = exports.addImportToModule = exports.addImportToPipe = exports.addImportToDirective = exports.addImportToComponent = exports.removeFromNgModule = exports.getDecoratorMetadata = void 0;
 const ts = require("typescript");
 const typescript_1 = require("nx/src/utils/typescript");
 const get_source_nodes_1 = require("@nrwl/workspace/src/utilities/typescript/get-source-nodes");
@@ -90,8 +90,8 @@ function getDecoratorMetadata(source, identifier, module) {
         .map((expr) => expr.arguments[0]);
 }
 exports.getDecoratorMetadata = getDecoratorMetadata;
-function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField, expression) {
-    const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
+function _addSymbolToDecoratorMetadata(host, source, filePath, metadataField, expression, decoratorName) {
+    const nodes = getDecoratorMetadata(source, decoratorName, '@angular/core');
     let node = nodes[0]; // tslint:disable-line:no-any
     // Find the decorator declaration.
     if (!node) {
@@ -137,7 +137,7 @@ function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField,
                 toInsert = `, ${metadataField}: [${expression}]`;
             }
         }
-        return (0, ast_utils_1.insertChange)(host, source, ngModulePath, position, toInsert);
+        return (0, ast_utils_1.insertChange)(host, source, filePath, position, toInsert);
     }
     const assignment = matchingProperties[0];
     // If it's not an array, nothing we can do really.
@@ -203,7 +203,10 @@ function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField,
             toInsert = `, ${expression}`;
         }
     }
-    return (0, ast_utils_1.insertChange)(host, source, ngModulePath, position, toInsert);
+    return (0, ast_utils_1.insertChange)(host, source, filePath, position, toInsert);
+}
+function _addSymbolToNgModuleMetadata(host, source, ngModulePath, metadataField, expression) {
+    return _addSymbolToDecoratorMetadata(host, source, ngModulePath, metadataField, expression, 'NgModule');
 }
 function removeFromNgModule(host, source, modulePath, property) {
     const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
@@ -219,6 +222,18 @@ function removeFromNgModule(host, source, modulePath, property) {
     }
 }
 exports.removeFromNgModule = removeFromNgModule;
+function addImportToComponent(host, source, componentPath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, componentPath, 'imports', symbolName, 'Component');
+}
+exports.addImportToComponent = addImportToComponent;
+function addImportToDirective(host, source, directivePath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, directivePath, 'imports', symbolName, 'Directive');
+}
+exports.addImportToDirective = addImportToDirective;
+function addImportToPipe(host, source, pipePath, symbolName) {
+    return _addSymbolToDecoratorMetadata(host, source, pipePath, 'imports', symbolName, 'Pipe');
+}
+exports.addImportToPipe = addImportToPipe;
 function addImportToModule(host, source, modulePath, symbolName) {
     return _addSymbolToNgModuleMetadata(host, source, modulePath, 'imports', symbolName);
 }

package/src/utils/nx-devkit/ast-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/ast-utils.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,wDAAoD;AACpD,gGAA2F;AAC3F,6BAA6B;AAC7B,yCAAqE;AACrE,uEAKiD;AAEjD,SAAS,uBAAuB,CAC9B,IAA0B,EAC1B,WAA0B;IAE1B,MAAM,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC;IAChC,IAAI,UAAkB,CAAC;IACvB,QAAQ,EAAE,CAAC,IAAI,EAAE;QACf,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa;YAC9B,UAAU,GAAI,EAAuB,CAAC,IAAI,CAAC;YAC3C,MAAM;QACR;YACE,OAAO,EAAE,CAAC;KACb;IAED,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;QACvC,OAAO,EAAE,CAAC;KACX;IAED,IAAI,IAAI,CAAC,YAAY,EAAE;QACrB,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;YAC1B,yDAAyD;YACzD,OAAO,EAAE,CAAC;SACX;aAAM,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE;YAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;YAC3C,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,eAAe,EAAE;gBAC5C,sEAAsE;gBACtE,OAAO;oBACL,CAAC,GAAI,EAAyB,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE,UAAU;iBACzD,CAAC;aACH;iBAAM;gBACL,mDAAmD;gBACnD,MAAM,YAAY,GAAG,EAAqB,CAAC;gBAE3C,OAAO,YAAY,CAAC,QAAQ;qBACzB,GAAG,CAAC,CAAC,EAAsB,EAAE,EAAE,CAC9B,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CACtD;qBACA,MAAM,CAAC,CAAC,GAA+B,EAAE,IAAY,EAAE,EAAE;oBACxD,GAAG,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;oBAEvB,OAAO,GAAG,CAAC;gBACb,CAAC,EAAE,EAAE,CAAC,CAAC;aACV;SACF;QAED,OAAO,EAAE,CAAC;KACX;SAAM;QACL,uDAAuD;QACvD,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,SAAgB,oBAAoB,CAClC,MAAqB,EACrB,UAAkB,EAClB,MAAc;IAEd,MAAM,cAAc,GAA+B,IAAA,sBAAS,EAC1D,MAAM,EACN,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAChC;SACE,GAAG,CAAC,CAAC,IAA0B,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC1E,MAAM,CACL,CACE,GAA+B,EAC/B,OAAmC,EACnC,EAAE;QACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACtC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IAEJ,OAAO,IAAA,iCAAc,EAAC,MAAM,CAAC;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,OAAO,CACL,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS;YACnC,IAAqB,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CACvE,CAAC;IACJ,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAE,IAAqB,CAAC,UAA+B,CAAC;SACrE,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACf,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE;YACpD,MAAM,EAAE,GAAG,IAAI,CAAC,UAA2B,CAAC;YAE5C,OAAO,CACL,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,UAAU;gBACpC,cAAc,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,MAAM,CAClD,CAAC;SACH;aAAM,IACL,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,wBAAwB,EAC9D;YACA,oDAAoD;YACpD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAyC,CAAC;YAC9D,2EAA2E;YAC3E,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE;gBACvD,OAAO,KAAK,CAAC;aACd;YAED,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YAC5B,MAAM,QAAQ,GAAI,MAAM,CAAC,UAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEtE,OAAO,EAAE,KAAK,UAAU,IAAI,cAAc,CAAC,GAAG,QAAQ,GAAG,CAAC,KAAK,MAAM,CAAC;SACvE;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;SACD,MAAM,CACL,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAClE;SACA,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAA+B,CAAC,CAAC;AACpE,CAAC;AAhED,oDAgEC;AAED,SAAS,6BAA6B,CACpC,IAAU,EACV,MAAqB,EACrB,QAAgB,EAChB,aAAqB,EACrB,UAAkB,EAClB,aAA8D;IAE9D,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAC3E,IAAI,IAAI,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,6BAA6B;IAEvD,kCAAkC;IAClC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,MAAM,CAAC;KACf;IACD,+DAA+D;IAC/D,MAAM,kBAAkB,GACtB,IACD,CAAC,UAAU;SACT,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAChE,mFAAmF;QACnF,yBAAyB;SACxB,MAAM,CAAC,CAAC,IAA2B,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU;gBAC3B,OAAQ,IAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,aAAa,CAAC;YAClE,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa;gBAC9B,OAAQ,IAAyB,CAAC,IAAI,IAAI,aAAa,CAAC;SAC3D;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEL,0CAA0C;IAC1C,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,MAAM,CAAC;KACf;IACD,IAAI,kBAAkB,CAAC,MAAM,IAAI,CAAC,EAAE;QAClC,8EAA8E;QAC9E,MAAM,IAAI,GAAG,IAAkC,CAAC;QAChD,IAAI,QAAgB,CAAC;QACrB,IAAI,QAAgB,CAAC;QACrB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;YAC/B,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC7B,QAAQ,GAAG,KAAK,aAAa,MAAM,UAAU,KAAK,CAAC;SACpD;aAAM;YACL,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnD,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,mDAAmD;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBAC3B,QAAQ,GAAG,IACT,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAC3B,GAAG,aAAa,MAAM,UAAU,GAAG,CAAC;aACrC;iBAAM;gBACL,QAAQ,GAAG,KAAK,aAAa,MAAM,UAAU,GAAG,CAAC;aAClD;SACF;QAED,OAAO,IAAA,wBAAY,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;KACjE;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,CAAC,CAA0B,CAAC;IAElE,kDAAkD;IAClD,IAAI,UAAU,CAAC,WAAW,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,sBAAsB,EAAE;QACxE,OAAO,MAAM,CAAC;KACf;IAED,MAAM,UAAU,GAAG,UAAU,CAAC,WAAwC,CAAC;IACvE,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;QACnC,wBAAwB;QACxB,IAAI,GAAG,UAAU,CAAC;KACnB;SAAM;QACL,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;KAC5B;IAED,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,CAAC,GAAG,CACT,mEAAmE,CACpE,CAAC;QAEF,OAAO,MAAM,CAAC;KACf;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,OAAO,EAAE;QACX,MAAM,SAAS,GAAG,IAA4B,CAAC;QAC/C,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7D,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YACrC,OAAO,MAAM,CAAC;SACf;QAED,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAC9B;IAED,IAAI,QAAgB,CAAC;IACrB,IAAI,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,uBAAuB,EAAE;QAClE,uEAAuE;QACvE,SAAS;QACT,MAAM,IAAI,GAAG,IAAkC,CAAC;QAChD,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;YAC/B,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC7B,QAAQ,GAAG,KAAK,aAAa,MAAM,UAAU,KAAK,CAAC;SACpD;aAAM;YACL,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACnD,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,mDAAmD;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;gBAC3B,QAAQ,GAAG,IACT,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAC3B,GAAG,aAAa,MAAM,UAAU,GAAG,CAAC;aACrC;iBAAM;gBACL,QAAQ,GAAG,KAAK,aAAa,MAAM,UAAU,GAAG,CAAC;aAClD;SACF;KACF;SAAM,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,sBAAsB,EAAE;QACxE,oEAAoE;QACpE,QAAQ,EAAE,CAAC;QACX,QAAQ,GAAG,GAAG,UAAU,EAAE,CAAC;KAC5B;SAAM;QACL,mDAAmD;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACxB,QAAQ,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,CAAC;SAC/D;aAAM;YACL,QAAQ,GAAG,KAAK,UAAU,EAAE,CAAC;SAC9B;KACF;IACD,OAAO,IAAA,wBAAY,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,4BAA4B,CACnC,IAAU,EACV,MAAqB,EACrB,YAAoB,EACpB,aAAqB,EACrB,UAAkB;IAElB,OAAO,6BAA6B,CAClC,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,aAAa,EACb,UAAU,EACV,UAAU,CACX,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,QAAgB;IAEhB,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACxE,IAAI,IAAI,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,6BAA6B;IAEvD,kCAAkC;IAClC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,MAAM,CAAC;KACf;IAED,+DAA+D;IAC/D,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C,MAAM,EACN,QAAQ,EACR,UAAU,EACV,eAAe,CAChB,CAAC;IACF,IAAI,gBAAgB,EAAE;QACpB,OAAO,IAAA,wBAAY,EACjB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,EACjC,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CACrC,CAAC;KACH;AACH,CAAC;AA9BD,gDA8BC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,MAAqB,EACrB,aAAqB,EACrB,UAAkB;IAElB,OAAO,6BAA6B,CAClC,IAAI,EACJ,MAAM,EACN,aAAa,EACb,SAAS,EACT,UAAU,EACV,WAAW,CACZ,CAAC;AACJ,CAAC;AAdD,oDAcC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,MAAqB,EACrB,aAAqB,EACrB,UAAkB;IAElB,OAAO,6BAA6B,CAClC,IAAI,EACJ,MAAM,EACN,aAAa,EACb,SAAS,EACT,UAAU,EACV,WAAW,CACZ,CAAC;AACJ,CAAC;AAdD,oDAcC;AAED,SAAgB,eAAe,CAC7B,IAAU,EACV,MAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,OAAO,6BAA6B,CAClC,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,SAAS,EACT,UAAU,EACV,MAAM,CACP,CAAC;AACJ,CAAC;AAdD,0CAcC;AAED,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,UAAkB;IAElB,OAAO,4BAA4B,CACjC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,SAAS,EACT,UAAU,CACX,CAAC;AACJ,CAAC;AAbD,8CAaC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,MAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,MAAM,QAAQ,GAA6B,CACzC,IAAA,sBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAChD,CAAC;IAEF,MAAM,oCAAoC,GAAG,QAAQ;SAClD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC;SAC3E,MAAM,CACL,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,wBAAwB,CAC3E;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,uBAAuB;QAC3D,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,IAAI,CACT,CAAC;IAEJ,IAAI,oCAAoC,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,MAAM,aAAa,GAAG,oCAAoC,CAAC,CAAC,CAAC;aAC1D,aAAa,CAAC,MAAM,CAAC;aACrB,MAAM,EAAE,CAAC;QACZ,OAAO,IAAA,wBAAY,EACjB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,aAAa,EACb,aAAa,UAAU,KAAK,CAC7B,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAlCD,gDAkCC;AAED,SAAgB,wBAAwB,CACtC,IAAU,EACV,MAAqB,EACrB,QAAgB,EAChB,UAAoB;IAEpB,MAAM,QAAQ,GAA6B,CACzC,IAAA,sBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAChD,CAAC;IAEF,MAAM,oCAAoC,GAAG,QAAQ;SAClD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC;SAC3E,MAAM,CACL,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,wBAAwB,CAC3E;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,uBAAuB;QAC3D,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,IAAI,CACT,CAAC;IAEJ,IAAI,oCAAoC,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,MAAM,aAAa,GAAG,oCAAoC,CAAC,CAAC,CAAC;aAC1D,aAAa,CAAC,MAAM,CAAC;aACrB,MAAM,EAAE,CAAC;QACZ,OAAO,IAAA,wBAAY,EACjB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,aAAa,EACb,kBAAkB,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAC5C,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAlCD,4DAkCC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,MAAqB,EACrB,QAAgB,EAChB,SAAiB,EACjB,cAAsB;IAEtB,MAAM,QAAQ,GAA6B,CACzC,IAAA,sBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAChD,CAAC;IAEF,MAAM,oCAAoC,GAAG,QAAQ;SAClD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC;SAC3E,MAAM,CACL,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,wBAAwB,CAC3E;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,uBAAuB;QAC3D,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,IAAI,CACT,CAAC;IAEJ,IAAI,oCAAoC,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,MAAM,aAAa,GAAG,oCAAoC,CAAC,CAAC,CAAC;aAC1D,aAAa,CAAC,MAAM,CAAC;aACrB,MAAM,EAAE,CAAC;QACZ,OAAO,IAAA,yBAAa,EAClB,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,aAAa,EACb,SAAS,EACT,cAAc,CACf,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,oDAoCC;AAED,SAAgB,qBAAqB,CACnC,MAAqB,EACrB,eAAuB;IAEvB,MAAM,SAAS,GAAG,mBAAmB,CACnC,MAAM,EACN,WAAW,EACX,UAAU,EACV,eAAe,CAChB,CAAC;IACF,IAAI,CAAC,SAAS,EAAE;QACd,MAAM,IAAI,KAAK,CAAC,wCAAwC,eAAe,GAAG,CAAC,CAAC;KAC7E;IACD,MAAM,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAE5C,MAAM,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,eAAe,GAAG,CAAC,CAAC;KAC7E;IAED,OAAO,kBAAkB,CAAC,OAAO,EAAE,CAAC;AACtC,CAAC;AAtBD,sDAsBC;AAED,SAAS,mBAAmB,CAC1B,MAAqB,EACrB,QAAgB,EAChB,UAAkB,EAClB,MAAc;IAEd,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAC/D,IAAI,IAAI,GAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,6BAA6B;IAEvD,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,+DAA+D;IAC/D,OAAO,+BAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AACjE,CAAC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,YAAoB,EACpB,MAAqB,EACrB,KAAa;IAEb,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAE3B,IAAI,MAAM,CAAC,gBAAgB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QAClD,OAAO,IAAA,wBAAY,EAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;KACpE;SAAM;QACL,OAAO,IAAA,wBAAY,EAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC;KAC3E;AACH,CAAC;AAdD,gDAcC;AAED,SAAS,eAAe,CACtB,MAAqB;IAErB,MAAM,OAAO,GAAQ,mBAAmB,CACtC,MAAM,EACN,SAAS,EACT,UAAU,EACV,eAAe,CAChB,CAAC;IAEF,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC,IAAI,MAAK,EAAE,CAAC,UAAU,CAAC,sBAAsB,EAAE;QACtE,MAAM,CAAC,GAAG,OAAO,CAAC,WAAwC,CAAC;QAE3D,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;YAC1B,IAAI,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE;gBAC3C,MAAM,EAAE,GAAG,CAAsB,CAAC;gBAClC,MAAM,IAAI,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC3C,IACE,CAAC,IAAI,KAAK,sBAAsB;oBAC9B,IAAI,KAAK,uBAAuB,CAAC;oBACnC,EAAE,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EACvB;oBACA,MAAM,MAAM,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC/B,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,sBAAsB,EAAE;wBACxD,OAAQ,MAAoC,CAAC,QAAQ,CAAC;qBACvD;yBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE;wBACnD,4BAA4B;wBAC5B,MAAM,oBAAoB,GAAG,IAAA,sBAAS,EACpC,MAAM,EACN,EAAE,CAAC,UAAU,CAAC,mBAAmB,CACN,CAAC;wBAE9B,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;4BACxD,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC,OAAO,EAAE,CAAC;wBAC/C,CAAC,CAAC,CAAC;wBAEH,IAAI,iBAAiB,EAAE;4BACrB,OACE,iBAAiB,CAAC,WACnB,CAAC,QAAQ,CAAC;yBACZ;qBACF;iBACF;aACF;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,UAAkB;IAElB,OAAO,4BAA4B,CACjC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,UAAU,CACX,CAAC;AACJ,CAAC;AAbD,kDAaC;AAED,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,UAAkB;IAElB,OAAO,4BAA4B,CACjC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,cAAc,EACd,UAAU,CACX,CAAC;AACJ,CAAC;AAbD,wDAaC;AAED,SAAgB,kBAAkB,CAChC,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,UAAkB;IAElB,OAAO,4BAA4B,CACjC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,UAAU,CACX,CAAC;AACJ,CAAC;AAbD,gDAaC;AAED,SAAgB,iBAAiB,CAC/B,IAAU,EACV,GAAW;IAUX,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAEnD,IAAI,QAAQ,CAAC;IACb,IAAI;QACF,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;KAC9C;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAChD;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAChD;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG,EAAE,CAAC,gBAAgB,CAC9B,QAAQ,EACR,UAAU,EACV,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,qBAAS,EAC7B,IAAI,EACJ,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CACzC,CAAC;IACF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;KAC5D;IACD,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,eAAe,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACzD,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACrB,CAAC,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,IAAI,CAC7B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EACtB,YAAY,CAAC,UAAU,CACxB,KAAK,CAAC;IACP,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,gBAAgB,UAAU,GAAG,CAAC,CAAC;KAChD;IAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,EAAE,CAAC,gBAAgB,CACtC,UAAU,EACV,gBAAgB,EAChB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,2BAA2B,GAAG,qBAAqB,CACvD,YAAY,EACZ,eAAe,CAChB,CAAC;IACF,MAAM,0BAA0B,GAAG,KAAK,IAAI,CAAC,IAAI,CAC/C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,EACrC,GACE,IAAA,cAAK,EACH,2BAA2B,CAAC,SAAS,CACnC,CAAC,EACD,2BAA2B,CAAC,MAAM,GAAG,CAAC,CACvC,CACF,CAAC,QACJ,YAAY,CACb,EAAE,CAAC;IAEJ,OAAO;QACL,UAAU,EAAE,YAAY,CAAC,UAAU;QACnC,QAAQ;QACR,UAAU;QACV,YAAY;QACZ,eAAe;QACf,2BAA2B;QAC3B,0BAA0B;KAC3B,CAAC;AACJ,CAAC;AArFD,8CAqFC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,MAAc;IAEd,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClE,MAAM,YAAY,GAAG,EAAE,CAAC,gBAAgB,CACtC,UAAU,EACV,gBAAgB,EAChB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,MAAM,YAAY,GAAG,mBAAmB,CACtC,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,MAAM,CACP,CAAC;IAEF,OAAO,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;AACnE,CAAC;AAtBD,sEAsBC;AAED,SAAS,+BAA+B,CACtC,IAAS,EACT,MAAqB,EACrB,QAAgB;IAEhB,OAAO,CACJ,IAAmC,CAAC,UAAU;SAC5C,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAChE,mFAAmF;QACnF,yBAAyB;SACxB,MAAM,CAAC,CAAC,IAA2B,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,QAAQ,IAAI,CAAC,IAAI,EAAE;YACjB,KAAK,EAAE,CAAC,UAAU,CAAC,UAAU;gBAC3B,OAAQ,IAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC;YAC9D,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa;gBAC9B,OAAQ,IAAyB,CAAC,IAAI,KAAK,QAAQ,CAAC;SACvD;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,CAAC,CAAC,CACR,CAAC;AACJ,CAAC;AAED,SAAgB,eAAe,CAAC,IAAU,EAAE,IAAY;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,IAAI,CAAC,CAAC;KACtD;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAChC,IAAI,EACJ,OAAO,EACP,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAdD,0CAcC"}

package/src/utils/versions.d.ts CHANGED Viewed

@@ -10,7 +10,7 @@ export declare const tsLibVersion = "^2.3.0";
 export declare const ngUniversalVersion = "~15.0.0";
 export declare const corsVersion = "~2.8.5";
 export declare const expressVersion = "~4.18.2";
-export declare const moduleFederationNodeVersion = "~0.9.6";
+export declare const moduleFederationNodeVersion = "~0.9.9";
 export declare const angularEslintVersion = "~15.0.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";

package/src/utils/versions.js CHANGED Viewed

@@ -13,7 +13,7 @@ exports.tsLibVersion = '^2.3.0';
 exports.ngUniversalVersion = '~15.0.0';
 exports.corsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';
-exports.moduleFederationNodeVersion = '~0.9.6';
+exports.moduleFederationNodeVersion = '~0.9.9';
 exports.angularEslintVersion = '~15.0.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';
@@ -48,7 +48,7 @@ exports.versions = {
         ngUniversalVersion: '~14.2.0',
         corsVersion: '~2.8.5',
         expressVersion: '~4.18.2',
-        moduleFederationNodeVersion: '~0.9.6',
+        moduleFederationNodeVersion: '~0.9.9',
         angularEslintVersion: '~14.0.4',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',