nx 21.0.0-beta.0 → 21.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "21.0.0-beta.0",
+  "version": "21.0.0-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -83,16 +83,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "21.0.0-beta.0",
-    "@nx/nx-darwin-x64": "21.0.0-beta.0",
-    "@nx/nx-freebsd-x64": "21.0.0-beta.0",
-    "@nx/nx-linux-arm-gnueabihf": "21.0.0-beta.0",
-    "@nx/nx-linux-arm64-gnu": "21.0.0-beta.0",
-    "@nx/nx-linux-arm64-musl": "21.0.0-beta.0",
-    "@nx/nx-linux-x64-gnu": "21.0.0-beta.0",
-    "@nx/nx-linux-x64-musl": "21.0.0-beta.0",
-    "@nx/nx-win32-arm64-msvc": "21.0.0-beta.0",
-    "@nx/nx-win32-x64-msvc": "21.0.0-beta.0"
+    "@nx/nx-darwin-arm64": "21.0.0-beta.1",
+    "@nx/nx-darwin-x64": "21.0.0-beta.1",
+    "@nx/nx-freebsd-x64": "21.0.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "21.0.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "21.0.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "21.0.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "21.0.0-beta.1",
+    "@nx/nx-linux-x64-musl": "21.0.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "21.0.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "21.0.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/migrate/migrate.js

@@ -118,10 +118,10 @@ class Migrator {
         const packagesToCheck = await this.populatePackageJsonUpdatesAndGetPackagesToCheck(targetPackage, target);
         for (const packageToCheck of packagesToCheck) {
             const filteredUpdates = {};
-            for (const packageUpdate of packageToCheck.updates) {
+            for (const [packageUpdateKey, packageUpdate] of Object.entries(packageToCheck.updates)) {
                 if (this.areRequirementsMet(packageUpdate.requires) &&
                     (!this.interactive ||
-                        (await this.runPackageJsonUpdatesConfirmationPrompt(packageUpdate)))) {
+                        (await this.runPackageJsonUpdatesConfirmationPrompt(packageUpdate, packageUpdateKey, packageToCheck.package)))) {
                     Object.entries(packageUpdate.packages).forEach(([name, update]) => {
                         filteredUpdates[name] = update;
                         this.packageUpdates[name] = update;
@@ -166,15 +166,15 @@ class Migrator {
             addToPackageJson: target.addToPackageJson || false,
         });
         const { packageJsonUpdates, packageGroupOrder } = this.getPackageJsonUpdatesFromMigrationConfig(targetPackage, targetVersion, migrationConfig);
-        if (!packageJsonUpdates.length) {
+        if (!Object.keys(packageJsonUpdates).length) {
             return [];
         }
-        const shouldCheckUpdates = packageJsonUpdates.some((packageJsonUpdate) => (this.interactive && packageJsonUpdate['x-prompt']) ||
+        const shouldCheckUpdates = Object.values(packageJsonUpdates).some((packageJsonUpdate) => (this.interactive && packageJsonUpdate['x-prompt']) ||
             Object.keys(packageJsonUpdate.requires ?? {}).length);
         if (shouldCheckUpdates) {
             return [{ package: targetPackage, updates: packageJsonUpdates }];
         }
-        const packageUpdatesToApply = packageJsonUpdates.reduce((m, c) => ({ ...m, ...c.packages }), {});
+        const packageUpdatesToApply = Object.values(packageJsonUpdates).reduce((m, c) => ({ ...m, ...c.packages }), {});
         return (await Promise.all(Object.entries(packageUpdatesToApply).map(([packageName, packageUpdate]) => this.populatePackageJsonUpdatesAndGetPackagesToCheck(packageName, packageUpdate))))
             .filter((pkgs) => pkgs.length)
             .flat()
@@ -185,7 +185,7 @@ class Migrator {
         const packageGroupOrder = this.getPackageJsonUpdatesFromPackageGroup(packageName, targetVersion, migrationConfig);
         if (!migrationConfig.packageJsonUpdates ||
             !this.getPkgVersion(packageName)) {
-            return { packageJsonUpdates: [], packageGroupOrder };
+            return { packageJsonUpdates: {}, packageGroupOrder };
         }
         const packageJsonUpdates = this.filterPackageJsonUpdates(migrationConfig.packageJsonUpdates, packageName, targetVersion);
         return { packageJsonUpdates, packageGroupOrder };
@@ -228,8 +228,8 @@ class Migrator {
         return packageGroupOrder;
     }
     filterPackageJsonUpdates(packageJsonUpdates, packageName, targetVersion) {
-        const filteredPackageJsonUpdates = [];
-        for (const packageJsonUpdate of Object.values(packageJsonUpdates)) {
+        const filteredPackageJsonUpdates = {};
+        for (const [packageJsonUpdateKey, packageJsonUpdate] of Object.entries(packageJsonUpdates)) {
             if (!packageJsonUpdate.packages ||
                 this.lt(packageJsonUpdate.version, this.getPkgVersion(packageName)) ||
                 this.gt(packageJsonUpdate.version, targetVersion)) {
@@ -254,7 +254,7 @@ class Migrator {
             }
             if (Object.keys(filtered).length) {
                 packageJsonUpdate.packages = filtered;
-                filteredPackageJsonUpdates.push(packageJsonUpdate);
+                filteredPackageJsonUpdates[packageJsonUpdateKey] = packageJsonUpdate;
             }
         }
         return filteredPackageJsonUpdates;
@@ -313,7 +313,7 @@ class Migrator {
                 includePrerelease: true,
             }));
     }
-    async runPackageJsonUpdatesConfirmationPrompt(packageUpdate) {
+    async runPackageJsonUpdatesConfirmationPrompt(packageUpdate, packageUpdateKey, packageName) {
         if (!packageUpdate['x-prompt']) {
             return Promise.resolve(true);
         }
@@ -322,14 +322,17 @@ class Migrator {
             // a same prompt was already answered, skip
             return Promise.resolve(false);
         }
-        return await (0, enquirer_1.prompt)([
-            {
-                name: 'shouldApply',
-                type: 'confirm',
-                message: packageUpdate['x-prompt'],
-                initial: true,
-            },
-        ]).then(({ shouldApply }) => {
+        const promptConfig = {
+            name: 'shouldApply',
+            type: 'confirm',
+            message: packageUpdate['x-prompt'],
+            initial: true,
+        };
+        if (packageName.startsWith('@nx/')) {
+            // @ts-expect-error -- enquirer types aren't correct, footer does exist
+            promptConfig.footer = () => chalk.dim(`  View migration details at https://nx.dev/nx-api/${packageName.replace('@nx/', '')}#${packageUpdateKey.replace(/[-\.]/g, '')}packageupdates`);
+        }
+        return await (0, enquirer_1.prompt)([promptConfig]).then(({ shouldApply }) => {
             this.promptAnswers[promptKey] = shouldApply;
             if (!shouldApply &&
                 (!this.minVersionWithSkippedUpdates ||

package/src/project-graph/nx-deps-cache.js

@@ -150,10 +150,15 @@ function writeCache(cache, projectGraph, sourceMaps, errors) {
                 computedAt: Date.now(),
             });
             (0, node_fs_1.renameSync)(tmpProjectGraphPath, exports.nxProjectGraph);
-            (0, fileutils_1.writeJsonFile)(tmpFileMapPath, cache);
-            (0, node_fs_1.renameSync)(tmpFileMapPath, exports.nxFileMap);
             (0, fileutils_1.writeJsonFile)(tmpSourceMapPath, sourceMaps);
             (0, node_fs_1.renameSync)(tmpSourceMapPath, exports.nxSourceMaps);
+            // only write the file map if there are no errors
+            // if there were errors, the errors make the filemap invalid
+            // TODO: We should be able to keep the valid part of the filemap if the errors being thrown told us which parts of the filemap were invalid
+            if (errors.length === 0) {
+                (0, fileutils_1.writeJsonFile)(tmpFileMapPath, cache);
+                (0, node_fs_1.renameSync)(tmpFileMapPath, exports.nxFileMap);
+            }
             done = true;
         }
         catch (err) {

package/src/project-graph/plugins/loaded-nx-plugin.js

@@ -57,22 +57,18 @@ class LoadedNxPlugin {
         if (plugin.preTasksExecution) {
             this.preTasksExecution = async (context) => {
                 const updates = {};
-                let revokeFn;
+                let originalEnv = process.env;
                 if ((0, enabled_1.isIsolationEnabled)() || (0, client_1.isDaemonEnabled)()) {
-                    const { proxy, revoke } = Proxy.revocable(process.env, {
+                    process.env = new Proxy(originalEnv, {
                         set: (target, key, value) => {
                             target[key] = value;
                             updates[key] = value;
                             return true;
                         },
                     });
-                    process.env = proxy;
-                    revokeFn = revoke;
                 }
                 await plugin.preTasksExecution(this.options, context);
-                if (revokeFn) {
-                    revokeFn();
-                }
+                process.env = originalEnv;
                 return updates;
             };
         }

package/src/project-graph/project-graph.js

@@ -149,7 +149,7 @@ function handleProjectGraphError(opts, e) {
                 bodyLines: bodyLines,
             });
         }
-        else {
+        else if (typeof e.message === 'string') {
             const lines = e.message.split('\n');
             output_1.output.error({
                 title: lines[0],
@@ -159,6 +159,9 @@ function handleProjectGraphError(opts, e) {
                 console.error(e);
             }
         }
+        else {
+            console.error(e);
+        }
         process.exit(1);
     }
     else {