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

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

@@ -46,6 +46,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   const base = "/";
   const startTime = Date.now();
   const entryFiles = await (0, import_utils2.findEntryFiles)(serverRootDir, entryFilter);
+  console.time("traceFiles");
   const fileTrace = await traceFiles({
     entryFiles: entryFiles.concat(includeEntries),
     serverRootDir,
@@ -56,6 +57,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     base,
     traceOptions
   });
+  console.timeEnd("traceFiles");
   const currentProjectModules = import_node_path.default.join(appDir, "node_modules");
   const dependencySearchRoot = import_node_path.default.resolve(appDir, "../../../../../../");
   const tracedFiles = Object.fromEntries(await Promise.all([
@@ -238,7 +240,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
   await import_utils.fs.writeJSON(outputPkgPath, finalPkgJson);
   const endTime = Date.now();
-  console.log("handleDependencies cost:", endTime - startTime);
+  console.log("handleDependencies cost:", `${endTime - startTime}ms`);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -157,6 +157,9 @@ async function serializeMap(map) {
         value: Array.from(value)
       };
     }
+    if (value === null) {
+      return void 0;
+    }
     return value;
   });
 }
@@ -175,6 +178,8 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
   const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache } = 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)) {
     const analysisCache2 = (await import_utils.fs.readFile(analysisCacheFile)).toString();
@@ -184,14 +189,18 @@ 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)) {
+    const symlinkCache2 = (await import_utils.fs.readFile(symlinkCacheFile)).toString();
+    cache.symlinkCache = deserializeMap(symlinkCache2);
+  }
   const res = await (0, import_nft.nodeFileTrace)(entryFiles, {
     base,
     processCwd: serverRootDir,
     cache,
     ...traceOptions
   });
-  const { analysisCache, fileCache } = cache;
-  if (analysisCache || fileCache) {
+  const { analysisCache, fileCache, statCache, symlinkCache } = cache;
+  if (analysisCache || fileCache || statCache || symlinkCache) {
     await import_utils.fs.ensureDir(cacheDir);
     if (analysisCache) {
       const newAnalysisCache = new Map(analysisCache);
@@ -200,7 +209,10 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
           newAnalysisCache.delete(key);
         }
       }
-      import_utils.fs.writeFile(analysisCacheFile, await serializeMap(newAnalysisCache));
+      (async () => {
+        await import_utils.fs.writeFile(analysisCacheFile, await serializeMap(newAnalysisCache));
+        console.log("write analysis cache finish");
+      })();
     }
     if (fileCache) {
       const newFileCache = new Map(fileCache);
@@ -209,9 +221,22 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
           newFileCache.delete(key);
         }
       }
-      console.time("111");
-      import_utils.fs.writeFile(fileCacheFile, await serializeMap(newFileCache));
-      console.timeEnd("111");
+      (async () => {
+        await import_utils.fs.writeFile(fileCacheFile, await serializeMap(newFileCache));
+        console.log("write file cache finish");
+      })();
+    }
+    if (symlinkCache) {
+      const newSymlinkCache = new Map(symlinkCache);
+      for (const key of newSymlinkCache.keys()) {
+        if (!key.includes("node_modules/")) {
+          newSymlinkCache.delete(key);
+        }
+      }
+      (async () => {
+        await import_utils.fs.writeFile(symlinkCacheFile, await serializeMap(newSymlinkCache));
+        console.log("write symlink cache finish");
+      })();
     }
   }
   console.log("ffffffff", __filename);

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

@@ -30,6 +30,7 @@ var handleDependencies = function() {
           ];
         case 1:
           entryFiles = _state.sent();
+          console.time("traceFiles");
           return [
             4,
             traceFiles({
@@ -44,6 +45,7 @@ var handleDependencies = function() {
           ];
         case 2:
           fileTrace = _state.sent();
+          console.timeEnd("traceFiles");
           currentProjectModules = path.join(appDir, "node_modules");
           dependencySearchRoot = path.resolve(appDir, "../../../../../../");
           _ = Object.fromEntries;
@@ -609,7 +611,7 @@ var handleDependencies = function() {
         case 24:
           _state.sent();
           endTime = Date.now();
-          console.log("handleDependencies cost:", endTime - startTime);
+          console.log("handleDependencies cost:", "".concat(endTime - startTime, "ms"));
           return [
             2
           ];

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

@@ -427,6 +427,9 @@ function _serializeMap() {
                   value: Array.from(value)
                 };
               }
+              if (value === null) {
+                return void 0;
+              }
               return value;
             })
           ];
@@ -448,7 +451,7 @@ 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, cache, _tmp, analysisCache, _tmp1, fileCache, res, analysisCache1, fileCache1, newAnalysisCache, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, key, _, _tmp2, newFileCache, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, key1, _1, _tmp3;
+    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;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -456,6 +459,8 @@ var traceFiles = function() {
           cacheDir = cacheOptions.cacheDir, enableFileCache = cacheOptions.fileCache, enableAnalysisCache = cacheOptions.analysisCache;
           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;
           if (!_tmp)
@@ -513,6 +518,25 @@ var traceFiles = function() {
           cache.fileCache = deserializeMap(fileCache);
           _state.label = 8;
         case 8:
+          return [
+            4,
+            fse.pathExists(symlinkCacheFile)
+          ];
+        case 9:
+          if (!_state.sent())
+            return [
+              3,
+              11
+            ];
+          return [
+            4,
+            fse.readFile(symlinkCacheFile)
+          ];
+        case 10:
+          symlinkCache = _state.sent().toString();
+          cache.symlinkCache = deserializeMap(symlinkCache);
+          _state.label = 11;
+        case 11:
           return [
             4,
             nodeFileTrace(entryFiles, _object_spread({
@@ -521,10 +545,10 @@ var traceFiles = function() {
               cache
             }, traceOptions))
           ];
-        case 9:
+        case 12:
           res = _state.sent();
-          analysisCache1 = cache.analysisCache, fileCache1 = cache.fileCache;
-          if (!(analysisCache1 || fileCache1))
+          analysisCache1 = cache.analysisCache, fileCache1 = cache.fileCache, statCache = cache.statCache, symlinkCache1 = cache.symlinkCache;
+          if (!(analysisCache1 || fileCache1 || statCache || symlinkCache1))
             return [
               3,
               14
@@ -533,92 +557,170 @@ var traceFiles = function() {
             4,
             fse.ensureDir(cacheDir)
           ];
-        case 10:
+        case 13:
           _state.sent();
-          if (!analysisCache1)
-            return [
-              3,
-              12
-            ];
-          newAnalysisCache = new Map(analysisCache1);
-          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-          try {
-            for (_iterator = newAnalysisCache.keys()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-              key = _step.value;
-              if (!key.includes("node_modules/")) {
-                newAnalysisCache.delete(key);
-              }
-            }
-          } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-          } finally {
+          if (analysisCache1) {
+            newAnalysisCache = new Map(analysisCache1);
+            _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
             try {
-              if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+              for (_iterator = newAnalysisCache.keys()[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                key = _step.value;
+                if (!key.includes("node_modules/")) {
+                  newAnalysisCache.delete(key);
+                }
               }
+            } catch (err) {
+              _didIteratorError = true;
+              _iteratorError = err;
             } finally {
-              if (_didIteratorError) {
-                throw _iteratorError;
+              try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                  _iterator.return();
+                }
+              } finally {
+                if (_didIteratorError) {
+                  throw _iteratorError;
+                }
               }
             }
+            _async_to_generator(function() {
+              var _, _tmp2;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    _ = fse.writeFile;
+                    _tmp2 = [
+                      analysisCacheFile
+                    ];
+                    return [
+                      4,
+                      serializeMap(newAnalysisCache)
+                    ];
+                  case 1:
+                    return [
+                      4,
+                      _.apply(fse, _tmp2.concat([
+                        _state2.sent()
+                      ]))
+                    ];
+                  case 2:
+                    _state2.sent();
+                    console.log("write analysis cache finish");
+                    return [
+                      2
+                    ];
+                }
+              });
+            })();
           }
-          _ = fse.writeFile;
-          _tmp2 = [
-            analysisCacheFile
-          ];
-          return [
-            4,
-            serializeMap(newAnalysisCache)
-          ];
-        case 11:
-          _.apply(fse, _tmp2.concat([
-            _state.sent()
-          ]));
-          _state.label = 12;
-        case 12:
-          if (!fileCache1)
-            return [
-              3,
-              14
-            ];
-          newFileCache = new Map(fileCache1);
-          _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
-          try {
-            for (_iterator1 = newFileCache.keys()[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
-              key1 = _step1.value;
-              if (!key1.includes("node_modules/")) {
-                newFileCache.delete(key1);
+          if (fileCache1) {
+            newFileCache = new Map(fileCache1);
+            _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
+            try {
+              for (_iterator1 = newFileCache.keys()[Symbol.iterator](); !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true) {
+                key1 = _step1.value;
+                if (!key1.includes("node_modules/")) {
+                  newFileCache.delete(key1);
+                }
+              }
+            } catch (err) {
+              _didIteratorError1 = true;
+              _iteratorError1 = err;
+            } finally {
+              try {
+                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                  _iterator1.return();
+                }
+              } finally {
+                if (_didIteratorError1) {
+                  throw _iteratorError1;
+                }
               }
             }
-          } catch (err) {
-            _didIteratorError1 = true;
-            _iteratorError1 = err;
-          } finally {
+            _async_to_generator(function() {
+              var _, _tmp2;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    _ = fse.writeFile;
+                    _tmp2 = [
+                      fileCacheFile
+                    ];
+                    return [
+                      4,
+                      serializeMap(newFileCache)
+                    ];
+                  case 1:
+                    return [
+                      4,
+                      _.apply(fse, _tmp2.concat([
+                        _state2.sent()
+                      ]))
+                    ];
+                  case 2:
+                    _state2.sent();
+                    console.log("write file cache finish");
+                    return [
+                      2
+                    ];
+                }
+              });
+            })();
+          }
+          if (symlinkCache1) {
+            newSymlinkCache = new Map(symlinkCache1);
+            _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
             try {
-              if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                _iterator1.return();
+              for (_iterator2 = newSymlinkCache.keys()[Symbol.iterator](); !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+                key2 = _step2.value;
+                if (!key2.includes("node_modules/")) {
+                  newSymlinkCache.delete(key2);
+                }
               }
+            } catch (err) {
+              _didIteratorError2 = true;
+              _iteratorError2 = err;
             } finally {
-              if (_didIteratorError1) {
-                throw _iteratorError1;
+              try {
+                if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                  _iterator2.return();
+                }
+              } finally {
+                if (_didIteratorError2) {
+                  throw _iteratorError2;
+                }
               }
             }
+            _async_to_generator(function() {
+              var _, _tmp2;
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    _ = fse.writeFile;
+                    _tmp2 = [
+                      symlinkCacheFile
+                    ];
+                    return [
+                      4,
+                      serializeMap(newSymlinkCache)
+                    ];
+                  case 1:
+                    return [
+                      4,
+                      _.apply(fse, _tmp2.concat([
+                        _state2.sent()
+                      ]))
+                    ];
+                  case 2:
+                    _state2.sent();
+                    console.log("write symlink cache finish");
+                    return [
+                      2
+                    ];
+                }
+              });
+            })();
           }
-          console.time("111");
-          _1 = fse.writeFile;
-          _tmp3 = [
-            fileCacheFile
-          ];
-          return [
-            4,
-            serializeMap(newFileCache)
-          ];
-        case 13:
-          _1.apply(fse, _tmp3.concat([
-            _state.sent()
-          ]));
-          console.timeEnd("111");
           _state.label = 14;
         case 14:
           console.log("ffffffff", __filename);

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

@@ -12,6 +12,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   const base = "/";
   const startTime = Date.now();
   const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
+  console.time("traceFiles");
   const fileTrace = await traceFiles({
     entryFiles: entryFiles.concat(includeEntries),
     serverRootDir,
@@ -22,6 +23,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
     base,
     traceOptions
   });
+  console.timeEnd("traceFiles");
   const currentProjectModules = path.join(appDir, "node_modules");
   const dependencySearchRoot = path.resolve(appDir, "../../../../../../");
   const tracedFiles = Object.fromEntries(await Promise.all([
@@ -204,7 +206,7 @@ const handleDependencies = async ({ appDir, serverRootDir, includeEntries, trace
   const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
   await fse.writeJSON(outputPkgPath, finalPkgJson);
   const endTime = Date.now();
-  console.log("handleDependencies cost:", endTime - startTime);
+  console.log("handleDependencies cost:", `${endTime - startTime}ms`);
 };
 export {
   handleDependencies,

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

@@ -116,6 +116,9 @@ async function serializeMap(map) {
         value: Array.from(value)
       };
     }
+    if (value === null) {
+      return void 0;
+    }
     return value;
   });
 }
@@ -134,6 +137,8 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
   const { cacheDir, fileCache: enableFileCache, analysisCache: enableAnalysisCache } = 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)) {
     const analysisCache2 = (await fse.readFile(analysisCacheFile)).toString();
@@ -143,14 +148,18 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
     const fileCache2 = (await fse.readFile(fileCacheFile)).toString();
     cache.fileCache = deserializeMap(fileCache2);
   }
+  if (await fse.pathExists(symlinkCacheFile)) {
+    const symlinkCache2 = (await fse.readFile(symlinkCacheFile)).toString();
+    cache.symlinkCache = deserializeMap(symlinkCache2);
+  }
   const res = await nodeFileTrace(entryFiles, {
     base,
     processCwd: serverRootDir,
     cache,
     ...traceOptions
   });
-  const { analysisCache, fileCache } = cache;
-  if (analysisCache || fileCache) {
+  const { analysisCache, fileCache, statCache, symlinkCache } = cache;
+  if (analysisCache || fileCache || statCache || symlinkCache) {
     await fse.ensureDir(cacheDir);
     if (analysisCache) {
       const newAnalysisCache = new Map(analysisCache);
@@ -159,7 +168,10 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
           newAnalysisCache.delete(key);
         }
       }
-      fse.writeFile(analysisCacheFile, await serializeMap(newAnalysisCache));
+      (async () => {
+        await fse.writeFile(analysisCacheFile, await serializeMap(newAnalysisCache));
+        console.log("write analysis cache finish");
+      })();
     }
     if (fileCache) {
       const newFileCache = new Map(fileCache);
@@ -168,9 +180,22 @@ const traceFiles = async ({ entryFiles, serverRootDir, base = "/", cacheOptions,
           newFileCache.delete(key);
         }
       }
-      console.time("111");
-      fse.writeFile(fileCacheFile, await serializeMap(newFileCache));
-      console.timeEnd("111");
+      (async () => {
+        await fse.writeFile(fileCacheFile, await serializeMap(newFileCache));
+        console.log("write file cache finish");
+      })();
+    }
+    if (symlinkCache) {
+      const newSymlinkCache = new Map(symlinkCache);
+      for (const key of newSymlinkCache.keys()) {
+        if (!key.includes("node_modules/")) {
+          newSymlinkCache.delete(key);
+        }
+      }
+      (async () => {
+        await fse.writeFile(symlinkCacheFile, await serializeMap(newSymlinkCache));
+        console.log("write symlink cache finish");
+      })();
     }
   }
   console.log("ffffffff", __filename);

package/package.json

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