@modern-js/app-tools 2.54.1 → 2.54.2-alpha.3

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

@@ -5,7 +5,7 @@ import path from "path";
 import os from "node:os";
 import { fs as fse } from "@modern-js/utils";
 import { parseNodeModulePath } from "mlly";
-import { nodeFileTrace, resolve } from "@vercel/nft";
+import { nodeFileTrace } from "@vercel/nft";
 function applyPublicCondition(pkg) {
   var _pkg_publishConfig;
   if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
@@ -14,11 +14,12 @@ function applyPublicCondition(pkg) {
   }
 }
 var writePackage = function() {
-  var _ref = _async_to_generator(function(pkg, version, projectDir, _pkgPath) {
-    var pkgPath, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, src, subpath, dest, dirname, subpath1, dest1, dirname1, err, pkgJSON, packageJsonPath;
+  var _ref = _async_to_generator(function(options) {
+    var pkg, version, projectDir, _pkgPath, pkgPath, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, src, subpath, dest, dirname, subpath1, dest1, dirname1, err, pkgJSON, packageJsonPath;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
+          pkg = options.pkg, version = options.version, projectDir = options.projectDir, _pkgPath = options._pkgPath;
           pkgPath = _pkgPath || pkg.name;
           _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
           _state.label = 1;
@@ -133,7 +134,7 @@ var writePackage = function() {
       }
     });
   });
-  return function writePackage2(pkg, version, projectDir, _pkgPath) {
+  return function writePackage2(options) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -318,15 +319,20 @@ var findPackageParents = function(pkg, version, tracedFiles) {
     return tracedFiles[path2];
   });
   var parentPkgs = _to_consumable_array(new Set(versionFiles.flatMap(function(file) {
-    return file.parents.map(function(parentPath) {
-      var parentFile = tracedFiles[parentPath];
-      if (!parentFile || parentFile.pkgName === pkg.name) {
-        return null;
-      }
-      return "".concat(parentFile.pkgName, "@").concat(parentFile.pkgVersion);
-    }).filter(Boolean);
+    return (
+      // Because it supports copyWholePackage configuration, not all files exist.
+      file === null || file === void 0 ? void 0 : file.parents.map(function(parentPath) {
+        var parentFile = tracedFiles[parentPath];
+        if (!parentFile || parentFile.pkgName === pkg.name) {
+          return null;
+        }
+        return "".concat(parentFile.pkgName, "@").concat(parentFile.pkgVersion);
+      }).filter(Boolean)
+    );
   })));
-  return parentPkgs;
+  return parentPkgs.filter(function(parentPkg) {
+    return parentPkg;
+  });
 };
 var traceFiles = function() {
   var _ref = _async_to_generator(function(entryFiles, serverRootDir) {
@@ -341,33 +347,7 @@ var traceFiles = function() {
             nodeFileTrace(entryFiles, {
               base,
               processCwd: serverRootDir,
-              resolve: function() {
-                var _ref2 = _async_to_generator(function(id, parent, job, isCjs) {
-                  return _ts_generator(this, function(_state2) {
-                    if (id.startsWith("@modern-js/prod-server")) {
-                      return [
-                        2,
-                        require.resolve(id, {
-                          paths: [
-                            require.resolve("@modern-js/app-tools")
-                          ]
-                        })
-                      ];
-                    } else {
-                      return [
-                        2,
-                        resolve(id, parent, job, isCjs)
-                      ];
-                    }
-                    return [
-                      2
-                    ];
-                  });
-                });
-                return function(id, parent, job, isCjs) {
-                  return _ref2.apply(this, arguments);
-                };
-              }()
+              cache: /* @__PURE__ */ Object.create(null)
             })
           ];
         case 1:

package/dist/esm/plugins/deploy/exports.js

@@ -0,0 +1,4 @@
+import { handleDependencies } from "./dependencies";
+export {
+  handleDependencies
+};

package/dist/esm/plugins/deploy/platforms/netlify.js

@@ -273,9 +273,13 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
               }
               return [
                 4,
-                handleDependencies(appDirectory, funcsDirectory, [
-                  "@modern-js/prod-server"
-                ])
+                handleDependencies({
+                  appDir: appDirectory,
+                  serverRootDir: funcsDirectory,
+                  includeEntries: [
+                    require.resolve("@modern-js/prod-server")
+                  ]
+                })
               ];
             case 3:
               _state.sent();

package/dist/esm/plugins/deploy/platforms/node.js

@@ -106,9 +106,14 @@ var createNodePreset = function(appContext, config) {
               };
               return [
                 4,
-                handleDependencies(appDirectory, outputDirectory, [
-                  "@modern-js/prod-server"
-                ], filter)
+                handleDependencies({
+                  appDir: appDirectory,
+                  serverRootDir: outputDirectory,
+                  includeEntries: [
+                    require.resolve("@modern-js/prod-server")
+                  ],
+                  entryFilter: filter
+                })
               ];
             case 1:
               _state.sent();

package/dist/esm/plugins/deploy/platforms/vercel.js

@@ -207,9 +207,13 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
               }
               return [
                 4,
-                handleDependencies(appDirectory, funcsDirectory, [
-                  "@modern-js/prod-server"
-                ])
+                handleDependencies({
+                  appDir: appDirectory,
+                  serverRootDir: funcsDirectory,
+                  includeEntries: [
+                    require.resolve("@modern-js/prod-server")
+                  ]
+                })
               ];
             case 1:
               _state.sent();

package/dist/esm/utils/loadPlugins.js

@@ -8,12 +8,10 @@ function getServerPlugins(api) {
 }
 function _getServerPlugins() {
   _getServerPlugins = _async_to_generator(function(api) {
-    var metaName, runner, plugins, filtedPlugins;
-    var _arguments = arguments;
+    var runner, plugins;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          metaName = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : "modern-js";
           runner = api.useHookRunners();
           return [
             4,
@@ -23,33 +21,30 @@ function _getServerPlugins() {
           ];
         case 1:
           plugins = _state.sent().plugins;
-          filtedPlugins = plugins.filter(function(plugin) {
-            return plugin.name.includes(metaName);
-          });
           api.setAppContext(_object_spread_props(_object_spread({}, api.useAppContext()), {
-            serverPlugins: filtedPlugins
+            serverPlugins: plugins
           }));
           return [
             2,
-            filtedPlugins
+            plugins
           ];
       }
     });
   });
   return _getServerPlugins.apply(this, arguments);
 }
-function loadServerPlugins(api, appDirectory, metaName) {
+function loadServerPlugins(api, appDirectory) {
   return _loadServerPlugins.apply(this, arguments);
 }
 function _loadServerPlugins() {
-  _loadServerPlugins = _async_to_generator(function(api, appDirectory, metaName) {
+  _loadServerPlugins = _async_to_generator(function(api, appDirectory) {
     var plugins, instances;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           return [
             4,
-            getServerPlugins(api, metaName)
+            getServerPlugins(api)
           ];
         case 1:
           plugins = _state.sent();

package/dist/esm-node/commands/build.js

@@ -12,7 +12,7 @@ const build = async (api, options) => {
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
-  await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
+  await loadServerPlugins(api, appContext.appDirectory);
   await registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
   const { apiOnly } = appContext;
   if (apiOnly) {

package/dist/esm-node/commands/deploy.js

@@ -1,8 +1,7 @@
 import { getServerPlugins } from "../utils/loadPlugins";
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
-  const { metaName } = api.useAppContext();
-  await getServerPlugins(api, metaName);
+  await getServerPlugins(api);
   await hookRunners.beforeDeploy(options);
   await hookRunners.deploy(options);
   await hookRunners.afterDeploy(options);

package/dist/esm-node/commands/dev.js

@@ -37,7 +37,7 @@ const dev = async (api, options, devServerOptions = {}) => {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
   await generateRoutes(appContext);
-  const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
+  const pluginInstances = await loadServerPlugins(api, appDirectory);
   const serverOptions = {
     metaName,
     dev: {

package/dist/esm-node/commands/serve.js

@@ -17,7 +17,7 @@ const start = async (api) => {
   }
   const meta = getMeta(metaName);
   const serverConfigPath = path.resolve(distDirectory, SERVER_DIR, `${meta}.server`);
-  const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
+  const pluginInstances = await loadServerPlugins(api, appDirectory);
   const app = await createProdServer({
     metaName,
     pwd: distDirectory,

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

@@ -1,21 +1,11 @@
-import path, { isAbsolute } from "node:path";
+import path from "node:path";
 import { fs as fse, pkgUp, semver } from "@modern-js/utils";
 import { readPackageJSON } from "pkg-types";
 import { parseNodeModulePath } from "mlly";
-import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles, findPackageParents, resolveTracedPath } from "./utils";
-const handleDependencies = async (appDir, serverRootDir, include, entryFilter) => {
+import { linkPackage, writePackage, isFile, findEntryFiles, traceFiles as defaultTraceFiles, findPackageParents, resolveTracedPath, readDirRecursive } from "./utils";
+const handleDependencies = async ({ appDir, serverRootDir, includeEntries, traceFiles = defaultTraceFiles, entryFilter, modifyPackageJson, copyWholePackage }) => {
   const base = "/";
   const entryFiles = await findEntryFiles(serverRootDir, entryFilter);
-  const includeEntries = include.map((item) => {
-    if (isAbsolute(item)) {
-      return item;
-    }
-    try {
-      return require.resolve(item);
-    } catch (error) {
-    }
-    return item;
-  });
   const fileTrace = await traceFiles(entryFiles.concat(includeEntries), serverRootDir, base);
   const currentProjectModules = path.join(appDir, "node_modules");
   const tracedFiles = Object.fromEntries(await Promise.all([
@@ -110,9 +100,17 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
       }
       tracedPackage.versions[pkgJSON.version] = tracedPackageVersion;
     }
-    tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath && tracedPackageVersion.files.push(tracedFile.path);
     tracedFile.pkgName = pkgName;
     tracedFile.pkgVersion = pkgJSON.version;
+    const shouldCopyWholePackage = copyWholePackage === null || copyWholePackage === void 0 ? void 0 : copyWholePackage(pkgName);
+    if (tracedFile.path.startsWith(tracedFile.pkgPath) && tracedPackageVersion.path === tracedFile.pkgPath) {
+      if (shouldCopyWholePackage) {
+        const allFiles = await readDirRecursive(tracedFile.pkgPath);
+        tracedPackageVersion.files.push(...allFiles);
+      } else {
+        tracedPackageVersion.files.push(tracedFile.path);
+      }
+    }
   }
   const multiVersionPkgs = {};
   const singleVersionPackages = [];
@@ -130,7 +128,11 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
   await Promise.all(singleVersionPackages.map((pkgName) => {
     const pkg = tracedPackages[pkgName];
     const version = Object.keys(pkg.versions)[0];
-    return writePackage(pkg, version, serverRootDir);
+    return writePackage({
+      pkg,
+      version,
+      projectDir: serverRootDir
+    });
   }));
   const projectPkgJson = await readPackageJSON(serverRootDir).catch(() => ({}));
   for (const [pkgName, pkgVersions] of Object.entries(multiVersionPkgs)) {
@@ -157,7 +159,12 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
     for (const [version, parentPkgs] of versionEntires) {
       const pkg = tracedPackages[pkgName];
       const pkgDestPath = `.modernjs/${pkgName}@${version}/node_modules/${pkgName}`;
-      await writePackage(pkg, version, serverRootDir, pkgDestPath);
+      await writePackage({
+        pkg,
+        version,
+        projectDir: serverRootDir,
+        _pkgPath: pkgDestPath
+      });
       await linkPackage(pkgDestPath, `${pkgName}`, serverRootDir);
       for (const parentPkg of parentPkgs) {
         const parentPkgName = parentPkg.replace(/@[^@]+$/, "");
@@ -166,7 +173,7 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
     }
   }
   const outputPkgPath = path.join(serverRootDir, "package.json");
-  await fse.writeJSON(outputPkgPath, {
+  const newPkgJson = {
     name: `${projectPkgJson.name || "modernjs-project"}-prod`,
     version: projectPkgJson.version || "0.0.0",
     private: true,
@@ -176,7 +183,9 @@ const handleDependencies = async (appDir, serverRootDir, include, entryFilter) =
         Object.keys(pkg.versions)[0]
       ])
     ].sort(([a], [b]) => a.localeCompare(b)))
-  });
+  };
+  const finalPkgJson = (modifyPackageJson === null || modifyPackageJson === void 0 ? void 0 : modifyPackageJson(newPkgJson)) || newPkgJson;
+  await fse.writeJSON(outputPkgPath, finalPkgJson);
 };
 export {
   handleDependencies

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

@@ -2,7 +2,7 @@ import path from "path";
 import os from "node:os";
 import { fs as fse } from "@modern-js/utils";
 import { parseNodeModulePath } from "mlly";
-import { nodeFileTrace, resolve } from "@vercel/nft";
+import { nodeFileTrace } from "@vercel/nft";
 function applyPublicCondition(pkg) {
   var _pkg_publishConfig;
   if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
@@ -10,7 +10,8 @@ function applyPublicCondition(pkg) {
     pkg.exports = pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig1 = pkg.publishConfig) === null || _pkg_publishConfig1 === void 0 ? void 0 : _pkg_publishConfig1.exports;
   }
 }
-const writePackage = async (pkg, version, projectDir, _pkgPath) => {
+const writePackage = async (options) => {
+  const { pkg, version, projectDir, _pkgPath } = options;
   const pkgPath = _pkgPath || pkg.name;
   for (const src of pkg.versions[version].files) {
     if (src.includes("node_modules")) {
@@ -84,31 +85,24 @@ const findEntryFiles = async (rootDir, entryFilter) => {
 const findPackageParents = (pkg, version, tracedFiles) => {
   const versionFiles = pkg.versions[version].files.map((path2) => tracedFiles[path2]);
   const parentPkgs = [
-    ...new Set(versionFiles.flatMap((file) => file.parents.map((parentPath) => {
-      const parentFile = tracedFiles[parentPath];
-      if (!parentFile || parentFile.pkgName === pkg.name) {
-        return null;
-      }
-      return `${parentFile.pkgName}@${parentFile.pkgVersion}`;
-    }).filter(Boolean)))
+    ...new Set(versionFiles.flatMap((file) => (
+      // Because it supports copyWholePackage configuration, not all files exist.
+      file === null || file === void 0 ? void 0 : file.parents.map((parentPath) => {
+        const parentFile = tracedFiles[parentPath];
+        if (!parentFile || parentFile.pkgName === pkg.name) {
+          return null;
+        }
+        return `${parentFile.pkgName}@${parentFile.pkgVersion}`;
+      }).filter(Boolean)
+    )))
   ];
-  return parentPkgs;
+  return parentPkgs.filter((parentPkg) => parentPkg);
 };
 const traceFiles = async (entryFiles, serverRootDir, base = "/") => {
   return await nodeFileTrace(entryFiles, {
     base,
     processCwd: serverRootDir,
-    resolve: async (id, parent, job, isCjs) => {
-      if (id.startsWith("@modern-js/prod-server")) {
-        return require.resolve(id, {
-          paths: [
-            require.resolve("@modern-js/app-tools")
-          ]
-        });
-      } else {
-        return resolve(id, parent, job, isCjs);
-      }
-    }
+    cache: /* @__PURE__ */ Object.create(null)
   });
 };
 const resolveTracedPath = async (base, p) => fse.realpath(path.resolve(base, p));

package/dist/esm-node/plugins/deploy/exports.js

@@ -0,0 +1,4 @@
+import { handleDependencies } from "./dependencies";
+export {
+  handleDependencies
+};

package/dist/esm-node/plugins/deploy/platforms/netlify.js

@@ -91,9 +91,13 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await handleDependencies(appDirectory, funcsDirectory, [
-        "@modern-js/prod-server"
-      ]);
+      await handleDependencies({
+        appDir: appDirectory,
+        serverRootDir: funcsDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ]
+      });
     }
   };
 };

package/dist/esm-node/plugins/deploy/platforms/node.js

@@ -45,9 +45,14 @@ const createNodePreset = (appContext, config) => {
       const filter = (filePath) => {
         return !filePath.startsWith(staticDirectory);
       };
-      await handleDependencies(appDirectory, outputDirectory, [
-        "@modern-js/prod-server"
-      ], filter);
+      await handleDependencies({
+        appDir: appDirectory,
+        serverRootDir: outputDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ],
+        entryFilter: filter
+      });
     }
   };
 };

package/dist/esm-node/plugins/deploy/platforms/vercel.js

@@ -103,9 +103,13 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await handleDependencies(appDirectory, funcsDirectory, [
-        "@modern-js/prod-server"
-      ]);
+      await handleDependencies({
+        appDir: appDirectory,
+        serverRootDir: funcsDirectory,
+        includeEntries: [
+          require.resolve("@modern-js/prod-server")
+        ]
+      });
     }
   };
 };

package/dist/esm-node/utils/loadPlugins.js

@@ -1,18 +1,17 @@
 import { loadServerPlugins as loadServerPluginInstances } from "@modern-js/prod-server";
-async function getServerPlugins(api, metaName = "modern-js") {
+async function getServerPlugins(api) {
   const runner = api.useHookRunners();
   const { plugins } = await runner._internalServerPlugins({
     plugins: []
   });
-  const filtedPlugins = plugins.filter((plugin) => plugin.name.includes(metaName));
   api.setAppContext({
     ...api.useAppContext(),
-    serverPlugins: filtedPlugins
+    serverPlugins: plugins
   });
-  return filtedPlugins;
+  return plugins;
 }
-async function loadServerPlugins(api, appDirectory, metaName) {
-  const plugins = await getServerPlugins(api, metaName);
+async function loadServerPlugins(api, appDirectory) {
+  const plugins = await getServerPlugins(api);
   const instances = loadServerPluginInstances(plugins, appDirectory);
   return instances;
 }

package/dist/js/modern/analyze/constants.js

@@ -0,0 +1,15 @@
+export const JS_EXTENSIONS = ['.js', '.ts', '.jsx', '.tsx'];
+export const INDEX_FILE_NAME = 'index';
+export const APP_FILE_NAME = 'App';
+export const PAGES_DIR_NAME = 'pages';
+export const FILE_SYSTEM_ROUTES_FILE_NAME = 'routes.js';
+export const ENTRY_POINT_FILE_NAME = 'index.js';
+export const ENTRY_BOOTSTRAP_FILE_NAME = 'bootstrap.js';
+export const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
+export const FILE_SYSTEM_ROUTES_LAYOUT = '_layout';
+export const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = '_app';
+export const FILE_SYSTEM_ROUTES_INDEX = 'index';
+export const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
+export const HTML_PARTIALS_FOLDER = 'html';
+export const HTML_PARTIALS_EXTENSIONS = ['.htm', '.html', '.ejs'];
+export const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = 'internal_components';