@nx/js 19.2.0-alpha.3 → 19.2.0-beta.0

package/migrations.json

@@ -158,6 +158,23 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "19.2.0": {
+      "version": "19.2.0-beta.0",
+      "packages": {
+        "@swc/core": {
+          "version": "~1.5.7",
+          "alwaysAddToPackageJson": false
+        },
+        "@swc/helpers": {
+          "version": "~0.5.11",
+          "alwaysAddToPackageJson": false
+        },
+        "@swc-node/register": {
+          "version": "~1.9.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "19.2.0-alpha.3",
+  "version": "19.2.0-beta.0",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -58,9 +58,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.2.0-alpha.3",
-    "@nx/workspace": "19.2.0-alpha.3",
-    "@nrwl/js": "19.2.0-alpha.3"
+    "@nx/devkit": "19.2.0-beta.0",
+    "@nx/workspace": "19.2.0-beta.0",
+    "@nrwl/js": "19.2.0-beta.0"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/executors/release-publish/extract-npm-publish-json-data.d.ts

@@ -0,0 +1,5 @@
+export declare function extractNpmPublishJsonData(str: string): {
+    beforeJsonData: string;
+    jsonData: Record<string, unknown> | null;
+    afterJsonData: string;
+};

package/src/executors/release-publish/extract-npm-publish-json-data.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractNpmPublishJsonData = void 0;
+const expectedNpmPublishJsonKeys = [
+    'id',
+    'name',
+    'version',
+    'size',
+    'filename',
+];
+// Regular expression to match JSON-like objects, including nested objects (which the expected npm publish output will have, e.g. in its "files" array)
+// /{(?:[^{}]|{[^{}]*})*}/g
+// /{                       : Matches the opening brace of a JSON object
+//   (?:              )     : Non-capturing group to apply quantifiers
+//      [^{}]               : Matches any character except for braces
+//           |              : OR
+//            {[^{}]*}      : Matches nested JSON objects
+//                     *    : The non-capturing group (i.e. any character except for braces OR nested JSON objects) can repeat zero or more times
+//                      }   : Matches the closing brace of a JSON object
+//                       /g : Global flag to match all occurrences in the string
+const jsonRegex = /{(?:[^{}]|{[^{}]*})*}/g;
+function extractNpmPublishJsonData(str) {
+    const jsonMatches = str.match(jsonRegex);
+    if (jsonMatches) {
+        for (const match of jsonMatches) {
+            // Cheap upfront check to see if the stringified JSON data has the expected keys as substrings
+            if (!expectedNpmPublishJsonKeys.every((key) => str.includes(key))) {
+                continue;
+            }
+            // Full JSON parsing to identify the JSON object
+            try {
+                const parsedJson = JSON.parse(match);
+                if (!expectedNpmPublishJsonKeys.every((key) => parsedJson[key] !== undefined)) {
+                    continue;
+                }
+                const jsonStartIndex = str.indexOf(match);
+                return {
+                    beforeJsonData: str.slice(0, jsonStartIndex),
+                    jsonData: parsedJson,
+                    afterJsonData: str.slice(jsonStartIndex + match.length),
+                };
+            }
+            catch {
+                // Ignore parsing errors for unrelated JSON blocks
+            }
+        }
+    }
+    // No applicable jsonData detected, the whole contents is the beforeJsonData
+    return {
+        beforeJsonData: str,
+        jsonData: null,
+        afterJsonData: '',
+    };
+}
+exports.extractNpmPublishJsonData = extractNpmPublishJsonData;

package/src/executors/release-publish/release-publish.impl.js

@@ -7,6 +7,7 @@ const path_1 = require("path");
 const npm_config_1 = require("../../utils/npm-config");
 const log_tar_1 = require("./log-tar");
 const chalk = require("chalk");
+const extract_npm_publish_json_data_1 = require("./extract-npm-publish-json-data");
 const LARGE_BUFFER = 1024 * 1000000;
 function processEnv(color) {
     const env = {
@@ -146,6 +147,11 @@ async function runExecutor(options, context) {
     if (options.firstRelease && context.isVerbose) {
         console.log('Skipped npm view because --first-release was set');
     }
+    /**
+     * NOTE: If this is ever changed away from running the command at the workspace root and pointing at the package root (e.g. back
+     * to running from the package root directly), then special attention should be paid to the fact that npm publish will nest its
+     * JSON output under the name of the package in that case (and it would need to be handled below).
+     */
     const npmPublishCommandSegments = [
         `npm publish "${packageRoot}" --json --"${registryConfigKey}=${registry}" --tag=${tag}`,
     ];
@@ -162,10 +168,35 @@ async function runExecutor(options, context) {
             cwd: context.root,
             stdio: ['ignore', 'pipe', 'pipe'],
         });
-        const stdoutData = JSON.parse(output.toString());
-        // If npm workspaces are in use, the publish output will nest the data under the package name, so we normalize it first
-        const normalizedStdoutData = stdoutData[packageName] ?? stdoutData;
-        (0, log_tar_1.logTar)(normalizedStdoutData);
+        /**
+         * We cannot JSON.parse the output directly because if the user is using lifecycle scripts, npm will mix its publish output with the JSON output all on stdout.
+         * Additionally, we want to capture and show the lifecycle script outputs as beforeJsonData and afterJsonData and print them accordingly below.
+         */
+        const { beforeJsonData, jsonData, afterJsonData } = (0, extract_npm_publish_json_data_1.extractNpmPublishJsonData)(output.toString());
+        if (!jsonData) {
+            console.error('The npm publish output data could not be extracted. Please report this issue on https://github.com/nrwl/nx');
+            return {
+                success: false,
+            };
+        }
+        // If in dry-run mode, the version on disk will not represent the version that would be published, so we scrub it from the output to avoid confusion.
+        const dryRunVersionPlaceholder = 'X.X.X-dry-run';
+        if (isDryRun) {
+            for (const [key, val] of Object.entries(jsonData)) {
+                if (typeof val !== 'string') {
+                    continue;
+                }
+                jsonData[key] = val.replace(new RegExp(packageJson.version, 'g'), dryRunVersionPlaceholder);
+            }
+        }
+        if (typeof beforeJsonData === 'string' &&
+            beforeJsonData.trim().length > 0) {
+            console.log(beforeJsonData);
+        }
+        (0, log_tar_1.logTar)(jsonData);
+        if (typeof afterJsonData === 'string' && afterJsonData.trim().length > 0) {
+            console.log(afterJsonData);
+        }
         if (isDryRun) {
             console.log(`Would publish to ${registry} with tag "${tag}", but ${chalk.keyword('orange')('[dry-run]')} was set`);
         }

package/src/utils/buildable-libs-utils.js

@@ -105,7 +105,11 @@ function collectDependencies(project, projGraph, acc, shallow, areTopLevelDeps =
 }
 function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependencies) {
     const generatedTsConfig = { compilerOptions: {} };
-    generatedTsConfig.extends = (0, path_1.relative)((0, path_1.dirname)(generatedTsConfigPath), tsConfig);
+    const dirnameTsConfig = (0, path_1.dirname)(generatedTsConfigPath);
+    const relativeTsconfig = (0, path_1.isAbsolute)(dirnameTsConfig)
+        ? (0, path_1.relative)(devkit_1.workspaceRoot, dirnameTsConfig)
+        : dirnameTsConfig;
+    generatedTsConfig.extends = (0, path_1.relative)(relativeTsconfig, tsConfig);
     generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(tsConfig, dependencies);
     if (process.env.NX_VERBOSE_LOGGING_PATH_MAPPINGS === 'true') {
         output_1.output.log({

package/src/utils/versions.d.ts

@@ -2,9 +2,9 @@ export declare const nxVersion: any;
 export declare const esbuildVersion = "^0.19.2";
 export declare const prettierVersion = "^2.6.2";
 export declare const swcCliVersion = "~0.3.12";
-export declare const swcCoreVersion = "~1.3.85";
-export declare const swcHelpersVersion = "~0.5.2";
-export declare const swcNodeVersion = "~1.8.0";
+export declare const swcCoreVersion = "~1.5.7";
+export declare const swcHelpersVersion = "~0.5.11";
+export declare const swcNodeVersion = "~1.9.1";
 export declare const tsLibVersion = "^2.3.0";
 export declare const typesNodeVersion = "18.16.9";
 export declare const verdaccioVersion = "^5.0.4";

package/src/utils/versions.js

@@ -5,9 +5,9 @@ exports.nxVersion = require('../../package.json').version;
 exports.esbuildVersion = '^0.19.2';
 exports.prettierVersion = '^2.6.2';
 exports.swcCliVersion = '~0.3.12';
-exports.swcCoreVersion = '~1.3.85';
-exports.swcHelpersVersion = '~0.5.2';
-exports.swcNodeVersion = '~1.8.0';
+exports.swcCoreVersion = '~1.5.7';
+exports.swcHelpersVersion = '~0.5.11';
+exports.swcNodeVersion = '~1.9.1';
 exports.tsLibVersion = '^2.3.0';
 exports.typesNodeVersion = '18.16.9';
 exports.verdaccioVersion = '^5.0.4';