@modern-js/app-tools 2.58.1-alpha.1 → 2.58.1-alpha.3

package/dist/cjs/plugins/deploy/dependencies/index.js

@@ -40,8 +40,9 @@ var import_utils2 = require("./utils");
 var import_nft = require("@vercel/nft");
 const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = import_utils2.traceFiles, entryFilter, modifyPackageJson, copyWholePackage, cacheOptions = {
   cacheDir: ".modern-js/deploy",
-  fileCache: true,
-  analysisCache: true
+  analysisCache: true,
+  fileCache: false,
+  symlinkCache: false
 }, traceOptions }) => {
   const base = "/";
   const startTime = Date.now();

package/dist/cjs/plugins/deploy/dependencies/utils.js

@@ -145,6 +145,9 @@ async function serializeMap(map) {
     resolvedMap.set(key, value instanceof Promise ? await Promise.resolve(value) : value);
   }));
   return JSON.stringify(resolvedMap, (key, value) => {
+    if (value === null) {
+      return void 0;
+    }
     if (value instanceof Map) {
       return {
         dataType: "Map",
@@ -157,9 +160,6 @@ async function serializeMap(map) {
         value: Array.from(value)
       };
     }
-    if (value === null) {
-      return void 0;
-    }
     return value;
   });
 }
@@ -175,10 +175,9 @@ function deserializeMap(serializedData) {
   });
 }
 const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions, traceOptions }) => {
-  const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache } = cacheOptions;
+  const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache, symlinkCache: enableSymlinkCache } = cacheOptions;
   const analysisCacheFile = import_path.default.join(cacheDir, "analysis-cache.json");
   const fileCacheFile = import_path.default.join(cacheDir, "file-cache.json");
-  const statCacheFile = import_path.default.join(cacheDir, "stat-cache.json");
   const symlinkCacheFile = import_path.default.join(cacheDir, "symlink-cache.json");
   const cache = /* @__PURE__ */ Object.create(null);
   if (enableAnalysisCache && await import_utils.fs.pathExists(analysisCacheFile)) {
@@ -189,7 +188,7 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
     const fileCache2 = (await import_utils.fs.readFile(fileCacheFile)).toString();
     cache.fileCache = deserializeMap(fileCache2);
   }
-  if (await import_utils.fs.pathExists(symlinkCacheFile)) {
+  if (enableSymlinkCache && await import_utils.fs.pathExists(symlinkCacheFile)) {
     const symlinkCache2 = (await import_utils.fs.readFile(symlinkCacheFile)).toString();
     cache.symlinkCache = deserializeMap(symlinkCache2);
   }
@@ -199,10 +198,10 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
     cache,
     ...traceOptions
   });
-  const { analysisCache, fileCache, statCache, symlinkCache } = cache;
-  if (analysisCache || fileCache || statCache || symlinkCache) {
+  const { analysisCache, fileCache, symlinkCache } = cache;
+  if (analysisCache || fileCache || symlinkCache) {
     await import_utils.fs.ensureDir(cacheDir);
-    if (analysisCache) {
+    if (analysisCache && enableAnalysisCache) {
       const newAnalysisCache = new Map(analysisCache);
       for (const key of newAnalysisCache.keys()) {
         if (!key.includes("node_modules/")) {
@@ -214,7 +213,7 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
         console.log("write analysis cache finish");
       })();
     }
-    if (fileCache) {
+    if (fileCache && enableFileCache) {
       const newFileCache = new Map(fileCache);
       for (const key of newFileCache.keys()) {
         if (!key.includes("node_modules/")) {
@@ -226,7 +225,7 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
         console.log("write file cache finish");
       })();
     }
-    if (symlinkCache) {
+    if (symlinkCache && enableSymlinkCache) {
       const newSymlinkCache = new Map(symlinkCache);
       for (const key of newSymlinkCache.keys()) {
         if (!key.includes("node_modules/")) {

package/dist/esm/plugins/deploy/dependencies/index.js

@@ -19,8 +19,9 @@ var handleDependencies = function() {
         case 0:
           appDir = param.appDir, serverRootDir = param.serverRootDir, includeEntries = param.includeEntries, _param_traceFiles = param.traceFiles, traceFiles = _param_traceFiles === void 0 ? defaultTraceFiles : _param_traceFiles, entryFilter = param.entryFilter, modifyPackageJson = param.modifyPackageJson, copyWholePackage = param.copyWholePackage, _param_cacheOptions = param.cacheOptions, cacheOptions = _param_cacheOptions === void 0 ? {
             cacheDir: ".modern-js/deploy",
-            fileCache: true,
-            analysisCache: true
+            analysisCache: true,
+            fileCache: false,
+            symlinkCache: false
           } : _param_cacheOptions, traceOptions = param.traceOptions;
           base = "/";
           startTime = Date.now();

package/dist/esm/plugins/deploy/dependencies/utils.js

@@ -341,24 +341,7 @@ function serializeMap(map) {
   return _serializeMap.apply(this, arguments);
 }
 function _serializeMap() {
-  _serializeMap = // function serializeMap(map: Map<string, any>) {
-  //   return JSON.stringify(map, (key, value) => {
-  //     if (value instanceof Map) {
-  //       return {
-  //         dataType: 'Map',
-  //         value: [...value.entries()],
-  //       };
-  //     }
-  //     if (value instanceof Set) {
-  //       return {
-  //         dataType: 'Set',
-  //         value: [...value],
-  //       };
-  //     }
-  //     return value;
-  //   });
-  // }
-  _async_to_generator(function(map) {
+  _serializeMap = _async_to_generator(function(map) {
     var resolvedMap;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -415,6 +398,9 @@ function _serializeMap() {
           return [
             2,
             JSON.stringify(resolvedMap, function(key, value) {
+              if (value === null) {
+                return void 0;
+              }
               if (_instanceof(value, Map)) {
                 return {
                   dataType: "Map",
@@ -427,9 +413,6 @@ function _serializeMap() {
                   value: Array.from(value)
                 };
               }
-              if (value === null) {
-                return void 0;
-              }
               return value;
             })
           ];
@@ -451,15 +434,14 @@ function deserializeMap(serializedData) {
 }
 var traceFiles = function() {
   var _ref = _async_to_generator(function(param) {
-    var entryFiles, serverRootDir, _param_base, base, cacheOptions, traceOptions, cacheDir, enableFileCache, enableAnalysisCache, analysisCacheFile, fileCacheFile, statCacheFile, symlinkCacheFile, cache, _tmp, analysisCache, _tmp1, fileCache, symlinkCache, res, analysisCache1, fileCache1, statCache, symlinkCache1, newAnalysisCache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, key, newFileCache, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, key1, newSymlinkCache, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, key2;
+    var entryFiles, serverRootDir, _param_base, base, cacheOptions, traceOptions, cacheDir, enableFileCache, enableAnalysisCache, enableSymlinkCache, analysisCacheFile, fileCacheFile, symlinkCacheFile, cache, _tmp, analysisCache, _tmp1, fileCache, _tmp2, symlinkCache, res, analysisCache1, fileCache1, symlinkCache1, newAnalysisCache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, key, newFileCache, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, key1, newSymlinkCache, _iteratorNormalCompletion2, _didIteratorError2, _iteratorError2, _iterator2, _step2, key2;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           entryFiles = param.entryFiles, serverRootDir = param.serverRootDir, _param_base = param.base, base = _param_base === void 0 ? "/" : _param_base, cacheOptions = param.cacheOptions, traceOptions = param.traceOptions;
-          cacheDir = cacheOptions.cacheDir, enableFileCache = cacheOptions.fileCache, enableAnalysisCache = cacheOptions.analysisCache;
+          cacheDir = cacheOptions.cacheDir, enableFileCache = cacheOptions.fileCache, enableAnalysisCache = cacheOptions.analysisCache, enableSymlinkCache = cacheOptions.symlinkCache;
           analysisCacheFile = path.join(cacheDir, "analysis-cache.json");
           fileCacheFile = path.join(cacheDir, "file-cache.json");
-          statCacheFile = path.join(cacheDir, "stat-cache.json");
           symlinkCacheFile = path.join(cacheDir, "symlink-cache.json");
           cache = /* @__PURE__ */ Object.create(null);
           _tmp = enableAnalysisCache;
@@ -518,25 +500,34 @@ var traceFiles = function() {
           cache.fileCache = deserializeMap(fileCache);
           _state.label = 8;
         case 8:
+          _tmp2 = enableSymlinkCache;
+          if (!_tmp2)
+            return [
+              3,
+              10
+            ];
           return [
             4,
             fse.pathExists(symlinkCacheFile)
           ];
         case 9:
-          if (!_state.sent())
+          _tmp2 = _state.sent();
+          _state.label = 10;
+        case 10:
+          if (!_tmp2)
             return [
               3,
-              11
+              12
             ];
           return [
             4,
             fse.readFile(symlinkCacheFile)
           ];
-        case 10:
+        case 11:
           symlinkCache = _state.sent().toString();
           cache.symlinkCache = deserializeMap(symlinkCache);
-          _state.label = 11;
-        case 11:
+          _state.label = 12;
+        case 12:
           return [
             4,
             nodeFileTrace(entryFiles, _object_spread({
@@ -545,21 +536,21 @@ var traceFiles = function() {
               cache
             }, traceOptions))
           ];
-        case 12:
+        case 13:
           res = _state.sent();
-          analysisCache1 = cache.analysisCache, fileCache1 = cache.fileCache, statCache = cache.statCache, symlinkCache1 = cache.symlinkCache;
-          if (!(analysisCache1 || fileCache1 || statCache || symlinkCache1))
+          analysisCache1 = cache.analysisCache, fileCache1 = cache.fileCache, symlinkCache1 = cache.symlinkCache;
+          if (!(analysisCache1 || fileCache1 || symlinkCache1))
             return [
               3,
-              14
+              15
             ];
           return [
             4,
             fse.ensureDir(cacheDir)
           ];
-        case 13:
+        case 14:
           _state.sent();
-          if (analysisCache1) {
+          if (analysisCache1 && enableAnalysisCache) {
             newAnalysisCache = new Map(analysisCache1);
             _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
             try {
@@ -584,12 +575,12 @@ var traceFiles = function() {
               }
             }
             _async_to_generator(function() {
-              var _, _tmp2;
+              var _, _tmp3;
               return _ts_generator(this, function(_state2) {
                 switch (_state2.label) {
                   case 0:
                     _ = fse.writeFile;
-                    _tmp2 = [
+                    _tmp3 = [
                       analysisCacheFile
                     ];
                     return [
@@ -599,7 +590,7 @@ var traceFiles = function() {
                   case 1:
                     return [
                       4,
-                      _.apply(fse, _tmp2.concat([
+                      _.apply(fse, _tmp3.concat([
                         _state2.sent()
                       ]))
                     ];
@@ -613,7 +604,7 @@ var traceFiles = function() {
               });
             })();
           }
-          if (fileCache1) {
+          if (fileCache1 && enableFileCache) {
             newFileCache = new Map(fileCache1);
             _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
             try {
@@ -638,12 +629,12 @@ var traceFiles = function() {
               }
             }
             _async_to_generator(function() {
-              var _, _tmp2;
+              var _, _tmp3;
               return _ts_generator(this, function(_state2) {
                 switch (_state2.label) {
                   case 0:
                     _ = fse.writeFile;
-                    _tmp2 = [
+                    _tmp3 = [
                       fileCacheFile
                     ];
                     return [
@@ -653,7 +644,7 @@ var traceFiles = function() {
                   case 1:
                     return [
                       4,
-                      _.apply(fse, _tmp2.concat([
+                      _.apply(fse, _tmp3.concat([
                         _state2.sent()
                       ]))
                     ];
@@ -667,7 +658,7 @@ var traceFiles = function() {
               });
             })();
           }
-          if (symlinkCache1) {
+          if (symlinkCache1 && enableSymlinkCache) {
             newSymlinkCache = new Map(symlinkCache1);
             _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
             try {
@@ -692,12 +683,12 @@ var traceFiles = function() {
               }
             }
             _async_to_generator(function() {
-              var _, _tmp2;
+              var _, _tmp3;
               return _ts_generator(this, function(_state2) {
                 switch (_state2.label) {
                   case 0:
                     _ = fse.writeFile;
-                    _tmp2 = [
+                    _tmp3 = [
                       symlinkCacheFile
                     ];
                     return [
@@ -707,7 +698,7 @@ var traceFiles = function() {
                   case 1:
                     return [
                       4,
-                      _.apply(fse, _tmp2.concat([
+                      _.apply(fse, _tmp3.concat([
                         _state2.sent()
                       ]))
                     ];
@@ -721,8 +712,8 @@ var traceFiles = function() {
               });
             })();
           }
-          _state.label = 14;
-        case 14:
+          _state.label = 15;
+        case 15:
           console.log("ffffffff", __filename);
           return [
             2,

package/dist/esm-node/plugins/deploy/dependencies/index.js

@@ -6,8 +6,9 @@ import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaul
 import { nodeFileTrace } from "@vercel/nft";
 const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = defaultTraceFiles, entryFilter, modifyPackageJson, copyWholePackage, cacheOptions = {
   cacheDir: ".modern-js/deploy",
-  fileCache: true,
-  analysisCache: true
+  analysisCache: true,
+  fileCache: false,
+  symlinkCache: false
 }, traceOptions }) => {
   const base = "/";
   const startTime = Date.now();

package/dist/esm-node/plugins/deploy/dependencies/utils.js

@@ -104,6 +104,9 @@ async function serializeMap(map) {
     resolvedMap.set(key, value instanceof Promise ? await Promise.resolve(value) : value);
   }));
   return JSON.stringify(resolvedMap, (key, value) => {
+    if (value === null) {
+      return void 0;
+    }
     if (value instanceof Map) {
       return {
         dataType: "Map",
@@ -116,9 +119,6 @@ async function serializeMap(map) {
         value: Array.from(value)
       };
     }
-    if (value === null) {
-      return void 0;
-    }
     return value;
   });
 }
@@ -134,10 +134,9 @@ function deserializeMap(serializedData) {
   });
 }
 const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions, traceOptions }) => {
-  const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache } = cacheOptions;
+  const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache, symlinkCache: enableSymlinkCache } = cacheOptions;
   const analysisCacheFile = path.join(cacheDir, "analysis-cache.json");
   const fileCacheFile = path.join(cacheDir, "file-cache.json");
-  const statCacheFile = path.join(cacheDir, "stat-cache.json");
   const symlinkCacheFile = path.join(cacheDir, "symlink-cache.json");
   const cache = /* @__PURE__ */ Object.create(null);
   if (enableAnalysisCache && await fse.pathExists(analysisCacheFile)) {
@@ -148,7 +147,7 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
     const fileCache2 = (await fse.readFile(fileCacheFile)).toString();
     cache.fileCache = deserializeMap(fileCache2);
   }
-  if (await fse.pathExists(symlinkCacheFile)) {
+  if (enableSymlinkCache && await fse.pathExists(symlinkCacheFile)) {
     const symlinkCache2 = (await fse.readFile(symlinkCacheFile)).toString();
     cache.symlinkCache = deserializeMap(symlinkCache2);
   }
@@ -158,10 +157,10 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
     cache,
     ...traceOptions
   });
-  const { analysisCache, fileCache, statCache, symlinkCache } = cache;
-  if (analysisCache || fileCache || statCache || symlinkCache) {
+  const { analysisCache, fileCache, symlinkCache } = cache;
+  if (analysisCache || fileCache || symlinkCache) {
     await fse.ensureDir(cacheDir);
-    if (analysisCache) {
+    if (analysisCache && enableAnalysisCache) {
       const newAnalysisCache = new Map(analysisCache);
       for (const key of newAnalysisCache.keys()) {
         if (!key.includes("node_modules/")) {
@@ -173,7 +172,7 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
         console.log("write analysis cache finish");
       })();
     }
-    if (fileCache) {
+    if (fileCache && enableFileCache) {
       const newFileCache = new Map(fileCache);
       for (const key of newFileCache.keys()) {
         if (!key.includes("node_modules/")) {
@@ -185,7 +184,7 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
         console.log("write file cache finish");
       })();
     }
-    if (symlinkCache) {
+    if (symlinkCache && enableSymlinkCache) {
       const newSymlinkCache = new Map(symlinkCache);
       for (const key of newSymlinkCache.keys()) {
         if (!key.includes("node_modules/")) {

package/dist/types/plugins/deploy/dependencies/utils.d.ts

@@ -36,6 +36,7 @@ export declare const findPackageParents: (pkg: TracedPackage, version: string, t
 export interface CacheOptions {
     fileCache: boolean;
     analysisCache: boolean;
+    symlinkCache: boolean;
     cacheDir: string;
 }
 export declare const traceFiles: ({ entryFiles, serverRootDir, base, cacheOptions, traceOptions, }: {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1-alpha.1",
+  "version": "2.58.1-alpha.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -90,19 +90,19 @@
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
     "@modern-js/node-bundle-require": "2.58.0",
-    "@modern-js/plugin": "2.58.0",
     "@modern-js/core": "2.58.0",
+    "@modern-js/plugin": "2.58.0",
     "@modern-js/plugin-i18n": "2.58.0",
-    "@modern-js/server": "2.58.0",
-    "@modern-js/prod-server": "2.58.0",
-    "@modern-js/server-core": "2.58.0",
     "@modern-js/plugin-lint": "2.58.0",
+    "@modern-js/server-core": "2.58.0",
+    "@modern-js/server-utils": "2.58.0",
+    "@modern-js/server": "2.58.0",
     "@modern-js/types": "2.58.0",
     "@modern-js/utils": "2.58.0",
+    "@modern-js/prod-server": "2.58.0",
     "@modern-js/uni-builder": "2.58.0",
     "@modern-js/rsbuild-plugin-esbuild": "2.58.0",
-    "@modern-js/plugin-data-loader": "2.58.0",
-    "@modern-js/server-utils": "2.58.0"
+    "@modern-js/plugin-data-loader": "2.58.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.10",