@nx/js 22.6.0 → 22.7.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "22.6.0",
+  "version": "22.7.0-beta.0",
   "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",
-    "@nx/workspace": "22.6.0",
+    "@nx/devkit": "22.7.0-beta.0",
+    "@nx/workspace": "22.7.0-beta.0",
     "@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"
+    "nx": "22.7.0-beta.0"
   },
   "peerDependencies": {
     "verdaccio": "^6.0.5"

package/src/plugins/typescript/plugin.js

@@ -13,7 +13,7 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const util_1 = require("./util");
 let ts;
 const pmc = (0, devkit_1.getPackageManagerCommand)();
-const TSCONFIG_CACHE_VERSION = 1;
+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
 const cacheStore = new Map();
@@ -281,7 +281,7 @@ function buildTscTargets(config, options, context, configFiles, cache) {
             targets[targetName] = {
                 dependsOn,
                 command,
-                options: { cwd: config.project.root },
+                options: { cwd: config.project.normalized },
                 cache: true,
                 inputs: getInputs(namedInputs, config, tsConfig, internalProjectReferences, context.workspaceRoot, cache),
                 outputs: getOutputs(config, tsConfig, internalProjectReferences, context.workspaceRoot, 
@@ -311,7 +311,7 @@ function buildTscTargets(config, options, context, configFiles, cache) {
         targets[targetName] = {
             dependsOn: [`^${targetName}`],
             command: `${compiler} --build ${options.build.configName}${options.verboseOutput ? ' --verbose' : ''}`,
-            options: { cwd: config.project.root },
+            options: { cwd: config.project.normalized },
             cache: true,
             inputs: getInputs(namedInputs, config, tsConfig, internalProjectReferences, context.workspaceRoot, cache),
             outputs: getOutputs(config, tsConfig, internalProjectReferences, context.workspaceRoot, 
@@ -889,12 +889,28 @@ function readFile(filePath, workspaceRoot, cache) {
 function toAbsolutePaths(cache, workspaceRoot) {
     const updatedCache = {};
     for (const [key, { data, extendedFilesHash, hash }] of Object.entries(cache)) {
+        const raw = {
+            nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+        };
+        if (data.raw?.include) {
+            raw.include = data.raw.include;
+        }
+        if (data.raw?.exclude) {
+            raw.exclude = data.raw.exclude;
+        }
+        if (data.raw?.files) {
+            raw.files = data.raw.files;
+        }
         updatedCache[key] = {
             data: {
-                options: { noEmit: data.options.noEmit },
-                raw: {
-                    nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+                options: {
+                    noEmit: data.options.noEmit,
+                    allowJs: data.options.allowJs,
+                    resolveJsonModule: data.options.resolveJsonModule,
+                    emitDeclarationOnly: data.options.emitDeclarationOnly,
+                    declarationMap: data.options.declarationMap,
                 },
+                raw,
                 extendedConfigFiles: data.extendedConfigFiles,
             },
             extendedFilesHash,
@@ -926,12 +942,28 @@ function toAbsolutePaths(cache, workspaceRoot) {
 function toRelativePaths(cache, workspaceRoot) {
     const updatedCache = {};
     for (const [key, { data, extendedFilesHash, hash }] of Object.entries(cache)) {
+        const raw = {
+            nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+        };
+        if (data.raw?.include) {
+            raw.include = data.raw.include;
+        }
+        if (data.raw?.exclude) {
+            raw.exclude = data.raw.exclude;
+        }
+        if (data.raw?.files) {
+            raw.files = data.raw.files;
+        }
         updatedCache[key] = {
             data: {
-                options: { noEmit: data.options.noEmit },
-                raw: {
-                    nx: { addTypecheckTarget: data.raw?.['nx']?.addTypecheckTarget },
+                options: {
+                    noEmit: data.options.noEmit,
+                    allowJs: data.options.allowJs,
+                    resolveJsonModule: data.options.resolveJsonModule,
+                    emitDeclarationOnly: data.options.emitDeclarationOnly,
+                    declarationMap: data.options.declarationMap,
                 },
+                raw,
                 extendedConfigFiles: data.extendedConfigFiles,
             },
             extendedFilesHash,