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

package/dist/js/node/analyze/getHtmlTemplate.js

@@ -1,85 +1,140 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  getHtmlTemplate: () => getHtmlTemplate
 });
-exports.getHtmlTemplate = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _constants = require("./constants");
-var templates = _interopRequireWildcard(require("./templates"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var PartialPosition;
-(function (PartialPosition) {
-  PartialPosition["TOP"] = "top";
-  PartialPosition["HEAD"] = "head";
-  PartialPosition["BODY"] = "body";
-  PartialPosition["BOTTOM"] = "bottom";
-  PartialPosition["INDEX"] = "index";
-})(PartialPosition || (PartialPosition = {}));
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+var templates = __toESM(require("./templates"));
+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());
+  });
+};
+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 (_utils.fs.existsSync(dir)) {
-    const base = (0, _utils.findExists)(_constants.HTML_PARTIALS_EXTENSIONS.map(ext => _path.default.resolve(dir, `${position}${ext}`)));
-    const file = entryName ? (0, _utils.findExists)(_constants.HTML_PARTIALS_EXTENSIONS.map(ext => _path.default.resolve(dir, entryName, `${position}${ext}`))) || base : base;
-    return file ? {
-      file,
-      content: _utils.fs.readFileSync(file, 'utf8')
-    } : null;
+  if (import_utils.fs.existsSync(dir)) {
+    const base = (0, import_utils.findExists)(
+      import_constants.HTML_PARTIALS_EXTENSIONS.map(
+        (ext) => import_path.default.resolve(dir, `${position}${ext}`)
+      )
+    );
+    const file = entryName ? (0, import_utils.findExists)(
+      import_constants.HTML_PARTIALS_EXTENSIONS.map(
+        (ext) => import_path.default.resolve(dir, entryName, `${position}${ext}`)
+      )
+    ) || base : base;
+    return file ? { file, content: import_utils.fs.readFileSync(file, "utf8") } : null;
   }
   return null;
 };
-
-// generate html template for
-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.default.resolve(appDirectory, configDir || '', _constants.HTML_PARTIALS_FOLDER);
+  const htmlDir = import_path.default.resolve(
+    appDirectory,
+    configDir || "",
+    import_constants.HTML_PARTIALS_FOLDER
+  );
   const htmlTemplates = {};
   for (const entrypoint of entrypoints) {
-    const {
-      entryName
-    } = entrypoint;
-    const name = entrypoints.length === 1 && entryName === _utils.MAIN_ENTRY_NAME ? '' : entryName;
-    const customIndexTemplate = findPartials(htmlDir, name, PartialPosition.INDEX);
+    const { entryName } = entrypoint;
+    const name = entrypoints.length === 1 && entryName === import_utils.MAIN_ENTRY_NAME ? "" : entryName;
+    const customIndexTemplate = findPartials(
+      htmlDir,
+      name,
+      "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",
+          "head",
+          "body"
+        ].reduce(
+          (previous, position) => {
+            const found = findPartials(htmlDir, name, position);
+            previous[position] = found ? [found.content] : [];
+            return previous;
+          },
+          {
+            top: [],
+            head: [],
+            body: []
+          }
+        )
       });
-      const templatePath = _path.default.resolve(internalDirectory, entryName, 'index.html');
-      _utils.fs.outputFileSync(templatePath, templates.html(partials), 'utf8');
+      const templatePath = import_path.default.resolve(
+        internalDirectory,
+        entryName,
+        "index.html"
+      );
+      import_utils.fs.outputFileSync(templatePath, templates.html(partials), "utf8");
       htmlTemplates[entryName] = templatePath;
-      const bottomTemplate = findPartials(htmlDir, name, PartialPosition.BOTTOM);
+      const bottomTemplate = findPartials(
+        htmlDir,
+        name,
+        "bottom"
+      );
       if (bottomTemplate) {
         htmlTemplates[`__${entryName}-bottom__`] = bottomTemplate.content;
       }
     }
   }
   return htmlTemplates;
-};
-exports.getHtmlTemplate = getHtmlTemplate;
+});

package/dist/js/node/analyze/getServerRoutes.js

@@ -1,186 +1,192 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  getServerRoutes: () => getServerRoutes
 });
-exports.getServerRoutes = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _fs = _interopRequireDefault(require("fs"));
-var _utils = require("@modern-js/utils");
-var _utils2 = require("./utils");
-const _excluded = ["path"],
-  _excluded2 = ["path"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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; }
-/**
- * Add base url for each server route.
- * @param baseUrl - Base url from server.baseUrl
- * @param routes - Server routes.
- * @returns Server routes with baseUrl prefixed.
- */
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("./utils");
+var __defProp2 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.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 (__hasOwnProp2.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;
+};
 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 => {
-        const urlPath = (0, _utils.urlJoin)(baseUrl, route.urlPath);
-        return _objectSpread(_objectSpread({}, route), {}, {
-          urlPath: urlPath === '/' ? urlPath : (0, _utils.removeTailSlash)(urlPath)
+      return routes.map((route) => {
+        const urlPath = (0, import_utils.urlJoin)(baseUrl, route.urlPath);
+        return __spreadProps(__spreadValues({}, route), {
+          urlPath: urlPath === "/" ? urlPath : (0, import_utils.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.default.dirname(original.entryPath));
+  !original.isSPA && (original.entryPath = import_path.default.dirname(original.entryPath));
   let routes;
   if (route) {
     if (Array.isArray(route)) {
-      routes = route.map(url => {
-        if ((0, _utils.isPlainObject)(url)) {
-          const _ref = url,
-            {
-              path: urlPath
-            } = _ref,
-            other = _objectWithoutProperties(_ref, _excluded);
-          return _objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
+      routes = route.map((url) => {
+        if ((0, import_utils.isPlainObject)(url)) {
+          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 ((0, _utils.isPlainObject)(route)) {
-      const _ref2 = route,
-        {
-          path: urlPath
-        } = _ref2,
-        other = _objectWithoutProperties(_ref2, _excluded2);
-      routes = [_objectSpread(_objectSpread(_objectSpread({}, original), other), {}, {
-        urlPath
-      })];
+    } else if ((0, import_utils.isPlainObject)(route)) {
+      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 = (0, _utils.getEntryOptions)(entryName, ssr, ssrByEntries, packageName);
-    const isSSR = Boolean(entryOptions);
-    const {
-      resHeaders
-    } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
-    let route = {
-      urlPath: `/${entryName === _utils.MAIN_ENTRY_NAME ? '' : entryName}`,
-      entryName,
-      entryPath: (0, _utils.removeLeadingSlash)(_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? '.html' : '/index.html'}`)),
-      isSPA: true,
-      isSSR,
-      responseHeaders: resHeaders,
-      // FIXME: remove the config.enableModernMode
-      // enableModernMode: Boolean(enableModernMode),
-      bundle: isSSR ? `${_utils.SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : undefined
-    };
-    if (routes !== null && routes !== void 0 && routes.hasOwnProperty(entryName)) {
-      const routeOptions = (0, _utils.isPlainObject)(routes[entryName]) ? routes[entryName] : {
-        route: routes[entryName]
+  const { packageName } = appContext;
+  let htmlRoutes = entrypoints.reduce(
+    (previous, { entryName }) => {
+      const entryOptions = (0, import_utils.getEntryOptions)(
+        entryName,
+        ssr,
+        ssrByEntries,
+        packageName
+      );
+      const isSSR = Boolean(entryOptions);
+      const { resHeaders } = (routes == null ? void 0 : routes[entryName]) || {};
+      let route = {
+        urlPath: `/${entryName === import_utils.MAIN_ENTRY_NAME ? "" : entryName}`,
+        entryName,
+        entryPath: (0, import_utils.removeLeadingSlash)(
+          import_path.default.posix.normalize(
+            `${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`
+          )
+        ),
+        isSPA: true,
+        isSSR,
+        responseHeaders: resHeaders,
+        bundle: isSSR ? `${import_utils.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 = (0, import_utils.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.default.resolve(appDirectory, configDir || '', 'public');
-  return _fs.default.existsSync(publicFolder) ? (0, _utils2.walkDirectory)(publicFolder).map(filePath => {
-    const urlPath = `${(0, _utils.urlJoin)(toPosix(filePath).slice(toPosix(publicFolder).length))}`;
+  const publicFolder = import_path.default.resolve(appDirectory, configDir || "", "public");
+  return import_fs.default.existsSync(publicFolder) ? (0, import_utils2.walkDirectory)(publicFolder).map((filePath) => {
+    const urlPath = `${(0, import_utils.urlJoin)(
+      toPosix(filePath).slice(toPosix(publicFolder).length)
+    )}`;
     return {
-      urlPath: publicRoutes[(0, _utils.removeLeadingSlash)(urlPath)] || urlPath,
+      urlPath: publicRoutes[(0, import_utils.removeLeadingSlash)(urlPath)] || urlPath,
       isSPA: true,
       isSSR: false,
-      entryPath: toPosix(_path.default.relative(_path.default.resolve(appDirectory, configDir || ''), filePath))
+      entryPath: toPosix(
+        import_path.default.relative(
+          import_path.default.resolve(appDirectory, configDir || ""),
+          filePath
+        )
+      )
     };
   }) : [];
 };
 const getServerRoutes = (entrypoints, {
   appContext,
   config
-}) => [...collectHtmlRoutes(entrypoints, appContext, config), ...collectStaticRoutes(appContext, config)];
-exports.getServerRoutes = getServerRoutes;
-const toPosix = pathStr => pathStr.split(_path.default.sep).join(_path.default.posix.sep);
+}) => [
+  ...collectHtmlRoutes(entrypoints, appContext, config),
+  ...collectStaticRoutes(appContext, config)
+];
+const toPosix = (pathStr) => pathStr.split(import_path.default.sep).join(import_path.default.posix.sep);