@modern-js/app-tools 2.4.0 → 2.5.0

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

@@ -0,0 +1,225 @@
+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 = async (appContext, config, entrypoints, api) => {
+  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;
+  await Promise.all(entrypoints.map(generateEntryCode));
+  async function generateEntryCode(entrypoint) {
+    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 = await 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 } = await 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 } = await hookRunners.beforeGenerateRoutes({
+          entrypoint,
+          code: await 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
+          });
+          await fs.ensureFile(routesServerFile);
+          await fs.writeFile(routesServerFile, code3);
+        }
+        fs.outputFileSync(
+          path.resolve(
+            internalDirectory,
+            `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`
+          ),
+          code2,
+          "utf8"
+        );
+      }
+      const { imports: importStatements } = await hookRunners.modifyEntryImports({
+        entrypoint,
+        imports: getDefaultImports({
+          entrypoint,
+          srcDirectory,
+          internalSrcAlias,
+          internalDirAlias,
+          internalDirectory
+        })
+      });
+      const { plugins } = await hookRunners.modifyEntryRuntimePlugins({
+        entrypoint,
+        plugins: []
+      });
+      const { code: renderFunction } = await hookRunners.modifyEntryRenderFunction({
+        entrypoint,
+        code: templates.renderFunction({
+          plugins,
+          customBootstrap,
+          fileSystemRoutes
+        })
+      });
+      const { exportStatement } = await 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 } = await 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 → esm-node}/analyze/getBundleEntry.js

@@ -40,11 +40,17 @@ const getBundleEntry = (appContext, config) => {
       const entrypoint = typeof value === "string" ? {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value),
+        absoluteEntryDir: path.dirname(
+          ensureAbsolutePath(appDirectory, value)
+        ),
         isAutoMount: true,
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
       } : {
         entryName: name,
         entry: ensureAbsolutePath(appDirectory, value.entry),
+        absoluteEntryDir: path.dirname(
+          ensureAbsolutePath(appDirectory, value.entry)
+        ),
         isAutoMount: !value.disableMount,
         customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
         fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0

package/dist/{js/modern → esm-node}/analyze/getClientRoutes/getRoutes.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import path from "path";
 import { fs } from "@modern-js/utils";
 import { makeLegalIdentifier } from "../makeLegalIdentifier";
@@ -160,7 +141,7 @@ export default ${lastComponent}`
     };
   };
   const normalized = flat(nested).map(
-    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+    (route) => route.parent ? { ...route, ...generate(route), parent: void 0 } : { ...route, parent: void 0 }
   );
   return normalized;
 };

package/dist/{js/modern → esm-node}/analyze/getClientRoutes/getRoutesLegacy.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import path from "path";
 import { fs } from "@modern-js/utils";
 import { makeLegalIdentifier } from "../makeLegalIdentifier";
@@ -159,7 +140,7 @@ export default ${lastComponent}`
     };
   };
   const normalized = flat(nested).map(
-    (route) => route.parent ? __spreadProps(__spreadValues(__spreadValues({}, route), generate(route)), { parent: void 0 }) : __spreadProps(__spreadValues({}, route), { parent: void 0 })
+    (route) => route.parent ? { ...route, ...generate(route), parent: void 0 } : { ...route, parent: void 0 }
   );
   return normalized;
 };

package/dist/{js/modern → esm-node}/analyze/getHtmlTemplate.js

@@ -1,23 +1,3 @@
-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, findExists, MAIN_ENTRY_NAME } from "@modern-js/utils";
 import { HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER } from "./constants";
@@ -46,10 +26,10 @@ const findPartials = (dir, entryName, position) => {
   }
   return null;
 };
-const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (entrypoints, api, {
+const getHtmlTemplate = async (entrypoints, api, {
   appContext,
   config
-}) {
+}) => {
   const { appDirectory, internalDirectory } = appContext;
   const {
     source: { configDir }
@@ -72,7 +52,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
       const hookRunners = api.useHookRunners();
-      const { partials } = yield hookRunners.htmlPartials({
+      const { partials } = await hookRunners.htmlPartials({
         entrypoint,
         partials: [
           "top" /* TOP */,
@@ -109,7 +89,7 @@ const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function*
     }
   }
   return htmlTemplates;
-});
+};
 export {
   getHtmlTemplate
 };

package/dist/{js/modern → esm-node}/analyze/getServerRoutes.js

@@ -1,34 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 import path from "path";
 import fs from "fs";
 import {
@@ -38,7 +7,8 @@ import {
   getEntryOptions,
   SERVER_BUNDLE_DIRECTORY,
   MAIN_ENTRY_NAME,
-  removeTailSlash
+  removeTailSlash,
+  SERVER_WORKER_BUNDLE_DIRECTORY
 } from "@modern-js/utils";
 import { walkDirectory } from "./utils";
 const applyBaseUrl = (baseUrl, routes) => {
@@ -51,9 +21,10 @@ const applyBaseUrl = (baseUrl, routes) => {
     } else {
       return routes.map((route) => {
         const urlPath = urlJoin(baseUrl, route.urlPath);
-        return __spreadProps(__spreadValues({}, route), {
+        return {
+          ...route,
           urlPath: urlPath === "/" ? urlPath : removeTailSlash(urlPath)
-        });
+        };
       });
     }
   }
@@ -68,28 +39,34 @@ const applyRouteOptions = (original, routeOptions) => {
     if (Array.isArray(route)) {
       routes = route.map((url) => {
         if (isPlainObject(url)) {
-          const _a2 = url, { path: urlPath } = _a2, other = __objRest(_a2, ["path"]);
-          return __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+          const { path: urlPath, ...other } = url;
+          return {
+            ...original,
+            ...other,
             urlPath
-          });
+          };
         } else {
-          return __spreadProps(__spreadValues({}, original), {
+          return {
+            ...original,
             urlPath: url
-          });
+          };
         }
       });
     } else if (isPlainObject(route)) {
-      const _a = route, { path: urlPath } = _a, other = __objRest(_a, ["path"]);
+      const { path: urlPath, ...other } = route;
       routes = [
-        __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+        {
+          ...original,
+          ...other,
           urlPath
-        })
+        }
       ];
     } else {
       routes = [
-        __spreadProps(__spreadValues({}, original), {
+        {
+          ...original,
           urlPath: route
-        })
+        }
       ];
     }
   } else {
@@ -101,7 +78,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
     html: { disableHtmlFolder },
     output: { distPath: { html: htmlPath } = {} },
-    server: { baseUrl, routes, ssr, ssrByEntries }
+    server: { baseUrl, routes, ssr, ssrByEntries, worker }
   } = config;
   const { packageName } = appContext;
   let htmlRoutes = entrypoints.reduce(
@@ -113,6 +90,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         packageName
       );
       const isSSR = Boolean(entryOptions);
+      const isWorker = Boolean(worker);
       const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
       let route = {
         urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
@@ -125,6 +103,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
         isSPA: true,
         isSSR,
         responseHeaders: resHeaders,
+        worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
         bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
       if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {