@nx/js 23.0.0-beta.18 → 23.0.0-beta.19

package/dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports.js

@@ -91,19 +91,34 @@ function collectCallExpressionRewrites(sourceFile, changes) {
             shouldRewriteSpecifier(node.arguments[0].text)) {
             replaceSpecifier(sourceFile, node.arguments[0], changes);
         }
+        else if (ts.isImportTypeNode(node)) {
+            // `typeof import('...')` parses as an `ImportTypeNode`, not a
+            // CallExpression — its argument is `LiteralTypeNode<StringLiteral>`.
+            // The whole module is referenced, so it can't be symbol-split.
+            const literal = getImportTypeStringLiteral(node);
+            if (literal && shouldRewriteSpecifier(literal.text)) {
+                replaceSpecifier(sourceFile, literal, changes);
+            }
+        }
         ts.forEachChild(node, visit);
     };
     visit(sourceFile);
 }
+function getImportTypeStringLiteral(node) {
+    const arg = node.argument;
+    if (arg && ts.isLiteralTypeNode(arg) && ts.isStringLiteral(arg.literal)) {
+        return arg.literal;
+    }
+    return undefined;
+}
 function shouldRewriteCallExpression(call) {
     const callee = call.expression;
     // `require('...')`
     if (ts.isIdentifier(callee) && callee.text === 'require')
         return true;
     // dynamic `import('...')` (runtime form parses as a CallExpression whose
-    // callee is the `import` keyword). The type-position form
-    // (`typeof import('...')`) is an `ImportTypeNode`, not a CallExpression, so
-    // we don't touch it.
+    // callee is the `import` keyword). The `typeof import('...')` type-position
+    // form is an `ImportTypeNode` (handled in `collectCallExpressionRewrites`).
     if (callee.kind === ts.SyntaxKind.ImportKeyword)
         return true;
     // `jest.mock(...)` / `vi.mock(...)` and friends.

package/dist/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
@@ -356,7 +368,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 = [
@@ -821,7 +833,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/package.json

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