nx 19.2.0-canary.20240528-7f11a1d → 19.2.0-canary.20240530-316dcb9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.2.0-canary.20240528-7f11a1d",
+  "version": "19.2.0-canary.20240530-316dcb9",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -69,7 +69,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.2.0-canary.20240528-7f11a1d"
+    "@nrwl/tao": "19.2.0-canary.20240530-316dcb9"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -84,16 +84,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-darwin-arm64": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-linux-x64-gnu": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-linux-x64-musl": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-win32-x64-msvc": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-linux-arm64-gnu": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-linux-arm64-musl": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-linux-arm-gnueabihf": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-win32-arm64-msvc": "19.2.0-canary.20240528-7f11a1d",
-    "@nx/nx-freebsd-x64": "19.2.0-canary.20240528-7f11a1d"
+    "@nx/nx-darwin-x64": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-darwin-arm64": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-linux-x64-gnu": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-linux-x64-musl": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-win32-x64-msvc": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-linux-arm64-gnu": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-linux-arm64-musl": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-linux-arm-gnueabihf": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-win32-arm64-msvc": "19.2.0-canary.20240530-316dcb9",
+    "@nx/nx-freebsd-x64": "19.2.0-canary.20240530-316dcb9"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/devkit-internals.d.ts

@@ -23,3 +23,4 @@ export { retrieveProjectConfigurations } from './project-graph/utils/retrieve-wo
 export { LoadedNxPlugin } from './project-graph/plugins/internal-api';
 export * from './project-graph/error-types';
 export { registerTsProject } from './plugins/js/utils/register';
+export { interpolate } from './tasks-runner/utils';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.interpolate = exports.registerTsProject = exports.LoadedNxPlugin = exports.retrieveProjectConfigurations = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.readProjectConfigurationsFromRootMap = exports.mergeTargetConfigurations = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 const tslib_1 = require("tslib");
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
@@ -47,3 +47,5 @@ Object.defineProperty(exports, "LoadedNxPlugin", { enumerable: true, get: functi
 tslib_1.__exportStar(require("./project-graph/error-types"), exports);
 var register_1 = require("./plugins/js/utils/register");
 Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });
+var utils_1 = require("./tasks-runner/utils");
+Object.defineProperty(exports, "interpolate", { enumerable: true, get: function () { return utils_1.interpolate; } });

package/src/plugins/js/lock-file/pnpm-parser.js

@@ -233,7 +233,7 @@ function getNodes(data, keyMap, isV5) {
 function getHoistedVersion(hoistedDependencies, packageName, isV5) {
     let version = (0, package_json_1.getHoistedPackageVersion)(packageName);
     if (!version) {
-        const key = Object.keys(hoistedDependencies).find((k) => k.startsWith(isV5 ? `/${packageName}/` : `/${packageName}@`));
+        const key = Object.keys(hoistedDependencies).find((k) => k.startsWith(`/${packageName}/`));
         if (key) {
             version = parseBaseVersion(getVersion(key.slice(1), packageName), isV5);
         }

package/src/tasks-runner/utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.unparse = exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeIdsFromGraph = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.getTargetConfigurationForTask = exports.interpolate = exports.getOutputsForTargetAndConfiguration = exports.transformLegacyOutputs = exports.validateOutputs = exports.getOutputs = exports.expandDependencyConfigSyntaxSugar = exports.getDependencyConfigs = void 0;
 const output_1 = require("../utils/output");
 const path_1 = require("path");
+const posix_1 = require("path/posix");
 const workspace_root_1 = require("../utils/workspace-root");
 const path_2 = require("../utils/path");
 const fileutils_1 = require("../utils/fileutils");
@@ -166,18 +167,32 @@ function getOutputsForTargetAndConfiguration(taskTargetOrTask, overridesOrNode,
     }
 }
 exports.getOutputsForTargetAndConfiguration = getOutputsForTargetAndConfiguration;
+/**
+ * Matches portions of a string which need to be interpolated.
+ * Matches anything within curly braces, excluding the braces.
+ */
+const replacementRegex = /{([\s\S]+?)}/g;
 function interpolate(template, data) {
+    // Path is absolute or doesn't need interpolation
+    if (template.startsWith('/') || !replacementRegex.test(template)) {
+        return template;
+    }
     if (template.includes('{workspaceRoot}', 1)) {
         throw new Error(`Output '${template}' is invalid. {workspaceRoot} can only be used at the beginning of the expression.`);
     }
     if (data.projectRoot == '.' && template.includes('{projectRoot}', 1)) {
         throw new Error(`Output '${template}' is invalid. When {projectRoot} is '.', it can only be used at the beginning of the expression.`);
     }
-    let res = template.replace('{workspaceRoot}/', '');
+    const parts = template.split('/').map((s) => _interpolate(s, data));
+    return (0, posix_1.join)(...parts).replace('{workspaceRoot}/', '');
+}
+exports.interpolate = interpolate;
+function _interpolate(template, data) {
+    let res = template;
     if (data.projectRoot == '.') {
-        res = res.replace('{projectRoot}/', '');
+        res = res.replace('{projectRoot}', '');
     }
-    return res.replace(/{([\s\S]+?)}/g, (match) => {
+    return res.replace(replacementRegex, (match) => {
         let value = data;
         let path = match.slice(1, -1).trim().split('.');
         for (let idx = 0; idx < path.length; idx++) {
@@ -189,7 +204,6 @@ function interpolate(template, data) {
         return value;
     });
 }
-exports.interpolate = interpolate;
 function getTargetConfigurationForTask(task, projectGraph) {
     const project = projectGraph.nodes[task.target.project].data;
     return project.targets[task.target.target];

package/src/utils/print-help.js

@@ -226,7 +226,7 @@ function generateLinkOutput({ pluginName, name, type, }) {
         !pluginName.startsWith(nrwlPackagePrefix)) {
         return '';
     }
-    const link = `https://nx.dev/packages/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
+    const link = `https://nx.dev/nx-api/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
         ? nxPackagePrefix.length
         : nrwlPackagePrefix.length)}/${type}/${name}`;
     return `\n\n${chalk.dim('Find more information and examples at:')} ${chalk.bold(link)}`;