@modern-js/prod-server 2.4.0 → 2.5.0

package/dist/cjs/libs/render/index.js

@@ -0,0 +1,93 @@
+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 render_exports = {};
+__export(render_exports, {
+  createRenderHandler: () => createRenderHandler
+});
+module.exports = __toCommonJS(render_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_constants = require("../../constants");
+var import_static = require("./static");
+var import_reader = require("./reader");
+var ssr = __toESM(require("./ssr"));
+const createRenderHandler = ({
+  distDir,
+  staticGenerate,
+  forceCSR
+}) => async function render({
+  ctx,
+  route,
+  runner
+}) {
+  if (ctx.resHasHandled()) {
+    return null;
+  }
+  const { entryPath, urlPath } = route;
+  const entry = import_path.default.join(distDir, entryPath);
+  if (!route.isSPA) {
+    const result = await (0, import_static.handleDirectory)(ctx, entry, urlPath);
+    return result;
+  }
+  const templatePath = entry;
+  if (!import_utils.fs.existsSync(templatePath)) {
+    throw new Error(`Could not find template file: ${templatePath}`);
+  }
+  const content = await (0, import_reader.readFile)(templatePath);
+  if (!content) {
+    return null;
+  }
+  const useCSR = forceCSR && ctx.query.csr;
+  if (route.isSSR && !useCSR) {
+    try {
+      const result = await ssr.render(
+        ctx,
+        {
+          distDir,
+          entryName: route.entryName,
+          urlPath: route.urlPath,
+          bundle: route.bundle,
+          template: content.toString(),
+          staticGenerate
+        },
+        runner
+      );
+      return result;
+    } catch (err) {
+      ctx.error(
+        import_constants.ERROR_DIGEST.ERENDER,
+        err.stack || err.message
+      );
+      ctx.res.setHeader("x-modern-ssr-fallback", "1");
+    }
+  }
+  return {
+    content,
+    contentType: import_utils.mime.contentType(import_path.default.extname(templatePath))
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRenderHandler
+});

package/dist/{js/node → cjs}/libs/render/measure.js

@@ -1,24 +1,7 @@
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -43,16 +26,18 @@ const createMetrics = (context, metrics) => {
   const { entryName: entry, request } = context;
   const { pathname = "" } = request || {};
   const emitTimer = (name, cost, tags = {}) => {
-    metrics.emitTimer(name, cost, __spreadProps(__spreadValues({}, tags), {
+    metrics.emitTimer(name, cost, {
+      ...tags,
       pathname,
       entry
-    }));
+    });
   };
   const emitCounter = (name, counter, tags = {}) => {
-    metrics.emitCounter(name, counter, __spreadProps(__spreadValues({}, tags), {
+    metrics.emitCounter(name, counter, {
+      ...tags,
       pathname,
       entry
-    }));
+    });
   };
   return { emitTimer, emitCounter };
 };

package/dist/{js/node → cjs}/libs/render/reader.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 reader_exports = {};
 __export(reader_exports, {
   LruReader: () => LruReader,
@@ -56,13 +36,13 @@ const Byte = 1;
 const KB = 1024 * Byte;
 const MB = 1024 * KB;
 const getContentLength = (cache) => cache.content.length;
-const createCacheItem = (filepath, mtime) => __async(void 0, null, function* () {
-  const content = yield import_utils.fs.readFile(filepath);
+const createCacheItem = async (filepath, mtime) => {
+  const content = await import_utils.fs.readFile(filepath);
   return {
     content,
     mtime
   };
-});
+};
 class LruReader {
   constructor() {
     this.cache = new import_lru_cache.default({
@@ -75,26 +55,24 @@ class LruReader {
   }
   close() {
   }
-  read(filepath) {
-    return __async(this, null, function* () {
-      if (this.cache.has(filepath)) {
-        const { content } = this.cache.get(filepath);
-        return { content };
-      }
-      if (!import_utils.fs.existsSync(filepath)) {
-        return null;
-      }
-      const stat = import_utils.fs.statSync(filepath);
-      if (stat.isDirectory()) {
-        return null;
-      }
-      if (stat.size > 20 * MB) {
-        return null;
-      }
-      const item = yield createCacheItem(filepath, stat.mtime);
-      this.cache.set(filepath, item);
-      return item;
-    });
+  async read(filepath) {
+    if (this.cache.has(filepath)) {
+      const { content } = this.cache.get(filepath);
+      return { content };
+    }
+    if (!import_utils.fs.existsSync(filepath)) {
+      return null;
+    }
+    const stat = import_utils.fs.statSync(filepath);
+    if (stat.isDirectory()) {
+      return null;
+    }
+    if (stat.size > 20 * MB) {
+      return null;
+    }
+    const item = await createCacheItem(filepath, stat.mtime);
+    this.cache.set(filepath, item);
+    return item;
   }
   update() {
     const { cache } = this;
@@ -117,10 +95,10 @@ class LruReader {
   }
 }
 const reader = new LruReader();
-const readFile = (filepath) => __async(void 0, null, function* () {
-  const file = yield reader.read(filepath);
+const readFile = async (filepath) => {
+  const file = await reader.read(filepath);
   return file == null ? void 0 : file.content;
-});
+};
 const updateFile = () => {
   reader.update();
 };

package/dist/{js/node → cjs}/libs/render/ssr.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 ssr_exports = {};
 __export(ssr_exports, {
   render: () => render
@@ -51,7 +31,7 @@ var import_utils = require("@modern-js/utils");
 var import_cookie = __toESM(require("cookie"));
 var import_cache = __toESM(require("./cache"));
 var import_measure = require("./measure");
-const render = (ctx, renderOptions, runner) => __async(void 0, null, function* () {
+const render = async (ctx, renderOptions, runner) => {
   var _a;
   const { urlPath, bundle, distDir, template, entryName, staticGenerate } = renderOptions;
   const bundleJS = import_path.default.join(distDir, bundle);
@@ -94,7 +74,7 @@ const render = (ctx, renderOptions, runner) => __async(void 0, null, function* (
   context.metrics = (0, import_measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
   const serverRender = require(bundleJS)[import_utils.SERVER_RENDER_FUNCTION_NAME];
-  const content = yield (0, import_cache.default)(serverRender, ctx)(context);
+  const content = await (0, import_cache.default)(serverRender, ctx)(context);
   const { url, status = 302 } = context.redirection;
   if (url) {
     return {
@@ -116,7 +96,7 @@ const render = (ctx, renderOptions, runner) => __async(void 0, null, function* (
       contentType: import_utils.mime.contentType("html")
     };
   }
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   render

package/dist/{js/node → cjs}/libs/render/static.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 static_exports = {};
 __export(static_exports, {
   handleDirectory: () => handleDirectory
@@ -49,33 +29,31 @@ module.exports = __toCommonJS(static_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_reader = require("./reader");
-function handleDirectory(ctx, entryPath, urlPath) {
-  return __async(this, null, function* () {
-    const { path: pathname } = ctx;
-    const filepath = import_path.default.join(entryPath, trimLeft(pathname, urlPath));
-    let content = yield (0, import_reader.readFile)(filepath);
-    let contentType = import_utils.mime.contentType(import_path.default.extname(filepath) || "");
-    if (!content) {
-      if (pathname.endsWith("/")) {
-        content = yield (0, import_reader.readFile)(`${filepath}index.html`);
-      } else if (!pathname.includes(".")) {
-        content = yield (0, import_reader.readFile)(`${filepath}.html`);
-        if (!content) {
-          content = yield (0, import_reader.readFile)(`${filepath}/index.html`);
-        }
-      }
-      if (content) {
-        contentType = import_utils.mime.contentType("html");
+async function handleDirectory(ctx, entryPath, urlPath) {
+  const { path: pathname } = ctx;
+  const filepath = import_path.default.join(entryPath, trimLeft(pathname, urlPath));
+  let content = await (0, import_reader.readFile)(filepath);
+  let contentType = import_utils.mime.contentType(import_path.default.extname(filepath) || "");
+  if (!content) {
+    if (pathname.endsWith("/")) {
+      content = await (0, import_reader.readFile)(`${filepath}index.html`);
+    } else if (!pathname.includes(".")) {
+      content = await (0, import_reader.readFile)(`${filepath}.html`);
+      if (!content) {
+        content = await (0, import_reader.readFile)(`${filepath}/index.html`);
       }
     }
-    if (!content) {
-      return null;
+    if (content) {
+      contentType = import_utils.mime.contentType("html");
     }
-    return {
-      content,
-      contentType: contentType || ""
-    };
-  });
+  }
+  if (!content) {
+    return null;
+  }
+  return {
+    content,
+    contentType: contentType || ""
+  };
 }
 const trimLeft = (str, prefix) => {
   if (str.startsWith(prefix)) {

package/dist/{js/node → cjs}/libs/serve-file.js

@@ -21,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 serve_file_exports = {};
 __export(serve_file_exports, {
   createStaticFileHandler: () => createStaticFileHandler,
@@ -69,7 +49,7 @@ const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-const createStaticFileHandler = (rules, output = {}) => (context, next) => __async(void 0, null, function* () {
+const createStaticFileHandler = (rules, output = {}) => async (context, next) => {
   const { url: requestUrl, req, res } = context;
   const { assetPrefix = "/" } = output;
   const hitRule = rules.find((item) => {
@@ -89,7 +69,7 @@ const createStaticFileHandler = (rules, output = {}) => (context, next) => __asy
   } else {
     return next();
   }
-});
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createStaticFileHandler,

package/dist/{js/node → cjs}/server/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-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 server_exports = {};
 __export(server_exports, {
   Server: () => Server
@@ -81,30 +44,26 @@ class Server {
     this.options = options;
     this.serverConfig = {};
   }
-  init() {
-    return __async(this, null, function* () {
-      const { options } = this;
-      this.loadServerEnv(options);
-      this.initServerConfig(options);
-      yield this.injectContext(this.runner, options);
-      this.runner = yield this.createHookRunner();
-      yield this.initConfig(this.runner, options);
-      yield this.injectContext(this.runner, options);
-      this.server = this.serverImpl(options);
-      yield this.runPrepareHook(this.runner);
-      this.app = yield this.server.createHTTPServer(this.getRequestHandler());
-      yield this.server.onInit(this.runner, this.app);
-      return this;
-    });
+  async init() {
+    const { options } = this;
+    this.loadServerEnv(options);
+    this.initServerConfig(options);
+    await this.injectContext(this.runner, options);
+    this.runner = await this.createHookRunner();
+    await this.initConfig(this.runner, options);
+    await this.injectContext(this.runner, options);
+    this.server = this.serverImpl(options);
+    await this.runPrepareHook(this.runner);
+    this.app = await this.server.createHTTPServer(this.getRequestHandler());
+    await this.server.onInit(this.runner, this.app);
+    return this;
   }
   runConfigHook(runner, serverConfig) {
     const newServerConfig = runner.config(serverConfig || {});
     return newServerConfig;
   }
-  runPrepareHook(runner) {
-    return __async(this, null, function* () {
-      runner.prepare();
-    });
+  async runPrepareHook(runner) {
+    runner.prepare();
   }
   initServerConfig(options) {
     const { pwd, serverConfigFile } = options;
@@ -116,27 +75,23 @@ class Server {
     const serverConfig = (0, import_loadConfig.requireConfig)(serverConfigPath);
     this.serverConfig = serverConfig;
   }
-  initConfig(runner, options) {
-    return __async(this, null, function* () {
-      const { pwd, config } = options;
-      const { serverConfig } = this;
-      const finalServerConfig = this.runConfigHook(runner, serverConfig);
-      const resolvedConfigPath = import_path.default.join(
-        pwd,
-        config.output.path || "dist",
-        import_utils.OUTPUT_CONFIG_FILE
-      );
-      options.config = (0, import_loadConfig.loadConfig)({
-        cliConfig: config,
-        serverConfig: finalServerConfig,
-        resolvedConfigPath
-      });
+  async initConfig(runner, options) {
+    const { pwd, config } = options;
+    const { serverConfig } = this;
+    const finalServerConfig = this.runConfigHook(runner, serverConfig);
+    const resolvedConfigPath = import_path.default.join(
+      pwd,
+      config.output.path || "dist",
+      import_utils.OUTPUT_CONFIG_FILE
+    );
+    options.config = (0, import_loadConfig.loadConfig)({
+      cliConfig: config,
+      serverConfig: finalServerConfig,
+      resolvedConfigPath
     });
   }
-  close() {
-    return __async(this, null, function* () {
-      this.app.close();
-    });
+  async close() {
+    this.app.close();
   }
   listen(options, listener) {
     const callback = () => {
@@ -154,40 +109,35 @@ class Server {
       return requestHandler(req, res, next);
     };
   }
-  render(req, res, url) {
-    return __async(this, null, function* () {
-      return this.server.render(req, res, url);
-    });
+  async render(req, res, url) {
+    return this.server.render(req, res, url);
   }
-  createHookRunner() {
-    return __async(this, null, function* () {
-      import_server_core.serverManager.clear();
-      const { options } = this;
-      const {
-        internalPlugins = import_utils.INTERNAL_SERVER_PLUGINS,
-        pwd,
-        plugins = []
-      } = options;
-      const serverPlugins = this.serverConfig.plugins || [];
-      const loadedPlugins = (0, import_server_core.loadPlugins)(pwd, [...serverPlugins, ...plugins], {
-        internalPlugins
-      });
-      (0, import_utils2.debug)("plugins", loadedPlugins);
-      loadedPlugins.forEach((p) => {
-        import_server_core.serverManager.usePlugin(p);
-      });
-      const hooksRunner = yield import_server_core.serverManager.init();
-      return hooksRunner;
+  async createHookRunner() {
+    import_server_core.serverManager.clear();
+    const { options } = this;
+    const {
+      internalPlugins = import_utils.INTERNAL_SERVER_PLUGINS,
+      pwd,
+      plugins = []
+    } = options;
+    const serverPlugins = this.serverConfig.plugins || [];
+    const loadedPlugins = (0, import_server_core.loadPlugins)(pwd, [...serverPlugins, ...plugins], {
+      internalPlugins
+    });
+    (0, import_utils2.debug)("plugins", loadedPlugins);
+    loadedPlugins.forEach((p) => {
+      import_server_core.serverManager.usePlugin(p);
     });
+    const hooksRunner = await import_server_core.serverManager.init();
+    return hooksRunner;
   }
-  injectContext(runner, options) {
-    return __async(this, null, function* () {
-      const appContext = this.initAppContext();
-      const { config, pwd } = options;
-      import_server_core.ConfigContext.set(config);
-      import_server_core.AppContext.set(__spreadProps(__spreadValues({}, appContext), {
-        distDirectory: import_path.default.join(pwd, config.output.path || "dist")
-      }));
+  async injectContext(runner, options) {
+    const appContext = this.initAppContext();
+    const { config, pwd } = options;
+    import_server_core.ConfigContext.set(config);
+    import_server_core.AppContext.set({
+      ...appContext,
+      distDirectory: import_path.default.join(pwd, config.output.path || "dist")
     });
   }
   initAppContext() {