@nx/devkit 19.4.0-canary.20240615-f431d0a → 19.4.0-canary.20240619-5646b38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "19.4.0-canary.20240615-f431d0a",
+  "version": "19.4.0-canary.20240619-5646b38",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -36,7 +36,7 @@
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
     "minimatch": "9.0.3",
-    "@nrwl/devkit": "19.4.0-canary.20240615-f431d0a"
+    "@nrwl/devkit": "19.4.0-canary.20240619-5646b38"
   },
   "peerDependencies": {
     "nx": ">= 17 <= 20"

package/src/generators/plugin-migrations/executor-to-plugin-migrator.d.ts

@@ -3,7 +3,7 @@ type PluginOptionsBuilder<T> = (targetName: string) => T;
 type PostTargetTransformer = (targetConfiguration: TargetConfiguration, tree: Tree, projectDetails: {
     projectName: string;
     root: string;
-}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration;
+}, inferredTargetConfiguration: TargetConfiguration) => TargetConfiguration | Promise<TargetConfiguration>;
 type SkipTargetFilter = (targetConfiguration: TargetConfiguration) => [boolean, string];
 export declare function migrateExecutorToPlugin<T>(tree: Tree, projectGraph: ProjectGraph, executor: string, pluginPath: string, pluginOptionsBuilder: PluginOptionsBuilder<T>, postTargetTransformer: PostTargetTransformer, createNodes: CreateNodesV2<T>, specificProjectToMigrate?: string, skipTargetFilter?: SkipTargetFilter): Promise<Map<string, Set<string>>>;
 export declare function migrateExecutorToPluginV1<T>(tree: Tree, projectGraph: ProjectGraph, executor: string, pluginPath: string, pluginOptionsBuilder: PluginOptionsBuilder<T>, postTargetTransformer: PostTargetTransformer, createNodes: CreateNodes<T>, specificProjectToMigrate?: string, skipTargetFilter?: SkipTargetFilter): Promise<Map<string, Set<string>>>;

package/src/generators/plugin-migrations/executor-to-plugin-migrator.js

@@ -41,7 +41,7 @@ class ExecutorToPluginMigrator {
         await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_init).call(this);
         if (tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").size > 0) {
             for (const targetName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").keys()) {
-                tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateTarget).call(this, targetName);
+                await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateTarget).call(this, targetName);
             }
             await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_addPlugins).call(this);
         }
@@ -58,17 +58,17 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getTargetDefaultsForExecutor).call(this);
     tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getTargetAndProjectsToMigrate).call(this);
     await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getCreateNodesResults).call(this);
-}, _ExecutorToPluginMigrator_migrateTarget = function _ExecutorToPluginMigrator_migrateTarget(targetName) {
+}, _ExecutorToPluginMigrator_migrateTarget = async function _ExecutorToPluginMigrator_migrateTarget(targetName) {
     const include = [];
     for (const projectName of tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_targetAndProjectsToMigrate, "f").get(targetName)) {
-        include.push(tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateProject).call(this, projectName, targetName));
+        include.push(await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_migrateProject).call(this, projectName, targetName));
     }
     tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginToAddForTarget, "f").set(targetName, {
         plugin: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginPath, "f"),
         options: tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_pluginOptionsBuilder, "f").call(this, targetName),
         include,
     });
-}, _ExecutorToPluginMigrator_migrateProject = function _ExecutorToPluginMigrator_migrateProject(projectName, targetName) {
+}, _ExecutorToPluginMigrator_migrateProject = async function _ExecutorToPluginMigrator_migrateProject(projectName, targetName) {
     const projectFromGraph = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_projectGraph, "f").nodes[projectName];
     const projectConfig = (0, devkit_exports_1.readProjectConfiguration)(this.tree, projectName);
     const createdTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_getCreatedTargetForProjectRoot).call(this, targetName, projectFromGraph.data.root);
@@ -79,7 +79,7 @@ _ExecutorToPluginMigrator_projectGraph = new WeakMap(), _ExecutorToPluginMigrato
     if (projectTarget.inputs && createdTarget.inputs) {
         tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_instances, "m", _ExecutorToPluginMigrator_mergeInputs).call(this, projectTarget, createdTarget);
     }
-    projectTarget = tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree, { projectName, root: projectFromGraph.data.root }, createdTarget);
+    projectTarget = await tslib_1.__classPrivateFieldGet(this, _ExecutorToPluginMigrator_postTargetTransformer, "f").call(this, projectTarget, this.tree, { projectName, root: projectFromGraph.data.root }, createdTarget);
     if (projectTarget.options &&
         Object.keys(projectTarget.options).length === 0) {
         delete projectTarget.options;

package/src/generators/plugin-migrations/plugin-migration-utils.d.ts

@@ -1,4 +1,4 @@
-import type { TargetConfiguration } from 'nx/src/devkit-exports';
+import { type TargetConfiguration } from 'nx/src/devkit-exports';
 /**
  * Iterate through the current target in the project.json and its options comparing it to the target created by the Plugin itself
  * Delete matching properties from current target.
@@ -60,3 +60,4 @@ export declare function processTargetOutputs(target: TargetConfiguration, rename
     projectName: string;
     projectRoot: string;
 }): void;
+export declare function toProjectRelativePath(path: string, projectRoot: string): string;

package/src/generators/plugin-migrations/plugin-migration-utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processTargetOutputs = exports.deleteMatchingProperties = void 0;
+exports.toProjectRelativePath = exports.processTargetOutputs = exports.deleteMatchingProperties = void 0;
+const posix_1 = require("node:path/posix");
+const devkit_exports_1 = require("nx/src/devkit-exports");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
  * Iterate through the current target in the project.json and its options comparing it to the target created by the Plugin itself
@@ -105,6 +107,16 @@ function processTargetOutputs(target, renamedOutputOptions, inferredTarget, proj
     target.outputs = targetOutputs;
 }
 exports.processTargetOutputs = processTargetOutputs;
+function toProjectRelativePath(path, projectRoot) {
+    if (projectRoot === '.') {
+        // workspace and project root are the same, we add a leading './' which is
+        // required by some tools (e.g. Jest)
+        return path.startsWith('.') ? path : `./${path}`;
+    }
+    const relativePath = (0, posix_1.relative)((0, posix_1.resolve)(devkit_exports_1.workspaceRoot, projectRoot), (0, posix_1.resolve)(devkit_exports_1.workspaceRoot, path));
+    return relativePath.startsWith('.') ? relativePath : `./${relativePath}`;
+}
+exports.toProjectRelativePath = toProjectRelativePath;
 function updateOutputRenamingOption(output, option, previousName) {
     const newOptionToken = `{options.${option}}`;
     const oldOptionToken = `{options.${previousName}}`;