@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/migrations/update-15-5-0/update-angular-cli.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const angularCliVersion = '~15.1.0';
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let shouldFormat = false;
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            var _a, _b;
+            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
+                json.devDependencies['@angular/cli'] = angularCliVersion;
+                shouldFormat = true;
+            }
+            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
+                json.dependencies['@angular/cli'] = angularCliVersion;
+                shouldFormat = true;
+            }
+            return json;
+        });
+        if (shouldFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=update-angular-cli.js.map

package/src/migrations/update-15-5-0/update-angular-cli.js.map

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

package/src/migrations/update-15-7-0/install-required-packages.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const version_utils_1 = require("../../generators/utils/version-utils");
+const version_utils_2 = require("../../utils/version-utils");
+function default_1(tree) {
+    var _a, _b, _c, _d, _e;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const packagesToInstall = [
+            '@angular-devkit/core',
+            '@angular-devkit/schematics',
+            '@schematics/angular',
+        ];
+        const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
+        const angularMajorVersion = (0, version_utils_1.getInstalledAngularMajorVersion)(tree);
+        const angularDevkitVersion = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('angularDevkitVersion', angularMajorVersion);
+        const angularCliVersion = (_d = (_b = (_a = pkgJson.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) !== null && _b !== void 0 ? _b : (_c = pkgJson.dependencies) === null || _c === void 0 ? void 0 : _c['@angular/cli']) !== null && _d !== void 0 ? _d : angularDevkitVersion;
+        const filteredPackages = packagesToInstall
+            .filter((pkg) => { var _a, _b; return !((_a = pkgJson.devDependencies) === null || _a === void 0 ? void 0 : _a[pkg]) && !((_b = pkgJson.dependencies) === null || _b === void 0 ? void 0 : _b[pkg]); })
+            .reduce((allPkgs, pkg) => (Object.assign(Object.assign({}, allPkgs), { [pkg]: angularCliVersion })), {});
+        // even though we are going to install the packages directly, we still want
+        // to add them to the tree so the migrate command knows changes were made
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, Object.assign({}, filteredPackages));
+        // we need to install them immediately so the packages are available for
+        // other migrations that might be using them
+        (_e = pkgJson.devDependencies) !== null && _e !== void 0 ? _e : (pkgJson.devDependencies = {});
+        Object.entries(filteredPackages).forEach(([pkg, version]) => {
+            pkgJson.devDependencies[pkg] = version;
+        });
+        (0, devkit_1.writeJsonFile)((0, path_1.join)(tree.root, 'package.json'), pkgJson);
+        const pmc = (0, devkit_1.getPackageManagerCommand)();
+        (0, child_process_1.execSync)(pmc.install, { stdio: [0, 1, 2] });
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=install-required-packages.js.map

package/src/migrations/update-15-7-0/install-required-packages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"install-required-packages.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-7-0/install-required-packages.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,iDAAyC;AACzC,+BAA4B;AAC5B,wEAAuF;AACvF,6DAAgF;AAEhF,mBAA+B,IAAU;;;QACvC,MAAM,iBAAiB,GAAG;YACxB,sBAAsB;YACtB,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QACF,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAE/C,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,mDAAmC,EAC9D,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;QAEF,MAAM,iBAAiB,GACrB,MAAA,MAAA,MAAA,OAAO,CAAC,eAAe,0CAAG,cAAc,CAAC,mCACzC,MAAA,OAAO,CAAC,YAAY,0CAAG,cAAc,CAAC,mCACtC,oBAAoB,CAAC;QAEvB,MAAM,gBAAgB,GAA2B,iBAAiB;aAC/D,MAAM,CACL,CAAC,GAAG,EAAE,EAAE,eAAC,OAAA,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,0CAAG,GAAG,CAAC,CAAA,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,YAAY,0CAAG,GAAG,CAAC,CAAA,CAAA,EAAA,CACzE;aACA,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,iCAAM,OAAO,KAAE,CAAC,GAAG,CAAC,EAAE,iBAAiB,IAAG,EAAE,EAAE,CAAC,CAAC;QAC5E,2EAA2E;QAC3E,yEAAyE;QACzE,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,oBAAO,gBAAgB,EAAG,CAAC;QAEhE,wEAAwE;QACxE,4CAA4C;QAC5C,MAAA,OAAO,CAAC,eAAe,oCAAvB,OAAO,CAAC,eAAe,GAAK,EAAE,EAAC;QAC/B,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE;YAC1D,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,IAAA,sBAAa,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;;CAC7C;AArCD,4BAqCC"}

package/src/migrations/update-15-8-0/update-angular-cli.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const angularCliVersion = '~15.2.0';
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let shouldFormat = false;
+        (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+            var _a, _b;
+            if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular/cli']) {
+                json.devDependencies['@angular/cli'] = angularCliVersion;
+                shouldFormat = true;
+            }
+            else if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular/cli']) {
+                json.dependencies['@angular/cli'] = angularCliVersion;
+                shouldFormat = true;
+            }
+            return json;
+        });
+        if (shouldFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=update-angular-cli.js.map

package/src/migrations/update-15-8-0/update-angular-cli.js.map

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

package/src/runtime/nx/data-persistence.d.ts

@@ -1,9 +1,7 @@
-import { Type } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Actions } from '@ngrx/effects';
-import { Action, Store, ActionCreator } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import * as i0 from "@angular/core";
+import type { Type } from '@angular/core';
+import type { ActivatedRouteSnapshot } from '@angular/router';
+import type { Action } from '@ngrx/store';
+import type { Observable } from 'rxjs';
 export interface PessimisticUpdateOpts<T extends Array<unknown>, A> {
     run(a: A, ...slices: [...T]): Observable<Action> | Action | void;
     onError(a: A, e: any): Observable<any> | any;
@@ -21,10 +19,10 @@ export interface HandleNavigationOpts<T extends Array<unknown>> {
     run(a: ActivatedRouteSnapshot, ...slices: [...T]): Observable<Action> | Action | void;
     onError?(a: ActivatedRouteSnapshot, e: any): Observable<any> | any;
 }
-export declare type ActionOrActionWithStates<T extends Array<unknown>, A> = A | [A, ...T];
-export declare type ActionOrActionWithState<T, A> = ActionOrActionWithStates<[T], A>;
-export declare type ActionStatesStream<T extends Array<unknown>, A> = Observable<ActionOrActionWithStates<T, A>>;
-export declare type ActionStateStream<T, A> = Observable<ActionOrActionWithStates<[T], A>>;
+export type ActionOrActionWithStates<T extends Array<unknown>, A> = A | [A, ...T];
+export type ActionOrActionWithState<T, A> = ActionOrActionWithStates<[T], A>;
+export type ActionStatesStream<T extends Array<unknown>, A> = Observable<ActionOrActionWithStates<T, A>>;
+export type ActionStateStream<T, A> = Observable<ActionOrActionWithStates<[T], A>>;
 /**
  *
  * @whatItDoes Handles pessimistic updates (updating the server first).
@@ -271,43 +269,3 @@ export declare function fetch<T extends Array<unknown>, A extends Action>(opts:
  * @param opts
  */
 export declare function navigation<T extends Array<unknown>, A extends Action>(component: Type<any>, opts: HandleNavigationOpts<T>): (source: ActionStatesStream<T, A>) => Observable<Action>;
-/**
- * @whatItDoes Provides convenience methods for implementing common operations of persisting data.
- *
- * @deprecated Use the individual operators instead. Will be removed in v15.
- */
-export declare class DataPersistence<T> {
-    store: Store<T>;
-    actions: Actions;
-    constructor(store: Store<T>, actions: Actions);
-    /**
-     * See {@link pessimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link pessimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    pessimisticUpdate<A extends Action = Action>(actionType: string | ActionCreator, opts: PessimisticUpdateOpts<[T], A>): Observable<any>;
-    /**
-     * See {@link optimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link optimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    optimisticUpdate<A extends Action = Action>(actionType: string | ActionCreator, opts: OptimisticUpdateOpts<[T], A>): Observable<any>;
-    /**
-     * See {@link fetch} operator for more information.
-     *
-     * @deprecated Use the {@link fetch} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    fetch<A extends Action = Action>(actionType: string | ActionCreator, opts: FetchOpts<[T], A>): Observable<any>;
-    /**
-     * See {@link navigation} operator for more information.
-     *
-     * @deprecated Use the {@link navigation} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    navigation(component: Type<any>, opts: HandleNavigationOpts<[T]>): Observable<any>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<DataPersistence<any>, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<DataPersistence<any>>;
-}

package/src/runtime/nx/data-persistence.js

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataPersistence = exports.navigation = exports.fetch = exports.optimisticUpdate = exports.pessimisticUpdate = void 0;
-const tslib_1 = require("tslib");
-const core_1 = require("@angular/core");
-const effects_1 = require("@ngrx/effects");
+exports.navigation = exports.fetch = exports.optimisticUpdate = exports.pessimisticUpdate = void 0;
 const router_store_1 = require("@ngrx/router-store");
-const store_1 = require("@ngrx/store");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 /**
@@ -329,58 +325,6 @@ function normalizeActionAndState(args) {
     }
     return [action, ...slices];
 }
-/**
- * @whatItDoes Provides convenience methods for implementing common operations of persisting data.
- *
- * @deprecated Use the individual operators instead. Will be removed in v15.
- */
-let DataPersistence = class DataPersistence {
-    constructor(store, actions) {
-        this.store = store;
-        this.actions = actions;
-    }
-    /**
-     * See {@link pessimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link pessimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    pessimisticUpdate(actionType, opts) {
-        return this.actions.pipe((0, effects_1.ofType)(actionType), (0, operators_1.withLatestFrom)(this.store), pessimisticUpdate(opts));
-    }
-    /**
-     * See {@link optimisticUpdate} operator for more information.
-     *
-     * @deprecated Use the {@link optimisticUpdate} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    optimisticUpdate(actionType, opts) {
-        return this.actions.pipe((0, effects_1.ofType)(actionType), (0, operators_1.withLatestFrom)(this.store), optimisticUpdate(opts));
-    }
-    /**
-     * See {@link fetch} operator for more information.
-     *
-     * @deprecated Use the {@link fetch} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    fetch(actionType, opts) {
-        return this.actions.pipe((0, effects_1.ofType)(actionType), (0, operators_1.withLatestFrom)(this.store), fetch(opts));
-    }
-    /**
-     * See {@link navigation} operator for more information.
-     *
-     * @deprecated Use the {@link navigation} operator instead.
-     * The {@link DataPersistence} class will be removed in v15.
-     */
-    navigation(component, opts) {
-        return this.actions.pipe((0, operators_1.withLatestFrom)(this.store), navigation(component, opts));
-    }
-};
-DataPersistence = tslib_1.__decorate([
-    (0, core_1.Injectable)(),
-    tslib_1.__metadata("design:paramtypes", [store_1.Store, effects_1.Actions])
-], DataPersistence);
-exports.DataPersistence = DataPersistence;
 function findSnapshot(component, s) {
     if (s.routeConfig && s.routeConfig.component === component) {
         return s;

package/src/runtime/nx/data-persistence.js.map

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

package/src/utils/backward-compatible-versions.d.ts

@@ -0,0 +1,6 @@
+import * as latestVersions from './versions';
+type SupportedVersions = 'angularV14';
+export type PackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
+export type PackageVersions = Record<PackageVersionNames, string>;
+export declare const backwardCompatibleVersions: Record<SupportedVersions, PackageVersions>;
+export {};

package/src/utils/backward-compatible-versions.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.backwardCompatibleVersions = void 0;
+exports.backwardCompatibleVersions = {
+    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.10.1',
+        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',
+        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=backward-compatible-versions.js.map

package/src/utils/backward-compatible-versions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backward-compatible-versions.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/backward-compatible-versions.ts"],"names":[],"mappings":";;;AASa,QAAA,0BAA0B,GAGnC;IACF,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,SAAS;QACtC,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,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"}

package/src/utils/cli-config-utils.d.ts

@@ -0,0 +1 @@
+export declare function replaceAppNameWithPath(node: string | string[] | object | unknown, appName: string, root: string): any;

package/src/utils/cli-config-utils.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceAppNameWithPath = void 0;
+function replaceAppNameWithPath(node, appName, root) {
+    if (typeof node === 'string') {
+        const matchPattern = new RegExp(`([^a-z0-9]*(${appName}))|((${appName})[^a-z0-9:]*)`, 'gi');
+        if (!!node.match(matchPattern) &&
+            node !== 'application' &&
+            node !== 'library') {
+            const r = node.replace(appName, root);
+            return r.startsWith('/apps') || r.startsWith('/libs')
+                ? r.substring(1)
+                : r;
+        }
+        else {
+            return node;
+        }
+    }
+    else if (Array.isArray(node)) {
+        return node.map((j) => replaceAppNameWithPath(j, appName, root));
+    }
+    else if (typeof node === 'object' && node) {
+        const forbiddenPropertyList = [
+            'prefix',
+            'builder',
+            'executor',
+            'browserTarget',
+            'tags',
+            'defaultConfiguration',
+            'maximumError',
+            'name',
+            'type',
+            'outputHashing',
+            'buildTarget',
+        ]; // Some of the properties should not be renamed
+        return Object.keys(node).reduce((m, c) => ((m[c] = !forbiddenPropertyList.includes(c)
+            ? replaceAppNameWithPath(node[c], appName, root)
+            : node[c]),
+            m), {});
+    }
+    else {
+        return node;
+    }
+}
+exports.replaceAppNameWithPath = replaceAppNameWithPath;
+//# sourceMappingURL=cli-config-utils.js.map

package/src/utils/cli-config-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-config-utils.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/cli-config-utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,sBAAsB,CACpC,IAA0C,EAC1C,OAAe,EACf,IAAY;IAEZ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC5B,MAAM,YAAY,GAAG,IAAI,MAAM,CAC7B,eAAe,OAAO,QAAQ,OAAO,eAAe,EACpD,IAAI,CACL,CAAC;QACF,IACE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;YAC1B,IAAI,KAAK,aAAa;YACtB,IAAI,KAAK,SAAS,EAClB;YACA,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;gBACnD,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAChB,CAAC,CAAC,CAAC,CAAC;SACP;aAAM;YACL,OAAO,IAAI,CAAC;SACb;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;KAClE;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,EAAE;QAC3C,MAAM,qBAAqB,GAAa;YACtC,QAAQ;YACR,SAAS;YACT,UAAU;YACV,eAAe;YACf,MAAM;YACN,sBAAsB;YACtB,cAAc;YACd,MAAM;YACN,MAAM;YACN,eAAe;YACf,aAAa;SACd,CAAC,CAAC,+CAA+C;QAClD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAC7B,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CACR,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC;YAChD,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACZ,CAAC,CACF,EACD,EAAS,CACV,CAAC;KACH;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAlDD,wDAkDC"}

package/src/{generators/ng-add/utilities → utils}/file-change-recorder.d.ts

@@ -10,7 +10,7 @@ export declare class FileChangeRecorder {
     applyChanges(): void;
     insertLeft(index: number, content: string): void;
     insertRight(index: number, content: string): void;
-    remove(index: number, length: number): void;
+    remove(index: number, end: number): void;
     replace(node: Node, content: string): void;
     setContentToFileContent(): void;
 }

package/src/{generators/ng-add/utilities → utils}/file-change-recorder.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileChangeRecorder = void 0;
 const magic_string_1 = require("magic-string");
 class FileChangeRecorder {
-    constructor(tree, filePath) {
-        this.tree = tree;
-        this.filePath = filePath;
-        this.setContentToFileContent();
-    }
     get content() {
         return this.mutableContent.toString();
     }
     get originalContent() {
         return this.mutableContent.original;
     }
+    constructor(tree, filePath) {
+        this.tree = tree;
+        this.filePath = filePath;
+        this.setContentToFileContent();
+    }
     applyChanges() {
         this.tree.write(this.filePath, this.mutableContent.toString());
     }
@@ -23,8 +23,8 @@ class FileChangeRecorder {
     insertRight(index, content) {
         this.mutableContent.appendRight(index, content);
     }
-    remove(index, length) {
-        this.mutableContent.remove(index, length);
+    remove(index, end) {
+        this.mutableContent.remove(index, end);
     }
     replace(node, content) {
         this.mutableContent.overwrite(node.getStart(), node.getEnd(), content);

package/src/utils/file-change-recorder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-change-recorder.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/file-change-recorder.ts"],"names":[],"mappings":";;;AACA,+CAAuC;AAGvC,MAAa,kBAAkB;IAG7B,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,YAA6B,IAAU,EAAmB,QAAgB;QAA7C,SAAI,GAAJ,IAAI,CAAM;QAAmB,aAAQ,GAAR,QAAQ,CAAQ;QACxE,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACjC,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,OAAe;QACvC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,OAAe;QACxC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,KAAa,EAAE,GAAW;QAC/B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,OAAe;QACjC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,uBAAuB;QACrB,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAW,CACnC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CACvC,CAAC;IACJ,CAAC;CACF;AAxCD,gDAwCC"}

package/src/utils/get-mf-projects.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMFProjects = void 0;
-const tsquery_1 = require("@phenomnomnominal/tsquery");
-const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
 function getMFProjects(tree, { legacy } = { legacy: false }) {
     const NRWL_WEBPACK_BROWSER_BUILDER = '@nrwl/angular:webpack-browser';
     const CUSTOM_WEBPACK_OPTION = 'customWebpackConfig';
@@ -17,8 +16,9 @@ function getMFProjects(tree, { legacy } = { legacy: false }) {
             return;
         }
         const webpackConfig = tree.read(webpackPath, 'utf-8');
-        const ast = tsquery_1.tsquery.ast(webpackConfig);
-        const moduleFederationWebpackConfig = (0, tsquery_1.tsquery)(ast, MODULE_FEDERATION_IDENTIFIER, {
+        const { tsquery } = require('@phenomnomnominal/tsquery');
+        const ast = tsquery.ast(webpackConfig);
+        const moduleFederationWebpackConfig = tsquery(ast, MODULE_FEDERATION_IDENTIFIER, {
             visitAllChildren: true,
         });
         if (!moduleFederationWebpackConfig ||

package/src/utils/get-mf-projects.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iGAA8F;AAE9F,SAAgB,aAAa,CAC3B,IAAU,EACV,EAAE,MAAM,KAA0B,EAAE,MAAM,EAAE,KAAK,EAAE;IAEnD,MAAM,4BAA4B,GAAG,+BAA+B,CAAC;IACrE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,MAAM,4BAA4B,GAAG,MAAM;QACzC,CAAC,CAAC,yCAAyC;QAC3C,CAAC,CAAC,uCAAuC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAA,+CAAsB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;;QACpB,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,0CAAE,IAAI,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7C,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,6BAA6B,GAAG,IAAA,iBAAO,EAC3C,GAAG,EACH,4BAA4B,EAC5B;YACE,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,6BAA6B,CAAC,MAAM,KAAK,CAAC,EAC1C;YACA,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAxCD,sCAwCC"}
+{"version":3,"file":"get-mf-projects.js","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/get-mf-projects.ts"],"names":[],"mappings":";;;AACA,+FAA4F;AAE5F,SAAgB,aAAa,CAC3B,IAAU,EACV,EAAE,MAAM,KAA0B,EAAE,MAAM,EAAE,KAAK,EAAE;IAEnD,MAAM,4BAA4B,GAAG,+BAA+B,CAAC;IACrE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,MAAM,4BAA4B,GAAG,MAAM;QACzC,CAAC,CAAC,yCAAyC;QAC3C,CAAC,CAAC,uCAAuC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAA,+CAAsB,EACpB,IAAI,EACJ,4BAA4B,EAC5B,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE;;QACpB,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,qBAAqB,CAAC,0CAAE,IAAI,CAAC;QACtD,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7C,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvC,MAAM,6BAA6B,GAAG,OAAO,CAC3C,GAAG,EACH,4BAA4B,EAC5B;YACE,gBAAgB,EAAE,IAAI;SACvB,CACF,CAAC;QACF,IACE,CAAC,6BAA6B;YAC9B,6BAA6B,CAAC,MAAM,KAAK,CAAC,EAC1C;YACA,OAAO;SACR;QAED,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAzCD,sCAyCC"}

package/src/utils/mf/utils.d.ts

@@ -1,18 +1,13 @@
-import { ProjectGraph } from '@nrwl/devkit';
-export declare type WorkspaceLibrary = {
-    name: string;
-    root: string;
-    importKey: string | undefined;
-};
-export declare function readRootPackageJson(): {
-    dependencies?: {
-        [key: string]: string;
+import { ModuleFederationConfig, SharedLibraryConfig } from '@nrwl/devkit';
+export declare function applyDefaultEagerPackages(sharedConfig: Record<string, SharedLibraryConfig>): void;
+export declare const DEFAULT_NPM_PACKAGES_TO_AVOID: string[];
+export declare const DEFAULT_ANGULAR_PACKAGES_TO_SHARE: string[];
+export declare function getModuleFederationConfig(mfConfig: ModuleFederationConfig, determineRemoteUrl: (remote: string) => string, options?: {
+    isServer: boolean;
+}): Promise<{
+    sharedLibraries: import("@nrwl/devkit").SharedWorkspaceLibraryConfig;
+    sharedDependencies: {
+        [x: string]: SharedLibraryConfig;
     };
-    devDependencies?: {
-        [key: string]: string;
-    };
-};
-export declare function getDependentPackagesForProject(projectGraph: ProjectGraph, name: string): {
-    workspaceLibraries: WorkspaceLibrary[];
-    npmPackages: string[];
-};
+    mappedRemotes: Record<string, string>;
+}>;

package/src/utils/mf/utils.js

@@ -1,57 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDependentPackagesForProject = exports.readRootPackageJson = void 0;
+exports.getModuleFederationConfig = exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = exports.DEFAULT_NPM_PACKAGES_TO_AVOID = exports.applyDefaultEagerPackages = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const fs_1 = require("fs");
-const typescript_1 = require("./typescript");
-function readRootPackageJson() {
-    const pkgJsonPath = (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'package.json');
-    if (!(0, fs_1.existsSync)(pkgJsonPath)) {
-        throw new Error('NX MF: Could not find root package.json to determine dependency versions.');
+function applyDefaultEagerPackages(sharedConfig) {
+    const DEFAULT_PACKAGES_TO_LOAD_EAGERLY = [
+        '@angular/localize',
+        '@angular/localize/init',
+    ];
+    for (const pkg of DEFAULT_PACKAGES_TO_LOAD_EAGERLY) {
+        if (!sharedConfig[pkg]) {
+            continue;
+        }
+        sharedConfig[pkg] = Object.assign(Object.assign({}, sharedConfig[pkg]), { eager: true });
     }
-    return (0, devkit_1.readJsonFile)(pkgJsonPath);
-}
-exports.readRootPackageJson = readRootPackageJson;
-function getDependentPackagesForProject(projectGraph, name) {
-    const { npmPackages, workspaceLibraries } = collectDependencies(projectGraph, name);
-    return {
-        workspaceLibraries: [...workspaceLibraries.values()],
-        npmPackages: [...npmPackages],
-    };
 }
-exports.getDependentPackagesForProject = getDependentPackagesForProject;
-function collectDependencies(projectGraph, name, dependencies = {
-    workspaceLibraries: new Map(),
-    npmPackages: new Set(),
-}, seen = new Set()) {
-    var _a;
-    if (seen.has(name)) {
-        return dependencies;
-    }
-    seen.add(name);
-    ((_a = projectGraph.dependencies[name]) !== null && _a !== void 0 ? _a : []).forEach((dependency) => {
-        if (dependency.target.startsWith('npm:')) {
-            dependencies.npmPackages.add(dependency.target.replace('npm:', ''));
+exports.applyDefaultEagerPackages = applyDefaultEagerPackages;
+exports.DEFAULT_NPM_PACKAGES_TO_AVOID = ['zone.js', '@nrwl/angular/mf'];
+exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE = [
+    '@angular/animations',
+    '@angular/common',
+];
+function getModuleFederationConfig(mfConfig, determineRemoteUrl, options = { isServer: false }) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let projectGraph;
+        try {
+            projectGraph = (0, devkit_1.readCachedProjectGraph)();
         }
-        else {
-            dependencies.workspaceLibraries.set(dependency.target, {
-                name: dependency.target,
-                root: projectGraph.nodes[dependency.target].data.root,
-                importKey: getLibraryImportPath(dependency.target, projectGraph),
-            });
-            collectDependencies(projectGraph, dependency.target, dependencies, seen);
+        catch (e) {
+            projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
         }
-    });
-    return dependencies;
-}
-function getLibraryImportPath(library, projectGraph) {
-    const tsConfigPathMappings = (0, typescript_1.readTsPathMappings)();
-    const sourceRoot = projectGraph.nodes[library].data.sourceRoot;
-    for (const [key, value] of Object.entries(tsConfigPathMappings)) {
-        if (value.find((path) => path.startsWith(sourceRoot))) {
-            return key;
+        const dependencies = (0, devkit_1.getDependentPackagesForProject)(projectGraph, mfConfig.name);
+        if (mfConfig.shared) {
+            dependencies.workspaceLibraries = dependencies.workspaceLibraries.filter((lib) => mfConfig.shared(lib.name, {}));
+            dependencies.npmPackages = dependencies.npmPackages.filter((pkg) => mfConfig.shared(pkg, {}));
         }
-    }
-    return undefined;
+        const sharedLibraries = (0, devkit_1.shareWorkspaceLibraries)(dependencies.workspaceLibraries);
+        const npmPackages = (0, devkit_1.sharePackages)(Array.from(new Set([
+            ...exports.DEFAULT_ANGULAR_PACKAGES_TO_SHARE,
+            ...dependencies.npmPackages.filter((pkg) => !exports.DEFAULT_NPM_PACKAGES_TO_AVOID.includes(pkg)),
+        ])));
+        exports.DEFAULT_NPM_PACKAGES_TO_AVOID.forEach((pkgName) => {
+            if (pkgName in npmPackages) {
+                delete npmPackages[pkgName];
+            }
+        });
+        const sharedDependencies = Object.assign(Object.assign({}, sharedLibraries.getLibraries()), npmPackages);
+        applyDefaultEagerPackages(sharedDependencies);
+        (0, devkit_1.applySharedFunction)(sharedDependencies, mfConfig.shared);
+        (0, devkit_1.applyAdditionalShared)(sharedDependencies, mfConfig.additionalShared, projectGraph);
+        const mapRemotesFunction = options.isServer ? devkit_1.mapRemotesForSSR : devkit_1.mapRemotes;
+        const mappedRemotes = !mfConfig.remotes || mfConfig.remotes.length === 0
+            ? {}
+            : mapRemotesFunction(mfConfig.remotes, 'mjs', determineRemoteUrl);
+        return { sharedLibraries, sharedDependencies, mappedRemotes };
+    });
 }
+exports.getModuleFederationConfig = getModuleFederationConfig;
 //# sourceMappingURL=utils.js.map

package/src/utils/mf/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,2BAAgC;AAChC,6CAAkD;AAQlD,SAAgB,mBAAmB;IAIjC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC;IACrE,IAAI,CAAC,IAAA,eAAU,EAAC,WAAW,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,2EAA2E,CAC5E,CAAC;KACH;IAED,OAAO,IAAA,qBAAY,EAAC,WAAW,CAAC,CAAC;AACnC,CAAC;AAZD,kDAYC;AAED,SAAgB,8BAA8B,CAC5C,YAA0B,EAC1B,IAAY;IAKZ,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,GAAG,mBAAmB,CAC7D,YAAY,EACZ,IAAI,CACL,CAAC;IAEF,OAAO;QACL,kBAAkB,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC;QACpD,WAAW,EAAE,CAAC,GAAG,WAAW,CAAC;KAC9B,CAAC;AACJ,CAAC;AAhBD,wEAgBC;AAED,SAAS,mBAAmB,CAC1B,YAA0B,EAC1B,IAAY,EACZ,eAAe;IACb,kBAAkB,EAAE,IAAI,GAAG,EAA4B;IACvD,WAAW,EAAE,IAAI,GAAG,EAAU;CAC/B,EACD,OAAoB,IAAI,GAAG,EAAE;;IAK7B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAClB,OAAO,YAAY,CAAC;KACrB;IACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEf,CAAC,MAAA,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC7D,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACxC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;SACrE;aAAM;YACL,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE;gBACrD,IAAI,EAAE,UAAU,CAAC,MAAM;gBACvB,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI;gBACrD,SAAS,EAAE,oBAAoB,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC;aACjE,CAAC,CAAC;YACH,mBAAmB,CAAC,YAAY,EAAE,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;SAC1E;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,oBAAoB,CAC3B,OAAe,EACf,YAA0B;IAE1B,MAAM,oBAAoB,GAAG,IAAA,+BAAkB,GAAE,CAAC;IAElD,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC;IAC/D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;QAC/D,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAAE;YACrD,OAAO,GAAG,CAAC;SACZ;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/mf/utils.ts"],"names":[],"mappings":"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"}