nx 20.4.0-canary.20250121-ee135b2 → 20.4.0-canary.20250123-7524356

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{6395:()=>{}},s=>{var e;e=6395,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{69552:()=>{}},s=>{var e;e=69552,s(s.s=e)}]);

package/src/generators/utils/project-configuration.js

@@ -80,9 +80,15 @@ function updateProjectConfigurationInPackageJson(tree, projectName, projectConfi
     packageJson.nx = {
         ...packageJson.nx,
         ...projectConfiguration,
-        root: undefined,
     };
-    (0, json_1.writeJson)(tree, packageJsonFile, packageJson);
+    // We don't want to ever this since it is inferred
+    delete packageJson.nx.root;
+    // Only set `nx` property in `package.json` if it is a root project (necessary to mark it as Nx project),
+    // or if there are properties to be set. If it is empty, then avoid it so we don't add unnecessary boilerplate.
+    if (projectConfiguration.root === '.' ||
+        Object.keys(packageJson.nx).length > 0) {
+        (0, json_1.writeJson)(tree, packageJsonFile, packageJson);
+    }
 }
 function updateProjectConfigurationInProjectJson(tree, projectName, projectConfiguration) {
     const projectConfigFile = (0, path_2.joinPathFragments)(projectConfiguration.root, 'project.json');
@@ -158,7 +164,11 @@ function readAndCombineAllProjectConfigurations(tree) {
     const patterns = [
         '**/project.json',
         'project.json',
-        ...(0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
+        ...(0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true }), (p) => {
+            const content = tree.read(p, 'utf-8');
+            const { load } = require('@zkochan/js-yaml');
+            return load(content, { filename: p });
+        }, (p) => tree.exists(p)),
     ];
     const globbedFiles = (0, workspace_context_1.globWithWorkspaceContextSync)(tree.root, patterns);
     const createdFiles = findCreatedProjectFiles(tree, patterns);

package/src/plugins/js/lock-file/utils/package-json.d.ts

@@ -3,7 +3,7 @@ import { PackageJson } from '../../../../utils/package-json';
  * Get version of hoisted package if available
  */
 export declare function getHoistedPackageVersion(packageName: string): string;
-export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'optionalDependencies'>;
+export type NormalizedPackageJson = Pick<PackageJson, 'name' | 'version' | 'license' | 'dependencies' | 'devDependencies' | 'peerDependencies' | 'peerDependenciesMeta' | 'optionalDependencies' | 'packageManager'>;
 /**
  * Strip off non-pruning related fields from package.json
  */

package/src/plugins/js/lock-file/utils/package-json.js

@@ -19,7 +19,7 @@ function getHoistedPackageVersion(packageName) {
  * Strip off non-pruning related fields from package.json
  */
 function normalizePackageJson(packageJson) {
-    const { name, version, license, dependencies, devDependencies, peerDependencies, peerDependenciesMeta, optionalDependencies, } = packageJson;
+    const { name, version, license, dependencies, devDependencies, peerDependencies, peerDependenciesMeta, optionalDependencies, packageManager, } = packageJson;
     return {
         name,
         version,
@@ -29,5 +29,6 @@ function normalizePackageJson(packageJson) {
         peerDependencies,
         peerDependenciesMeta,
         optionalDependencies,
+        packageManager,
     };
 }

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

@@ -418,18 +418,29 @@ function findPatchedKeys(dependencies, node) {
 }
 const BERRY_LOCK_FILE_DISCLAIMER = `# This file is generated by running "yarn install" inside your project.\n# Manual changes might be lost - proceed with caution!\n\n`;
 function generateRootWorkspacePackage(packageJson) {
+    let isVersion4 = false;
+    if (!!packageJson.packageManager) {
+        const [_, version] = packageJson.packageManager.split('@');
+        isVersion4 = !!version && (0, semver_1.satisfies)(version, '>=4.0.0');
+    }
+    const reducer = (acc, [name, version]) => {
+        acc[name] = isVersion4 ? `npm:${version}` : version;
+        return acc;
+    };
     return {
         version: '0.0.0-use.local',
         resolution: `${packageJson.name}@workspace:.`,
-        ...(packageJson.dependencies && { dependencies: packageJson.dependencies }),
+        ...(packageJson.dependencies && {
+            dependencies: Object.entries(packageJson.dependencies).reduce(reducer, {}),
+        }),
         ...(packageJson.peerDependencies && {
-            peerDependencies: packageJson.peerDependencies,
+            peerDependencies: Object.entries(packageJson.peerDependencies).reduce(reducer, {}),
         }),
         ...(packageJson.devDependencies && {
-            devDependencies: packageJson.devDependencies,
+            devDependencies: Object.entries(packageJson.devDependencies).reduce(reducer, {}),
         }),
         ...(packageJson.optionalDependencies && {
-            optionalDependencies: packageJson.optionalDependencies,
+            optionalDependencies: Object.entries(packageJson.optionalDependencies).reduce(reducer, {}),
         }),
         languageName: 'unknown',
         linkType: 'soft',

package/src/plugins/package-json/create-nodes.d.ts

@@ -16,4 +16,4 @@ export declare function buildProjectConfigurationFromPackageJson(packageJson: Pa
 /**
  * Get the package.json globs from package manager workspaces
  */
-export declare function getGlobPatternsFromPackageManagerWorkspaces(root: string, readJson?: <T extends Object>(path: string) => T): string[];
+export declare function getGlobPatternsFromPackageManagerWorkspaces(root: string, readJson?: <T extends Object>(path: string) => T, readYaml?: <T extends Object>(path: string) => T, exists?: (path: string) => boolean): string[];

package/src/plugins/package-json/create-nodes.js

@@ -151,17 +151,18 @@ function buildProjectConfigurationFromPackageJson(packageJson, workspaceRoot, pa
 /**
  * Get the package.json globs from package manager workspaces
  */
-function getGlobPatternsFromPackageManagerWorkspaces(root, readJson = (path) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, path)) // making this an arg allows us to reuse in devkit
-) {
+function getGlobPatternsFromPackageManagerWorkspaces(root, 
+// allow overwriting these args so we can use them in devkit
+readJson = (path) => (0, fileutils_1.readJsonFile)((0, node_path_1.join)(root, path)), readYaml = (path) => (0, fileutils_1.readYamlFile)((0, node_path_1.join)(root, path)), exists = (p) => (0, node_fs_1.existsSync)((0, node_path_1.join)(root, p))) {
     try {
         const patterns = [];
         const packageJson = readJson('package.json');
         patterns.push(...normalizePatterns(Array.isArray(packageJson.workspaces)
             ? packageJson.workspaces
             : packageJson.workspaces?.packages ?? []));
-        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(root, 'pnpm-workspace.yaml'))) {
+        if (exists('pnpm-workspace.yaml')) {
             try {
-                const { packages } = (0, fileutils_1.readYamlFile)((0, node_path_1.join)(root, 'pnpm-workspace.yaml')) ?? {};
+                const { packages } = readYaml('pnpm-workspace.yaml') ?? {};
                 patterns.push(...normalizePatterns(packages || []));
             }
             catch (e) {

package/src/tasks-runner/default-tasks-runner.js

@@ -18,7 +18,7 @@ class RemoteCacheV2 {
                         (0, promises_1.readFile)((0, path_1.join)(cacheDirectory, hash, 'code'), 'utf-8').then((s) => +s),
                     ]);
                     return {
-                        outputsPath: cacheDirectory,
+                        outputsPath: (0, path_1.join)(cacheDirectory, hash, 'outputs'),
                         terminalOutput: terminalOutput ?? oldTerminalOutput,
                         code,
                     };
@@ -27,8 +27,26 @@ class RemoteCacheV2 {
                     return null;
                 }
             },
-            store: async (hash, cacheDirectory, __, code) => {
+            store: async (hash, cacheDirectory, terminalOutput, code) => {
+                // The new db cache places the outputs directly into the cacheDirectory + hash.
+                // old instances of Nx Cloud expect these outputs to be in cacheDirectory + hash + outputs
+                // this ensures that everything that was in the cache directory is moved to the outputs directory
+                const cacheDir = (0, path_1.join)(cacheDirectory, hash);
+                const outputDir = (0, path_1.join)(cacheDir, 'outputs');
+                await (0, promises_1.mkdir)(outputDir, { recursive: true });
+                const files = await (0, promises_1.readdir)(cacheDir);
+                await Promise.all(files.map(async (file) => {
+                    const filePath = (0, path_1.join)(cacheDir, file);
+                    // we don't want to move these files to the outputs directory because they are not artifacts of the task
+                    if (filePath === outputDir ||
+                        file === 'code' ||
+                        file === 'terminalOutput') {
+                        return;
+                    }
+                    await (0, promises_1.rename)(filePath, (0, path_1.join)(outputDir, file));
+                }));
                 await (0, promises_1.writeFile)((0, path_1.join)(cacheDirectory, hash, 'code'), code.toString());
+                await (0, promises_1.writeFile)((0, path_1.join)(cacheDirectory, hash, 'terminalOutput'), terminalOutput);
                 return cache.store(hash, cacheDirectory);
             },
         };

package/src/tasks-runner/run-command.js

@@ -599,5 +599,10 @@ function getRunnerOptions(runner, nxJson, nxArgs, isCloudDefault) {
     return result;
 }
 function isCustomRunnerPath(modulePath) {
-    return !['nx-cloud', '@nrwl/nx-cloud', defaultTasksRunnerPath].includes(modulePath);
+    return ![
+        'nx-cloud',
+        '@nrwl/nx-cloud',
+        'nx/tasks-runners/default',
+        defaultTasksRunnerPath,
+    ].includes(modulePath);
 }