@nrwl/angular 14.8.3 → 15.0.0-beta.1

package/src/generators/application/schema.d.ts

@@ -2,8 +2,6 @@ import { Linter } from '@nrwl/linter';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
-type AngularLinter = Exclude<Linter, Linter.TsLint>;
-
 export interface Schema {
   name: string;
   addTailwind?: boolean;
@@ -17,36 +15,16 @@ export interface Schema {
   skipTests?: boolean;
   directory?: string;
   tags?: string;
-  linter?: AngularLinter;
+  linter?: Linter;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
   standaloneConfig?: boolean;
-  /**
-   * @deprecated Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version.
-   */
-  mf?: boolean;
-  /**
-   * @deprecated Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version.
-   */
-  mfType?: 'host' | 'remote';
-  /**
-   * @deprecated Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version.
-   */
-  remotes?: string[];
   port?: number;
-  /**
-   * @deprecated Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version.
-   */
-  host?: string;
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
   skipPostInstall?: boolean;
-  /**
-   * @deprecated Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version.
-   */
-  federationType?: 'static' | 'dynamic';
   skipDefaultProject?: boolean;
   standalone?: boolean;
 }

package/src/generators/application/schema.json

@@ -133,40 +133,10 @@
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
       "type": "boolean"
     },
-    "mf": {
-      "description": "Generate a Module Federation configuration for the application",
-      "type": "boolean",
-      "default": false,
-      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
-    },
-    "mfType": {
-      "type": "string",
-      "enum": ["host", "remote"],
-      "description": "Type of application to generate the Module Federation configuration for.",
-      "default": "remote",
-      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
-    },
-    "federationType": {
-      "type": "string",
-      "enum": ["static", "dynamic"],
-      "description": "Use either Static or Dynamic Module Federation pattern for the application.",
-      "default": "static",
-      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
-    },
     "port": {
       "type": "number",
       "description": "The port at which the remote application should be served."
     },
-    "remotes": {
-      "type": "array",
-      "description": "A list of remote application names that the host application should consume.",
-      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
-    },
-    "host": {
-      "type": "string",
-      "description": "The name of the host application that the remote application will be consumed by.",
-      "x-deprecated": "Use the `host` or `remote` generators instead. Support for generating Module Federation applications using the application generator will be removed in an upcoming version."
-    },
     "setParserOptionsProject": {
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",

package/src/generators/host/host.js

@@ -6,8 +6,7 @@ const application_1 = require("../application/application");
 const remote_1 = require("../remote/remote");
 const project_1 = require("../utils/project");
 const ts = require("typescript");
-const ast_utils_1 = require("../../utils/nx-devkit/ast-utils");
-const standalone_utils_1 = require("../../utils/nx-devkit/standalone-utils");
+const route_utils_1 = require("../../utils/nx-devkit/route-utils");
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const test_runners_1 = require("../../utils/test-runners");
 function host(tree, options) {
@@ -62,26 +61,15 @@ ${remoteRoutes}
 </ul>
 <router-outlet></router-outlet>
 `);
-    const pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, options.standalone ? 'bootstrap.ts' : 'app/app.module.ts');
+    const pathToHostRootRoutingFile = (0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.ts');
     const hostRootRoutingFile = tree.read(pathToHostRootRoutingFile, 'utf-8');
-    if (!hostRootRoutingFile.includes('RouterModule.forRoot(')) {
-        return;
-    }
     let sourceFile = ts.createSourceFile(pathToHostRootRoutingFile, hostRootRoutingFile, ts.ScriptTarget.Latest, true);
-    if (hostRootRoutingFile.includes('@NgModule')) {
-        sourceFile = (0, ast_utils_1.addRoute)(tree, pathToHostRootRoutingFile, sourceFile, `{
-         path: '', 
-         component: NxWelcomeComponent
-     }`);
-    }
-    else {
-        (0, standalone_utils_1.addStandaloneRoute)(tree, pathToHostRootRoutingFile, `{
+    (0, route_utils_1.addRoute)(tree, pathToHostRootRoutingFile, `{
       path: '',
       component: NxWelcomeComponent
     }`);
-        tree.write(pathToHostRootRoutingFile, `import { NxWelcomeComponent } from './app/nx-welcome.component';
+    tree.write(pathToHostRootRoutingFile, `import { NxWelcomeComponent } from './nx-welcome.component';
     ${tree.read(pathToHostRootRoutingFile, 'utf-8')}`);
-    }
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)(sourceRoot, 'app'), {
         appName: (0, project_1.normalizeProjectName)(options.name, options.directory),
         tmpl: '',

package/src/generators/host/host.js.map

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

package/src/generators/host/schema.d.ts

@@ -2,8 +2,6 @@ import { Linter } from '@nrwl/linter';
 import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
-type AngularLinter = Exclude<Linter, Linter.TsLint>;
-
 export interface Schema {
   name: string;
   remotes?: string[];
@@ -17,7 +15,7 @@ export interface Schema {
   skipTests?: boolean;
   directory?: string;
   tags?: string;
-  linter?: AngularLinter;
+  linter?: Linter;
   unitTestRunner?: UnitTestRunner;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;

package/src/generators/init/schema.d.ts

@@ -8,7 +8,7 @@ export interface Schema {
   skipFormat?: boolean;
   skipInstall?: boolean;
   style?: Styles;
-  linter?: Exclude<Linter, Linter.TsLint>;
+  linter?: Linter;
   skipPackageJson?: boolean;
   skipPostInstall?: boolean;
 }

package/src/generators/library/lib/add-children.js

@@ -5,28 +5,23 @@ const devkit_1 = require("@nrwl/devkit");
 const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
 const ts = require("typescript");
 const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
-const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
+const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function addChildren(tree, options) {
-    if (!tree.exists(options.parentModule)) {
-        throw new Error(`Cannot find '${options.parentModule}'`);
+    if (!tree.exists(options.parent)) {
+        throw new Error(`Cannot find '${options.parent}'`);
     }
-    const moduleSource = tree.read(options.parentModule, 'utf-8');
+    const routeFileSource = tree.read(options.parent, 'utf-8');
     const constName = options.standalone
-        ? `${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES`
+        ? `${(0, devkit_1.names)(options.name).propertyName}Routes`
         : `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
     const importPath = options.importPath;
-    let sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
+    let sourceFile = ts.createSourceFile(options.parent, routeFileSource, ts.ScriptTarget.Latest, true);
     if (!options.standalone) {
-        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.parentModule, options.moduleName);
+        sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.parent, options.moduleName);
     }
-    sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.parentModule, options.standalone ? constName : `${options.moduleName}, ${constName}`, importPath);
+    sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.parent, options.standalone ? constName : `${options.moduleName}, ${constName}`, importPath);
     const route = `{ path: '${(0, devkit_1.names)(options.fileName).fileName}', children: ${constName} }`;
-    if (moduleSource.includes('@NgModule')) {
-        sourceFile = (0, ast_utils_2.addRoute)(tree, options.parentModule, sourceFile, route);
-    }
-    else {
-        (0, standalone_utils_1.addStandaloneRoute)(tree, options.parentModule, route, false, constName, importPath);
-    }
+    (0, route_utils_1.addRoute)(tree, options.parent, route, false, constName, importPath);
 }
 exports.addChildren = addChildren;
 //# sourceMappingURL=add-children.js.map

package/src/generators/library/lib/add-children.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,iCAAiC;AACjC,kEAG4C;AAE5C,gFAA+E;AAE/E,SAAgB,WAAW,CACzB,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS;QACzD,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtC,UAAU,GAAG,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KACtE;SAAM;QACL,IAAA,qCAAkB,EAChB,IAAI,EACJ,OAAO,CAAC,YAAY,EACpB,KAAK,EACL,KAAK,EACL,SAAS,EACT,UAAU,CACX,CAAC;KACH;AACH,CAAC;AArDD,kCAqDC"}
+{"version":3,"file":"add-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,uEAAuE;AACvE,iCAAiC;AACjC,kEAAuE;AAEvE,sEAAgE;AAEhE,SAAgB,WAAW,CACzB,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IACpD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,MAAM,EACd,eAAe,EACf,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;QACvB,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CACnB,CAAC;KACH;IAED,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,EACtE,UAAU,CACX,CAAC;IAEF,MAAM,KAAK,GAAG,YACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,gBAAgB,SAAS,IAAI,CAAC;IAE9B,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AACtE,CAAC;AA1CD,kCA0CC"}

package/src/generators/library/lib/add-lazy-loaded-router-configuration.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from './normalized-schema';
-export declare function addLazyLoadedRouterConfiguration(host: Tree, options: NormalizedSchema['libraryOptions']): void;
+export declare function addLazyLoadedRouterConfiguration(tree: Tree, options: NormalizedSchema['libraryOptions']): void;

package/src/generators/library/lib/add-lazy-loaded-router-configuration.js

@@ -1,17 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLazyLoadedRouterConfiguration = void 0;
+const devkit_1 = require("@nrwl/devkit");
 const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
 const ts = require("typescript");
 const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
-function addLazyLoadedRouterConfiguration(host, options) {
-    const moduleSource = host.read(options.modulePath).toString('utf-8');
-    let sourceFile = ts.createSourceFile(options.modulePath, moduleSource, ts.ScriptTarget.Latest, true);
-    sourceFile = (0, ast_utils_2.addImportToModule)(host, sourceFile, options.modulePath, `
-    RouterModule.forChild([
-      /* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */
-    ]) `);
-    sourceFile = (0, ast_utils_1.insertImport)(host, sourceFile, options.modulePath, 'RouterModule', '@angular/router');
+const path_1 = require("path");
+function addLazyLoadedRouterConfiguration(tree, options) {
+    const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
+    tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
+
+export const ${constName}: Route[] = [/* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */];`);
+    const routeFileSource = tree.read(options.modulePath, 'utf-8');
+    let sourceFile = ts.createSourceFile(options.modulePath, routeFileSource, ts.ScriptTarget.Latest, true);
+    sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, options.modulePath, `
+    RouterModule.forChild(${constName}) `);
+    sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.modulePath, 'RouterModule', '@angular/router');
+    sourceFile = (0, ast_utils_1.insertImport)(tree, sourceFile, options.modulePath, constName, './lib.routes');
+    const pathToIndex = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/index.ts');
+    const indexFileContents = tree.read(pathToIndex, 'utf-8');
+    tree.write(pathToIndex, `${indexFileContents}
+  export * from './lib/lib.routes';`);
 }
 exports.addLazyLoadedRouterConfiguration = addLazyLoadedRouterConfiguration;
 //# sourceMappingURL=add-lazy-loaded-router-configuration.js.map

package/src/generators/library/lib/add-lazy-loaded-router-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AACA,uEAAuE;AACvE,iCAAiC;AACjC,kEAAuE;AAGvE,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB;;;QAGI,CACL,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;AACJ,CAAC;AA5BD,4EA4BC"}
+{"version":3,"file":"add-lazy-loaded-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-lazy-loaded-router-configuration.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,uEAAuE;AACvE,iCAAiC;AACjC,kEAAuE;AAEvE,+BAA+B;AAE/B,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA2C;IAE3C,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,wFAAwF,CAC7G,CAAC;IAEF,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,UAAU,GAAG,EAAE,CAAC,gBAAgB,CAClC,OAAO,CAAC,UAAU,EAClB,eAAe,EACf,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,UAAU,GAAG,IAAA,6BAAiB,EAC5B,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB;4BACwB,SAAS,IAAI,CACtC,CAAC;IAEF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,cAAc,EACd,iBAAiB,CAClB,CAAC;IACF,UAAU,GAAG,IAAA,wBAAY,EACvB,IAAI,EACJ,UAAU,EACV,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AAjDD,4EAiDC"}

package/src/generators/library/lib/add-load-children.js

@@ -3,23 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLoadChildren = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const ts = require("typescript");
-const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
-const standalone_utils_1 = require("../../../utils/nx-devkit/standalone-utils");
+const route_utils_1 = require("../../../utils/nx-devkit/route-utils");
 function addLoadChildren(tree, options) {
-    if (!tree.exists(options.parentModule)) {
-        throw new Error(`Cannot find '${options.parentModule}'`);
+    if (!tree.exists(options.parent)) {
+        throw new Error(`Cannot find '${options.parent}'`);
     }
-    const moduleSource = tree.read(options.parentModule).toString('utf-8');
-    const sourceFile = ts.createSourceFile(options.parentModule, moduleSource, ts.ScriptTarget.Latest, true);
+    const moduleSource = tree.read(options.parent, 'utf-8');
+    const sourceFile = ts.createSourceFile(options.parent, moduleSource, ts.ScriptTarget.Latest, true);
     const route = `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
-        ? `${(0, devkit_1.names)(options.name).className.toUpperCase()}_ROUTES`
+        ? `${(0, devkit_1.names)(options.name).propertyName}Routes`
         : options.moduleName})}`;
-    if (moduleSource.includes('@NgModule')) {
-        (0, ast_utils_1.addRoute)(tree, options.parentModule, sourceFile, route);
-    }
-    else {
-        (0, standalone_utils_1.addStandaloneRoute)(tree, options.parentModule, route);
-    }
+    (0, route_utils_1.addRoute)(tree, options.parent, route);
 }
 exports.addLoadChildren = addLoadChildren;
 //# sourceMappingURL=add-load-children.js.map

package/src/generators/library/lib/add-load-children.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAiC;AACjC,kEAA8D;AAE9D,gFAA+E;AAE/E,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACtC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;KAC1D;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,YAAY,EACpB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS;QACzD,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACtC,IAAA,oBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KACzD;SAAM;QACL,IAAA,qCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;KACvD;AACH,CAAC;AA7BD,0CA6BC"}
+{"version":3,"file":"add-load-children.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-load-children.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,iCAAiC;AAEjC,sEAAgE;AAEhE,SAAgB,eAAe,CAC7B,IAAU,EACV,OAA2C;IAE3C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QAChC,MAAM,IAAI,KAAK,CAAC,gBAAgB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;KACpD;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxD,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,OAAO,CAAC,MAAM,EACd,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,MAAM,KAAK,GAAG,WACZ,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAC1B,kCAAkC,OAAO,CAAC,UAAU,kBAClD,OAAO,CAAC,UAAU;QAChB,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,QAAQ;QAC7C,CAAC,CAAC,OAAO,CAAC,UACd,IAAI,CAAC;IAEL,IAAA,sBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACxC,CAAC;AAzBD,0CAyBC"}

package/src/generators/library/lib/add-module.js

@@ -9,13 +9,13 @@ function addModule(host, options) {
     if (options.routing && options.lazy) {
         (0, add_lazy_loaded_router_configuration_1.addLazyLoadedRouterConfiguration)(host, options);
     }
-    if (options.routing && options.lazy && options.parentModule) {
+    if (options.routing && options.lazy && options.parent) {
         (0, add_load_children_1.addLoadChildren)(host, options);
     }
     if (options.routing && !options.lazy) {
         (0, add_router_configuration_1.addRouterConfiguration)(host, options);
     }
-    if (options.routing && !options.lazy && options.parentModule) {
+    if (options.routing && !options.lazy && options.parent) {
         (0, add_children_1.addChildren)(host, options);
     }
 }

package/src/generators/library/lib/add-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-module.ts"],"names":[],"mappings":";;;AACA,iDAA6C;AAC7C,iGAA0F;AAC1F,2DAAsD;AACtD,yEAAoE;AAGpE,SAAgB,SAAS,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;QACnC,IAAA,uEAAgC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE;QAC3D,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACpC,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACvC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE;QAC5D,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC;AAhBD,8BAgBC"}
+{"version":3,"file":"add-module.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-module.ts"],"names":[],"mappings":";;;AACA,iDAA6C;AAC7C,iGAA0F;AAC1F,2DAAsD;AACtD,yEAAoE;AAGpE,SAAgB,SAAS,CACvB,IAAU,EACV,OAA2C;IAE3C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;QACnC,IAAA,uEAAgC,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACjD;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE;QACrD,IAAA,mCAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;QACpC,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACvC;IACD,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE;QACtD,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC;AAhBD,8BAgBC"}

package/src/generators/library/lib/add-router-configuration.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nrwl/devkit';
 import { NormalizedSchema } from './normalized-schema';
-export declare function addRouterConfiguration(host: Tree, options: NormalizedSchema['libraryOptions']): void;
+export declare function addRouterConfiguration(tree: Tree, options: NormalizedSchema['libraryOptions']): void;

package/src/generators/library/lib/add-router-configuration.js

@@ -5,13 +5,21 @@ const devkit_1 = require("@nrwl/devkit");
 const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
 const ts = require("typescript");
 const ast_utils_2 = require("../../../utils/nx-devkit/ast-utils");
-function addRouterConfiguration(host, options) {
+const path_1 = require("path");
+function addRouterConfiguration(tree, options) {
     const constName = `${(0, devkit_1.names)(options.fileName).propertyName}Routes`;
-    const moduleSource = host.read(options.modulePath).toString('utf-8');
+    const moduleSource = tree.read(options.modulePath, 'utf-8');
     let moduleSourceFile = ts.createSourceFile(options.modulePath, moduleSource, ts.ScriptTarget.Latest, true);
-    moduleSourceFile = (0, ast_utils_2.addImportToModule)(host, moduleSourceFile, options.modulePath, `RouterModule`);
-    moduleSourceFile = (0, ast_utils_1.insertImport)(host, moduleSourceFile, options.modulePath, 'RouterModule, Route', '@angular/router');
-    moduleSourceFile = (0, ast_utils_1.addGlobal)(host, moduleSourceFile, options.modulePath, `export const ${constName}: Route[] = [];`);
+    moduleSourceFile = (0, ast_utils_2.addImportToModule)(tree, moduleSourceFile, options.modulePath, `RouterModule`);
+    moduleSourceFile = (0, ast_utils_1.insertImport)(tree, moduleSourceFile, options.modulePath, 'RouterModule, Route', '@angular/router');
+    moduleSourceFile = (0, ast_utils_1.insertImport)(tree, moduleSourceFile, options.modulePath, constName, './lib.routes');
+    tree.write((0, devkit_1.joinPathFragments)((0, path_1.dirname)(options.modulePath), 'lib.routes.ts'), `import { Route } from '@angular/router';
+
+export const ${constName}: Route[] = [];`);
+    const pathToIndex = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/index.ts');
+    const indexFileContents = tree.read(pathToIndex, 'utf-8');
+    tree.write(pathToIndex, `${indexFileContents}
+  export * from './lib/lib.routes';`);
 }
 exports.addRouterConfiguration = addRouterConfiguration;
 //# sourceMappingURL=add-router-configuration.js.map

package/src/generators/library/lib/add-router-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAqC;AACrC,uEAGiD;AACjD,iCAAiC;AACjC,kEAAuE;AAGvE,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,gBAAgB,GAAG,IAAA,6BAAiB,EAClC,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,qBAAqB,EACrB,iBAAiB,CAClB,CAAC;IACF,gBAAgB,GAAG,IAAA,qBAAS,EAC1B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,gBAAgB,SAAS,iBAAiB,CAC3C,CAAC;AACJ,CAAC;AAhCD,wDAgCC"}
+{"version":3,"file":"add-router-configuration.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-router-configuration.ts"],"names":[],"mappings":";;;AACA,yCAAwD;AACxD,uEAAuE;AACvE,iCAAiC;AACjC,kEAAuE;AAEvE,+BAA+B;AAE/B,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA2C;IAE3C,MAAM,SAAS,GAAG,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,YAAY,QAAQ,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,OAAO,CAAC,UAAU,EAClB,YAAY,EACZ,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IAEF,gBAAgB,GAAG,IAAA,6BAAiB,EAClC,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,cAAc,CACf,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,qBAAqB,EACrB,iBAAiB,CAClB,CAAC;IACF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,OAAO,CAAC,UAAU,EAClB,SAAS,EACT,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAC/D;;eAEW,SAAS,iBAAiB,CACtC,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC3E,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,CACR,WAAW,EACX,GAAG,iBAAiB;oCACY,CACjC,CAAC;AACJ,CAAC;AAhDD,wDAgDC"}

package/src/generators/library/lib/add-standalone-component.js

@@ -11,19 +11,19 @@ function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         yield (0, component_1.default)(tree, Object.assign(Object.assign({}, componentOptions), { name: componentOptions.name, standalone: true, export: true, project: libraryOptions.name }));
         if (libraryOptions.routing) {
-            const pathToRoutes = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src/lib/routes.ts');
+            const pathToRoutes = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src/lib/lib.routes.ts');
             const routesContents = `import { Route } from '@angular/router';
     import { ${libraryOptions.standaloneComponentName} } from './${(0, path_1.joinPathFragments)(libraryOptions.fileName, `${libraryOptions.fileName}.component`)}';
     
-        export const ${(0, devkit_1.names)(libraryOptions.name).className.toUpperCase()}_ROUTES: Route[] = [
+        export const ${(0, devkit_1.names)(libraryOptions.name).propertyName}Routes: Route[] = [
           {path: '', component: ${libraryOptions.standaloneComponentName}}
         ];`;
             tree.write(pathToRoutes, routesContents);
             const pathToEntryFile = (0, path_1.joinPathFragments)(libraryOptions.projectRoot, 'src', `${libraryOptions.entryFile}.ts`);
             const entryFileContents = tree.read(pathToEntryFile, 'utf-8');
             tree.write(pathToEntryFile, `${entryFileContents}
-        export * from './lib/routes'`);
-            if (libraryOptions.parentModule) {
+        export * from './lib/lib.routes'`);
+            if (libraryOptions.parent) {
                 if (libraryOptions.lazy) {
                     (0, add_load_children_1.addLoadChildren)(tree, libraryOptions);
                 }

package/src/generators/library/lib/add-standalone-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAE7C,SAAsB,sBAAsB,CAC1C,IAAU,EACV,EAAE,cAAc,EAAE,gBAAgB,EAAoB;;QAEtD,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAC3B,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,cAAc,CAAC,IAAI,IAC5B,CAAC;QAEH,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,cAAc,CAAC,WAAW,EAC1B,mBAAmB,CACpB,CAAC;YAEF,MAAM,cAAc,GAAG;eAErB,cAAc,CAAC,uBACjB,cAAc,IAAA,wBAAiB,EAC7B,cAAc,CAAC,QAAQ,EACvB,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC;;uBAEkB,IAAA,cAAK,EAClB,cAAc,CAAC,IAAI,CACpB,CAAC,SAAS,CAAC,WAAW,EAAE;kCACC,cAAc,CAAC,uBAAuB;WAC7D,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,cAAc,CAAC,WAAW,EAC1B,KAAK,EACL,GAAG,cAAc,CAAC,SAAS,KAAK,CACjC,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;qCACW,CAChC,CAAC;YAEF,IAAI,cAAc,CAAC,YAAY,EAAE;gBAC/B,IAAI,cAAc,CAAC,IAAI,EAAE;oBACvB,IAAA,mCAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACvC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACnC;aACF;SACF;IACH,CAAC;CAAA;AArDD,wDAqDC"}
+{"version":3,"file":"add-standalone-component.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/add-standalone-component.ts"],"names":[],"mappings":";;;;AAEA,yDAA2D;AAC3D,4CAAsD;AACtD,yCAAqC;AACrC,2DAAsD;AACtD,iDAA6C;AAE7C,SAAsB,sBAAsB,CAC1C,IAAU,EACV,EAAE,cAAc,EAAE,gBAAgB,EAAoB;;QAEtD,MAAM,IAAA,mBAAkB,EAAC,IAAI,kCACxB,gBAAgB,KACnB,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAC3B,UAAU,EAAE,IAAI,EAChB,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,cAAc,CAAC,IAAI,IAC5B,CAAC;QAEH,IAAI,cAAc,CAAC,OAAO,EAAE;YAC1B,MAAM,YAAY,GAAG,IAAA,wBAAiB,EACpC,cAAc,CAAC,WAAW,EAC1B,uBAAuB,CACxB,CAAC;YAEF,MAAM,cAAc,GAAG;eAErB,cAAc,CAAC,uBACjB,cAAc,IAAA,wBAAiB,EAC7B,cAAc,CAAC,QAAQ,EACvB,GAAG,cAAc,CAAC,QAAQ,YAAY,CACvC;;uBAGK,IAAA,cAAK,EAAC,cAAc,CAAC,IAAI,CAAC,CAAC,YAC7B;kCAC0B,cAAc,CAAC,uBAAuB;WAC7D,CAAC;YACR,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;YAEzC,MAAM,eAAe,GAAG,IAAA,wBAAiB,EACvC,cAAc,CAAC,WAAW,EAC1B,KAAK,EACL,GAAG,cAAc,CAAC,SAAS,KAAK,CACjC,CAAC;YACF,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,CACR,eAAe,EACf,GAAG,iBAAiB;yCACe,CACpC,CAAC;YAEF,IAAI,cAAc,CAAC,MAAM,EAAE;gBACzB,IAAI,cAAc,CAAC,IAAI,EAAE;oBACvB,IAAA,mCAAe,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACvC;qBAAM;oBACL,IAAA,0BAAW,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;iBACnC;aACF;SACF;IACH,CAAC;CAAA;AArDD,wDAqDC"}

package/src/generators/library/lib/normalized-schema.d.ts

@@ -1,5 +1,5 @@
 import { UnitTestRunner } from '../../../utils/test-runners';
-import type { AngularLinter } from '../schema';
+import type { Linter } from '@nrwl/linter';
 export interface NormalizedSchema {
     libraryOptions: {
         name: string;
@@ -18,7 +18,7 @@ export interface NormalizedSchema {
         commonModule?: boolean;
         routing?: boolean;
         lazy?: boolean;
-        parentModule?: string;
+        parent?: string;
         tags?: string;
         strict?: boolean;
         compilationMode?: 'full' | 'partial';
@@ -27,7 +27,7 @@ export interface NormalizedSchema {
         skipPackageJson?: boolean;
         skipPostInstall?: boolean;
         standalone?: boolean;
-        linter: AngularLinter;
+        linter: Linter;
         unitTestRunner: UnitTestRunner;
         prefix: string;
         fileName: string;

package/src/generators/library/schema.d.ts

@@ -1,8 +1,6 @@
 import { UnitTestRunner } from '../../utils/test-runners';
 import { Linter } from '@nrwl/linter';
 
-type AngularLinter = Exclude<Linter, Linter.TsLint>;
-
 export interface Schema {
   name: string;
   addTailwind?: boolean;
@@ -21,10 +19,10 @@ export interface Schema {
   prefix?: string;
   routing?: boolean;
   lazy?: boolean;
-  parentModule?: string;
+  parent?: string;
   tags?: string;
   strict?: boolean;
-  linter?: AngularLinter;
+  linter?: Linter;
   unitTestRunner?: UnitTestRunner;
   compilationMode?: 'full' | 'partial';
   setParserOptionsProject?: boolean;

package/src/generators/library/schema.json

@@ -76,10 +76,9 @@
       "default": false,
       "description": "Add `RouterModule.forChild` when set to true, and a simple array of routes when set to false."
     },
-    "parentModule": {
+    "parent": {
       "type": "string",
-      "description": "Update the router configuration of the parent module using `loadChildren` or `children`, depending on what `lazy` is set to.",
-      "alias": "parent"
+      "description": "Path to the parent route configuration using `loadChildren` or `children`, depending on what `lazy` is set to."
     },
     "tags": {
       "type": "string",

package/src/generators/ng-add/schema.d.ts

@@ -14,6 +14,6 @@ export interface GeneratorOptions {
   skipInstall?: boolean;
   skipPostInstall?: boolean;
   style?: Styles;
-  linter?: Exclude<Linter, Linter.TsLint>;
+  linter?: Linter;
   skipPackageJson?: boolean;
 }

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

@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Action } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { NxModule<% if (useDataPersistence) { %>, DataPersistence<% } %> } from '@nrwl/angular';
 import { hot } from 'jasmine-marbles';
 import { Observable } from 'rxjs';
 
@@ -15,12 +14,9 @@ describe('<%= className %>Effects', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        NxModule.forRoot(),
-      ],
+      imports: [],
       providers: [
-        <%= className %>Effects,<% if (useDataPersistence) { %>
-        DataPersistence,<% } %>
+        <%= className %>Effects,
         provideMockActions(() => actions),
         provideMockStore()
       ],

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

@@ -1,25 +1,16 @@
 import { Injectable } from '@angular/core';
 import { createEffect, Actions, ofType } from '@ngrx/effects';
-import { <% if (useDataPersistence) { %>DataPersistence<% } %><% if (!useDataPersistence) { %>fetch<% } %> } from '@nrwl/angular';
+import { fetch } from '@nrwl/angular';
 
 import * as <%= className %>Actions from './<%= fileName %>.actions';
 import * as <%= className %>Feature from './<%= fileName %>.reducer';
 
 @Injectable()
 export class <%= className %>Effects {
-  <% if (useDataPersistence) { %>init$ = createEffect(() => this.dataPersistence.fetch(<%= className %>Actions.init<%= className %>, {
-    run: (action: ReturnType<typeof <%= className %>Actions.init<%= className %>>, state: <%= className %>Feature.<%= className %>PartialState) => {
-      // Your custom service 'load' logic goes here. For now just return a success action...
-      return <%= className %>Actions.load<%= className %>Success({ <%= propertyName %>: [] });
-    },
-    onError: (action: ReturnType<typeof <%= className %>Actions.init<%= className %>>, error) => {
-      console.error('Error', error);
-      return <%= className %>Actions.load<%= className %>Failure({ error });
-    }
-  }));<% } else { %>init$ = createEffect(() => this.actions$.pipe(
+  init$ = createEffect(() => this.actions$.pipe(
     ofType(<%= className %>Actions.init<%= className %>),
     fetch({
-      run: action => {
+      run: (action) => {
         // Your custom service 'load' logic goes here. For now just return a success action...
         return <%= className %>Actions.load<%= className %>Success({ <%= propertyName %>: [] });
       },
@@ -28,10 +19,7 @@ export class <%= className %>Effects {
         return <%= className %>Actions.load<%= className %>Failure({ error });
       }
     })
-  ));<% } %>
+  ));
 
-  constructor(
-    private readonly actions$: Actions<% if (useDataPersistence) { %>,
-    private readonly dataPersistence: DataPersistence<<%= className %>Feature.<%= className %>PartialState><% } %>
-  ) {}
+  constructor(private readonly actions$: Actions) {}
 }

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

@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
-import { NxModule } from '@nrwl/angular';
 import { readFirst } from '@nrwl/angular/testing';
 
 import * as <%= className %>Actions from './<%= fileName %>.actions';
@@ -42,7 +41,6 @@ describe('<%= className %>Facade', () => {
 
       @NgModule({
         imports: [
-          NxModule.forRoot(),
           StoreModule.forRoot({}),
           EffectsModule.forRoot([]),
           CustomFeatureModule,

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

@@ -31,7 +31,6 @@ function addImportsToModule(tree, options) {
         strictStateImmutability: true
       }
     })`;
-    const nxModule = 'NxModule.forRoot()';
     const effectsForRoot = `EffectsModule.forRoot([${effectsName}])`;
     const effectsForEmptyRoot = `EffectsModule.forRoot([])`;
     const storeForFeature = `StoreModule.forFeature(from${className}.${constantName}_FEATURE_KEY, from${className}.${propertyName}Reducer)`;
@@ -40,7 +39,6 @@ function addImportsToModule(tree, options) {
     const storeRouterModule = 'StoreRouterConnectingModule.forRoot()';
     // this is just a heuristic
     const hasRouter = sourceText.indexOf('RouterModule') > -1;
-    const hasNxModule = sourceText.includes(nxModule);
     sourceFile = addImport(sourceFile, 'StoreModule', '@ngrx/store');
     sourceFile = addImport(sourceFile, 'EffectsModule', '@ngrx/effects');
     if (options.minimal && options.root) {
@@ -66,10 +64,6 @@ function addImportsToModule(tree, options) {
         };
         if (options.root) {
             sourceFile = addCommonImports();
-            if (!hasNxModule) {
-                sourceFile = addImport(sourceFile, 'NxModule', '@nrwl/angular');
-                sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, nxModule);
-            }
             sourceFile = addImport(sourceFile, 'StoreDevtoolsModule', '@ngrx/store-devtools');
             sourceFile = addImport(sourceFile, 'environment', '../environments/environment');
             sourceFile = (0, ast_utils_2.addImportToModule)(tree, sourceFile, modulePath, storeForRoot);