@nx/angular 16.8.0-beta.7 → 16.8.0-rc.0

package/generators.json

@@ -74,7 +74,8 @@
       "factory": "./src/generators/move/compat",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
-      "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration."
+      "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.",
+      "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v18."
     },
     "convert-to-with-mf": {
       "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf.compat",
@@ -230,10 +231,11 @@
       "description": "Generate a Remote Angular Module Federation Application."
     },
     "move": {
-      "factory": "./src/generators/move/move#angularMoveGenerator",
+      "factory": "./src/generators/move/move#angularMoveGeneratorInternal",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
-      "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration."
+      "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.",
+      "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v18."
     },
     "convert-to-with-mf": {
       "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf",

package/ng-package.json

@@ -14,7 +14,6 @@
     "@phenomnomnominal/tsquery",
     "@typescript-eslint/",
     "chalk",
-    "chokidar",
     "ignore",
     "minimatch",
     "rxjs-for-await",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.8.0-beta.7",
+  "version": "16.8.0-rc.0",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -26,6 +26,7 @@
     "./src/utils": "./src/utils/public-api.js",
     "./plugins/component-testing": "./plugins/component-testing.js",
     "./src/generators/utils": "./src/generators/utils/index.js",
+    "./src/generators/move/move-impl": "./src/generators/move/move-impl.js",
     "./src/builders/*/schema.json": "./src/builders/*/schema.json",
     "./src/builders/*.impl": "./src/builders/*.impl.js",
     "./src/executors/*/schema.json": "./src/executors/*/schema.json",
@@ -66,14 +67,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.8.0-beta.7",
-    "@nx/cypress": "16.8.0-beta.7",
-    "@nx/devkit": "16.8.0-beta.7",
-    "@nx/jest": "16.8.0-beta.7",
-    "@nx/js": "16.8.0-beta.7",
-    "@nx/linter": "16.8.0-beta.7",
-    "@nx/webpack": "16.8.0-beta.7",
-    "@nx/workspace": "16.8.0-beta.7",
+    "@nrwl/angular": "16.8.0-rc.0",
+    "@nx/cypress": "16.8.0-rc.0",
+    "@nx/devkit": "16.8.0-rc.0",
+    "@nx/jest": "16.8.0-rc.0",
+    "@nx/js": "16.8.0-rc.0",
+    "@nx/linter": "16.8.0-rc.0",
+    "@nx/webpack": "16.8.0-rc.0",
+    "@nx/workspace": "16.8.0-rc.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -110,5 +111,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "6175b0f2033a80504bdc79d6212de9377843d787"
+  "gitHead": "44d0b22f4f6c4a790e2ad4702bf27ffa15073582"
 }

package/src/generators/move/lib/index.d.ts

@@ -1,4 +1,3 @@
-export * from './normalize-schema';
 export * from './update-module-name';
 export * from './update-ng-package';
 export * from './update-secondary-entry-points';

package/src/generators/move/lib/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./normalize-schema"), exports);
 tslib_1.__exportStar(require("./update-module-name"), exports);
 tslib_1.__exportStar(require("./update-ng-package"), exports);
 tslib_1.__exportStar(require("./update-secondary-entry-points"), exports);

package/src/generators/move/lib/types.d.ts

@@ -0,0 +1,4 @@
+export type MoveImplOptions = {
+    oldProjectName: string;
+    newProjectName: string;
+};

package/src/generators/move/lib/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/generators/move/lib/update-module-name.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
-import type { NormalizedSchema } from '../schema';
+import type { MoveImplOptions } from './types';
 /**
  * Updates the Angular module name (including the spec file and index.ts)
  *
@@ -8,4 +8,4 @@ import type { NormalizedSchema } from '../schema';
  *
  * @param schema The options provided to the schematic
  */
-export declare function updateModuleName(tree: Tree, { projectName: oldProjectName, newProjectName }: NormalizedSchema): void;
+export declare function updateModuleName(tree: Tree, { oldProjectName, newProjectName }: MoveImplOptions): void;

package/src/generators/move/lib/update-module-name.js

@@ -10,7 +10,13 @@ const devkit_1 = require("@nx/devkit");
  *
  * @param schema The options provided to the schematic
  */
-function updateModuleName(tree, { projectName: oldProjectName, newProjectName }) {
+function updateModuleName(tree, { oldProjectName, newProjectName }) {
+    const unscopedNewProjectName = newProjectName.startsWith('@')
+        ? newProjectName.split('/')[1]
+        : newProjectName;
+    if (oldProjectName === unscopedNewProjectName) {
+        return;
+    }
     const project = (0, devkit_1.readProjectConfiguration)(tree, newProjectName);
     if (project.projectType === 'application') {
         // Expect the module to be something like 'app.module.ts' regardless of the folder name,
@@ -19,12 +25,12 @@ function updateModuleName(tree, { projectName: oldProjectName, newProjectName })
     }
     const moduleName = {
         from: `${(0, devkit_1.names)(oldProjectName).className}Module`,
-        to: `${(0, devkit_1.names)(newProjectName).className}Module`,
+        to: `${(0, devkit_1.names)(unscopedNewProjectName).className}Module`,
     };
     const findModuleName = new RegExp(`\\b${moduleName.from}`, 'g');
     const moduleFile = {
         from: `${oldProjectName}.module`,
-        to: `${newProjectName}.module`,
+        to: `${unscopedNewProjectName}.module`,
     };
     const findFileName = new RegExp(`\\b${moduleFile.from}`, 'g');
     const filesToRename = [

package/src/generators/move/lib/update-ng-package.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
-import type { NormalizedSchema } from '../schema';
-export declare function updateNgPackage(tree: Tree, schema: NormalizedSchema): void;
+import type { MoveImplOptions } from './types';
+export declare function updateNgPackage(tree: Tree, schema: MoveImplOptions): void;

package/src/generators/move/lib/update-secondary-entry-points.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { NormalizedSchema } from '../schema';
-export declare function updateSecondaryEntryPoints(tree: Tree, schema: NormalizedSchema): void;
+import type { MoveImplOptions } from './types';
+export declare function updateSecondaryEntryPoints(tree: Tree, schema: MoveImplOptions): void;

package/src/generators/move/lib/update-secondary-entry-points.js

@@ -12,6 +12,9 @@ const libraryExecutors = [
     '@nrwl/angular:package',
 ];
 function updateSecondaryEntryPoints(tree, schema) {
+    if (schema.oldProjectName === schema.newProjectName) {
+        return;
+    }
     const project = (0, devkit_1.readProjectConfiguration)(tree, schema.newProjectName);
     if (project.projectType !== 'library') {
         return;
@@ -25,7 +28,7 @@ function updateSecondaryEntryPoints(tree, schema) {
                 (0, devkit_1.joinPathFragments)(project.root, 'ng-package.json')) {
             return;
         }
-        updateReadme(tree, (0, path_1.dirname)(filePath), schema.projectName, schema.newProjectName);
+        updateReadme(tree, (0, path_1.dirname)(filePath), schema.oldProjectName, schema.newProjectName);
     });
 }
 exports.updateSecondaryEntryPoints = updateSecondaryEntryPoints;

package/src/generators/move/move-impl.d.ts

@@ -0,0 +1,7 @@
+import { type Tree } from '@nx/devkit';
+import type { MoveImplOptions } from './lib/types';
+/**
+ * Angular-specific logic to move a project to another directory.
+ * This is invoked by the `@nx/workspace:move` generator.
+ */
+export declare function move(tree: Tree, options: MoveImplOptions): Promise<void>;

package/src/generators/move/move-impl.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.move = void 0;
+const devkit_1 = require("@nx/devkit");
+const lib_1 = require("./lib");
+/**
+ * Angular-specific logic to move a project to another directory.
+ * This is invoked by the `@nx/workspace:move` generator.
+ */
+async function move(tree, options) {
+    // while the project has already being moved at this point, the changes are
+    // still in the virtual tree and haven't been committed, so the project graph
+    // still contains the old project name
+    if (!(await isAngularProject(options.oldProjectName))) {
+        return;
+    }
+    (0, lib_1.updateModuleName)(tree, options);
+    (0, lib_1.updateNgPackage)(tree, options);
+    (0, lib_1.updateSecondaryEntryPoints)(tree, options);
+}
+exports.move = move;
+async function isAngularProject(project) {
+    const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    return projectGraph.dependencies[project]?.some((dependency) => dependency.target === 'npm:@angular/core');
+}

package/src/generators/move/move.d.ts

@@ -1,10 +1,4 @@
-import { Tree } from '@nx/devkit';
+import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-/**
- * Moves an Angular lib/app to another folder (and renames it in the process)
- *
- * @remarks It's important to note that `updateModuleName` is done after the update
- * to the workspace, so it can't use the same tricks as the `@nx/workspace` rules
- * to get the before and after names and paths.
- */
 export declare function angularMoveGenerator(tree: Tree, schema: Schema): Promise<void>;
+export declare function angularMoveGeneratorInternal(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/move/move.js

@@ -1,24 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.angularMoveGenerator = void 0;
-const devkit_1 = require("@nx/devkit");
-const generators_1 = require("@nx/workspace/generators");
-const lib_1 = require("./lib");
-/**
- * Moves an Angular lib/app to another folder (and renames it in the process)
- *
- * @remarks It's important to note that `updateModuleName` is done after the update
- * to the workspace, so it can't use the same tricks as the `@nx/workspace` rules
- * to get the before and after names and paths.
- */
+exports.angularMoveGeneratorInternal = exports.angularMoveGenerator = void 0;
+const move_1 = require("@nx/workspace/src/generators/move/move");
 async function angularMoveGenerator(tree, schema) {
-    const normalizedSchema = (0, lib_1.normalizeSchema)(tree, schema);
-    await (0, generators_1.moveGenerator)(tree, { ...schema, skipFormat: true });
-    (0, lib_1.updateModuleName)(tree, normalizedSchema);
-    (0, lib_1.updateNgPackage)(tree, normalizedSchema);
-    (0, lib_1.updateSecondaryEntryPoints)(tree, normalizedSchema);
-    if (!normalizedSchema.skipFormat) {
-        await (0, devkit_1.formatFiles)(tree);
-    }
+    await angularMoveGeneratorInternal(tree, {
+        projectNameAndRootFormat: 'derived',
+        ...schema,
+    });
 }
 exports.angularMoveGenerator = angularMoveGenerator;
+async function angularMoveGeneratorInternal(tree, schema) {
+    process.env.NX_ANGULAR_MOVE_INVOKED = 'true';
+    await (0, move_1.moveGeneratorInternal)(tree, schema);
+}
+exports.angularMoveGeneratorInternal = angularMoveGeneratorInternal;

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

@@ -1,12 +1,11 @@
+import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+
 export interface Schema {
   projectName: string;
   destination: string;
   updateImportPath: boolean;
   importPath?: string;
   skipFormat?: boolean;
-}
-
-export interface NormalizedSchema extends Schema {
-  oldProjectRoot: string;
-  newProjectName: string;
+  newProjectName?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
 }

package/src/generators/move/schema.json

@@ -19,6 +19,13 @@
       "x-dropdown": "projects",
       "x-priority": "important"
     },
+    "newProjectName": {
+      "type": "string",
+      "alias": "project",
+      "description": "The new name of the project after the move.",
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
+      "x-priority": "important"
+    },
     "destination": {
       "type": "string",
       "description": "The folder to move the Angular project into.",
@@ -28,6 +35,11 @@
       },
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the new project name and destination as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "importPath": {
       "type": "string",
       "description": "The new import path to use in the `tsconfig.base.json`."

package/src/generators/move/lib/normalize-schema.d.ts

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

package/src/generators/move/lib/normalize-schema.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeSchema = void 0;
-const devkit_1 = require("@nx/devkit");
-const get_new_project_name_1 = require("../../utils/get-new-project-name");
-function normalizeSchema(tree, schema) {
-    const newProjectName = (0, get_new_project_name_1.getNewProjectName)(schema.destination);
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
-    return {
-        ...schema,
-        newProjectName,
-        oldProjectRoot: root,
-    };
-}
-exports.normalizeSchema = normalizeSchema;