@nx/angular 16.1.4 → 16.2.0-beta.1

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":";;;;AACA,uCAAwC;AACxC,gDAAkE;AAClE,uCAAoC;AACpC,2DAA0D;AAC1D,mDAA4D;AAC5D,4DAAkE;AAElE,sDAA4D;AAC5D,uCAAoC;AAEpC,gDAAsD;AAEtD,6CAA0C;AAG1C,SAAsB,uBAAuB,CAC3C,IAAU,EACV,OAA2B;;QAE3B,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7B,MAAM,IAAA,kCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;CAAA;AAPD,0DAOC;AAED,SAAsB,2BAA2B,CAC/C,IAAU,EACV,OAAoB;;QAEpB,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7B,MAAM,IAAA,WAAI,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;CAAA;AAPD,kEAOC;AAED,SAAsB,6BAA6B,CACjD,IAAU,EACV,OAAsB;;QAEtB,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7B,MAAM,IAAA,eAAM,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;CAAA;AAPD,sEAOC;AAED,SAAsB,mBAAmB,CACvC,IAAU,EACV,OAAuB;;QAEvB,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAC7B,MAAM,IAAA,0BAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;CAAA;AAPD,kDAOC;AAED,SAAsB,kCAAkC,CACtD,OAAe;;QAEf,IAAI,IAAI,GAAG,IAAA,sCAA4B,EAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QACjE,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAE7B,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;QAC3E,MAAM,eAAe,GAAG,0BAA0B,CAChD,qBAAqB,EACrB,QAAQ,CACT,CAAC;QAEF,MAAM,IAAA,0BAAgB,EAAC,IAAI,EAAE;YAC3B,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,eAAM,CAAC,MAAM;YACrB,WAAW,EAAE,KAAK;YAClB,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE,6BAAc,CAAC,IAAI;SACpC,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,+CAA+C,EAC9D;;;;;;;;;;;;;;EAcF,CACC,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,iDAAiD,EAChE,wDAAwD,CACzD,CAAC;QAEF,MAAM,UAAU,GAAG,QAAQ,OAAO,YAAY,OAAO,YAAY,CAAC;QAClE,IAAI,CAAC,KAAK,CACR,UAAU,EACV;MACE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAC1B,CAAC;QAEF,qEAAqE;QACrE,MAAM,eAAe,CAAC,IAAI,EAAE;YAC1B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,iBAAiB;YACtC,MAAM,EAAE,QAAQ;SACjB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,wCAAwC,EACvD,4CAA4C,CAC7C,CAAC;QAEF,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,kCAAkC,EACjD;;;;;;;;6BAQyB,CAC1B,CAAC;QAEF,qFAAqF;QACrF,MAAM,eAAe,CAAC,IAAI,EAAE;YAC1B,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,2BAA2B;YAChD,MAAM,EAAE,kBAAkB;SAC3B,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,uBAAuB;YAC7B,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,2BAA2B;YAChD,MAAM,EAAE,kBAAkB;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,sDAAsD,EACrE;;;;;;;;;;;;;;;sCAekC,CACnC,CAAC;QAEF,qFAAqF;QACrF,MAAM,eAAe,CAAC,IAAI,EAAE;YAC1B,IAAI,EAAE,yBAAyB;YAC/B,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,gCAAgC;YACtC,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,kCAAkC;YACvD,MAAM,EAAE,yBAAyB;SAClC,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,8BAA8B;YACpC,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,kCAAkC;YACvD,MAAM,EAAE,yBAAyB;SAClC,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,qCAAqC;YAC3C,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,kCAAkC;YACvD,MAAM,EAAE,yBAAyB;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,oEAAoE,EACnF;;;;;;;;;;;;;;;4CAewC,CACzC,CAAC;QAEF,0FAA0F;QAC1F,MAAM,eAAe,CAAC,IAAI,EAAE;YAC1B,IAAI,EAAE,4BAA4B;YAClC,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,qCAAqC;YAC1D,MAAM,EAAE,4BAA4B;SACrC,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,qCAAqC;YAC1D,MAAM,EAAE,4BAA4B;SACrC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CACR,QAAQ,OAAO,0EAA0E,EACzF;;;;;;;;;;;;EAYF,CACC,CAAC;QAEF,4CAA4C;QAC5C,MAAM,eAAe,CAAC,IAAI,EAAE;YAC1B,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,QAAQ,OAAO,UAAU;SAChC,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,QAAQ,OAAO,iBAAiB;SACvC,CAAC,CAAC;QAEH,MAAM,IAAA,8BAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AA1OD,gFA0OC;AAED,SAAS,wBAAwB,CAAC,IAAU;IAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,eAAe,kCACV,IAAI,CAAC,eAAe,KACvB,sBAAsB,EAAE,+BAAoB,EAC5C,4BAA4B,EAAE,+BAAoB,EAClD,qBAAqB,EAAE,+BAAoB,OAE7C,CAAC,CAAC;AACN,CAAC"}
+{"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);

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

@@ -1 +1 @@
-{"version":3,"file":"extract-standalone-config-from-bootstrap.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"extract-standalone-config-from-bootstrap.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-1-0/extract-standalone-config-from-bootstrap.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js

@@ -0,0 +1,124 @@
+"use strict";
+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 file_change_recorder_1 = require("../../utils/file-change-recorder");
+const versions_1 = require("../../utils/versions");
+const projects_1 = require("../utils/projects");
+let tsquery;
+const angularPluginTargetNames = ['npm:@nx/angular', 'npm:@nrwl/angular'];
+const dataPersistenceOperators = [
+    'fetch',
+    'navigation',
+    'optimisticUpdate',
+    'pessimisticUpdate',
+];
+const newImportPath = '@ngrx/router-store/data-persistence';
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projects = yield (0, projects_1.getProjectsFilteredByDependencies)(tree, angularPluginTargetNames);
+        if (!projects.length) {
+            return;
+        }
+        (0, ensure_typescript_1.ensureTypescript)();
+        tsquery = require('@phenomnomnominal/tsquery').tsquery;
+        const filesWithNxAngularImports = [];
+        for (const { graphNode } of projects) {
+            const files = filterFilesWithNxAngularDep(graphNode.data.files);
+            filesWithNxAngularImports.push(...files);
+        }
+        let isAnyFileUsingDataPersistence = false;
+        for (const { file } of filesWithNxAngularImports) {
+            const updated = replaceDataPersistenceInFile(tree, file);
+            isAnyFileUsingDataPersistence || (isAnyFileUsingDataPersistence = updated);
+        }
+        if (isAnyFileUsingDataPersistence) {
+            addNgrxRouterStoreIfNotInstalled(tree);
+            yield (0, devkit_1.formatFiles)(tree);
+        }
+    });
+}
+exports.default = default_1;
+function replaceDataPersistenceInFile(tree, file) {
+    const fileContents = tree.read(file, 'utf-8');
+    const fileAst = tsquery.ast(fileContents);
+    // "\\u002F" is the unicode code for "/", there's an issue with the query parser
+    // that prevents using "/" directly in regex queries
+    // https://github.com/estools/esquery/issues/68#issuecomment-415597670
+    const NX_ANGULAR_IMPORT_SELECTOR = 'ImportDeclaration:has(StringLiteral[value=/@(nx|nrwl)\\u002Fangular$/])';
+    const nxAngularImports = tsquery(fileAst, NX_ANGULAR_IMPORT_SELECTOR, { visitAllChildren: true });
+    if (!nxAngularImports.length) {
+        return false;
+    }
+    const recorder = new file_change_recorder_1.FileChangeRecorder(tree, file);
+    const IMPORT_SPECIFIERS_SELECTOR = 'ImportClause NamedImports ImportSpecifier';
+    for (const importDeclaration of nxAngularImports) {
+        const importSpecifiers = tsquery(importDeclaration, IMPORT_SPECIFIERS_SELECTOR, { visitAllChildren: true });
+        if (!importSpecifiers.length) {
+            continue;
+        }
+        // no imported symbol is a data persistence operator, skip
+        if (importSpecifiers.every((i) => !isOperatorImport(i))) {
+            continue;
+        }
+        // all imported symbols are data persistence operators, change import path
+        if (importSpecifiers.every((i) => isOperatorImport(i))) {
+            const IMPORT_PATH_SELECTOR = `${NX_ANGULAR_IMPORT_SELECTOR} > StringLiteral`;
+            const importPathNode = tsquery(importDeclaration, IMPORT_PATH_SELECTOR, {
+                visitAllChildren: true,
+            });
+            recorder.replace(importPathNode[0], `'${newImportPath}'`);
+            continue;
+        }
+        // mixed imports, split data persistence operators to a separate import
+        const operatorImportSpecifiers = [];
+        for (const importSpecifier of importSpecifiers) {
+            if (isOperatorImport(importSpecifier)) {
+                operatorImportSpecifiers.push(importSpecifier.getText());
+                recorder.remove(importSpecifier.getStart(), importSpecifier.getEnd() +
+                    (hasTrailingComma(recorder.originalContent, importSpecifier)
+                        ? 1
+                        : 0));
+            }
+        }
+        recorder.insertLeft(importDeclaration.getStart(), `import { ${operatorImportSpecifiers.join(', ')} } from '${newImportPath}';`);
+    }
+    if (recorder.hasChanged()) {
+        recorder.applyChanges();
+        return true;
+    }
+    return false;
+}
+function hasTrailingComma(content, node) {
+    return content[node.getEnd()] === ',';
+}
+function isOperatorImport(importSpecifier) {
+    return dataPersistenceOperators.includes(getOriginalIdentifierTextFromImportSpecifier(importSpecifier));
+}
+function getOriginalIdentifierTextFromImportSpecifier(importSpecifier) {
+    const children = importSpecifier.getChildren();
+    if (!children.length) {
+        return importSpecifier.getText();
+    }
+    return children[0].getText();
+}
+function addNgrxRouterStoreIfNotInstalled(tree) {
+    const { dependencies, devDependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    if ((dependencies === null || dependencies === void 0 ? void 0 : dependencies['@ngrx/router-store']) ||
+        (devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies['@ngrx/router-store'])) {
+        return;
+    }
+    (0, devkit_1.addDependenciesToPackageJson)(tree, { '@ngrx/router-store': versions_1.ngrxVersion }, {});
+}
+function filterFilesWithNxAngularDep(files) {
+    var _a;
+    const filteredFiles = [];
+    for (const file of files) {
+        if ((_a = file.dependencies) === null || _a === void 0 ? void 0 : _a.some((dep) => angularPluginTargetNames.includes(dep.target))) {
+            filteredFiles.push(file);
+        }
+    }
+    return filteredFiles;
+}
+//# sourceMappingURL=switch-data-persistence-operators-imports-to-ngrx-router-store.js.map

package/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switch-data-persistence-operators-imports-to-ngrx-router-store.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store.ts"],"names":[],"mappings":"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"}

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const angularVersion = "~16.0.0";
 export declare const angularDevkitVersion = "~16.0.0";
 export declare const ngPackagrVersion = "~16.0.0";
-export declare const ngrxVersion = "~15.3.0";
+export declare const ngrxVersion = "~16.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.13.0";
 export declare const angularJsVersion = "1.7.9";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~16.0.0';
 exports.angularDevkitVersion = '~16.0.0';
 exports.ngPackagrVersion = '~16.0.0';
-exports.ngrxVersion = '~15.3.0';
+exports.ngrxVersion = '~16.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.13.0';
 exports.angularJsVersion = '1.7.9';

package/src/generators/cypress-component-configuration/files/cypress/support/commands.ts__tpl__

@@ -1,42 +0,0 @@
-/// <reference types="cypress" />
-import { mount } from 'cypress/angular'
-
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-
-declare global {
-// eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Cypress {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    interface Chainable<Subject> {
-      login(email: string, password: string): void;
-      mount: typeof mount;
-    }
-  }
-}
-
-Cypress.Commands.add('mount', mount)
-
-//
-// -- This is a parent command --
-Cypress.Commands.add('login', (email, password) => {
-  console.log('Custom command example: Login', email, password);
-});
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })

package/src/generators/cypress-component-configuration/files/cypress.config.ts__tpl__

@@ -1,6 +0,0 @@
-import { defineConfig } from 'cypress';
-import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';
-
-export default defineConfig({
-  component: nxComponentTestingPreset(__filename),
-});

package/src/generators/ng-add/utilities/normalize-options.d.ts

@@ -1,4 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import type { GeneratorOptions } from '../schema';
-import type { WorkspaceProjects } from './types';
-export declare function normalizeOptions(tree: Tree, options: GeneratorOptions, projects: WorkspaceProjects): GeneratorOptions;

package/src/generators/ng-add/utilities/normalize-options.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
-const devkit_1 = require("@nx/devkit");
-function normalizeOptions(tree, options, projects) {
-    let npmScope = options.npmScope;
-    if (npmScope) {
-        npmScope = (0, devkit_1.names)(npmScope).fileName;
-    }
-    else if (projects.libs.length > 0) {
-        // try get the scope from any library that have one
-        for (const lib of projects.libs) {
-            const packageJsonPath = (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json');
-            if (!tree.exists(packageJsonPath)) {
-                continue;
-            }
-            const { name } = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(lib.config.root, 'package.json'));
-            npmScope = (0, devkit_1.detectWorkspaceScope)(name);
-            if (npmScope) {
-                break;
-            }
-        }
-    }
-    // use the name (scope if exists) in the root package.json
-    npmScope =
-        npmScope || (0, devkit_1.detectWorkspaceScope)((0, devkit_1.readJson)(tree, 'package.json').name);
-    return Object.assign(Object.assign({}, options), { npmScope });
-}
-exports.normalizeOptions = normalizeOptions;
-//# sourceMappingURL=normalize-options.js.map

package/src/generators/ng-add/utilities/normalize-options.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AAIpB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;IAE3B,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,cAAc,CACf,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBACjC,SAAS;aACV;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,QAAQ,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;YACtC,IAAI,QAAQ,EAAE;gBACZ,MAAM;aACP;SACF;KACF;IAED,0DAA0D;IAC1D,QAAQ;QACN,QAAQ,IAAI,IAAA,6BAAoB,EAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC;IAExE,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AAnCD,4CAmCC"}