@nx/js 23.0.0-beta.21 → 23.0.0-beta.23

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

@@ -8,17 +8,24 @@ const expectedNpmPublishJsonKeys = [
     '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;
+// Regular expression to match JSON-like objects, including up to two levels of
+// nested objects.
+// /{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*}/g
+// Two levels of nesting are required to support both shapes of npm/pnpm publish
+// output:
+//   - Older npm (<= 11.13) prints the publish summary as a flat object whose only
+//     nesting is its own "files" array (one level deep).
+//   - Newer npm (>= 11.16, bundled with Node 26) nests that same summary under the
+//     package name, e.g. { "@scope/pkg": { ...id/name/files... } }, adding a
+//     second level. pnpm publish nests the same way when run from the workspace
+//     root. Matching two levels lets us capture the wrapper object in the nested
+//     case so its braces are not left behind in beforeJsonData/afterJsonData.
+const jsonRegex = /{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*}/g;
+function isNpmPublishSummary(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        expectedNpmPublishJsonKeys.every((key) => value[key] !== undefined));
+}
 function extractNpmPublishJsonData(str) {
     const jsonMatches = str.match(jsonRegex);
     if (jsonMatches) {
@@ -28,21 +35,39 @@ function extractNpmPublishJsonData(str) {
                 continue;
             }
             // Full JSON parsing to identify the JSON object
+            let parsedJson;
             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),
-                };
+                parsedJson = JSON.parse(match);
             }
             catch {
                 // Ignore parsing errors for unrelated JSON blocks
+                continue;
+            }
+            // npm <= 11.13 emits the summary as a flat object, while npm >= 11.16 (and
+            // pnpm publish run from the workspace root) nest it one level deep under the
+            // package name. Support both by unwrapping a single level when the matched
+            // object isn't itself the summary.
+            let publishData = null;
+            if (isNpmPublishSummary(parsedJson)) {
+                publishData = parsedJson;
+            }
+            else if (typeof parsedJson === 'object' && parsedJson !== null) {
+                for (const value of Object.values(parsedJson)) {
+                    if (isNpmPublishSummary(value)) {
+                        publishData = value;
+                        break;
+                    }
+                }
+            }
+            if (!publishData) {
+                continue;
             }
+            const jsonStartIndex = str.indexOf(match);
+            return {
+                beforeJsonData: str.slice(0, jsonStartIndex),
+                jsonData: publishData,
+                afterJsonData: str.slice(jsonStartIndex + match.length),
+            };
         }
     }
     // No applicable jsonData detected, the whole contents is the beforeJsonData

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

@@ -21,6 +21,23 @@ function processEnv(color) {
     }
     return env;
 }
+function isAlreadyPublishedPublishError(stdoutData, stderr = '', stdout = '') {
+    const error = stdoutData?.error;
+    const errorMessage = [
+        error?.summary,
+        error?.detail,
+        error?.message,
+        error?.body?.error,
+        stderr,
+        stdout,
+    ]
+        .filter(Boolean)
+        .join('\n');
+    return (error?.code === 'EPUBLISHCONFLICT' ||
+        errorMessage.includes('You cannot publish over the previously published versions') ||
+        (error?.code === 'E409' &&
+            errorMessage.includes('this package is already present')));
+}
 async function runExecutor(options, context) {
     const pm = (0, devkit_1.detectPackageManager)();
     // Check if npm is installed (needed for dist-tag management and as fallback for view command)
@@ -278,10 +295,11 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
         tag,
         isDryRun,
         isNpmInstalled,
+        packageTxt,
     });
 }
 function runPublish(ctx) {
-    const { pm, options, context, packageRoot, packageJson, registry, registryConfigKey, tag, isDryRun, isNpmInstalled, } = ctx;
+    const { pm, options, context, packageRoot, packageJson, registry, registryConfigKey, tag, isDryRun, isNpmInstalled, packageTxt, } = ctx;
     const pmCommand = (0, devkit_1.getPackageManagerCommand)(pm);
     const publishCommandSegments = [
         pmCommand.publish(packageRoot, registry, registryConfigKey, tag),
@@ -382,12 +400,26 @@ function runPublish(ctx) {
                 stdoutData = JSON.parse(err.stdout?.toString() || '{}');
             }
             catch {
+                const stderr = err.stderr?.toString() || '';
+                const stdout = err.stdout?.toString() || '';
+                if (isAlreadyPublishedPublishError(undefined, stderr, stdout)) {
+                    console.warn(`Skipped ${packageTxt}, as v${packageJson.version} has already been published to ${registry} with tag "${tag}"`);
+                    return {
+                        success: true,
+                    };
+                }
                 console.error(err.stderr?.toString() || '');
                 console.error(err.stdout?.toString() || '');
                 return {
                     success: false,
                 };
             }
+            if (isAlreadyPublishedPublishError(stdoutData, err.stderr?.toString() || '', err.stdout?.toString() || '')) {
+                console.warn(`Skipped ${packageTxt}, as v${packageJson.version} has already been published to ${registry} with tag "${tag}"`);
+                return {
+                    success: true,
+                };
+            }
             console.error(`${pm} publish error:`);
             // npm returns error.summary and error.detail
             if (stdoutData.error?.summary) {

package/dist/src/plugins/typescript/plugin.d.ts

@@ -1,4 +1,4 @@
-import { type CreateDependencies, type CreateNodesV2 } from '@nx/devkit';
+import { type CreateDependencies, type CreateNodes } from '@nx/devkit';
 export interface TscPluginOptions {
     compiler?: 'tsc' | 'tsgo';
     typecheck?: boolean | {
@@ -19,5 +19,5 @@ export interface TscPluginOptions {
  */
 export declare const createDependencies: CreateDependencies;
 export declare const PLUGIN_NAME = "@nx/js/typescript";
-export declare const createNodesV2: CreateNodesV2<TscPluginOptions>;
-export declare const createNodes: CreateNodesV2<TscPluginOptions>;
+export declare const createNodesV2: CreateNodes<TscPluginOptions>;
+export declare const createNodes: CreateNodes<TscPluginOptions>;

package/dist/src/utils/typescript/plugin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureProjectIsIncludedInPluginRegistrations = ensureProjectIsIncludedInPluginRegistrations;
 const devkit_internals_1 = require("nx/src/devkit-internals");
+const picomatch = require("picomatch");
 function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, buildTargetName) {
     nxJson.plugins ??= [];
     let isIncluded = false;
@@ -26,7 +27,13 @@ function ensureProjectIsIncludedInPluginRegistrations(nxJson, projectRoot, build
         }
         else {
             // check if the project would be included by the plugin registration
-            const matchingConfigFiles = (0, devkit_internals_1.findMatchingConfigFiles)([`${projectRoot}/tsconfig.json`], '**/tsconfig.json', registration.include, registration.exclude);
+            // Only consider the tsconfig if the @nx/js/typescript plugin would
+            // actually process it (its path matches the plugin's createNodes glob)
+            // before the registration's include/exclude filters are applied.
+            const tsconfigPath = `${projectRoot}/tsconfig.json`;
+            const matchingConfigFiles = picomatch('**/tsconfig.json', { dot: true })(tsconfigPath)
+                ? (0, devkit_internals_1.findMatchingConfigFiles)([tsconfigPath], registration.include, registration.exclude)
+                : [];
             if (matchingConfigFiles.length) {
                 // it's included by the plugin registration, check if the user-specified options would result
                 // in the appropriate build task being inferred, if not, we need to exclude it

package/dist/src/utils/typescript/ts-config.js

@@ -96,7 +96,7 @@ function resolvePathsBaseUrl(tsconfigPath) {
         const absolute = (0, path_1.resolve)(queue.shift());
         const dir = (0, path_1.dirname)(absolute);
         try {
-            const raw = JSON.parse((0, fs_1.readFileSync)(absolute, 'utf-8'));
+            const raw = (0, devkit_1.readJsonFile)(absolute);
             chain.push({ dir, raw });
             const exts = raw.extends
                 ? Array.isArray(raw.extends)

package/migrations.json

@@ -3,17 +3,20 @@
     "migrate-development-custom-condition": {
       "version": "21.5.0-beta.2",
       "description": "Migrate the legacy 'development' custom condition to a workspace-unique custom condition name.",
-      "factory": "./dist/src/migrations/update-21-5-0/migrate-development-custom-condition"
+      "factory": "./dist/src/migrations/update-21-5-0/migrate-development-custom-condition",
+      "documentation": "./dist/src/migrations/update-21-5-0/migrate-development-custom-condition.md"
     },
     "remove-external-options-from-js-executors": {
       "version": "22.0.0-beta.0",
       "description": "Remove the deprecated `external` and `externalBuildTargets` options from the `@nx/js:swc` and `@nx/js:tsc` executors.",
-      "factory": "./dist/src/migrations/update-22-0-0/remove-external-options-from-js-executors"
+      "factory": "./dist/src/migrations/update-22-0-0/remove-external-options-from-js-executors",
+      "documentation": "./dist/src/migrations/update-22-0-0/remove-external-options-from-js-executors.md"
     },
     "remove-redundant-ts-project-references": {
       "version": "22.1.0-rc.1",
       "description": "Removes redundant TypeScript project references from project's tsconfig.json files when runtime tsconfig files (e.g., tsconfig.lib.json, tsconfig.app.json) exist.",
-      "factory": "./dist/src/migrations/update-22-1-0/remove-redundant-ts-project-references"
+      "factory": "./dist/src/migrations/update-22-1-0/remove-redundant-ts-project-references",
+      "documentation": "./dist/src/migrations/update-22-1-0/remove-redundant-ts-project-references.md"
     },
     "23-0-0-rewrite-internal-subpath-imports": {
       "version": "23.0.0-beta.14",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.0.0-beta.21",
+  "version": "23.0.0-beta.23",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -144,11 +144,11 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/workspace": "23.0.0-beta.21",
-    "@nx/devkit": "23.0.0-beta.21"
+    "@nx/workspace": "23.0.0-beta.23",
+    "@nx/devkit": "23.0.0-beta.23"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.21"
+    "nx": "23.0.0-beta.23"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",