@nx/js 22.7.1 → 22.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.7.1",
+  "version": "22.7.3",
   "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,16 +40,16 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "22.7.1",
-    "@nx/workspace": "22.7.1",
+    "@nx/devkit": "22.7.3",
+    "@nx/workspace": "22.7.3",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.1",
     "chalk": "^4.1.0",
     "columnify": "^1.6.0",
-    "detect-port": "^1.5.1",
-    "ignore": "^5.0.4",
+    "detect-port": "^2.1.0",
+    "ignore": "^7.0.5",
     "js-tokens": "^4.0.0",
     "jsonc-parser": "3.2.0",
     "npm-run-path": "^4.0.1",
@@ -61,7 +61,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.7.1"
+    "nx": "22.7.3"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/executors/copy-workspace-modules/copy-workspace-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy-workspace-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/copy-workspace-modules/copy-workspace-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAa5D,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,eAAe;;GASzB"}
+{"version":3,"file":"copy-workspace-modules.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/copy-workspace-modules/copy-workspace-modules.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAc5D,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,2BAA2B,EACnC,OAAO,EAAE,eAAe;;GASzB"}

package/src/executors/copy-workspace-modules/copy-workspace-modules.js

@@ -8,6 +8,7 @@ const path_1 = require("path");
 const fs_1 = require("fs");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
+const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function copyWorkspaceModules(schema, context) {
     devkit_1.logger.log('Copying Workspace Modules to Build Directory...');
     const outputDirectory = getOutputDir(schema, context);
@@ -128,6 +129,7 @@ function getOutputDir(schema, context) {
     return outputDir;
 }
 function normalizeOutputPath(outputPath) {
+    outputPath = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputPath);
     if (!outputPath.startsWith(devkit_1.workspaceRoot)) {
         outputPath = (0, path_1.join)(devkit_1.workspaceRoot, outputPath);
     }

package/src/executors/node/node.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAqB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AA6ID,eAAe,YAAY,CAAC"}
+{"version":3,"file":"node.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node.impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAQhB,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAe,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAsB5D,wBAAuB,YAAY,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,eAAe;aAgEb,OAAO;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;cA6QhC;AAmID,eAAe,YAAY,CAAC"}

package/src/executors/node/node.impl.js

@@ -18,6 +18,7 @@ const fileutils_1 = require("nx/src/utils/fileutils");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const detect_module_format_1 = require("./lib/detect-module-format");
 const output_file_1 = require("./lib/output-file");
+const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 const globalLineAwareWriter = new line_aware_writer_1.LineAwareWriter();
 async function* nodeExecutor(options, context) {
     process.env.NODE_ENV ??= context?.configurationName ?? 'development';
@@ -298,7 +299,7 @@ function calculateResolveMappings(context, options) {
             // `outputs` are cache patterns and may contain globs (e.g. from the
             // inferred `@nx/js/typescript` build target). Strip the glob portion
             // so the runtime require overrides resolve to the actual output dir.
-            const outputDir = stripGlobToBaseDir(c.outputs[0]);
+            const outputDir = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(c.outputs[0]);
             m[c.name] = (0, devkit_1.joinPathFragments)(context.root, outputDir);
         }
         return m;
@@ -338,7 +339,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
             // `{projectRoot}/dist/**/*.{js,...}` to avoid caching non-tsc files).
             // Strip the glob portion back to the last path separator before it to
             // recover the base output directory.
-            const outputDir = stripGlobToBaseDir(outputFilePath);
+            const outputDir = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputFilePath);
             return path.join(outputDir, 'main.js');
         }
         const fallbackFile = path.join('dist', project.data.root, 'main.js');
@@ -356,15 +357,6 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     }
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }
-function stripGlobToBaseDir(pathWithGlob) {
-    const globIdx = pathWithGlob.search(/[*?[{(]/);
-    if (globIdx === -1) {
-        return pathWithGlob.replace(/[\\/]+$/, '');
-    }
-    const prefix = pathWithGlob.slice(0, globIdx);
-    const lastSep = Math.max(prefix.lastIndexOf('/'), prefix.lastIndexOf('\\'));
-    return lastSep === -1 ? '' : prefix.slice(0, lastSep);
-}
 function fileToRunCorrectPath(fileToRun) {
     if ((0, fileutils_1.fileExists)(fileToRun))
         return fileToRun;

package/src/executors/prune-lockfile/prune-lockfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prune-lockfile.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/prune-lockfile/prune-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,wBAA8B,qBAAqB,CACjD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,eAAe;;GAgCzB"}
+{"version":3,"file":"prune-lockfile.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/prune-lockfile/prune-lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,eAAe,EAMrB,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAGrD,wBAA8B,qBAAqB,CACjD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,eAAe;;GAgCzB"}

package/src/executors/prune-lockfile/prune-lockfile.js

@@ -9,6 +9,7 @@ const utils_1 = require("nx/src/tasks-runner/utils");
 const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const get_workspace_packages_from_graph_1 = require("nx/src/plugins/js/utils/get-workspace-packages-from-graph");
+const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
     const outputDirectory = getOutputDir(schema, context);
@@ -89,6 +90,7 @@ function getOutputDir(schema, context) {
     return outputDir;
 }
 function normalizeOutputPath(outputPath) {
+    outputPath = (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputPath);
     if (!outputPath.startsWith(devkit_1.workspaceRoot)) {
         outputPath = (0, path_1.join)(devkit_1.workspaceRoot, outputPath);
     }

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/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAWjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAqK/B;AA2HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CA4G5B;AA+uBD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAWjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAyCpB,OAAO,KAAK,EAEV,sBAAsB,EACtB,iCAAiC,EAClC,MAAM,UAAU,CAAC;AASlB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAO/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,sBAAsB,8BAqK/B;AA2HD,MAAM,MAAM,cAAc,GAAG,IAAI,CAC/B,iCAAiC,EAC/B,MAAM,GACN,QAAQ,GACR,aAAa,GACb,gBAAgB,GAChB,IAAI,GACJ,yBAAyB,GACzB,aAAa,GACb,SAAS,GACT,WAAW,GACX,yBAAyB,CAC5B,CAAC;AAEF,wBAAsB,OAAO,CAC3B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,iBAAiB,CAAC,CAmH5B;AA+uBD,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -318,7 +318,12 @@ async function addLint(tree, options) {
                 ignoredFiles.add('{projectRoot}/esbuild.config.{js,ts,mjs,mts}');
             }
             if (options.unitTestRunner === 'vitest') {
-                ignoredFiles.add('{projectRoot}/vite.config.{js,ts,mjs,mts}');
+                // When bundler is 'vite', vite.config holds both build and test config
+                // (added above). Otherwise, @nx/vitest:configuration generates a
+                // dedicated vitest.config file for non-framework JS libraries.
+                ignoredFiles.add(options.bundler === 'vite'
+                    ? '{projectRoot}/vite.config.{js,ts,mjs,mts}'
+                    : '{projectRoot}/vitest.config.{js,ts,mjs,mts}');
             }
             if (ignoredFiles.size) {
                 ruleOptions.ignoredFiles = Array.from(ignoredFiles);

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

package/src/utils/buildable-libs-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildable-libs-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/buildable-libs-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAgBtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,uBAAuB,GAAG,wBAAwB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CAqBA;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA+EA;AA0ED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA8EA;AAkGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,EACvC,YAAY,EAAE,6BAA6B,EAAE,wBAK9C;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,qBAAqB,GAAE,OAAe,UAsBvC;AAUD,wBAAgB,WAAW,CACzB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,QA6DhC;AAED;;;GAGG;AACH,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,uBAAuB,EAC7B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,gBAAgB,GAAE,cAAc,GAAG,kBAAmC,QAkFvE"}
+{"version":3,"file":"buildable-libs-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/buildable-libs-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,wBAAwB,EACxB,uBAAuB,EACvB,SAAS,EACV,MAAM,YAAY,CAAC;AAYpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAiBtC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,IAAI,EAAE,uBAAuB,GAAG,wBAAwB,CAAC;CAC1D,CAAC;AAEF,wBAAgB,qCAAqC,CACnD,SAAS,EAAE,SAAS,GAAG,SAAS,EAChC,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CAqBA;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,YAAY,EACvB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA+EA;AA0ED,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE,OAAO,GAChB;IACD,MAAM,EAAE,uBAAuB,CAAC;IAChC,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,oBAAoB,EAAE,6BAA6B,EAAE,CAAC;CACvD,CA8EA;AAkGD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,GAAG,EAAE,CAAC,iBAAiB,EACvC,YAAY,EAAE,6BAA6B,EAAE,wBAK9C;AAED,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,qBAAqB,GAAE,OAAe,UAsBvC;AAUD,wBAAgB,WAAW,CACzB,YAAY,EAAE,6BAA6B,EAAE,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,QA6DhC;AAED;;;GAGG;AACH,wBAAgB,6CAA6C,CAC3D,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,MAAM,EACzB,IAAI,EAAE,uBAAuB,EAC7B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,gBAAgB,GAAE,cAAc,GAAG,kBAAmC,QAsFvE"}

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

@@ -14,6 +14,7 @@ const fileutils_1 = require("nx/src/utils/fileutils");
 const output_1 = require("nx/src/utils/output");
 const path_1 = require("path");
 const ts_config_1 = require("./typescript/ts-config");
+const strip_glob_to_base_dir_1 = require("./strip-glob-to-base-dir");
 const crypto_1 = require("crypto");
 const project_graph_1 = require("nx/src/config/project-graph");
 function isBuildable(target, node) {
@@ -311,7 +312,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
         target: targetName,
         configuration: configurationName,
     }, {}, node);
-    const packageJsonPath = `${outputs[0]}/package.json`;
+    const packageJsonPath = `${(0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputs[0])}/package.json`;
     let packageJson;
     let workspacePackageJson;
     try {
@@ -341,7 +342,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
                         target: targetName,
                         configuration: configurationName,
                     }, {}, entry.node);
-                    const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
+                    const depPackageJsonPath = (0, path_1.join)(root, (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputs[0]), 'package.json');
                     depVersion = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
                     packageJson[typeOfDependency][packageName] = depVersion;
                 }

package/src/utils/package-json/update-package-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-package-json.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,eAAe,EAIf,cAAc,EAGd,uBAAuB,EAIxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAIxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAK7D,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAE5C,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,uCAAuC,CAAC,EAAE,OAAO,CAAC;IAClD,qCAAqC,CAAC,EAAE,cAAc,GAAG,kBAAkB,CAAC;IAC5E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,OAAO,GAAE,cAAqB,GAC7B,IAAI,CAmFN;AAiFD,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IAEZ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,uBAAuB,GACvB,YAAY,GACZ,iBAAiB,CACpB,GAAG;IACF,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAgCT;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,uBAAuB,GAC/B,WAAW,CAuGb;AA2CD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,YAAY,GACZ,iBAAiB,CACpB,GACA,MAAM,CAWR"}
+{"version":3,"file":"update-package-json.d.ts","sourceRoot":"","sources":["../../../../../../packages/js/src/utils/package-json/update-package-json.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,eAAe,EAIf,cAAc,EAGd,uBAAuB,EAIxB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAIxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAM7D,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,KAAK,CAAC;AAE5C,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,yBAAyB,CAAC,EAAE,IAAI,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,uCAAuC,CAAC,EAAE,OAAO,CAAC;IAClD,qCAAqC,CAAC,EAAE,cAAc,GAAG,kBAAkB,CAAC;IAC5E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,6BAA6B,EAAE,EAC7C,OAAO,GAAE,cAAqB,GAC7B,IAAI,CAmFN;AAqFD,UAAU,OAAO;IACf,GAAG,EAAE,MAAM,CAAC;IAEZ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,uBAAuB,GACvB,YAAY,GACZ,iBAAiB,CACpB,GAAG;IACF,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAgCT;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,uBAAuB,GAC/B,WAAW,CAuGb;AA2CD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,IAAI,CACX,uBAAuB,EACrB,MAAM,GACN,SAAS,GACT,aAAa,GACb,gBAAgB,GAChB,YAAY,GACZ,iBAAiB,CACpB,GACA,MAAM,CAWR"}

package/src/utils/package-json/update-package-json.js

@@ -14,6 +14,7 @@ const path_1 = require("path");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 const get_main_file_dir_1 = require("../get-main-file-dir");
+const strip_glob_to_base_dir_1 = require("../strip-glob-to-base-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     let packageJson;
     if (fileMap == null) {
@@ -101,7 +102,7 @@ function addMissingDependencies(packageJson, { projectName, targetName, configur
                     target: targetName,
                     configuration: configurationName,
                 }, {}, entry.node);
-                const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
+                const depPackageJsonPath = (0, path_1.join)(root, (0, strip_glob_to_base_dir_1.stripGlobToBaseDir)(outputs[0]), 'package.json');
                 if ((0, node_fs_1.existsSync)(depPackageJsonPath)) {
                     const version = (0, devkit_1.readJsonFile)(depPackageJsonPath).version;
                     packageJson[propType] ??= {};

package/src/utils/strip-glob-to-base-dir.d.ts

@@ -0,0 +1,2 @@
+export declare function stripGlobToBaseDir(pathWithGlob: string): string;
+//# sourceMappingURL=strip-glob-to-base-dir.d.ts.map

package/src/utils/strip-glob-to-base-dir.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"strip-glob-to-base-dir.d.ts","sourceRoot":"","sources":["../../../../../packages/js/src/utils/strip-glob-to-base-dir.ts"],"names":[],"mappings":"AAIA,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ/D"}

package/src/utils/strip-glob-to-base-dir.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripGlobToBaseDir = stripGlobToBaseDir;
+// `outputs` entries on inferred targets (e.g. from `@nx/js/typescript`) are
+// cache-match patterns and may contain globs. Strip the glob portion back to
+// the last path separator to recover the base output directory. Returns the
+// input with trailing separators stripped when there is no glob.
+function stripGlobToBaseDir(pathWithGlob) {
+    const globIdx = pathWithGlob.search(/[*?[{(]/);
+    if (globIdx === -1) {
+        return pathWithGlob.replace(/[\\/]+$/, '');
+    }
+    const prefix = pathWithGlob.slice(0, globIdx);
+    const lastSep = Math.max(prefix.lastIndexOf('/'), prefix.lastIndexOf('\\'));
+    return lastSep === -1 ? '' : prefix.slice(0, lastSep);
+}