nx 20.3.2 → 20.3.4

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/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);
 }