@nx/js 21.0.0-beta.2 → 21.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "21.0.0-beta.2",
+  "version": "21.0.0-beta.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": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "21.0.0-beta.2",
-    "@nx/workspace": "21.0.0-beta.2",
+    "@nx/devkit": "21.0.0-beta.4",
+    "@nx/workspace": "21.0.0-beta.4",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",

package/src/plugins/typescript/plugin.js

@@ -14,8 +14,9 @@ const cache_directory_1 = require("nx/src/utils/cache-directory");
 const util_1 = require("./util");
 let ts;
 const pmc = (0, devkit_1.getPackageManagerCommand)();
-let tsConfigCache;
-const tsConfigCachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsconfig-files.hash');
+const TSCONFIG_CACHE_VERSION = 1;
+const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'tsconfig-files.hash');
+let tsConfigCacheData;
 let cache;
 function readFromCache(cachePath) {
     try {
@@ -27,9 +28,22 @@ function readFromCache(cachePath) {
         return {};
     }
 }
+function readTsConfigCacheData() {
+    const cache = readFromCache(TS_CONFIG_CACHE_PATH);
+    if (cache.version !== TSCONFIG_CACHE_VERSION) {
+        return {};
+    }
+    return cache.data;
+}
 function writeToCache(cachePath, data) {
     (0, devkit_1.writeJsonFile)(cachePath, data, { spaces: 0 });
 }
+function writeTsConfigCache(data) {
+    writeToCache(TS_CONFIG_CACHE_PATH, {
+        version: TSCONFIG_CACHE_VERSION,
+        data,
+    });
+}
 /**
  * @deprecated The 'createDependencies' function is now a no-op. This functionality is included in 'createNodesV2'.
  */
@@ -68,7 +82,7 @@ exports.createNodesV2 = [
         }
         finally {
             writeToCache(targetsCachePath, targetsCache);
-            writeToCache(tsConfigCachePath, toRelativePaths(tsConfigCache, context.workspaceRoot));
+            writeTsConfigCache(toRelativePaths(tsConfigCacheData, context.workspaceRoot));
         }
     },
 ];
@@ -84,7 +98,7 @@ exports.createNodes = [
         cache = { fileHashes: {}, rawFiles: {}, isExternalProjectReference: {} };
         initializeTsConfigCache([configFilePath], context.workspaceRoot);
         const { targets } = buildTscTargets((0, node_path_1.join)(context.workspaceRoot, configFilePath), projectRoot, normalizedOptions, context);
-        writeToCache(tsConfigCachePath, toRelativePaths(tsConfigCache, context.workspaceRoot));
+        writeTsConfigCache(toRelativePaths(tsConfigCacheData, context.workspaceRoot));
         return {
             projects: {
                 [projectRoot]: {
@@ -587,12 +601,12 @@ function retrieveTsConfigFromCache(tsConfigPath, workspaceRoot) {
     const relativePath = posixRelative(workspaceRoot, tsConfigPath);
     // we don't need to check the hash if it's in the cache, because we've already
     // checked it when we initially populated the cache
-    return tsConfigCache[relativePath]
-        ? tsConfigCache[relativePath].data
+    return tsConfigCacheData[relativePath]
+        ? tsConfigCacheData[relativePath].data
         : readTsConfigAndCache(tsConfigPath, workspaceRoot);
 }
 function initializeTsConfigCache(configFilePaths, workspaceRoot) {
-    tsConfigCache = toAbsolutePaths(readFromCache(tsConfigCachePath), workspaceRoot);
+    tsConfigCacheData = toAbsolutePaths(readTsConfigCacheData(), workspaceRoot);
     // ensure hashes are checked and the cache is invalidated and populated as needed
     for (const configFilePath of configFilePaths) {
         const fullConfigPath = (0, node_path_1.join)(workspaceRoot, configFilePath);
@@ -603,11 +617,11 @@ function readTsConfigAndCache(tsConfigPath, workspaceRoot) {
     const relativePath = posixRelative(workspaceRoot, tsConfigPath);
     const hash = getFileHash(tsConfigPath, workspaceRoot);
     let extendedFilesHash;
-    if (tsConfigCache[relativePath] &&
-        tsConfigCache[relativePath].hash === hash) {
-        extendedFilesHash = getExtendedFilesHash(tsConfigCache[relativePath].data.extendedConfigFiles, workspaceRoot);
-        if (tsConfigCache[relativePath].extendedFilesHash === extendedFilesHash) {
-            return tsConfigCache[relativePath].data;
+    if (tsConfigCacheData[relativePath] &&
+        tsConfigCacheData[relativePath].hash === hash) {
+        extendedFilesHash = getExtendedFilesHash(tsConfigCacheData[relativePath].data.extendedConfigFiles, workspaceRoot);
+        if (tsConfigCacheData[relativePath].extendedFilesHash === extendedFilesHash) {
+            return tsConfigCacheData[relativePath].data;
         }
     }
     const tsConfig = readTsConfig(tsConfigPath, workspaceRoot);
@@ -624,7 +638,7 @@ function readTsConfigAndCache(tsConfigPath, workspaceRoot) {
         }
     }
     extendedFilesHash ??= getExtendedFilesHash(extendedConfigFiles, workspaceRoot);
-    tsConfigCache[relativePath] = {
+    tsConfigCacheData[relativePath] = {
         data: {
             options: tsConfig.options,
             projectReferences: tsConfig.projectReferences,
@@ -634,7 +648,7 @@ function readTsConfigAndCache(tsConfigPath, workspaceRoot) {
         hash,
         extendedFilesHash,
     };
-    return tsConfigCache[relativePath].data;
+    return tsConfigCacheData[relativePath].data;
 }
 function getExtendedFilesHash(extendedConfigFiles, workspaceRoot) {
     const hashes = [];