@nx/angular 16.1.4 → 16.2.0-beta.1

package/src/generators/ngrx-root-store/lib/validate-options.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nx/devkit';
+import { Schema } from '../schema';
+export declare function validateOptions(tree: Tree, options: Schema): void;

package/src/generators/ngrx-root-store/lib/validate-options.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../utils/version-utils");
+const version_utils_2 = require("../../../utils/version-utils");
+const semver_1 = require("semver");
+const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+function validateOptions(tree, options) {
+    var _a, _b;
+    if (!(0, devkit_1.getProjects)(tree).has(options.project)) {
+        throw new Error(`Could not find project '${options.project}'. Please ensure the project name is correct and exists.`);
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (project.projectType !== 'application') {
+        throw new Error(`NgRx Root Stores can only be added to applications, please ensure the project you use is an application.`);
+    }
+    if (!options.minimal && !options.name) {
+        throw new Error(`If generating a global feature state with your root store, you must provide a name for it with '--name'.`);
+    }
+    const angularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const intendedNgRxVersionForAngularMajor = (0, version_utils_2.getPkgVersionForAngularMajorVersion)('ngrxVersion', angularVersionInfo.major);
+    const ngrxMajorVersion = (_b = (_a = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@ngrx/store')) === null || _a === void 0 ? void 0 : _a.major) !== null && _b !== void 0 ? _b : (0, semver_1.major)((0, semver_1.coerce)(intendedNgRxVersionForAngularMajor));
+    const isStandalone = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
+    if ((0, semver_1.lt)(angularVersionInfo.version, '14.1.0') || ngrxMajorVersion < 15) {
+        if (isStandalone) {
+            throw new Error(`The provided project '${options.project}' is set up to use Standalone APIs, however your workspace is not configured to support Standalone APIs. ` +
+                'Please make sure to provide a path to an "NgModule" where the state will be registered. ');
+        }
+    }
+}
+exports.validateOptions = validateOptions;
+//# sourceMappingURL=validate-options.js.map

package/src/generators/ngrx-root-store/lib/validate-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ngrx-root-store/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,uCAAmE;AAEnE,6DAGmC;AACnC,gEAAmF;AACnF,mCAA2C;AAC3C,kEAAuE;AAEvE,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;;IACzD,IAAI,CAAC,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3C,MAAM,IAAI,KAAK,CACb,2BAA2B,OAAO,CAAC,OAAO,0DAA0D,CACrG,CAAC;KACH;IAED,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,0GAA0G,CAC3G,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACrC,MAAM,IAAI,KAAK,CACb,0GAA0G,CAC3G,CAAC;KACH;IAED,MAAM,kBAAkB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;IAChE,MAAM,kCAAkC,GACtC,IAAA,mDAAmC,EACjC,aAAa,EACb,kBAAkB,CAAC,KAAK,CACzB,CAAC;IAEJ,MAAM,gBAAgB,GACpB,MAAA,MAAA,IAAA,8CAA8B,EAAC,IAAI,EAAE,aAAa,CAAC,0CAAE,KAAK,mCAC1D,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,kCAAkC,CAAC,CAAC,CAAC;IAEpD,MAAM,YAAY,GAAG,IAAA,6BAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAE9D,IAAI,IAAA,WAAE,EAAC,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,gBAAgB,GAAG,EAAE,EAAE;QACrE,IAAI,YAAY,EAAE;YAChB,MAAM,IAAI,KAAK,CACb,yBAAyB,OAAO,CAAC,OAAO,2GAA2G;gBACjJ,0FAA0F,CAC7F,CAAC;SACH;KACF;AACH,CAAC;AAzCD,0CAyCC"}

package/src/generators/ngrx-root-store/ngrx-root-store.d.ts

@@ -0,0 +1,5 @@
+import type { Tree } from '@nx/devkit';
+import { GeneratorCallback } from '@nx/devkit';
+import type { Schema } from './schema';
+export declare function ngrxRootStoreGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
+export default ngrxRootStoreGenerator;

package/src/generators/ngrx-root-store/ngrx-root-store.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ngrxRootStoreGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+const lib_1 = require("./lib");
+const ngrx_feature_store_1 = require("../ngrx-feature-store/ngrx-feature-store");
+function ngrxRootStoreGenerator(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, lib_1.validateOptions)(tree, schema);
+        const options = (0, lib_1.normalizeOptions)(tree, schema);
+        if (!options.skipImport) {
+            (0, lib_1.addImportsToModule)(tree, options);
+        }
+        if (!options.minimal) {
+            yield (0, ngrx_feature_store_1.default)(tree, {
+                name: options.name,
+                parent: options.parent,
+                directory: options.directory,
+                minimal: false,
+                facade: options.facade,
+                barrels: false,
+                skipImport: false,
+                skipPackageJson: true,
+                skipFormat: true,
+            });
+        }
+        let packageInstallationTask = () => { };
+        if (!options.skipPackageJson) {
+            packageInstallationTask = (0, lib_1.addNgRxToPackageJson)(tree, options);
+        }
+        if (!options.skipFormat) {
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+        return packageInstallationTask;
+    });
+}
+exports.ngrxRootStoreGenerator = ngrxRootStoreGenerator;
+exports.default = ngrxRootStoreGenerator;
+//# sourceMappingURL=ngrx-root-store.js.map

package/src/generators/ngrx-root-store/ngrx-root-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ngrx-root-store.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ngrx-root-store/ngrx-root-store.ts"],"names":[],"mappings":";;;;AACA,uCAA4D;AAG5D,+BAKe;AAEf,iFAAiF;AAEjF,SAAsB,sBAAsB,CAAC,IAAU,EAAE,MAAc;;QACrE,IAAA,qBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,MAAM,IAAA,4BAAyB,EAAC,IAAI,EAAE;gBACpC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,eAAe,EAAE,IAAI;gBACrB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;SACJ;QAED,IAAI,uBAAuB,GAAsB,GAAG,EAAE,GAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YAC5B,uBAAuB,GAAG,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC/D;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,uBAAuB,CAAC;IACjC,CAAC;CAAA;AAhCD,wDAgCC;AAED,kBAAe,sBAAsB,CAAC"}

package/src/generators/ngrx-root-store/schema.d.ts

@@ -0,0 +1,10 @@
+export interface Schema {
+  project: string;
+  minimal: boolean;
+  name?: string;
+  directory?: string;
+  facade?: boolean;
+  skipFormat?: boolean;
+  skipImport?: boolean;
+  skipPackageJson?: boolean;
+}

package/src/generators/ngrx-root-store/schema.json

@@ -0,0 +1,66 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxNgrxRootStoreGenerator",
+  "title": "Add NgRx support to an application.",
+  "description": "Adds NgRx support to an application.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "The name of the application to generate the NgRx configuration for.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What app would you like to generate a NgRx configuration for?",
+      "x-dropdown": "projects"
+    },
+    "minimal": {
+      "type": "boolean",
+      "default": true,
+      "description": "Only register the root state management setup or also generate a global feature state.",
+      "x-priority": "important"
+    },
+    "name": {
+      "type": "string",
+      "description": "Name of the NgRx state, such as `products` or `users`. Recommended to use the plural form of the name.",
+      "x-priority": "important"
+    },
+    "route": {
+      "type": "string",
+      "description": "The route that the Standalone NgRx Providers should be added to. _Note: This is only supported in Angular versions >= 14.1.0_.",
+      "default": "''"
+    },
+    "directory": {
+      "type": "string",
+      "default": "+state",
+      "description": "The name of the folder used to contain/group the generated NgRx files."
+    },
+    "facade": {
+      "type": "boolean",
+      "default": false,
+      "description": "Create a Facade class for the the feature.",
+      "x-prompt": "Would you like to use a Facade with your NgRx state?"
+    },
+    "skipImport": {
+      "type": "boolean",
+      "default": false,
+      "description": "Generate NgRx feature files without registering the feature in the NgModule."
+    },
+    "skipFormat": {
+      "description": "Skip formatting files.",
+      "type": "boolean",
+      "default": false,
+      "x-priority": "internal"
+    },
+    "skipPackageJson": {
+      "type": "boolean",
+      "default": false,
+      "description": "Do not update the `package.json` with NgRx dependencies.",
+      "x-priority": "internal"
+    }
+  },
+  "additionalProperties": false,
+  "required": ["project"]
+}

package/src/generators/pipe/lib/validate-options.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const path_1 = require("../../utils/path");
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
-    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
     (0, validations_1.validateStandaloneOption)(tree, options.standalone);
 }
 exports.validateOptions = validateOptions;

package/src/generators/pipe/lib/validate-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/pipe/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAGiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/pipe/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,yDAIiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,4CAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACpE,IAAA,sCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC;AAJD,0CAIC"}

package/src/generators/remote/remote.js

@@ -38,6 +38,7 @@ function remote(tree, options) {
             skipE2E,
             e2eProjectName: skipE2E ? undefined : `${appName}-e2e`,
             standalone: options.standalone,
+            prefix: options.prefix,
         });
         let installTasks = [appInstallTask];
         if (options.ssr) {

package/src/generators/remote/remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EACJ,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE;gBACtC,OAAO;gBACP,IAAI;gBACJ,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC,CAAC;YACH,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AA1DD,wBA0DC;AAED,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/remote/remote.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,4DAA8D;AAC9D,8CAAwD;AACxD,mDAA+C;AAC/C,2DAAyD;AACzD,+BAAsD;AAEtD,0DAAwE;AACxE,mCAA4B;AAE5B,SAAsB,MAAM,CAAC,IAAU,EAAE,OAAe;;;QACtD,MAAM,2BAA2B,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAEzE,IAAI,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YAC3E,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,2FAA2F,2BAA2B,CAAC,OAAO;sGACxD,CAAC,CAAC;SACrG;QAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC/C,MAAM,IAAI,KAAK,CACb,2EAA2E,OAAO,CAAC,IAAI,GAAG,CAC3F,CAAC;SACH;QAED,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAsB,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,IAAA,8BAAoB,EAAC,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACrE,MAAM,IAAI,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAA,2BAAqB,EAAC,IAAI,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAG,MAAM,IAAA,qBAAoB,EAAC,IAAI,kCACjD,OAAO,KACV,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,KAAK,EACvC,OAAO,EAAE,IAAI,EACb,IAAI,EACJ,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,OAAO,GACX,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,4BAAa,CAAC,IAAI,CAAC;QAEzE,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE;YAClB,OAAO;YACP,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI;YACJ,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,UAAU,EAAE,IAAI;YAChB,OAAO;YACP,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,MAAM;YACtD,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QAEH,IAAI,YAAY,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,IAAI,cAAc,GAAG,MAAM,IAAA,YAAM,EAAC,IAAI,EAAE;gBACtC,OAAO;gBACP,IAAI;gBACJ,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC,CAAC;YACH,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,GAAG,YAAY,CAAC,CAAC;;CAC1C;AA3DD,wBA2DC;AAED,kBAAe,MAAM,CAAC"}

package/src/generators/scam/lib/validate-options.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const path_1 = require("../../utils/path");
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
-    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
 }
 exports.validateOptions = validateOptions;
 //# sourceMappingURL=validate-options.js.map

package/src/generators/scam/lib/validate-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAA0D;AAG1D,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACjE,CAAC;AAHD,0CAGC"}
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,yDAGiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,4CAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAHD,0CAGC"}

package/src/generators/scam-directive/lib/validate-options.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const path_1 = require("../../utils/path");
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
-    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
 }
 exports.validateOptions = validateOptions;
 //# sourceMappingURL=validate-options.js.map

package/src/generators/scam-directive/lib/validate-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAA0D;AAG1D,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACjE,CAAC;AAHD,0CAGC"}
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-directive/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,yDAGiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,4CAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAHD,0CAGC"}

package/src/generators/scam-pipe/lib/validate-options.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
-const path_1 = require("../../utils/path");
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
-    (0, path_1.checkPathUnderProjectRoot)(tree, options.project, options.path);
+    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
 }
 exports.validateOptions = validateOptions;
 //# sourceMappingURL=validate-options.js.map

package/src/generators/scam-pipe/lib/validate-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,2CAA6D;AAC7D,yDAA0D;AAG1D,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,gCAAyB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACjE,CAAC;AAHD,0CAGC"}
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/scam-pipe/lib/validate-options.ts"],"names":[],"mappings":";;;AACA,yDAGiC;AAGjC,SAAgB,eAAe,CAAC,IAAU,EAAE,OAAe;IACzD,IAAA,6BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,4CAA8B,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AAHD,0CAGC"}

package/src/generators/setup-mf/lib/add-remote-entry.js

@@ -4,9 +4,6 @@ exports.addRemoteEntry = void 0;
 const devkit_1 = require("@nx/devkit");
 const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function addRemoteEntry(tree, { appName, routing, prefix, standalone }, appRoot) {
-    var _a, _b;
-    prefix =
-        (_b = prefix !== null && prefix !== void 0 ? prefix : (_a = (0, devkit_1.readProjectConfiguration)(tree, appName)) === null || _a === void 0 ? void 0 : _a.prefix) !== null && _b !== void 0 ? _b : (0, devkit_1.readNxJson)(tree).npmScope;
     (0, devkit_1.generateFiles)(tree, standalone
         ? (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-entry-component-files')
         : (0, devkit_1.joinPathFragments)(__dirname, '../files/entry-module-files'), `${appRoot}/src/app/remote-entry`, {

package/src/generators/setup-mf/lib/add-remote-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AACpB,sEAAgE;AAIhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAU,EAChD,OAAe;;IAEf,MAAM;QACJ,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GACN,MAAC,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAiC,0CACpE,MAAM,mCACV,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5B,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;QACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;QACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;QACE,IAAI,EAAE,EAAE;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP,CACF,CAAC;IAEF,IAAI,UAAU,IAAI,OAAO,EAAE;QACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;KACH;SAAM;QACL,IAAI,OAAO,EAAE;YACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AArDD,wCAqDC"}
+{"version":3,"file":"add-remote-entry.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/add-remote-entry.ts"],"names":[],"mappings":";;;AACA,uCAA8D;AAC9D,sEAAgE;AAGhE,SAAgB,cAAc,CAC5B,IAAU,EACV,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAU,EAChD,OAAe;IAEf,IAAA,sBAAa,EACX,IAAI,EACJ,UAAU;QACR,CAAC,CAAC,IAAA,0BAAiB,EACf,SAAS,EACT,2CAA2C,CAC5C;QACH,CAAC,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC/D,GAAG,OAAO,uBAAuB,EACjC;QACE,IAAI,EAAE,EAAE;QACR,OAAO;QACP,OAAO;QACP,MAAM;KACP,CACF,CAAC;IAEF,IAAI,UAAU,IAAI,OAAO,EAAE;QACzB,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,iGAAiG,CAClG,CAAC;KACH;SAAM;QACL,IAAI,OAAO,EAAE;YACX,IAAA,sBAAQ,EACN,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACnD,sGAAsG,CACvG,CAAC;SACH;QAED,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,wBAAwB,EAClC;;;;;;EAMJ,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,wBAAwB,EAAE,OAAO,CAAC,EAAE,CACrD,CAAC;KACH;AACH,CAAC;AAhDD,wCAgDC"}

package/src/generators/setup-mf/lib/index.d.ts

@@ -5,6 +5,7 @@ export * from './change-build-target';
 export * from './fix-bootstrap';
 export * from './generate-config';
 export * from './get-remotes-with-ports';
+export * from './normalize-options';
 export * from './set-tsconfig-target';
 export * from './setup-host-if-dynamic';
 export * from './setup-serve-target';

package/src/generators/setup-mf/lib/index.js

@@ -8,6 +8,7 @@ tslib_1.__exportStar(require("./change-build-target"), exports);
 tslib_1.__exportStar(require("./fix-bootstrap"), exports);
 tslib_1.__exportStar(require("./generate-config"), exports);
 tslib_1.__exportStar(require("./get-remotes-with-ports"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./set-tsconfig-target"), exports);
 tslib_1.__exportStar(require("./setup-host-if-dynamic"), exports);
 tslib_1.__exportStar(require("./setup-serve-target"), exports);

package/src/generators/setup-mf/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/index.ts"],"names":[],"mappings":";;;AAAA,mEAAyC;AACzC,6DAAmC;AACnC,+DAAqC;AACrC,gEAAsC;AACtC,0DAAgC;AAChC,4DAAkC;AAClC,mEAAyC;AACzC,gEAAsC;AACtC,kEAAwC;AACxC,+DAAqC;AACrC,mEAAyC;AACzC,yEAA+C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/index.ts"],"names":[],"mappings":";;;AAAA,mEAAyC;AACzC,6DAAmC;AACnC,+DAAqC;AACrC,gEAAsC;AACtC,0DAAgC;AAChC,4DAAkC;AAClC,mEAAyC;AACzC,8DAAoC;AACpC,gEAAsC;AACtC,kEAAwC;AACxC,+DAAqC;AACrC,mEAAyC;AACzC,yEAA+C"}

package/src/generators/setup-mf/lib/normalize-options.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nx/devkit';
+import type { NormalizedOptions, Schema } from '../schema';
+export declare function normalizeOptions(tree: Tree, options: Schema): NormalizedOptions;

package/src/generators/setup-mf/lib/normalize-options.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const project_1 = require("../../utils/project");
+function normalizeOptions(tree, options) {
+    var _a, _b;
+    return Object.assign(Object.assign({}, options), { federationType: (_a = options.federationType) !== null && _a !== void 0 ? _a : 'static', prefix: (_b = options.prefix) !== null && _b !== void 0 ? _b : (0, project_1.getProjectPrefix)(tree, options.appName) });
+}
+exports.normalizeOptions = normalizeOptions;
+//# sourceMappingURL=normalize-options.js.map

package/src/generators/setup-mf/lib/normalize-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,iDAAuD;AAGvD,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,uCACK,OAAO,KACV,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,EAClD,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAA,0BAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IACjE;AACJ,CAAC;AATD,4CASC"}

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from 'nx/src/generators/tree';
+import type { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
 export declare function removeDeadCodeFromRemote(tree: Tree, options: Schema): void;

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeDeadCodeFromRemote = void 0;
-const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
-const path_1 = require("nx/src/utils/path");
 const devkit_1 = require("@nx/devkit");
 function removeDeadCodeFromRemote(tree, options) {
-    var _a;
     const projectName = options.appName;
-    const project = (0, project_configuration_1.readProjectConfiguration)(tree, projectName);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     ['css', 'less', 'scss', 'sass'].forEach((style) => {
-        const pathToComponentStyle = (0, path_1.joinPathFragments)(project.sourceRoot, `app/app.component.${style}`);
+        const pathToComponentStyle = (0, devkit_1.joinPathFragments)(project.sourceRoot, `app/app.component.${style}`);
         if (tree.exists(pathToComponentStyle)) {
             tree.delete(pathToComponentStyle);
         }
     });
-    tree.rename((0, path_1.joinPathFragments)(project.sourceRoot, 'app/nx-welcome.component.ts'), (0, path_1.joinPathFragments)(project.sourceRoot, 'app/remote-entry/nx-welcome.component.ts'));
-    tree.delete((0, path_1.joinPathFragments)(project.sourceRoot, 'app/app.component.spec.ts'));
-    tree.delete((0, path_1.joinPathFragments)(project.sourceRoot, 'app/app.component.html'));
-    const pathToAppComponent = (0, path_1.joinPathFragments)(project.sourceRoot, 'app/app.component.ts');
+    tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/nx-welcome.component.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/remote-entry/nx-welcome.component.ts'));
+    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.spec.ts'));
+    tree.delete((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.html'));
+    const pathToAppComponent = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.component.ts');
     if (!options.standalone) {
         const componentContents = tree.read(pathToAppComponent, 'utf-8');
         const isInlineTemplate = !componentContents.includes('templateUrl');
@@ -27,7 +24,7 @@ function removeDeadCodeFromRemote(tree, options) {
 })
 export class AppComponent {}`;
         tree.write(pathToAppComponent, component);
-        tree.write((0, path_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts'), `import { NgModule } from '@angular/core';
+        tree.write((0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.module.ts'), `import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule } from '@angular/router';
 import { AppComponent } from './app.component';
@@ -48,11 +45,10 @@ export class AppModule {}`);
     }
     else {
         tree.delete(pathToAppComponent);
-        const prefix = (_a = options.prefix) !== null && _a !== void 0 ? _a : (0, devkit_1.readNxJson)(tree).npmScope;
-        const remoteEntrySelector = `${prefix}-${projectName}-entry`;
         const pathToIndexHtml = project.targets.build.options.index;
         const indexContents = tree.read(pathToIndexHtml, 'utf-8');
-        const rootSelectorRegex = new RegExp(`${prefix}-root`, 'ig');
+        const rootSelectorRegex = new RegExp(`${options.prefix || 'app'}-root`, 'ig');
+        const remoteEntrySelector = `${options.prefix || 'app'}-${projectName}-entry`;
         const newIndexContents = indexContents.replace(rootSelectorRegex, remoteEntrySelector);
         tree.write(pathToIndexHtml, newIndexContents);
     }

package/src/generators/setup-mf/lib/remove-dead-code-from-remote.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-dead-code-from-remote.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/remove-dead-code-from-remote.ts"],"names":[],"mappings":";;;AAEA,yFAAyF;AACzF,4CAAsD;AACtD,uCAAwC;AAExC,SAAgB,wBAAwB,CAAC,IAAU,EAAE,OAAe;;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,gDAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE5D,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAChD,MAAM,oBAAoB,GAAG,IAAA,wBAAiB,EAC5C,OAAO,CAAC,UAAU,EAClB,qBAAqB,KAAK,EAAE,CAC7B,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;SACnC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CACT,IAAA,wBAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,6BAA6B,CAAC,EACpE,IAAA,wBAAiB,EACf,OAAO,CAAC,UAAU,EAClB,0CAA0C,CAC3C,CACF,CAAC;IACF,IAAI,CAAC,MAAM,CACT,IAAA,wBAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,2BAA2B,CAAC,CACnE,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAE7E,MAAM,kBAAkB,GAAG,IAAA,wBAAiB,EAC1C,OAAO,CAAC,UAAU,EAClB,sBAAsB,CACvB,CAAC;IACF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEpE,MAAM,SAAS,GACb,iBAAiB,CAAC,KAAK,CACrB,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAC9C,CAAC,CAAC,CAAC;YACJ;;;6BAGuB,CAAC;QAE1B,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QAE1C,IAAI,CAAC,KAAK,CACR,IAAA,wBAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,mBAAmB,CAAC,EAC1D;;;;;;;;;;;;;;;;;0BAiBoB,CACrB,CAAC;KACH;SAAM;QACL,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAEhC,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,mCAAI,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC3D,MAAM,mBAAmB,GAAG,GAAG,MAAM,IAAI,WAAW,QAAQ,CAAC;QAE7D,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAAC,GAAG,MAAM,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,iBAAiB,EACjB,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;KAC/C;AACH,CAAC;AAnFD,4DAmFC"}
+{"version":3,"file":"remove-dead-code-from-remote.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/setup-mf/lib/remove-dead-code-from-remote.ts"],"names":[],"mappings":";;;AACA,uCAAyE;AAGzE,SAAgB,wBAAwB,CAAC,IAAU,EAAE,OAAe;IAClE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IACpC,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE5D,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QAChD,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAC5C,OAAO,CAAC,UAAU,EAClB,qBAAqB,KAAK,EAAE,CAC7B,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;SACnC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,6BAA6B,CAAC,EACpE,IAAA,0BAAiB,EACf,OAAO,CAAC,UAAU,EAClB,0CAA0C,CAC3C,CACF,CAAC;IACF,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,2BAA2B,CAAC,CACnE,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAE7E,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,OAAO,CAAC,UAAU,EAClB,sBAAsB,CACvB,CAAC;IACF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAEpE,MAAM,SAAS,GACb,iBAAiB,CAAC,KAAK,CACrB,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAC9C,CAAC,CAAC,CAAC;YACJ;;;6BAGuB,CAAC;QAE1B,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QAE1C,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,OAAO,CAAC,UAAU,EAAE,mBAAmB,CAAC,EAC1D;;;;;;;;;;;;;;;;;0BAiBoB,CACrB,CAAC;KACH;SAAM;QACL,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAEhC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,IAAI,MAAM,CAClC,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,OAAO,EACjC,IAAI,CACL,CAAC;QACF,MAAM,mBAAmB,GAAG,GAC1B,OAAO,CAAC,MAAM,IAAI,KACpB,IAAI,WAAW,QAAQ,CAAC;QACxB,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,iBAAiB,EACjB,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;KAC/C;AACH,CAAC;AArFD,4DAqFC"}

package/src/generators/setup-mf/schema.d.ts

@@ -1,10 +1,12 @@
+type FederationType = 'static' | 'dynamic';
+
 export interface Schema {
   appName: string;
   mfType: 'host' | 'remote';
   port?: number;
   remotes?: string[];
   host?: string;
-  federationType?: 'static' | 'dynamic';
+  federationType?: FederationType;
   routing?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
@@ -13,3 +15,8 @@ export interface Schema {
   standalone?: boolean;
   skipE2E?: boolean;
 }
+
+export interface NormalizedOptions extends Schema {
+  federationType: FederationType;
+  prefix: string | undefined;
+}

package/src/generators/setup-mf/setup-mf.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function setupMf(tree: Tree, options: Schema): Promise<() => void>;
+export declare function setupMf(tree: Tree, rawOptions: Schema): Promise<() => void>;
 export default setupMf;

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

@@ -7,15 +7,14 @@ const lib_1 = require("./lib");
 const version_utils_1 = require("../utils/version-utils");
 const versions_1 = require("../../utils/versions");
 const semver_1 = require("semver");
-function setupMf(tree, options) {
-    var _a;
+function setupMf(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installedAngularInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        if ((0, semver_1.lt)(installedAngularInfo.version, '14.1.0') && options.standalone) {
+        if ((0, semver_1.lt)(installedAngularInfo.version, '14.1.0') && rawOptions.standalone) {
             throw new Error(`The --standalone flag is not supported in your current version of Angular (${installedAngularInfo.version}). Please update to a version of Angular that supports Standalone Components (>= 14.1.0).`);
         }
+        const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
-        options.federationType = (_a = options.federationType) !== null && _a !== void 0 ? _a : 'static';
         if (options.mfType === 'host') {
             (0, lib_1.setupHostIfDynamic)(tree, options);
             (0, lib_1.updateHostAppRoutes)(tree, options);

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

@@ -1 +1 @@
-{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AAGpB,+BAae;AACf,0DAAwE;AACxE,mDAAiD;AACjD,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,OAAe;;;QACvD,MAAM,oBAAoB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAElE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE;YACpE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QACD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,OAAO,CAAC,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;QAE5D,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,WAAW,GAAG,IAAA,qCAA4B,EACxC,IAAI,EACJ,EAAE,EACF,EAAE,SAAS,EAAE,oBAAS,EAAE,CACzB,CAAC;SACH;QAED,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;;CACpB;AAjDD,0BAiDC;AAED,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"setup-mf.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/setup-mf/setup-mf.ts"],"names":[],"mappings":";;;;AACA,uCAIoB;AAGpB,+BAce;AACf,0DAAwE;AACxE,mDAAiD;AACjD,mCAA4B;AAE5B,SAAsB,OAAO,CAAC,IAAU,EAAE,UAAkB;;QAC1D,MAAM,oBAAoB,GAAG,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC;QAClE,IAAI,IAAA,WAAE,EAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,UAAU,CAAC,UAAU,EAAE;YACvE,MAAM,IAAI,KAAK,CACb,8EAA8E,oBAAoB,CAAC,OAAO,2FAA2F,CACtM,CAAC;SACH;QAED,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtE,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE;YAC7B,IAAA,wBAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClC,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,WAAW,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;QAC3B,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE;YAC/B,IAAA,qBAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAClD,IAAA,8BAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACxC,WAAW,GAAG,IAAA,qCAA4B,EACxC,IAAI,EACJ,EAAE,EACF,EAAE,SAAS,EAAE,oBAAS,EAAE,CACzB,CAAC;SACH;QAED,MAAM,gBAAgB,GAAG,IAAA,yBAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE5D,IAAA,2BAAqB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAE3E,IAAA,uBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjC,IAAA,0BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,sBAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhC,IAAA,kBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,IAAA,iCAA2B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC5C;QAED,eAAe;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAhDD,0BAgDC;AAED,kBAAe,OAAO,CAAC"}

package/src/generators/utils/path.d.ts

@@ -1,7 +1,6 @@
 import type { Tree } from '@nx/devkit';
 export declare function pathStartsWith(path1: string, path2: string): boolean;
 export declare function getRelativeImportToFile(sourceFilePath: string, targetFilePath: string): string;
-export declare function checkPathUnderProjectRoot(tree: Tree, projectName: string, path: string): void;
 export type PathGenerationOptions = {
     name: string;
     project: string;

package/src/generators/utils/path.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeNameAndPaths = exports.checkPathUnderProjectRoot = exports.getRelativeImportToFile = exports.pathStartsWith = void 0;
+exports.normalizeNameAndPaths = exports.getRelativeImportToFile = exports.pathStartsWith = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const names_1 = require("./names");
@@ -15,21 +15,6 @@ function getRelativeImportToFile(sourceFilePath, targetFilePath) {
     return `./${(0, devkit_1.joinPathFragments)(relativeDirToTarget, (0, path_1.basename)(targetFilePath, '.ts'))}`;
 }
 exports.getRelativeImportToFile = getRelativeImportToFile;
-function checkPathUnderProjectRoot(tree, projectName, path) {
-    if (!path) {
-        return;
-    }
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    let pathToComponent = (0, devkit_1.normalizePath)(path);
-    pathToComponent = pathToComponent.startsWith('/')
-        ? pathToComponent.slice(1)
-        : pathToComponent;
-    if (!pathStartsWith(pathToComponent, root)) {
-        throw new Error(`The path provided (${path}) does not exist under the project root (${root}). ` +
-            `Please make sure to provide a path that exists under the project root.`);
-    }
-}
-exports.checkPathUnderProjectRoot = checkPathUnderProjectRoot;
 function normalizeNameAndPaths(tree, options) {
     var _a;
     const { root, sourceRoot, projectType } = (0, devkit_1.readProjectConfiguration)(tree, options.project);

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

@@ -1 +1 @@
-{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/path.ts"],"names":[],"mappings":";;;AACA,uCAMoB;AACpB,+BAAmD;AACnD,mCAA4C;AAE5C,SAAgB,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC;IAEhE,OAAO,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AACrD,CAAC;AALD,wCAKC;AAED,SAAgB,uBAAuB,CACrC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,cAAc,CAAC,EACvB,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CAAC;IAEF,OAAO,KAAK,IAAA,0BAAiB,EAC3B,mBAAmB,EACnB,IAAA,eAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAChC,EAAE,CAAC;AACN,CAAC;AAbD,0DAaC;AAED,SAAgB,yBAAyB,CACvC,IAAU,EACV,WAAmB,EACnB,IAAY;IAEZ,IAAI,CAAC,IAAI,EAAE;QACT,OAAO;KACR;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAE7D,IAAI,eAAe,GAAG,IAAA,sBAAa,EAAC,IAAI,CAAC,CAAC;IAC1C,eAAe,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC;QAC/C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,eAAe,CAAC;IAEpB,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,sBAAsB,IAAI,4CAA4C,IAAI,KAAK;YAC7E,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAtBD,8DAsBC;AAoBD,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAA8B;;IAE9B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IAEF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAC7C,QAAQ,CACT,CAAC;IAEJ,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI;QAC5B,CAAC,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC;QACrB,CAAC,CAAC,IAAA,0BAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,GAAG,IAAI,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QAC3C,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;IAEhE,OAAO;QACL,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,UAAU;KACX,CAAC;AACJ,CAAC;AAvCD,sDAuCC"}
+{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/path.ts"],"names":[],"mappings":";;;AACA,uCAMoB;AACpB,+BAAmD;AACnD,mCAA4C;AAE5C,SAAgB,cAAc,CAAC,KAAa,EAAE,KAAa;IACzD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,sBAAa,EAAE,KAAK,CAAC,CAAC;IAEhE,OAAO,eAAe,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;AACrD,CAAC;AALD,wCAKC;AAED,SAAgB,uBAAuB,CACrC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAClC,IAAA,cAAO,EAAC,cAAc,CAAC,EACvB,IAAA,cAAO,EAAC,cAAc,CAAC,CACxB,CAAC;IAEF,OAAO,KAAK,IAAA,0BAAiB,EAC3B,mBAAmB,EACnB,IAAA,eAAQ,EAAC,cAAc,EAAE,KAAK,CAAC,CAChC,EAAE,CAAC;AACN,CAAC;AAbD,0DAaC;AAoBD,SAAgB,qBAAqB,CACnC,IAAU,EACV,OAA8B;;IAE9B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,IAAA,iCAAwB,EAChE,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IAEF,MAAM,iBAAiB,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAA,0BAAiB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjE,MAAM,IAAI,GACR,MAAA,OAAO,CAAC,IAAI,mCACZ,IAAA,0BAAiB,EACf,iBAAiB,EACjB,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAC7C,QAAQ,CACT,CAAC;IAEJ,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI;QAC5B,CAAC,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC;QACrB,CAAC,CAAC,IAAA,0BAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI;QAC3B,CAAC,CAAC,GAAG,IAAI,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;QAC3C,CAAC,CAAC,IAAI,CAAC;IAET,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;IAEhE,OAAO;QACL,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,UAAU;KACX,CAAC;AACJ,CAAC;AAvCD,sDAuCC"}

package/src/generators/utils/project.d.ts

@@ -1,3 +1,5 @@
+import type { Tree } from '@nx/devkit';
 export declare function normalizeDirectory(appName: string, directoryName: string): string;
 export declare function normalizeProjectName(appName: string, directoryName: string): string;
-export declare function normalizePrefix(prefix: string | undefined, npmScope: string | undefined): string;
+export declare function normalizeNewProjectPrefix(prefix: string | undefined, npmScope: string | undefined, fallbackPrefix: string): string;
+export declare function getProjectPrefix(tree: Tree, project: string): string | undefined;

package/src/generators/utils/project.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePrefix = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
+exports.getProjectPrefix = exports.normalizeNewProjectPrefix = exports.normalizeProjectName = exports.normalizeDirectory = void 0;
 const devkit_1 = require("@nx/devkit");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 function normalizeDirectory(appName, directoryName) {
     return directoryName
         ? `${(0, devkit_1.names)(directoryName).fileName}/${(0, devkit_1.names)(appName).fileName}`
@@ -12,14 +13,17 @@ function normalizeProjectName(appName, directoryName) {
     return normalizeDirectory(appName, directoryName).replace(/\//g, '-');
 }
 exports.normalizeProjectName = normalizeProjectName;
-function normalizePrefix(prefix, npmScope) {
-    if (prefix) {
-        return prefix;
-    }
+function normalizeNewProjectPrefix(prefix, npmScope, fallbackPrefix) {
     // Prefix needs to be a valid html selector, if npmScope it's not valid, we don't default
     // to it and let it fall through to the Angular schematic to handle it
     // https://github.com/angular/angular-cli/blob/1c634cd327e5a850553b258aa2d5e6a6b2c75c65/packages/schematics/angular/component/index.ts#L130
     const htmlSelectorRegex = /^[a-zA-Z][.0-9a-zA-Z]*(:?-[a-zA-Z][.0-9a-zA-Z]*)*$/;
+    if (prefix) {
+        if (!htmlSelectorRegex.test(prefix)) {
+            throw new Error('The provided "prefix" is invalid. The prefix must start with a letter, and must contain only alphanumeric characters or dashes. When adding a dash the segment after the dash must also start with a letter.');
+        }
+        return prefix;
+    }
     if (npmScope && !htmlSelectorRegex.test(npmScope)) {
         throw new Error(`The "--prefix" option was not provided, therefore attempted to use the "npmScope" defined in "nx.json" to set the application's selector prefix, but it is invalid.
 
@@ -31,7 +35,13 @@ If you encountered this error when creating a new Nx Workspace, the workspace na
 
 Valid selector prefixes must start with a letter, and must contain only alphanumeric characters or dashes. When adding a dash the segment after the dash must also start with a letter.`);
     }
-    return npmScope || 'app';
+    return npmScope || fallbackPrefix;
+}
+exports.normalizeNewProjectPrefix = normalizeNewProjectPrefix;
+function getProjectPrefix(tree, project) {
+    var _a;
+    return ((_a = (0, devkit_1.readProjectConfiguration)(tree, project)
+        .prefix) !== null && _a !== void 0 ? _a : (0, get_npm_scope_1.getNpmScope)(tree));
 }
-exports.normalizePrefix = normalizePrefix;
+exports.getProjectPrefix = getProjectPrefix;
 //# sourceMappingURL=project.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,SAAgB,kBAAkB,CAChC,OAAe,EACf,aAAqB;IAErB,OAAO,aAAa;QAClB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;QAC/D,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;AAC9B,CAAC;AAPD,gDAOC;AAED,SAAgB,oBAAoB,CAClC,OAAe,EACf,aAAqB;IAErB,OAAO,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AALD,oDAKC;AAED,SAAgB,eAAe,CAC7B,MAA0B,EAC1B,QAA4B;IAE5B,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IAED,yFAAyF;IACzF,sEAAsE;IACtE,2IAA2I;IAC3I,MAAM,iBAAiB,GACrB,oDAAoD,CAAC;IACvD,IAAI,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC;;;;;;;;wLAQoK,CAAC,CAAC;KACvL;IAED,OAAO,QAAQ,IAAI,KAAK,CAAC;AAC3B,CAAC;AA1BD,0CA0BC"}
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/project.ts"],"names":[],"mappings":";;;AACA,uCAAyE;AAEzE,+EAA0E;AAE1E,SAAgB,kBAAkB,CAChC,OAAe,EACf,aAAqB;IAErB,OAAO,aAAa;QAClB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,QAAQ,IAAI,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE;QAC/D,CAAC,CAAC,IAAA,cAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;AAC9B,CAAC;AAPD,gDAOC;AAED,SAAgB,oBAAoB,CAClC,OAAe,EACf,aAAqB;IAErB,OAAO,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACxE,CAAC;AALD,oDAKC;AAED,SAAgB,yBAAyB,CACvC,MAA0B,EAC1B,QAA4B,EAC5B,cAAsB;IAEtB,yFAAyF;IACzF,sEAAsE;IACtE,2IAA2I;IAC3I,MAAM,iBAAiB,GACrB,oDAAoD,CAAC;IAEvD,IAAI,MAAM,EAAE;QACV,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,MAAM,IAAI,KAAK,CACb,8MAA8M,CAC/M,CAAC;SACH;QAED,OAAO,MAAM,CAAC;KACf;IAED,IAAI,QAAQ,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC;;;;;;;;wLAQoK,CAAC,CAAC;KACvL;IAED,OAAO,QAAQ,IAAI,cAAc,CAAC;AACpC,CAAC;AAlCD,8DAkCC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAe;;IAEf,OAAO,CACL,MAAC,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAiC;SACrE,MAAM,mCAAI,IAAA,2BAAW,EAAC,IAAI,CAAC,CAC/B,CAAC;AACJ,CAAC;AARD,4CAQC"}