@modern-js/app-tools 2.31.2 → 2.31.3-alpha.1

package/dist/esm-node/analyze/templates.js

@@ -132,12 +132,13 @@ export const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, ent
     import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"
   `;
   let rootLayoutCode = ``;
-  const getDataLoaderPath = (loaderId) => {
+  const getDataLoaderPath = (loaderId, clientData) => {
     if (!ssrMode) {
       return "";
     }
+    const clientDataStr = clientData ? `&clientData=${clientData}` : "";
     if (nestedRoutesEntry) {
-      return `?mapFile=${slash(loadersMapFile)}&loaderId=${loaderId}`;
+      return `?mapFile=${slash(loadersMapFile)}&loaderId=${loaderId}${clientDataStr}`;
     }
     return "";
   };
@@ -162,15 +163,17 @@ export const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, ent
         errors.push(route.error);
         error = `error_${errors.length - 1}`;
       }
-      if (route.loader) {
+      if (route.loader || route.data) {
         loaders.push(route.loader);
         const loaderId = loaders.length - 1;
         loader = `loader_${loaderId}`;
         loadersMap[loader] = {
           routeId: route.id,
-          filePath: route.loader,
-          inline: false
+          filePath: route.data || route.loader,
+          clientData: Boolean(route.clientData),
+          inline: Boolean(route.data)
         };
+        loader = `loader_${loaderId}`;
       }
       if (typeof route.config === "string") {
         configs.push(route.config);
@@ -269,10 +272,10 @@ export const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, ent
   let importLoadersCode = "";
   for (const [key, loaderInfo] of Object.entries(loadersMap)) {
     if (loaderInfo.inline) {
-      importLoadersCode += `import { loader as ${key} } from "${slash(loaderInfo.filePath)}${getDataLoaderPath(key)}";
+      importLoadersCode += `import { loader as ${key} } from "${slash(loaderInfo.filePath)}${getDataLoaderPath(key, loaderInfo.clientData)}";
 `;
     } else {
-      importLoadersCode += `import ${key} from "${slash(loaderInfo.filePath)}${getDataLoaderPath(key)}";
+      importLoadersCode += `import ${key} from "${slash(loaderInfo.filePath)}${getDataLoaderPath(key, loaderInfo.clientData)}";
 `;
     }
   }

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -143,6 +143,6 @@ function applySSRDataLoader(chain, options) {
   const { appDirectory } = appContext;
   const { entriesDir = "./src" } = normalizedConfig.source;
   const absolutePath = path.resolve(appDirectory, entriesDir).split(path.sep).join("(\\\\|/)");
-  const reg = new RegExp(`${absolutePath}.*\\.loader\\.[t|j]s$`);
+  const reg = new RegExp(`${absolutePath}.*\\.(loader|data|data.client)\\.[t|j]sx?$`);
   chain.module.rule("ssr-data-loader").test(reg).use("data-loader").loader(require.resolve("@modern-js/plugin-data-loader/loader")).end();
 }

package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js

@@ -154,28 +154,30 @@ export class RouterPlugin {
           const oldHtml = compilation.assets[htmlName];
           const { enableInlineRouteManifests, disableFilenameHash, staticJsDir, scriptLoading, nonce } = this;
           const nonceAttr = nonce ? `nonce="${nonce}"` : "";
-          if (enableInlineRouteManifests) {
-            compilation.updateAsset(
-              htmlName,
-              new RawSource(oldHtml.source().toString().replace(placeholder, `<script ${nonceAttr}>${injectedContent}</script>`)),
-              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-              void 0
-            );
-          } else {
-            const scriptPath = `${staticJsDir}/${ROUTE_MANIFEST_HOLDER}-${entryName}${disableFilenameHash ? ".js" : `.${generateContentHash(injectedContent)}.js`}`;
-            const scriptUrl = `${publicPath}${scriptPath}`;
-            const scriptLoadingAttr = (
-              // eslint-disable-next-line no-nested-ternary
-              scriptLoading === "defer" ? scriptLoading : scriptLoading === "module" ? `type="module"` : ""
-            );
-            const script = `<script ${scriptLoadingAttr} ${nonceAttr} src="${scriptUrl}"></script>`;
-            compilation.updateAsset(
-              htmlName,
-              new RawSource(oldHtml.source().toString().replace(placeholder, script)),
-              // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
-              void 0
-            );
-            compilation.emitAsset(scriptPath, new RawSource(injectedContent));
+          if (oldHtml) {
+            if (enableInlineRouteManifests) {
+              compilation.updateAsset(
+                htmlName,
+                new RawSource(oldHtml.source().toString().replace(placeholder, `<script ${nonceAttr}>${injectedContent}</script>`)),
+                // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+                void 0
+              );
+            } else {
+              const scriptPath = `${staticJsDir}/${ROUTE_MANIFEST_HOLDER}-${entryName}${disableFilenameHash ? ".js" : `.${generateContentHash(injectedContent)}.js`}`;
+              const scriptUrl = `${publicPath}${scriptPath}`;
+              const scriptLoadingAttr = (
+                // eslint-disable-next-line no-nested-ternary
+                scriptLoading === "defer" ? scriptLoading : scriptLoading === "module" ? `type="module"` : ""
+              );
+              const script = `<script ${scriptLoadingAttr} ${nonceAttr} src="${scriptUrl}"></script>`;
+              compilation.updateAsset(
+                htmlName,
+                new RawSource(oldHtml.source().toString().replace(placeholder, script)),
+                // FIXME: The arguments third of updatgeAsset is a optional function in webpack.
+                void 0
+              );
+              compilation.emitAsset(scriptPath, new RawSource(injectedContent));
+            }
           }
         }
         if (prevManifestAsset) {

package/dist/esm-node/index.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv } from "@modern-js/utils";
+import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { castArray } from "@modern-js/utils/lodash";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
 import analyzePlugin from "./analyze";
@@ -89,6 +89,7 @@ export const appTools = (options = {
         ...appContext,
         toolsType: "app-tools"
       });
+      const nestedRoutes = {};
       const locale = getLocaleLanguage();
       i18n.changeLanguage({
         locale
@@ -174,6 +175,21 @@ export const appTools = (options = {
           cleanRequireCache([
             require.resolve("./analyze")
           ]);
+        },
+        async modifyFileSystemRoutes({ entrypoint, routes }) {
+          nestedRoutes[entrypoint.entryName] = routes;
+          return {
+            entrypoint,
+            routes
+          };
+        },
+        async beforeGenerateRoutes({ entrypoint, code }) {
+          const { distDirectory } = api.useAppContext();
+          await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
+          return {
+            entrypoint,
+            code
+          };
         }
       };
     }

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

@@ -0,0 +1,54 @@
+const JS_EXTENSIONS = [".js", ".ts", ".jsx", ".tsx"];
+const INDEX_FILE_NAME = "index";
+const APP_FILE_NAME = "App";
+const PAGES_DIR_NAME = "pages";
+const NESTED_ROUTES_DIR = "routes";
+const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+const LOADER_EXPORT_NAME = "loader";
+const TEMP_LOADERS_DIR = "__loaders__";
+const ENTRY_POINT_FILE_NAME = "index.js";
+const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
+const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP = /^\[(\S+)\]([*+?]?)$/;
+const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
+const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
+const FILE_SYSTEM_ROUTES_INDEX = "index";
+const FILE_SYSTEM_ROUTES_IGNORED_REGEX = /\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/;
+const HTML_PARTIALS_FOLDER = "html";
+const HTML_PARTIALS_EXTENSIONS = [".htm", ".html", ".ejs"];
+const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";
+const NESTED_ROUTE = {
+  LAYOUT_FILE: "layout",
+  LAYOUT_LOADER_FILE: "layout.loader",
+  PAGE_FILE: "page",
+  PAGE_LOADER_FILE: "page.loader",
+  LOADING_FILE: "loading",
+  ERROR_FILE: "error",
+  LOADER_FILE: "loader"
+};
+const APP_CONFIG_NAME = "config";
+const APP_INIT_EXPORTED = "init";
+const APP_INIT_IMPORTED = "appInit";
+export {
+  APP_CONFIG_NAME,
+  APP_FILE_NAME,
+  APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED,
+  ENTRY_BOOTSTRAP_FILE_NAME,
+  ENTRY_POINT_FILE_NAME,
+  FILE_SYSTEM_ROUTES_COMPONENTS_DIR,
+  FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP,
+  FILE_SYSTEM_ROUTES_FILE_NAME,
+  FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT,
+  FILE_SYSTEM_ROUTES_IGNORED_REGEX,
+  FILE_SYSTEM_ROUTES_INDEX,
+  FILE_SYSTEM_ROUTES_LAYOUT,
+  HTML_PARTIALS_EXTENSIONS,
+  HTML_PARTIALS_FOLDER,
+  INDEX_FILE_NAME,
+  JS_EXTENSIONS,
+  LOADER_EXPORT_NAME,
+  NESTED_ROUTE,
+  NESTED_ROUTES_DIR,
+  PAGES_DIR_NAME,
+  TEMP_LOADERS_DIR
+};

package/dist/js/modern/analyze/generateCode.js

@@ -0,0 +1,247 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import path from "path";
+import { fs, getEntryOptions, logger } from "@modern-js/utils";
+import {
+  useResolvedConfigContext
+} from "@modern-js/core";
+import * as templates from "./templates";
+import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
+import {
+  FILE_SYSTEM_ROUTES_FILE_NAME,
+  ENTRY_POINT_FILE_NAME,
+  ENTRY_BOOTSTRAP_FILE_NAME
+} from "./constants";
+import { getDefaultImports, getServerLoadersFile } from "./utils";
+import { walk } from "./nestedRoutes";
+const createImportSpecifier = (specifiers) => {
+  let defaults = "";
+  const named = [];
+  for (const { local, imported } of specifiers) {
+    if (local && imported) {
+      named.push(`${imported} as ${local}`);
+    } else if (local) {
+      defaults = local;
+    } else {
+      named.push(imported);
+    }
+  }
+  if (defaults && named.length) {
+    return `${defaults}, { ${named.join(", ")} }`;
+  } else if (defaults) {
+    return defaults;
+  } else {
+    return `{ ${named.join(", ")} }`;
+  }
+};
+const createImportStatements = (statements) => {
+  var _a, _b;
+  const deDuplicated = [];
+  const seen = /* @__PURE__ */ new Map();
+  for (const { value, specifiers, initialize } of statements) {
+    if (!seen.has(value)) {
+      deDuplicated.push({
+        value,
+        specifiers,
+        initialize
+      });
+      seen.set(value, specifiers);
+    } else {
+      seen.get(value).push(...specifiers);
+      const modifyIndex = deDuplicated.findIndex((v) => v.value === value);
+      const originInitialize = (_b = (_a = deDuplicated[modifyIndex]) == null ? void 0 : _a.initialize) != null ? _b : "";
+      deDuplicated[modifyIndex].initialize = originInitialize.concat(
+        `
+${initialize || ""}`
+      );
+    }
+  }
+  return deDuplicated.map(
+    ({ value, specifiers, initialize }) => `import ${createImportSpecifier(specifiers)} from '${value}';
+${initialize || ""}`
+  ).join("\n");
+};
+const generateCode = (appContext, config, entrypoints, api) => __async(void 0, null, function* () {
+  var _a, _b, _c;
+  const {
+    internalDirectory,
+    srcDirectory,
+    internalDirAlias,
+    internalSrcAlias,
+    packageName
+  } = appContext;
+  const hookRunners = api.useHookRunners();
+  const isV5 = typeof ((_a = config.runtime) == null ? void 0 : _a.router) !== "boolean" && ((_c = (_b = config == null ? void 0 : config.runtime) == null ? void 0 : _b.router) == null ? void 0 : _c.mode) === "react-router-5";
+  const { mountId } = config.html;
+  const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
+  yield Promise.all(entrypoints.map(generateEntryCode));
+  function generateEntryCode(entrypoint) {
+    return __async(this, null, function* () {
+      const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
+      if (isAutoMount) {
+        if (fileSystemRoutes) {
+          let initialRoutes = [];
+          let nestedRoute = null;
+          if (entrypoint.entry) {
+            initialRoutes = getRoutes({
+              entrypoint,
+              srcDirectory,
+              srcAlias: internalSrcAlias,
+              internalDirectory,
+              internalDirAlias
+            });
+          }
+          if (entrypoint.nestedRoutesEntry) {
+            if (!isV5) {
+              nestedRoute = yield walk(
+                entrypoint.nestedRoutesEntry,
+                entrypoint.nestedRoutesEntry,
+                {
+                  name: internalSrcAlias,
+                  basename: srcDirectory
+                },
+                entrypoint.entryName
+              );
+              if (nestedRoute) {
+                initialRoutes.unshift(nestedRoute);
+              }
+            } else {
+              logger.error("Nested routes is not supported in legacy mode.");
+              process.exit(1);
+            }
+          }
+          const { routes } = yield hookRunners.modifyFileSystemRoutes({
+            entrypoint,
+            routes: initialRoutes
+          });
+          const config2 = useResolvedConfigContext();
+          const ssr = getEntryOptions(
+            entryName,
+            config2.server.ssr,
+            config2.server.ssrByEntries,
+            packageName
+          );
+          let mode;
+          if (ssr) {
+            mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
+          } else {
+            mode = false;
+          }
+          if (mode === "stream") {
+            const hasPageRoute = routes.some(
+              (route) => "type" in route && route.type === "page"
+            );
+            if (hasPageRoute) {
+              logger.error(
+                "Streaming ssr is not supported when pages dir exists"
+              );
+              process.exit(1);
+            }
+          }
+          const { code: code2 } = yield hookRunners.beforeGenerateRoutes({
+            entrypoint,
+            code: yield templates.fileSystemRoutes({
+              routes,
+              ssrMode: mode,
+              nestedRoutesEntry: entrypoint.nestedRoutesEntry,
+              entryName: entrypoint.entryName,
+              internalDirectory
+            })
+          });
+          if (entrypoint.nestedRoutesEntry && mode) {
+            const routesServerFile = getServerLoadersFile(
+              internalDirectory,
+              entryName
+            );
+            const code3 = templates.routesForServer({
+              routes
+            });
+            yield fs.ensureFile(routesServerFile);
+            yield fs.writeFile(routesServerFile, code3);
+          }
+          fs.outputFileSync(
+            path.resolve(
+              internalDirectory,
+              `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`
+            ),
+            code2,
+            "utf8"
+          );
+        }
+        const { imports: importStatements } = yield hookRunners.modifyEntryImports({
+          entrypoint,
+          imports: getDefaultImports({
+            entrypoint,
+            srcDirectory,
+            internalSrcAlias,
+            internalDirAlias,
+            internalDirectory
+          })
+        });
+        const { plugins } = yield hookRunners.modifyEntryRuntimePlugins({
+          entrypoint,
+          plugins: []
+        });
+        const { code: renderFunction } = yield hookRunners.modifyEntryRenderFunction({
+          entrypoint,
+          code: templates.renderFunction({
+            plugins,
+            customBootstrap,
+            fileSystemRoutes
+          })
+        });
+        const { exportStatement } = yield hookRunners.modifyEntryExport({
+          entrypoint,
+          exportStatement: "export default AppWrapper;"
+        });
+        const code = templates.index({
+          mountId,
+          imports: createImportStatements(importStatements),
+          renderFunction,
+          exportStatement
+        });
+        const entryFile = path.resolve(
+          internalDirectory,
+          `./${entryName}/${ENTRY_POINT_FILE_NAME}`
+        );
+        entrypoint.entry = entryFile;
+        if (config.source.enableAsyncEntry) {
+          const { code: asyncEntryCode } = yield hookRunners.modifyAsyncEntry({
+            entrypoint,
+            code: `import('./${ENTRY_BOOTSTRAP_FILE_NAME}');`
+          });
+          fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
+          const bootstrapFile = path.resolve(
+            internalDirectory,
+            `./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`
+          );
+          fs.outputFileSync(bootstrapFile, code, "utf8");
+        } else {
+          fs.outputFileSync(entryFile, code, "utf8");
+        }
+      }
+    });
+  }
+});
+export {
+  createImportStatements,
+  generateCode
+};

package/dist/js/modern/analyze/getBundleEntry.js

@@ -0,0 +1,71 @@
+import path from "path";
+import {
+  ensureAbsolutePath,
+  fs,
+  findExists,
+  MAIN_ENTRY_NAME
+} from "@modern-js/utils";
+import { getFileSystemEntry } from "./getFileSystemEntry";
+import { JS_EXTENSIONS } from "./constants";
+const ensureExtensions = (file) => {
+  if (!path.extname(file)) {
+    return findExists(JS_EXTENSIONS.map((ext) => `${file}${ext}`)) || file;
+  }
+  return file;
+};
+const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint) => {
+  if (ensureExtensions(entrypoint.entry) === ensureExtensions(checked.entry)) {
+    checked.entryName = entrypoint.entryName;
+    return true;
+  }
+  if (entrypoint.entry.startsWith(checked.entry) || checked.entry.startsWith(entrypoint.entry)) {
+    throw new Error(
+      `Entry configuration conflicts
+ Your configuration: ${checked.entry}.
+ Default entrypoint: ${entrypoint.entry}
+ Please reset source.entries or set source.disableDefaultEntries to disable the default entry rules.`
+    );
+  }
+  return false;
+});
+const getBundleEntry = (appContext, config) => {
+  const { appDirectory, packageName } = appContext;
+  const {
+    source: { disableDefaultEntries, entries, entriesDir }
+  } = config;
+  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
+  if (entries) {
+    Object.keys(entries).forEach((name) => {
+      const value = entries[name];
+      const entrypoint = typeof value === "string" ? {
+        entryName: name,
+        entry: ensureAbsolutePath(appDirectory, value),
+        isAutoMount: true,
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
+      } : {
+        entryName: name,
+        entry: ensureAbsolutePath(appDirectory, value.entry),
+        isAutoMount: !value.disableMount,
+        customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
+      };
+      if (entrypoint.fileSystemRoutes) {
+        entrypoint.nestedRoutesEntry = entrypoint.entry;
+      }
+      if (!ifAlreadyExists(defaults, entrypoint)) {
+        defaults.push(entrypoint);
+      }
+    });
+  }
+  if (!disableDefaultEntries) {
+    const entriesDirAbs = ensureAbsolutePath(appDirectory, entriesDir || "");
+    const found = defaults.find(
+      ({ entryName, entry, nestedRoutesEntry = "" }) => entryName === packageName || path.dirname(entry) === entriesDirAbs || path.dirname(nestedRoutesEntry) === entriesDirAbs
+    );
+    found && (found.entryName = MAIN_ENTRY_NAME);
+  }
+  return defaults;
+};
+export {
+  getBundleEntry
+};