@nx/angular 16.1.3 → 16.2.0-beta.0

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"}

package/src/generators/utils/selector.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildSelector = void 0;
 const devkit_1 = require("@nx/devkit");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 function buildSelector(tree, name, prefix, projectPrefix, casing) {
-    var _a;
     let selector = name;
-    prefix !== null && prefix !== void 0 ? prefix : (prefix = projectPrefix !== null && projectPrefix !== void 0 ? projectPrefix : (_a = (0, devkit_1.readNxJson)(tree)) === null || _a === void 0 ? void 0 : _a.npmScope);
+    prefix !== null && prefix !== void 0 ? prefix : (prefix = projectPrefix !== null && projectPrefix !== void 0 ? projectPrefix : (0, get_npm_scope_1.getNpmScope)(tree));
     if (prefix) {
         selector = `${prefix}-${selector}`;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"selector.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/selector.ts"],"names":[],"mappings":";;;AACA,uCAA+C;AAE/C,SAAgB,aAAa,CAC3B,IAAU,EACV,IAAY,EACZ,MAA0B,EAC1B,aAAiC,EACjC,MAAyE;;IAEzE,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,MAAM,aAAN,MAAM,cAAN,MAAM,IAAN,MAAM,GAAK,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,MAAA,IAAA,mBAAU,EAAC,IAAI,CAAC,0CAAE,QAAQ,EAAC;IACvD,IAAI,MAAM,EAAE;QACV,QAAQ,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;KACpC;IAED,OAAO,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AAdD,sCAcC"}
+{"version":3,"file":"selector.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/selector.ts"],"names":[],"mappings":";;;AACA,uCAAmC;AAEnC,+EAA0E;AAE1E,SAAgB,aAAa,CAC3B,IAAU,EACV,IAAY,EACZ,MAA0B,EAC1B,aAAiC,EACjC,MAAyE;IAEzE,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,MAAM,aAAN,MAAM,cAAN,MAAM,IAAN,MAAM,GAAK,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,IAAA,2BAAW,EAAC,IAAI,CAAC,EAAC;IAC9C,IAAI,MAAM,EAAE;QACV,QAAQ,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;KACpC;IAED,OAAO,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AAdD,sCAcC"}

package/src/generators/utils/testing.js

@@ -49,8 +49,6 @@ function createStorybookTestWorkspaceForLib(libName) {
         let tree = (0, testing_1.createTreeWithEmptyWorkspace)({ layout: 'apps-libs' });
         addAngularPluginPeerDeps(tree);
         tree.write('.gitignore', '');
-        const { wrapAngularDevkitSchematic } = require('@nx/devkit/ngcli-adapter');
-        const moduleGenerator = wrapAngularDevkitSchematic('@schematics/angular', 'module');
         yield (0, library_1.libraryGenerator)(tree, {
             name: libName,
             buildable: false,
@@ -84,7 +82,7 @@ export class TestButtonComponent {
         tree.write(modulePath, `import * as ButtonExports from './test-button/test-button.component';
     ${tree.read(modulePath)}`);
         // create a module with component that gets exported in a barrel file
-        yield moduleGenerator(tree, {
+        generateModule(tree, {
             name: 'barrel',
             project: libName,
         });
@@ -105,7 +103,7 @@ import { BarrelButtonComponent } from './barrel-button';
 })
 export class BarrelModule {}`);
         // create a module with components that get Angular exported and declared by variable
-        yield moduleGenerator(tree, {
+        generateModule(tree, {
             name: 'variable-declare',
             project: libName,
         });
@@ -138,7 +136,7 @@ const COMPONENTS = [
 })
 export class VariableDeclareModule {}`);
         // create a module with components that get Angular exported and declared by variable
-        yield moduleGenerator(tree, {
+        generateModule(tree, {
             name: 'variable-spread-declare',
             project: libName,
         });
@@ -177,7 +175,7 @@ const COMPONENTS = [
 })
 export class VariableSpreadDeclareModule {}`);
         // create a module where declared components are pulled from a static member of the module
-        yield moduleGenerator(tree, {
+        generateModule(tree, {
             name: 'static-member-declarations',
             project: libName,
         });
@@ -207,7 +205,7 @@ export class StaticMemberDeclarationsModule {
   static readonly COMPONENTS = [Cmp1Component, Cmp2Component];
 }`);
         // create another button in a nested subpath
-        yield moduleGenerator(tree, {
+        generateModule(tree, {
             name: 'nested',
             project: libName,
             path: `libs/${libName}/src/lib`,
@@ -229,4 +227,23 @@ exports.createStorybookTestWorkspaceForLib = createStorybookTestWorkspaceForLib;
 function addAngularPluginPeerDeps(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', (json) => (Object.assign(Object.assign({}, json), { devDependencies: Object.assign(Object.assign({}, json.devDependencies), { '@angular-devkit/core': versions_1.angularDevkitVersion, '@angular-devkit/schematics': versions_1.angularDevkitVersion, '@schematics/angular': versions_1.angularDevkitVersion }) })));
 }
+function generateModule(tree, options) {
+    var _a;
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (options.path === undefined) {
+        const sourceRoot = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : `${project.root}/src`;
+        const projectDirName = project.projectType === 'application' ? 'app' : 'lib';
+        options.path = `${sourceRoot}/${projectDirName}`;
+    }
+    const moduleNames = (0, devkit_1.names)(options.name);
+    const moduleFilePath = `${options.path}/${moduleNames.fileName}/${moduleNames.fileName}.module.ts`;
+    tree.write(moduleFilePath, `import { NgModule } from '@angular/core';
+  import { CommonModule } from '@angular/common';
+  
+  @NgModule({
+    declarations: [],
+    imports: [CommonModule],
+  })
+  export class ${moduleNames.className}Module {}`);
+}
 //# sourceMappingURL=testing.js.map

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

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

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

@@ -1,3 +1,4 @@
 import type { Tree } from '@nx/devkit';
 export declare function validateProject(tree: Tree, projectName: string): void;
 export declare function validateStandaloneOption(tree: Tree, standalone: boolean | undefined, angularVersion?: string): void;
+export declare function validatePathIsUnderProjectRoot(tree: Tree, projectName: string, path: string): void;

package/src/generators/utils/validations.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateStandaloneOption = exports.validateProject = void 0;
+exports.validatePathIsUnderProjectRoot = exports.validateStandaloneOption = exports.validateProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
+const path_1 = require("./path");
 const version_utils_1 = require("./version-utils");
 function validateProject(tree, projectName) {
     const projects = (0, devkit_1.getProjects)(tree);
@@ -22,4 +23,19 @@ function validateStandaloneOption(tree, standalone, angularVersion) {
     }
 }
 exports.validateStandaloneOption = validateStandaloneOption;
+function validatePathIsUnderProjectRoot(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 (!(0, path_1.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.validatePathIsUnderProjectRoot = validatePathIsUnderProjectRoot;
 //# sourceMappingURL=validations.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/validations.ts"],"names":[],"mappings":";;;AACA,uCAAuD;AACvD,mCAA4B;AAC5B,mDAAiE;AAEjE,SAAgB,eAAe,CAAC,IAAU,EAAE,WAAmB;IAC7D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CACb,YAAY,WAAW,4DAA4D,CACpF,CAAC;KACH;AACH,CAAC;AARD,0CAQC;AAED,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAA+B,EAC/B,cAAuB;IAEvB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,MAAM,uBAAuB,GAC3B,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAEjE,IAAI,IAAA,WAAE,EAAC,uBAAuB,EAAE,QAAQ,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,4FAA4F,uBAAuB;sGAC7C,CAAC,CAAC;KACrG;AACH,CAAC;AAhBD,4DAgBC"}
+{"version":3,"file":"validations.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/utils/validations.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AACpB,mCAA4B;AAC5B,iCAAwC;AACxC,mDAAiE;AAEjE,SAAgB,eAAe,CAAC,IAAU,EAAE,WAAmB;IAC7D,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC9B,MAAM,IAAI,KAAK,CACb,YAAY,WAAW,4DAA4D,CACpF,CAAC;KACH;AACH,CAAC;AARD,0CAQC;AAED,SAAgB,wBAAwB,CACtC,IAAU,EACV,UAA+B,EAC/B,cAAuB;IAEvB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;KACR;IAED,MAAM,uBAAuB,GAC3B,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,IAAA,8CAA8B,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IAEjE,IAAI,IAAA,WAAE,EAAC,uBAAuB,EAAE,QAAQ,CAAC,EAAE;QACzC,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,4FAA4F,uBAAuB;sGAC7C,CAAC,CAAC;KACrG;AACH,CAAC;AAhBD,4DAgBC;AAED,SAAgB,8BAA8B,CAC5C,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,IAAA,qBAAc,EAAC,eAAe,EAAE,IAAI,CAAC,EAAE;QAC1C,MAAM,IAAI,KAAK,CACb,sBAAsB,IAAI,4CAA4C,IAAI,KAAK;YAC7E,wEAAwE,CAC3E,CAAC;KACH;AACH,CAAC;AAtBD,wEAsBC"}

package/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const path_1 = require("path");
 let tsModule;
 let tsquery;
-function getBootstrapCallFileInfo(project, tree) {
-    var _a, _b, _c;
+function getBootstrapCallFileInfo(tree, project, mainFilePath) {
     const IMPORT_BOOTSTRAP_FILE = 'CallExpression:has(ImportKeyword) > StringLiteral';
-    let bootstrapCallFilePath = (_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.main;
+    let bootstrapCallFilePath = mainFilePath;
     let bootstrapCallFileContents = tree.read(bootstrapCallFilePath, 'utf-8');
     const ast = tsquery.ast(bootstrapCallFileContents);
     const importBootstrapNodes = tsquery(ast, IMPORT_BOOTSTRAP_FILE, {
@@ -29,29 +29,49 @@ function getImportTokenMap(bootstrapCallFileContentsAst) {
     }
     return importTokenMap;
 }
-function getImportsRequiredForAppConfig(importTokenMap, appConfigNode) {
-    const importsRequiredForAppConfig = new Set();
-    const checkImportsForTokens = (nodeText) => {
-        const keys = importTokenMap.keys();
-        for (const key of keys) {
-            if (key.includes(nodeText))
-                importsRequiredForAppConfig.add(importTokenMap.get(key));
+function getImportsRequiredForAppConfig(importTokenMap, appConfigNode, oldSourceFilePath, newSourceFilePath) {
+    const identifiers = tsquery.query(appConfigNode, 'Identifier:not(PropertyAssignment > Identifier)', { visitAllChildren: true });
+    const appConfigImports = new Set();
+    const originalImportsToRemove = new Set();
+    for (const identifier of identifiers) {
+        for (const key of importTokenMap.keys()) {
+            if (!key.includes(identifier.getText())) {
+                continue;
+            }
+            let importText = importTokenMap.get(key);
+            originalImportsToRemove.add(importText);
+            if (oldSourceFilePath === newSourceFilePath ||
+                oldSourceFilePath.split('/').length ===
+                    newSourceFilePath.split('/').length) {
+                appConfigImports.add(importText);
+                continue;
+            }
+            const importPath = tsquery
+                .query(importText, 'StringLiteral', {
+                visitAllChildren: true,
+            })[0]
+                .getText()
+                .replace(/'/g, '')
+                .replace(/"/g, '');
+            if (importPath.startsWith('.')) {
+                const resolvedImportPath = (0, path_1.resolve)((0, path_1.dirname)(oldSourceFilePath), importPath);
+                const newRelativeImportPath = (0, path_1.relative)((0, path_1.dirname)(newSourceFilePath), resolvedImportPath);
+                importText = importText.replace(importPath, newRelativeImportPath.startsWith('.')
+                    ? newRelativeImportPath
+                    : `./${newRelativeImportPath}`);
+            }
+            appConfigImports.add(importText);
         }
+    }
+    return {
+        appConfigImports: Array.from(appConfigImports),
+        importsToRemoveFromSource: Array.from(originalImportsToRemove),
     };
-    const visitEachChild = (node) => {
-        node.forEachChild((node) => {
-            const nodeText = node.getText();
-            checkImportsForTokens(nodeText);
-            visitEachChild(node);
-        });
-    };
-    visitEachChild(appConfigNode);
-    return importsRequiredForAppConfig;
 }
 function getAppConfigFileContents(importsRequiredForAppConfig, appConfigText) {
     const buildAppConfigFileContents = (importStatements, appConfig) => `import { ApplicationConfig } from '@angular/core';${importStatements.join('\n')}
         export const appConfig: ApplicationConfig = ${appConfig}`;
-    const appConfigFileContents = buildAppConfigFileContents(Array.from(importsRequiredForAppConfig), appConfigText);
+    const appConfigFileContents = buildAppConfigFileContents(importsRequiredForAppConfig, appConfigText);
     return appConfigFileContents;
 }
 function getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsRequiredForAppConfig) {
@@ -74,14 +94,14 @@ function extractStandaloneConfig(tree) {
         const projects = (0, devkit_1.getProjects)(tree);
         const BOOTSTRAP_APPLICATION_CALL_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication])';
         const BOOTSTRAP_APPLICATION_CALL_CONFIG_SELECTOR = 'CallExpression:has(Identifier[name=bootstrapApplication]) > ObjectLiteralExpression';
-        for (const [projectName, project] of projects.entries()) {
+        for (const [, project] of projects.entries()) {
             if (project.projectType !== 'application') {
                 continue;
             }
             if (((_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.main) === undefined) {
                 continue;
             }
-            const { bootstrapCallFilePath, bootstrapCallFileContents } = getBootstrapCallFileInfo(project, tree);
+            const { bootstrapCallFilePath, bootstrapCallFileContents } = getBootstrapCallFileInfo(tree, project, project.targets.build.options.main);
             const bootstrapCallFileContentsAst = tsquery.ast(bootstrapCallFileContents);
             const nodes = tsquery(bootstrapCallFileContentsAst, BOOTSTRAP_APPLICATION_CALL_SELECTOR, { visitAllChildren: true });
             if (nodes.length === 0) {
@@ -95,11 +115,11 @@ function extractStandaloneConfig(tree) {
             }
             const appConfigNode = appConfigNodes[0];
             const appConfigText = appConfigNode.getText();
-            const importsRequiredForAppConfig = getImportsRequiredForAppConfig(importTokenMap, appConfigNode);
             const appConfigFilePath = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'app/app.config.ts');
-            const appConfigFileContents = getAppConfigFileContents(importsRequiredForAppConfig, appConfigText);
+            const { appConfigImports, importsToRemoveFromSource } = getImportsRequiredForAppConfig(importTokenMap, appConfigNode, bootstrapCallFilePath, appConfigFilePath);
+            const appConfigFileContents = getAppConfigFileContents(appConfigImports, appConfigText);
             tree.write(appConfigFilePath, appConfigFileContents);
-            let newBootstrapCallFileContents = getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsRequiredForAppConfig);
+            let newBootstrapCallFileContents = getBootstrapCallFileContents(bootstrapCallFileContents, appConfigNode, importsToRemoveFromSource);
             tree.write(bootstrapCallFilePath, newBootstrapCallFileContents);
         }
         yield (0, devkit_1.formatFiles)(tree);