@modern-js/app-tools 2.53.1-alpha.4 → 2.54.1-alpha.0

package/dist/cjs/{analyze → plugins/analyze}/generateCode.js

@@ -36,10 +36,8 @@ module.exports = __toCommonJS(generateCode_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var templates = __toESM(require("./templates"));
-var import_getClientRoutes = require("./getClientRoutes");
 var import_constants = require("./constants");
 var import_utils2 = require("./utils");
-var import_nestedRoutes = require("./nestedRoutes");
 const createImportSpecifier = (specifiers) => {
   let defaults = "";
   const named = [];
@@ -85,92 +83,17 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  const { internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
+  const { internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, runtimeConfigFile } = appContext;
   const hookRunners = api.useHookRunners();
-  const isV5 = (0, import_utils.isRouterV5)(config);
-  const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
+  const customRuntimeConfig = (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(srcDirectory, `${runtimeConfigFile}${ext}`)));
   const importsStatemets = /* @__PURE__ */ new Map();
-  const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
-  await Promise.all(entrypoints.map(generateEntryCode));
+  await Promise.all(entrypoints.map((entrypoint) => generateEntryCode(entrypoint, customRuntimeConfig)));
   return {
     importsStatemets
   };
-  async function generateEntryCode(entrypoint) {
-    const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
+  async function generateEntryCode(entrypoint, customRuntimeConfig2) {
+    const { entryName, isAutoMount } = entrypoint;
     if (isAutoMount) {
-      if (fileSystemRoutes) {
-        var _config_output;
-        let initialRoutes = [];
-        let nestedRoutes = null;
-        if (entrypoint.entry) {
-          initialRoutes = getRoutes({
-            entrypoint,
-            srcDirectory,
-            srcAlias: internalSrcAlias,
-            internalDirectory,
-            internalDirAlias
-          });
-        }
-        if (!isV5 && entrypoint.nestedRoutesEntry) {
-          nestedRoutes = await (0, import_nestedRoutes.walk)(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
-            name: internalSrcAlias,
-            basename: srcDirectory
-          }, entrypoint.entryName, entrypoint.isMainEntry, oldVersion);
-          if (nestedRoutes) {
-            if (!Array.isArray(nestedRoutes)) {
-              nestedRoutes = [
-                nestedRoutes
-              ];
-            }
-            for (const route of nestedRoutes) {
-              initialRoutes.unshift(route);
-            }
-          }
-        }
-        const { routes } = await hookRunners.modifyFileSystemRoutes({
-          entrypoint,
-          routes: initialRoutes
-        });
-        const config2 = api.useResolvedConfigContext();
-        const ssr = (0, import_utils.getEntryOptions)(entryName, isMainEntry, config2.server.ssr, config2.server.ssrByEntries, packageName);
-        const useSSG = (0, import_utils.isSSGEntry)(config2, entryName, entrypoints);
-        let mode;
-        if (ssr) {
-          mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
-        }
-        if (mode === "stream") {
-          const hasPageRoute = routes.some((route) => "type" in route && route.type === "page");
-          if (hasPageRoute) {
-            import_utils.logger.error("Streaming ssr is not supported when pages dir exists");
-            process.exit(1);
-          }
-        }
-        const { code } = await hookRunners.beforeGenerateRoutes({
-          entrypoint,
-          code: await templates.fileSystemRoutes({
-            routes,
-            ssrMode: useSSG ? "string" : mode,
-            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-            entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
-          })
-        });
-        if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
-          const routesServerFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
-          const code2 = templates.routesForServer({
-            routes
-          });
-          await import_utils.fs.ensureFile(routesServerFile);
-          await import_utils.fs.writeFile(routesServerFile, code2);
-        }
-        const serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
-        if (serverLoaderCombined) {
-          const serverLoaderFile = (0, import_utils2.getServerCombinedModueFile)(internalDirectory, entryName);
-          await import_utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
-        }
-        import_utils.fs.outputFileSync(import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
-      }
       const { imports } = await hookRunners.modifyEntryImports({
         entrypoint,
         imports: (0, import_utils2.getDefaultImports)({
@@ -178,7 +101,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           srcDirectory,
           appDirectory,
           internalSrcAlias,
-          internalDirAlias
+          internalDirAlias,
+          runtimeConfigFile,
+          customRuntimeConfig: customRuntimeConfig2
         })
       });
       importsStatemets.set(entryName, imports);
@@ -190,7 +115,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
 const generateIndexCode = async ({ appContext, api, entrypoints, config, importsStatemets, bundlerConfigs }) => {
   const hookRunners = api.useHookRunners();
   const { mountId } = config.html;
-  const { internalDirectory, packageName } = appContext;
+  const { internalDirectory, packageName, srcDirectory, runtimeConfigFile } = appContext;
+  const customRuntimeConfig = (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(srcDirectory, `${runtimeConfigFile}${ext}`)));
   await Promise.all(entrypoints.map(async (entrypoint) => {
     const { entryName, isMainEntry, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
@@ -204,6 +130,7 @@ const generateIndexCode = async ({ appContext, api, entrypoints, config, imports
         code: templates.renderFunction({
           plugins,
           customBootstrap,
+          customRuntimeConfig,
           fileSystemRoutes
         })
       });

package/dist/cjs/{analyze → plugins/analyze}/getBundleEntry.js

@@ -34,11 +34,10 @@ module.exports = __toCommonJS(getBundleEntry_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_getFileSystemEntry = require("./getFileSystemEntry");
-var import_constants = require("./constants");
 var import_utils2 = require("./utils");
 const ensureExtensions = (file) => {
   if (!import_path.default.extname(file)) {
-    return (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
+    return (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
   }
   return file;
 };
@@ -56,32 +55,24 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
   }
   return false;
 });
-const getBundleEntry = (appContext, config) => {
+const getBundleEntry = async (hookRunners, appContext, config) => {
   const { appDirectory, packageName } = appContext;
   const { disableDefaultEntries, entries, entriesDir, mainEntryName } = config.source;
-  const defaults = disableDefaultEntries ? [] : (0, import_getFileSystemEntry.getFileSystemEntry)(appContext, config);
+  const defaults = disableDefaultEntries ? [] : await (0, import_getFileSystemEntry.getFileSystemEntry)(hookRunners, appContext, config);
   if (entries) {
     Object.keys(entries).forEach((name) => {
       const value = entries[name];
-      const entrypoint = typeof value === "string" ? {
+      const entryName = typeof value === "string" ? value : value.entry;
+      const isAutoMount = typeof value === "string" ? true : !value.disableMount;
+      const entrypoint = {
         entryName: name,
         isMainEntry: false,
-        entry: (0, import_utils.ensureAbsolutePath)(appDirectory, value),
-        absoluteEntryDir: isDirectory((0, import_utils.ensureAbsolutePath)(appDirectory, value)) ? (0, import_utils.ensureAbsolutePath)(appDirectory, value) : import_path.default.dirname((0, import_utils.ensureAbsolutePath)(appDirectory, value)),
-        isAutoMount: true,
-        fileSystemRoutes: import_utils.fs.statSync((0, import_utils.ensureAbsolutePath)(appDirectory, value)).isDirectory() ? {} : void 0
-      } : {
-        entryName: name,
-        isMainEntry: false,
-        entry: (0, import_utils.ensureAbsolutePath)(appDirectory, value.entry),
-        absoluteEntryDir: isDirectory((0, import_utils.ensureAbsolutePath)(appDirectory, value.entry)) ? (0, import_utils.ensureAbsolutePath)(appDirectory, value.entry) : import_path.default.dirname((0, import_utils.ensureAbsolutePath)(appDirectory, value.entry)),
-        isAutoMount: !value.disableMount,
-        customBootstrap: value.customBootstrap && (0, import_utils.ensureAbsolutePath)(appDirectory, value.customBootstrap),
-        fileSystemRoutes: import_utils.fs.statSync((0, import_utils.ensureAbsolutePath)(appDirectory, value.entry)).isDirectory() ? {} : void 0
+        entry: (0, import_utils.ensureAbsolutePath)(appDirectory, entryName),
+        absoluteEntryDir: isDirectory((0, import_utils.ensureAbsolutePath)(appDirectory, entryName)) ? (0, import_utils.ensureAbsolutePath)(appDirectory, entryName) : import_path.default.dirname((0, import_utils.ensureAbsolutePath)(appDirectory, entryName)),
+        isAutoMount,
+        customBootstrap: typeof value === "string" ? false : value.customBootstrap && (0, import_utils.ensureAbsolutePath)(appDirectory, value.customBootstrap),
+        fileSystemRoutes: import_utils.fs.statSync((0, import_utils.ensureAbsolutePath)(appDirectory, entryName)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes && !(0, import_utils.isRouterV5)(config)) {
-        entrypoint.nestedRoutesEntry = entrypoint.entry;
-      }
       if (!ifAlreadyExists(defaults, entrypoint)) {
         defaults.push(entrypoint);
       }

package/dist/cjs/{analyze → plugins/analyze}/getFileSystemEntry.js

@@ -34,14 +34,16 @@ module.exports = __toCommonJS(getFileSystemEntry_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_isDefaultExportFunction = require("./isDefaultExportFunction");
 var import_constants = require("./constants");
-const hasIndex = (dir) => (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.INDEX_FILE_NAME}${ext}`)));
-const hasApp = (dir) => (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.APP_FILE_NAME}${ext}`)));
-const hasPages = (dir) => import_fs.default.existsSync(import_path.default.join(dir, import_constants.PAGES_DIR_NAME));
-const hasNestedRoutes = (dir) => import_fs.default.existsSync(import_path.default.join(dir, import_constants.NESTED_ROUTES_DIR));
-const isBundleEntry = (dir) => hasApp(dir) || hasPages(dir) || hasIndex(dir) || hasNestedRoutes(dir);
-const scanDir = (dirs) => dirs.map((dir) => {
+var import_isDefaultExportFunction = require("./isDefaultExportFunction");
+const hasIndex = (dir) => (0, import_utils.findExists)(import_utils.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `${import_constants.INDEX_FILE_NAME}${ext}`)));
+const isBundleEntry = async (hookRunners, dir) => {
+  return (await hookRunners.checkEntryPoint({
+    path: dir,
+    entry: false
+  })).entry || hasIndex(dir);
+};
+const scanDir = (hookRunners, dirs) => Promise.all(dirs.map(async (dir) => {
   const indexFile = hasIndex(dir);
   const customBootstrap = (0, import_isDefaultExportFunction.isDefaultExportFunction)(indexFile) ? indexFile : false;
   const entryName = import_path.default.basename(dir);
@@ -51,53 +53,27 @@ const scanDir = (dirs) => dirs.map((dir) => {
       isMainEntry: false,
       entry: indexFile,
       absoluteEntryDir: import_path.default.resolve(dir),
-      isAutoMount: false
+      isAutoMount: false,
+      customBootstrap
     };
   }
-  const isHasApp = hasApp(dir);
-  if (isHasApp) {
+  const entryFile = (await hookRunners.checkEntryPoint({
+    path: dir,
+    entry: false
+  })).entry;
+  if (entryFile) {
     return {
       entryName,
       isMainEntry: false,
-      entry: import_path.default.join(dir, import_constants.APP_FILE_NAME),
-      isAutoMount: true,
+      entry: entryFile,
       absoluteEntryDir: import_path.default.resolve(dir),
-      customBootstrap
-    };
-  }
-  const isHasNestedRoutes = hasNestedRoutes(dir);
-  const isHasPages = hasPages(dir);
-  if (isHasNestedRoutes || isHasPages) {
-    const entrypoint = {
-      entryName,
-      isMainEntry: false,
-      entry: "",
-      fileSystemRoutes: {
-        globalApp: (0, import_utils.findExists)(import_constants.JS_EXTENSIONS.map((ext) => import_path.default.resolve(dir, `./${import_constants.PAGES_DIR_NAME}/${import_constants.FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT}${ext}`)))
-      },
       isAutoMount: true,
-      absoluteEntryDir: import_path.default.resolve(dir),
       customBootstrap
     };
-    if (isHasPages) {
-      entrypoint.entry = import_path.default.join(dir, import_constants.PAGES_DIR_NAME);
-      entrypoint.pageRoutesEntry = entrypoint.entry;
-    }
-    if (isHasNestedRoutes) {
-      entrypoint.entry = import_path.default.join(dir, import_constants.NESTED_ROUTES_DIR);
-      entrypoint.nestedRoutesEntry = entrypoint.entry;
-    }
-    return entrypoint;
   }
-  return {
-    entryName,
-    isMainEntry: false,
-    entry: indexFile,
-    absoluteEntryDir: import_path.default.resolve(dir),
-    isAutoMount: false
-  };
-});
-const getFileSystemEntry = (appContext, config) => {
+  throw Error("There is no valid entry point in the current project!");
+}));
+const getFileSystemEntry = async (hookRunners, appContext, config) => {
   const { appDirectory } = appContext;
   const { source: { entriesDir, disableEntryDirs } } = config;
   let disabledDirs = [];
@@ -107,9 +83,19 @@ const getFileSystemEntry = (appContext, config) => {
   const src = (0, import_utils.ensureAbsolutePath)(appDirectory, entriesDir || "");
   if (import_fs.default.existsSync(src)) {
     if (import_fs.default.statSync(src).isDirectory()) {
-      return scanDir(isBundleEntry(src) ? [
-        src
-      ] : import_fs.default.readdirSync(src).map((file) => import_path.default.join(src, file)).filter((file) => import_fs.default.statSync(file).isDirectory() && isBundleEntry(file) && !disabledDirs.includes(file)));
+      if (await isBundleEntry(hookRunners, src)) {
+        return scanDir(hookRunners, [
+          src
+        ]);
+      }
+      const dirs = [];
+      await Promise.all(import_fs.default.readdirSync(src).map(async (filename) => {
+        const file = import_path.default.join(src, filename);
+        if (import_fs.default.statSync(file).isDirectory() && await isBundleEntry(hookRunners, file) && !disabledDirs.includes(file)) {
+          dirs.push(file);
+        }
+      }));
+      return scanDir(hookRunners, dirs);
     } else {
       throw Error(`source.entriesDir accept a directory.`);
     }

package/dist/cjs/{analyze → plugins/analyze}/getServerRoutes.js

@@ -34,7 +34,7 @@ module.exports = __toCommonJS(getServerRoutes_exports);
 var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
 var import_utils = require("@modern-js/utils");
-var import_routes = require("../utils/routes");
+var import_routes = require("../../utils/routes");
 var import_utils2 = require("./utils");
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {

package/dist/cjs/{analyze → plugins/analyze}/index.js

@@ -33,13 +33,12 @@ __export(analyze_exports, {
 module.exports = __toCommonJS(analyze_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_lodash = require("@modern-js/utils/lodash");
-var import_printInstructions = require("../utils/printInstructions");
-var import_routes = require("../utils/routes");
-var import_config = require("../utils/config");
-var import_getSelectedEntries = require("../utils/getSelectedEntries");
-var import_config2 = require("../config");
-var import_builder = require("../builder");
+var import_printInstructions = require("../../utils/printInstructions");
+var import_routes = require("../../utils/routes");
+var import_config = require("../../utils/config");
+var import_getSelectedEntries = require("../../utils/getSelectedEntries");
+var import_config2 = require("../../config");
+var import_builder = require("../../builder");
 var import_utils2 = require("./utils");
 var import_constants = require("./constants");
 var import_generateCode = require("./generateCode");
@@ -49,7 +48,6 @@ var analyze_default = ({ bundler }) => ({
   setup: (api) => {
     let pagesDir = [];
     let nestedRouteEntries = [];
-    let originEntrypoints = [];
     return {
       async prepare() {
         var _resolvedConfig_source;
@@ -83,7 +81,9 @@ var analyze_default = ({ bundler }) => ({
           Promise.resolve().then(() => __toESM(require("./generateCode"))),
           Promise.resolve().then(() => __toESM(require("./getHtmlTemplate")))
         ]);
-        const entrypoints = getBundleEntry(appContext, resolvedConfig);
+        const { entrypoints } = await hookRunners.modifyEntrypoints({
+          entrypoints: await getBundleEntry(hookRunners, appContext, resolvedConfig)
+        });
         debug(`entrypoints: %o`, entrypoints);
         const initialRoutes = getServerRoutes(entrypoints, {
           appContext,
@@ -101,7 +101,6 @@ var analyze_default = ({ bundler }) => ({
         api.setAppContext(appContext);
         nestedRouteEntries = entrypoints.map((point) => point.nestedRoutesEntry).filter(Boolean);
         pagesDir = entrypoints.map((point) => point.entry).filter((entry) => entry && !path.extname(entry)).concat(nestedRouteEntries);
-        originEntrypoints = (0, import_lodash.cloneDeep)(entrypoints);
         const { importsStatemets } = await generateCode(appContext, resolvedConfig, entrypoints, api);
         const htmlTemplates = await getHtmlTemplate(entrypoints, api, {
           appContext,
@@ -245,20 +244,6 @@ var analyze_default = ({ bundler }) => ({
           entrypoint,
           imports
         };
-      },
-      async fileChange(e) {
-        const appContext = api.useAppContext();
-        const { appDirectory } = appContext;
-        const { filename, eventType } = e;
-        const isPageFile = (name) => pagesDir.some((pageDir) => name.includes(pageDir));
-        const absoluteFilePath = path.resolve(appDirectory, filename);
-        const isRouteComponent = isPageFile(absoluteFilePath) && (0, import_utils2.isPageComponentFile)(absoluteFilePath);
-        if (isRouteComponent && (eventType === "add" || eventType === "unlink")) {
-          const resolvedConfig = api.useResolvedConfigContext();
-          const { generateCode } = await Promise.resolve().then(() => __toESM(require("./generateCode")));
-          const entrypoints = (0, import_lodash.cloneDeep)(originEntrypoints);
-          generateCode(appContext, resolvedConfig, entrypoints, api);
-        }
       }
     };
   }

package/dist/cjs/plugins/analyze/templates.js

@@ -0,0 +1,101 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var templates_exports = {};
+__export(templates_exports, {
+  html: () => html,
+  index: () => index,
+  renderFunction: () => renderFunction
+});
+module.exports = __toCommonJS(templates_exports);
+var import_constants = require("./constants");
+const index = ({ mountId, imports, renderFunction: renderFunction2, exportStatement }) => `
+const IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';
+const IS_REACT18 = process.env.IS_REACT18 === 'true';
+const MOUNT_ID = '${mountId}';
+
+${imports}
+
+let AppWrapper = null;
+
+let root = null;
+
+function render() {
+  ${renderFunction2}
+}
+
+AppWrapper = render();
+
+${exportStatement};
+`;
+const renderFunction = ({ plugins, customBootstrap, fileSystemRoutes, customRuntimeConfig }) => {
+  const bootstrap = "bootstrap(AppWrapper, MOUNT_ID, root, ReactDOM)";
+  const runtimePlugins = `...(runtimeConfig?.plugins || []),`;
+  return `
+  const finalAppConfig = {
+    ...App.config,
+    ...typeof ${import_constants.APP_CONFIG_NAME} === 'function' ? ${import_constants.APP_CONFIG_NAME}() : {},
+  }
+
+  AppWrapper = createApp({
+    plugins: [
+     ${plugins.map(({ name, options, args }) => `${name}({...${options}, ...finalAppConfig?.${args || name}}),`).join("\n")}
+       ${customRuntimeConfig ? runtimePlugins : ""}
+    ]
+  })(${fileSystemRoutes ? "" : `App`})
+
+
+  if(!AppWrapper.init && typeof appInit !== 'undefined') {
+    AppWrapper.init = appInit;
+  }
+
+
+  if (IS_BROWSER) {
+    ${customBootstrap ? `customBootstrap(AppWrapper, () => ${bootstrap});` : `${bootstrap};`}
+  }
+
+  return AppWrapper
+`;
+};
+const html = (partials) => `
+<!DOCTYPE html>
+<html>
+<head>
+
+  ${partials.top.join("\n")}
+
+  ${partials.head.join("\n")}
+
+</head>
+
+<body>
+  <div id="<%= mountId %>"><!--<?- html ?>--></div>
+  ${partials.body.join("\n")}
+  <!--<?- chunksMap.js ?>-->
+  <!--<?- SSRDataScript ?>-->
+  <!--<?- bottomTemplate ?>-->
+</body>
+
+</html>
+`;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  html,
+  index,
+  renderFunction
+});

package/dist/cjs/{analyze → plugins/analyze}/utils.js

@@ -31,10 +31,6 @@ __export(utils_exports, {
   checkIsBuildCommands: () => checkIsBuildCommands,
   getDefaultImports: () => getDefaultImports,
   getServerCombinedModueFile: () => getServerCombinedModueFile,
-  getServerLoadersFile: () => getServerLoadersFile,
-  hasAction: () => hasAction,
-  hasLoader: () => hasLoader,
-  isPageComponentFile: () => isPageComponentFile,
   isSubDirOrEqual: () => isSubDirOrEqual,
   parseModule: () => parseModule,
   replaceWithAlias: () => replaceWithAlias,
@@ -61,7 +57,7 @@ const walkDirectory = (dir) => import_fs.default.readdirSync(dir).reduce((previo
     ];
   }
 }, []);
-const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrcAlias, internalDirAlias }) => {
+const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrcAlias, internalDirAlias, runtimeConfigFile, customRuntimeConfig }) => {
   const { entryName, fileSystemRoutes, customBootstrap, entry } = entrypoint;
   const imports = [
     {
@@ -132,21 +128,17 @@ const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrc
       value: (0, import_utils.normalizeToPosixPath)(entry.replace(srcDirectory, internalSrcAlias))
     });
   }
-  return imports;
-};
-const isPageComponentFile = (filePath) => {
-  if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
-    return false;
-  }
-  if ([
-    ".js",
-    ".jsx",
-    ".ts",
-    ".tsx"
-  ].includes(import_path.default.extname(filePath))) {
-    return true;
+  if (customRuntimeConfig) {
+    imports.push({
+      specifiers: [
+        {
+          local: "runtimeConfig"
+        }
+      ],
+      value: import_path.default.join(internalSrcAlias, runtimeConfigFile || "")
+    });
   }
-  return false;
+  return imports;
 };
 const replaceWithAlias = (base, filePath, alias) => {
   if (filePath.includes(base)) {
@@ -157,7 +149,7 @@ const replaceWithAlias = (base, filePath, alias) => {
 };
 const parseModule = async ({ source, filename }) => {
   let content = source;
-  if (import_constants.JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
+  if (import_utils.JS_EXTENSIONS.some((ext) => filename.endsWith(ext))) {
     const result = await (0, import_esbuild.transform)(content, {
       loader: import_path.default.extname(filename).slice(1),
       format: "esm"
@@ -166,37 +158,6 @@ const parseModule = async ({ source, filename }) => {
   }
   return await (0, import_es_module_lexer.parse)(content);
 };
-const hasLoader = async (filename, source) => {
-  let content = source;
-  if (!source) {
-    content = (await import_utils.fs.readFile(filename, "utf-8")).toString();
-  }
-  if (content) {
-    const [, moduleExports] = await parseModule({
-      source: content.toString(),
-      filename
-    });
-    return moduleExports.some((e) => e.n === import_constants.LOADER_EXPORT_NAME);
-  }
-  return false;
-};
-const hasAction = async (filename, source) => {
-  let content = source;
-  if (!source) {
-    content = (await import_utils.fs.readFile(filename, "utf-8")).toString();
-  }
-  if (content) {
-    const [, moduleExports] = await parseModule({
-      source: content.toString(),
-      filename
-    });
-    return moduleExports.some((e) => e.n === import_constants.ACTION_EXPORT_NAME);
-  }
-  return false;
-};
-const getServerLoadersFile = (internalDirectory, entryName) => {
-  return import_path.default.join(internalDirectory, entryName, "route-server-loaders.js");
-};
 const getServerCombinedModueFile = (internalDirectory, entryName) => {
   return import_path.default.join(internalDirectory, entryName, "server-loader-combined.js");
 };
@@ -225,10 +186,6 @@ const isSubDirOrEqual = (parent, child) => {
   checkIsBuildCommands,
   getDefaultImports,
   getServerCombinedModueFile,
-  getServerLoadersFile,
-  hasAction,
-  hasLoader,
-  isPageComponentFile,
   isSubDirOrEqual,
   parseModule,
   replaceWithAlias,

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

@@ -50,8 +50,8 @@ async function cleanDistDirectory(dir) {
   }
 }
 const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, serverInternalPlugins, entrypoints } = appContext;
-  const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
+  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
+  const plugins = serverPlugins.map((plugin) => plugin.name);
   const netlifyOutput = import_node_path.default.join(appDirectory, ".netlify");
   const funcsDirectory = import_node_path.default.join(netlifyOutput, "functions");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");

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

@@ -36,8 +36,8 @@ var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
 const createNodePreset = (appContext, config) => {
-  const { appDirectory, distDirectory, serverInternalPlugins } = appContext;
-  const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
+  const { appDirectory, distDirectory, serverPlugins } = appContext;
+  const plugins = serverPlugins.map((plugin) => plugin.name);
   const outputDirectory = import_node_path.default.join(appDirectory, ".output");
   const staticDirectory = import_node_path.default.join(outputDirectory, "static");
   const entryFilePath = import_node_path.default.join(outputDirectory, "index.js");

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

@@ -37,8 +37,8 @@ var import_routes = require("../../../utils/routes");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
-  const { appDirectory, distDirectory, serverInternalPlugins, entrypoints } = appContext;
-  const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
+  const { appDirectory, distDirectory, entrypoints, serverPlugins } = appContext;
+  const plugins = serverPlugins.map((plugin) => plugin.name);
   const vercelOutput = import_node_path.default.join(appDirectory, ".vercel");
   const outputDirectory = import_node_path.default.join(vercelOutput, "output");
   const funcsDirectory = import_node_path.default.join(outputDirectory, "functions", "index.func");

package/dist/cjs/{initialize → plugins/initialize}/index.js

@@ -22,7 +22,7 @@ __export(initialize_exports, {
 });
 module.exports = __toCommonJS(initialize_exports);
 var import_utils = require("@modern-js/utils");
-var import_config = require("../config");
+var import_config = require("../../config");
 var initialize_default = ({ bundler }) => ({
   name: "@modern-js/plugin-initialize",
   post: [