@modern-js/app-tools 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/modern/analyze/getHtmlTemplate.js

@@ -1,75 +1,115 @@
-import path from 'path';
-import { fs, findExists, MAIN_ENTRY_NAME } from '@modern-js/utils';
+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";
 import * as templates from "./templates";
-var PartialPosition;
-(function (PartialPosition) {
-  PartialPosition["TOP"] = "top";
-  PartialPosition["HEAD"] = "head";
-  PartialPosition["BODY"] = "body";
-  PartialPosition["BOTTOM"] = "bottom";
-  PartialPosition["INDEX"] = "index";
-})(PartialPosition || (PartialPosition = {}));
+var PartialPosition = /* @__PURE__ */ ((PartialPosition2) => {
+  PartialPosition2["TOP"] = "top";
+  PartialPosition2["HEAD"] = "head";
+  PartialPosition2["BODY"] = "body";
+  PartialPosition2["BOTTOM"] = "bottom";
+  PartialPosition2["INDEX"] = "index";
+  return PartialPosition2;
+})(PartialPosition || {});
 const findPartials = (dir, entryName, position) => {
   if (fs.existsSync(dir)) {
-    const base = findExists(HTML_PARTIALS_EXTENSIONS.map(ext => path.resolve(dir, `${position}${ext}`)));
-    const file = entryName ? findExists(HTML_PARTIALS_EXTENSIONS.map(ext => path.resolve(dir, entryName, `${position}${ext}`))) || base : base;
-    return file ? {
-      file,
-      content: fs.readFileSync(file, 'utf8')
-    } : null;
+    const base = findExists(
+      HTML_PARTIALS_EXTENSIONS.map(
+        (ext) => path.resolve(dir, `${position}${ext}`)
+      )
+    );
+    const file = entryName ? findExists(
+      HTML_PARTIALS_EXTENSIONS.map(
+        (ext) => path.resolve(dir, entryName, `${position}${ext}`)
+      )
+    ) || base : base;
+    return file ? { file, content: fs.readFileSync(file, "utf8") } : null;
   }
   return null;
 };
-
-// generate html template for
-export const getHtmlTemplate = async (entrypoints, api, {
+const getHtmlTemplate = (_0, _1, _2) => __async(void 0, [_0, _1, _2], function* (entrypoints, api, {
   appContext,
   config
-}) => {
-  const {
-    appDirectory,
-    internalDirectory
-  } = appContext;
+}) {
+  const { appDirectory, internalDirectory } = appContext;
   const {
-    source: {
-      configDir
-    }
+    source: { configDir }
   } = config;
-  const htmlDir = path.resolve(appDirectory, configDir || '', HTML_PARTIALS_FOLDER);
+  const htmlDir = path.resolve(
+    appDirectory,
+    configDir || "",
+    HTML_PARTIALS_FOLDER
+  );
   const htmlTemplates = {};
   for (const entrypoint of entrypoints) {
-    const {
-      entryName
-    } = entrypoint;
-    const name = entrypoints.length === 1 && entryName === MAIN_ENTRY_NAME ? '' : entryName;
-    const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
+    const { entryName } = entrypoint;
+    const name = entrypoints.length === 1 && entryName === MAIN_ENTRY_NAME ? "" : entryName;
+    const customIndexTemplate = findPartials(
+      htmlDir,
+      name,
+      "index" /* INDEX */
+    );
     if (customIndexTemplate) {
       htmlTemplates[entryName] = customIndexTemplate.file;
     } else {
       const hookRunners = api.useHookRunners();
-      const {
-        partials
-      } = await hookRunners.htmlPartials({
+      const { partials } = yield hookRunners.htmlPartials({
         entrypoint,
-        partials: [PartialPosition.TOP, PartialPosition.HEAD, PartialPosition.BODY].reduce((previous, position) => {
-          const found = findPartials(htmlDir, name, position);
-          previous[position] = found ? [found.content] : [];
-          return previous;
-        }, {
-          top: [],
-          head: [],
-          body: []
-        })
+        partials: [
+          "top" /* TOP */,
+          "head" /* HEAD */,
+          "body" /* BODY */
+        ].reduce(
+          (previous, position) => {
+            const found = findPartials(htmlDir, name, position);
+            previous[position] = found ? [found.content] : [];
+            return previous;
+          },
+          {
+            top: [],
+            head: [],
+            body: []
+          }
+        )
       });
-      const templatePath = path.resolve(internalDirectory, entryName, 'index.html');
-      fs.outputFileSync(templatePath, templates.html(partials), 'utf8');
+      const templatePath = path.resolve(
+        internalDirectory,
+        entryName,
+        "index.html"
+      );
+      fs.outputFileSync(templatePath, templates.html(partials), "utf8");
       htmlTemplates[entryName] = templatePath;
-      const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
+      const bottomTemplate = findPartials(
+        htmlDir,
+        name,
+        "bottom" /* BOTTOM */
+      );
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }
     }
   }
   return htmlTemplates;
-};
+});
+export {
+  getHtmlTemplate
+};

package/dist/js/modern/analyze/getServerRoutes.js

@@ -1,179 +1,175 @@
-const _excluded = ["path"],
-  _excluded2 = ["path"];
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-import path from 'path';
-import fs from 'fs';
-import { urlJoin, isPlainObject, removeLeadingSlash, getEntryOptions, SERVER_BUNDLE_DIRECTORY, MAIN_ENTRY_NAME, removeTailSlash } from '@modern-js/utils';
+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 {
+  urlJoin,
+  isPlainObject,
+  removeLeadingSlash,
+  getEntryOptions,
+  SERVER_BUNDLE_DIRECTORY,
+  MAIN_ENTRY_NAME,
+  removeTailSlash
+} from "@modern-js/utils";
 import { walkDirectory } from "./utils";
-
-/**
- * Add base url for each server route.
- * @param baseUrl - Base url from server.baseUrl
- * @param routes - Server routes.
- * @returns Server routes with baseUrl prefixed.
- */
 const applyBaseUrl = (baseUrl, routes) => {
   if (baseUrl) {
     if (Array.isArray(baseUrl)) {
-      return baseUrl.reduce((previous, current) => [...previous, ...applyBaseUrl(current, routes)], []);
+      return baseUrl.reduce(
+        (previous, current) => [...previous, ...applyBaseUrl(current, routes)],
+        []
+      );
     } else {
-      return routes.map(route => {
+      return routes.map((route) => {
         const urlPath = urlJoin(baseUrl, route.urlPath);
-        return _objectSpread(_objectSpread({}, route), {}, {
-          urlPath: urlPath === '/' ? urlPath : removeTailSlash(urlPath)
+        return __spreadProps(__spreadValues({}, route), {
+          urlPath: urlPath === "/" ? urlPath : removeTailSlash(urlPath)
         });
       });
     }
   }
   return routes;
 };
-
-/**
- *
- * @param original - Original entrypoint route info.
- * @param routeOptions - Custom entrypoint route config from server.routes.
- * @returns
- */
 const applyRouteOptions = (original, routeOptions) => {
-  const {
-    route,
-    disableSpa
-  } = routeOptions;
+  const { route, disableSpa } = routeOptions;
   original.isSPA = !disableSpa;
-
-  // set entryPath as dir
   !original.isSPA && (original.entryPath = path.dirname(original.entryPath));
   let routes;
   if (route) {
     if (Array.isArray(route)) {
-      routes = route.map(url => {
+      routes = route.map((url) => {
         if (isPlainObject(url)) {
-          const _ref = url,
-            {
-              path: urlPath
-            } = _ref,
-            other = _objectWithoutProperties(_ref, _excluded);
-          return _objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
+          const _a2 = url, { path: urlPath } = _a2, other = __objRest(_a2, ["path"]);
+          return __spreadProps(__spreadValues(__spreadValues({}, original), other), {
             urlPath
           });
         } else {
-          return _objectSpread(_objectSpread({}, original), {}, {
+          return __spreadProps(__spreadValues({}, original), {
             urlPath: url
           });
         }
       });
     } else if (isPlainObject(route)) {
-      const _ref2 = route,
-        {
-          path: urlPath
-        } = _ref2,
-        other = _objectWithoutProperties(_ref2, _excluded2);
-      routes = [_objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
-        urlPath
-      })];
+      const _a = route, { path: urlPath } = _a, other = __objRest(_a, ["path"]);
+      routes = [
+        __spreadProps(__spreadValues(__spreadValues({}, original), other), {
+          urlPath
+        })
+      ];
     } else {
-      routes = [_objectSpread(_objectSpread({}, original), {}, {
-        urlPath: route
-      })];
+      routes = [
+        __spreadProps(__spreadValues({}, original), {
+          urlPath: route
+        })
+      ];
     }
   } else {
     routes = [original];
   }
   return routes;
 };
-
-/**
- * Collect routes from entrypoints.
- * @param entrypoints - Bundle entrypoints.
- * @param config - Normalized user config.
- * @returns entrypoint Routes
- */
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   const {
-    html: {
-      disableHtmlFolder
-    },
-    output: {
-      distPath: {
-        html: htmlPath
-      } = {}
-    },
-    server: {
-      baseUrl,
-      routes,
-      ssr,
-      ssrByEntries
-    }
+    html: { disableHtmlFolder },
+    output: { distPath: { html: htmlPath } = {} },
+    server: { baseUrl, routes, ssr, ssrByEntries }
   } = config;
-  const {
-    packageName
-  } = appContext;
-  let htmlRoutes = entrypoints.reduce((previous, {
-    entryName
-  }) => {
-    const entryOptions = getEntryOptions(entryName, ssr, ssrByEntries, packageName);
-    const isSSR = Boolean(entryOptions);
-    const {
-      resHeaders
-    } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
-    let route = {
-      urlPath: `/${entryName === MAIN_ENTRY_NAME ? '' : entryName}`,
-      entryName,
-      entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? '.html' : '/index.html'}`)),
-      isSPA: true,
-      isSSR,
-      responseHeaders: resHeaders,
-      // FIXME: remove the config.enableModernMode
-      // enableModernMode: Boolean(enableModernMode),
-      bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : undefined
-    };
-    if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
-      const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {
-        route: routes[entryName]
+  const { packageName } = appContext;
+  let htmlRoutes = entrypoints.reduce(
+    (previous, { entryName }) => {
+      const entryOptions = getEntryOptions(
+        entryName,
+        ssr,
+        ssrByEntries,
+        packageName
+      );
+      const isSSR = Boolean(entryOptions);
+      const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
+      let route = {
+        urlPath: `/${entryName === MAIN_ENTRY_NAME ? "" : entryName}`,
+        entryName,
+        entryPath: removeLeadingSlash(
+          path.posix.normalize(
+            `${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`
+          )
+        ),
+        isSPA: true,
+        isSSR,
+        responseHeaders: resHeaders,
+        bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
       };
-      route = applyRouteOptions(route, routeOptions);
-    }
-    return Array.isArray(route) ? [...previous, ...route] : [...previous, route];
-  }, []);
+      if (routes == null ? void 0 : routes.hasOwnProperty(entryName)) {
+        const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : { route: routes[entryName] };
+        route = applyRouteOptions(route, routeOptions);
+      }
+      return Array.isArray(route) ? [...previous, ...route] : [...previous, route];
+    },
+    []
+  );
   htmlRoutes = applyBaseUrl(baseUrl, htmlRoutes);
   return htmlRoutes;
 };
-
-/**
- * Collect static public file routes from config/public folder.
- * @param appContext - App context info.
- * @param config - normalized user config.
- * @returns Static public file routes.
- */
 const collectStaticRoutes = (appContext, config) => {
+  const { appDirectory } = appContext;
   const {
-    appDirectory
-  } = appContext;
-  const {
-    source: {
-      configDir
-    },
-    server: {
-      publicRoutes = {}
-    }
+    source: { configDir },
+    server: { publicRoutes = {} }
   } = config;
-  const publicFolder = path.resolve(appDirectory, configDir || '', 'public');
-  return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map(filePath => {
-    const urlPath = `${urlJoin(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
+  const publicFolder = path.resolve(appDirectory, configDir || "", "public");
+  return fs.existsSync(publicFolder) ? walkDirectory(publicFolder).map((filePath) => {
+    const urlPath = `${urlJoin(
+      toPosix(filePath).slice(toPosix(publicFolder).length)
+    )}`;
     return {
       urlPath: publicRoutes[removeLeadingSlash(urlPath)] || urlPath,
       isSPA: true,
       isSSR: false,
-      entryPath: toPosix(path.relative(path.resolve(appDirectory, configDir || ''), filePath))
+      entryPath: toPosix(
+        path.relative(
+          path.resolve(appDirectory, configDir || ""),
+          filePath
+        )
+      )
     };
   }) : [];
 };
-export const getServerRoutes = (entrypoints, {
+const getServerRoutes = (entrypoints, {
   appContext,
   config
-}) => [...collectHtmlRoutes(entrypoints, appContext, config), ...collectStaticRoutes(appContext, config)];
-const toPosix = pathStr => pathStr.split(path.sep).join(path.posix.sep);
+}) => [
+  ...collectHtmlRoutes(entrypoints, appContext, config),
+  ...collectStaticRoutes(appContext, config)
+];
+const toPosix = (pathStr) => pathStr.split(path.sep).join(path.posix.sep);
+export {
+  getServerRoutes
+};