@nx/js 22.6.0-pr.34722.ef1fe91 → 22.6.0-pr.34746.a1e500d

package/package.json

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

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

@@ -3,6 +3,7 @@ export interface TscPluginOptions {
     compiler?: 'tsc' | 'tsgo';
     typecheck?: boolean | {
         targetName?: string;
+        configName?: string;
     };
     build?: boolean | {
         targetName?: string;

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;AAgCpB,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,CAAC,EACN,OAAO,GACP;QACE,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,CA0FzD,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;AA2KD;;GAEG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAEhC,CAAC;AAEF,eAAO,MAAM,WAAW,sBAAsB,CAAC;AAI/C,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,gBAAgB,CA0FzD,CAAC;AAEF,eAAO,MAAM,WAAW,iCAAgB,CAAC"}

package/src/plugins/typescript/plugin.js

@@ -5,7 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const posix = require("node:path/posix");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const picomatch = require("picomatch");
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
@@ -67,7 +66,7 @@ function createConfigContext(configFilePath, workspaceRoot, projectContext) {
     return {
         originalPath: configFilePath,
         absolutePath,
-        relativePath: posix.relative(workspaceRoot, absolutePath),
+        relativePath: posixRelative(workspaceRoot, absolutePath),
         basename: (0, node_path_1.basename)(configFilePath),
         basenameNoExt: (0, node_path_1.basename)(configFilePath, '.json'),
         dirname: (0, node_path_1.dirname)(absolutePath),
@@ -87,7 +86,7 @@ function getConfigContext(configPath, workspaceRoot, cache) {
     if (!cache.projectContexts.has(projectRoot)) {
         cache.projectContexts.set(projectRoot, {
             root: projectRoot,
-            normalized: posix.normalize(projectRoot),
+            normalized: (0, devkit_1.normalizePath)(projectRoot),
             absolute: (0, node_path_1.join)(workspaceRoot, projectRoot),
         });
     }
@@ -167,7 +166,8 @@ async function resolveValidConfigFilesAndHashes(configFilePaths, options, option
         const absolutePath = (0, node_path_1.join)(context.workspaceRoot, configFilePath);
         const configContext = getConfigContext(absolutePath, context.workspaceRoot, cache);
         // Skip configs that can't produce any targets based on plugin options
-        const isTypecheckConfig = configContext.basename === 'tsconfig.json';
+        const isTypecheckConfig = configContext.basename ===
+            (options.typecheck ? options.typecheck.configName : 'tsconfig.json');
         const isBuildConfig = options.build && configContext.basename === options.build.configName;
         if (!isTypecheckConfig && !isBuildConfig) {
             continue;
@@ -249,8 +249,8 @@ function buildTscTargets(config, options, context, configFiles, cache) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(config.project.root, context);
     const tsConfig = retrieveTsConfigFromCache(config.absolutePath, context.workspaceRoot, cache);
     let internalProjectReferences;
-    if (config.basename === 'tsconfig.json' &&
-        options.typecheck &&
+    if (options.typecheck &&
+        config.basename === options.typecheck.configName &&
         tsConfig.raw?.['nx']?.addTypecheckTarget !== false) {
         internalProjectReferences = resolveInternalProjectReferences(tsConfig, context.workspaceRoot, config.project, cache);
         const externalProjectReferences = resolveShallowExternalProjectReferences(tsConfig, context.workspaceRoot, config.project, cache);
@@ -747,6 +747,11 @@ function readTsConfig(tsConfigPath, workspaceRoot, cache) {
     if (!ts) {
         ts = require('typescript');
     }
+    // Normalize to forward slashes for TypeScript compatibility on Windows.
+    // TypeScript's parser normalizes paths inconsistently — diagnostics use
+    // normalized paths but the source file retains the original, causing
+    // assertion failures when backslashes are present.
+    tsConfigPath = tsConfigPath.replaceAll('\\', '/');
     const tsSys = {
         ...ts.sys,
         readFile: (path) => readFile(path, workspaceRoot, cache),
@@ -761,7 +766,9 @@ function normalizePluginOptions(pluginOptions = {}) {
     const defaultCompiler = 'tsc';
     const compiler = pluginOptions.compiler ?? defaultCompiler;
     const defaultTypecheckTargetName = 'typecheck';
+    const defaultTypecheckConfigName = 'tsconfig.json';
     let typecheck = {
+        configName: defaultTypecheckConfigName,
         targetName: defaultTypecheckTargetName,
     };
     if (pluginOptions.typecheck === false) {
@@ -770,6 +777,7 @@ function normalizePluginOptions(pluginOptions = {}) {
     else if (pluginOptions.typecheck &&
         typeof pluginOptions.typecheck !== 'boolean') {
         typecheck = {
+            configName: pluginOptions.typecheck.configName ?? defaultTypecheckConfigName,
             targetName: pluginOptions.typecheck.targetName ?? defaultTypecheckTargetName,
         };
     }
@@ -915,5 +923,5 @@ function toRelativePaths(cache, workspaceRoot) {
     return updatedCache;
 }
 function posixRelative(workspaceRoot, path) {
-    return posix.normalize((0, node_path_1.relative)(workspaceRoot, path));
+    return (0, devkit_1.normalizePath)((0, node_path_1.relative)(workspaceRoot, path));
 }