@nx/js 22.7.2 → 22.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.2",
+  "version": "22.7.4",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -40,8 +40,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.7.2",
-    "@nx/workspace": "22.7.2",
+    "@nx/devkit": "22.7.4",
+    "@nx/workspace": "22.7.4",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.2"
+    "nx": "22.7.4"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/release-publish/release-publish.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiBjD,wBAA8B,WAAW,CACvC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;GA6dzB"}
+{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiBjD,wBAA8B,WAAW,CACvC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe;;GA0UzB"}

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

@@ -267,6 +267,21 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
      * to running from the package root directly), then special attention should be paid to the fact that npm/pnpm publish will nest its
      * JSON output under the name of the package in that case (and it would need to be handled below).
      */
+    return runPublish({
+        pm,
+        options,
+        context,
+        packageRoot,
+        packageJson,
+        registry,
+        registryConfigKey,
+        tag,
+        isDryRun,
+        isNpmInstalled,
+    });
+}
+function runPublish(ctx) {
+    const { pm, options, context, packageRoot, packageJson, registry, registryConfigKey, tag, isDryRun, isNpmInstalled, } = ctx;
     const pmCommand = (0, devkit_1.getPackageManagerCommand)(pm);
     const publishCommandSegments = [
         pmCommand.publish(packageRoot, registry, registryConfigKey, tag),
@@ -342,9 +357,20 @@ Please update the local dependency on "${depName}" to be a valid semantic versio
         try {
             // bun publish does not support outputting JSON, so we cannot perform any further processing
             if (pm === 'bun') {
+                const bunStderr = err.stderr?.toString() || '';
+                const bunStdout = err.stdout?.toString() || '';
+                // bun publish does not yet support npm's OIDC trusted publishing flow. If the failure
+                // looks like an authentication error and npm is available, retry via npm to recover.
+                // Other failures (e.g. version conflict, 403) would produce the same error from npm,
+                // so we surface bun's error directly instead.
+                const looksLikeAuthError = /missing authentication|bunx npm login|unauthorized|\b401\b/i.test(bunStderr + bunStdout);
+                if (isNpmInstalled && looksLikeAuthError) {
+                    console.warn(`bun publish failed with an authentication error; falling back to npm publish (bun does not support npm OIDC trusted publishing).`);
+                    return runPublish({ ...ctx, pm: 'npm' });
+                }
                 console.error(`bun publish error:`);
-                console.error(err.stderr?.toString() || '');
-                console.error(err.stdout?.toString() || '');
+                console.error(bunStderr);
+                console.error(bunStdout);
                 return {
                     success: false,
                 };

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/typescript/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EAEvB,KAAK,aAAa,EAInB,MAAM,YAAY,CAAC;AA8BpB,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,EACN,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACN,KAAK,CAAC,EACF,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;IACN,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AA0KD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAI/C,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,gBAAgB,CA8FzD,CAAC;AAEF,eAAO,MAAM,WAAW,iCAAgB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/plugins/typescript/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,kBAAkB,EAEvB,KAAK,aAAa,EAInB,MAAM,YAAY,CAAC;AA+BpB,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,EACN,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;IACN,KAAK,CAAC,EACF,OAAO,GACP;QACE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,OAAO,CAAC;KAC1B,CAAC;IACN,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAyLD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAI/C,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,gBAAgB,CA8FzD,CAAC;AAEF,eAAO,MAAM,WAAW,iCAAgB,CAAC"}

package/src/plugins/typescript/plugin.js

@@ -10,8 +10,20 @@ const picomatch = require("picomatch");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
+const installation_directory_1 = require("nx/src/utils/installation-directory");
 const util_1 = require("./util");
 let ts;
+const resolvedTypescriptPaths = {};
+function resolveTypescriptPath(projectRoot, workspaceRoot) {
+    // Resolve from projectRoot first, then workspace paths, with __dirname as a
+    // last resort. Required so the lookup works under layouts where @nx/js's real
+    // path is outside the workspace tree (e.g. pnpm's enableGlobalVirtualStore),
+    // since typescript is not a declared dep.
+    resolvedTypescriptPaths[projectRoot] ??= require.resolve('typescript', {
+        paths: [projectRoot, ...(0, installation_directory_1.getNxRequirePaths)(workspaceRoot), __dirname],
+    });
+    return resolvedTypescriptPaths[projectRoot];
+}
 const TSCONFIG_CACHE_VERSION = 2;
 const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsconfig-files.hash');
 // Module-level cache store — each invocation gets a unique Symbol key
@@ -354,7 +366,7 @@ function getInputs(namedInputs, config, tsConfig, internalProjectReferences, wor
     ];
     const absoluteProjectRoot = config.project.absolute;
     if (!ts) {
-        ts = require('typescript');
+        ts = require(resolveTypescriptPath(absoluteProjectRoot, workspaceRoot));
     }
     // https://github.com/microsoft/TypeScript/blob/19b777260b26aac5707b1efd34202054164d4a9d/src/compiler/utilities.ts#L9869
     const supportedTSExtensions = [
@@ -819,7 +831,7 @@ function getExtendedFilesHash(extendedConfigFiles, workspaceRoot, cache) {
 }
 function readTsConfig(tsConfigPath, workspaceRoot, cache) {
     if (!ts) {
-        ts = require('typescript');
+        ts = require(resolveTypescriptPath(workspaceRoot, workspaceRoot));
     }
     // Normalize to forward slashes for TypeScript compatibility on Windows.
     // TypeScript's parser normalizes paths inconsistently — diagnostics use