@modern-js/prod-server 2.8.0 → 2.9.1-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @modern-js/prod-server
 
+## 2.9.0
+
+### Patch Changes
+
+- 49bb8cd0ef: fix: move chunkmap.css comment to bottom of head
+  fix: 将 chunkmap.css 标记移动到 head 底部
+  - @modern-js/server-core@2.9.0
+  - @modern-js/utils@2.9.0
+
 ## 2.8.0
 
 ### Patch Changes

package/dist/cjs/server/index.js

@@ -31,7 +31,6 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
 var import_utils = require("@modern-js/utils");
 var import_server_core = require("@modern-js/server-core");
 var import_metrics = require("../libs/metrics");
@@ -64,7 +63,7 @@ class Server {
    */
   async init() {
     const { options } = this;
-    this.loadServerEnv(options);
+    await this.loadServerEnv(options);
     this.initServerConfig(options);
     await this.injectContext(this.runner, options);
     this.runner = await this.createHookRunner();
@@ -185,13 +184,16 @@ class Server {
       plugins: serverPlugins
     };
   }
-  loadServerEnv(options) {
+  async loadServerEnv(options) {
     const { pwd: appDirectory } = options;
     const serverEnv = process.env.MODERN_ENV;
+    const defaultEnvPath = import_path.default.resolve(appDirectory, `.env`);
     const serverEnvPath = import_path.default.resolve(appDirectory, `.env.${serverEnv}`);
-    if (serverEnv && import_fs.default.existsSync(serverEnvPath) && !import_fs.default.statSync(serverEnvPath).isDirectory()) {
-      const envConfig = import_utils.dotenv.config({ path: serverEnvPath });
-      (0, import_utils.dotenvExpand)(envConfig);
+    for (const envPath of [defaultEnvPath, serverEnvPath]) {
+      if (await import_utils.fs.pathExists(envPath) && !(await import_utils.fs.stat(envPath)).isDirectory()) {
+        const envConfig = import_utils.dotenv.config({ path: envPath });
+        (0, import_utils.dotenvExpand)(envConfig);
+      }
     }
   }
 }

package/dist/esm/server/index.js

@@ -219,8 +219,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import fs from "fs";
-import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
+import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
 import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
@@ -267,50 +266,55 @@ var Server = /*#__PURE__*/ function() {
                         switch(_state.label){
                             case 0:
                                 options = _this.options;
-                                _this.loadServerEnv(options);
+                                return [
+                                    4,
+                                    _this.loadServerEnv(options)
+                                ];
+                            case 1:
+                                _state.sent();
                                 _this.initServerConfig(options);
                                 return [
                                     4,
                                     _this.injectContext(_this.runner, options)
                                 ];
-                            case 1:
+                            case 2:
                                 _state.sent();
                                 return [
                                     4,
                                     _this.createHookRunner()
                                 ];
-                            case 2:
+                            case 3:
                                 _this.runner = _state.sent();
                                 return [
                                     4,
                                     _this.initConfig(_this.runner, options)
                                 ];
-                            case 3:
+                            case 4:
                                 _state.sent();
                                 return [
                                     4,
                                     _this.injectContext(_this.runner, options)
                                 ];
-                            case 4:
+                            case 5:
                                 _state.sent();
                                 _this.server = _this.serverImpl(options);
                                 return [
                                     4,
                                     _this.runPrepareHook(_this.runner)
                                 ];
-                            case 5:
+                            case 6:
                                 _state.sent();
                                 return [
                                     4,
                                     _this.server.createHTTPServer(_this.getRequestHandler())
                                 ];
-                            case 6:
+                            case 7:
                                 _this.app = _state.sent();
                                 return [
                                     4,
                                     _this.server.onInit(_this.runner, _this.app)
                                 ];
-                            case 7:
+                            case 8:
                                 _state.sent();
                                 return [
                                     2,
@@ -515,15 +519,64 @@ var Server = /*#__PURE__*/ function() {
         {
             key: "loadServerEnv",
             value: function loadServerEnv(options) {
-                var appDirectory = options.pwd;
-                var serverEnv = process.env.MODERN_ENV;
-                var serverEnvPath = path.resolve(appDirectory, ".env.".concat(serverEnv));
-                if (serverEnv && fs.existsSync(serverEnvPath) && !fs.statSync(serverEnvPath).isDirectory()) {
-                    var envConfig = dotenv.config({
-                        path: serverEnvPath
+                return _asyncToGenerator(function() {
+                    var appDirectory, serverEnv, defaultEnvPath, serverEnvPath, _i, _iter, envPath, _tmp, envConfig;
+                    return __generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                appDirectory = options.pwd;
+                                serverEnv = process.env.MODERN_ENV;
+                                defaultEnvPath = path.resolve(appDirectory, ".env");
+                                serverEnvPath = path.resolve(appDirectory, ".env.".concat(serverEnv));
+                                _i = 0, _iter = [
+                                    defaultEnvPath,
+                                    serverEnvPath
+                                ];
+                                _state.label = 1;
+                            case 1:
+                                if (!(_i < _iter.length)) return [
+                                    3,
+                                    6
+                                ];
+                                envPath = _iter[_i];
+                                return [
+                                    4,
+                                    fs.pathExists(envPath)
+                                ];
+                            case 2:
+                                _tmp = _state.sent();
+                                if (!_tmp) return [
+                                    3,
+                                    4
+                                ];
+                                return [
+                                    4,
+                                    fs.stat(envPath)
+                                ];
+                            case 3:
+                                _tmp = !_state.sent().isDirectory();
+                                _state.label = 4;
+                            case 4:
+                                if (_tmp) {
+                                    envConfig = dotenv.config({
+                                        path: envPath
+                                    });
+                                    dotenvExpand(envConfig);
+                                }
+                                _state.label = 5;
+                            case 5:
+                                _i++;
+                                return [
+                                    3,
+                                    1
+                                ];
+                            case 6:
+                                return [
+                                    2
+                                ];
+                        }
                     });
-                    dotenvExpand(envConfig);
-                }
+                })();
             }
         }
     ]);

package/dist/esm-node/server/index.js

@@ -1,6 +1,6 @@
 import path from "path";
-import fs from "fs";
 import {
+  fs,
   Logger,
   SHARED_DIR,
   OUTPUT_CONFIG_FILE,
@@ -48,7 +48,7 @@ class Server {
    */
   async init() {
     const { options } = this;
-    this.loadServerEnv(options);
+    await this.loadServerEnv(options);
     this.initServerConfig(options);
     await this.injectContext(this.runner, options);
     this.runner = await this.createHookRunner();
@@ -169,13 +169,16 @@ class Server {
       plugins: serverPlugins
     };
   }
-  loadServerEnv(options) {
+  async loadServerEnv(options) {
     const { pwd: appDirectory } = options;
     const serverEnv = process.env.MODERN_ENV;
+    const defaultEnvPath = path.resolve(appDirectory, `.env`);
     const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
-    if (serverEnv && fs.existsSync(serverEnvPath) && !fs.statSync(serverEnvPath).isDirectory()) {
-      const envConfig = dotenv.config({ path: serverEnvPath });
-      dotenvExpand(envConfig);
+    for (const envPath of [defaultEnvPath, serverEnvPath]) {
+      if (await fs.pathExists(envPath) && !(await fs.stat(envPath)).isDirectory()) {
+        const envConfig = dotenv.config({ path: envPath });
+        dotenvExpand(envConfig);
+      }
     }
   }
 }

package/dist/js/modern/constants.js

@@ -0,0 +1,35 @@
+const AGGRED_DIR = {
+  mock: "config/mock",
+  server: "server",
+  api: "api",
+  shared: "shared",
+  lambda: "lambda"
+};
+var ApiServerMode = /* @__PURE__ */ ((ApiServerMode2) => {
+  ApiServerMode2["func"] = "function";
+  ApiServerMode2["frame"] = "framework";
+  return ApiServerMode2;
+})(ApiServerMode || {});
+const ERROR_DIGEST = {
+  INIT: "Server init error",
+  ENOTF: "Page could not be found",
+  WARMUP: "SSR warmup failed",
+  EINTER: "Internal server error",
+  ERENDER: "SSR render failed",
+  EMICROINJ: "Get micro-frontend info failed"
+};
+const ERROR_PAGE_TEXT = {
+  404: "This page could not be found.",
+  500: "Internal Server Error."
+};
+const RUN_MODE = {
+  FULL: "full",
+  TYPE: "type"
+};
+export {
+  AGGRED_DIR,
+  ApiServerMode,
+  ERROR_DIGEST,
+  ERROR_PAGE_TEXT,
+  RUN_MODE
+};

package/dist/js/modern/index.js

@@ -0,0 +1,18 @@
+import { Server } from "./server";
+import { ModernServer } from "./server/modern-server";
+import { createProxyHandler } from "./libs/proxy";
+export * from "./type";
+export * from "./constants";
+var src_default = (options) => {
+  if (options == null) {
+    throw new Error("can not start mserver without options");
+  }
+  const server = new Server(options);
+  return server.init();
+};
+export {
+  ModernServer,
+  Server,
+  createProxyHandler,
+  src_default as default
+};

package/dist/js/modern/libs/context/context.js

@@ -0,0 +1,160 @@
+import { URL } from "url";
+import qs from "querystring";
+import { Buffer } from "buffer";
+import createEtag from "etag";
+import fresh from "fresh";
+import { headersWithoutCookie } from "../../utils";
+class ModernServerContext {
+  constructor(req, res, options) {
+    this.params = {};
+    this.options = {};
+    this.req = req;
+    this.res = res;
+    this.options = options || {};
+    this.serverData = {};
+    this.bind();
+  }
+  get logger() {
+    return this.req.logger;
+  }
+  get metrics() {
+    return this.req.metrics;
+  }
+  bind() {
+    const { req, res } = this;
+    req.get = (key) => this.getReqHeader(key);
+    res.set = (key, value) => this.res.setHeader(key, value);
+    res.send = (body) => {
+      this.send(body);
+    };
+  }
+  send(body) {
+    try {
+      const generateETag = !this.res.getHeader("ETag") && this.options.etag;
+      if (body !== void 0 && generateETag) {
+        const encoding = typeof body === "string" ? "utf-8" : void 0;
+        const buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
+        const etag = createEtag(buf, { weak: true });
+        if (etag) {
+          this.res.setHeader("ETag", etag);
+        }
+      }
+      if (this.fresh) {
+        this.status = 304;
+      }
+    } catch (e) {
+      this.logger.error(e.message);
+    }
+    this.res.end(body);
+  }
+  setParams(params) {
+    this.params = params;
+  }
+  setServerData(key, value) {
+    this.serverData[key] = value;
+  }
+  getReqHeader(key) {
+    const { req } = this;
+    const field = key.toLowerCase();
+    switch (field) {
+      case "referer":
+      case "referrer":
+        return req.headers.referrer || req.headers.referer || "";
+      default:
+        return req.headers[field] || "";
+    }
+  }
+  get fresh() {
+    const { status, res, method } = this;
+    if ("GET" !== method && "HEAD" !== method) {
+      return false;
+    }
+    if (status >= 200 && status < 300 || 304 === status) {
+      return fresh(this.headers, {
+        etag: res.getHeader("ETag"),
+        "last-modified": res.getHeader("Last-Modified")
+      });
+    }
+    return false;
+  }
+  get headers() {
+    return this.req.headers;
+  }
+  get method() {
+    return this.req.method;
+  }
+  get url() {
+    return this.req.url || "";
+  }
+  set url(val) {
+    this.req.url = val;
+  }
+  get host() {
+    let host = this.getReqHeader("X-Forwarded-Host");
+    if (!host) {
+      host = this.getReqHeader("Host");
+    }
+    return host.split(/\s*,\s*/, 1)[0] || "";
+  }
+  get protocol() {
+    if (this.req.socket.encrypted) {
+      return "https";
+    }
+    const proto = this.getReqHeader("X-Forwarded-Proto");
+    return proto ? proto.split(/\s*,\s*/, 1)[0] : "http";
+  }
+  get origin() {
+    return `${this.protocol}://${this.host}`;
+  }
+  get href() {
+    return this.origin + this.url;
+  }
+  get parsedURL() {
+    const url = new URL(this.req.url, this.origin);
+    return url;
+  }
+  get path() {
+    return this.parsedURL.pathname;
+  }
+  set path(p) {
+    const url = new URL(this.req.url, this.origin);
+    if (!url || !p) {
+      return;
+    }
+    if (url.pathname === p) {
+      return;
+    }
+    url.pathname = p;
+    this.url = url.toString();
+  }
+  get querystring() {
+    if (!this.req) {
+      return "";
+    }
+    return this.parsedURL.search.replace(/^\?/, "") || "";
+  }
+  get query() {
+    const str = this.querystring;
+    return qs.parse(str);
+  }
+  get status() {
+    return this.res.statusCode;
+  }
+  set status(statusCode) {
+    this.res.statusCode = statusCode;
+  }
+  resHasHandled() {
+    return this.res.writableEnded;
+  }
+  error(dig, e = "") {
+    this.logger.error(
+      `Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`,
+      e instanceof Error ? e.stack || e.message : e,
+      this.path,
+      headersWithoutCookie(this.headers)
+    );
+  }
+}
+export {
+  ModernServerContext
+};

package/dist/js/modern/libs/context/index.js

@@ -0,0 +1,6 @@
+import { ModernServerContext } from "./context";
+const createContext = (req, res, options) => new ModernServerContext(req, res, options);
+export {
+  ModernServerContext,
+  createContext
+};

package/dist/js/modern/libs/hook-api/index.js

@@ -0,0 +1,134 @@
+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 cookie from "cookie";
+import { RouteAPI } from "./route";
+import { TemplateAPI } from "./template";
+class Response {
+  constructor(res) {
+    this.res = res;
+    this._cookie = cookie.parse(res.getHeader("set-cookie") || "");
+    this.cookies = {
+      get: this.getCookie.bind(this),
+      set: this.setCookie.bind(this),
+      delete: this.deleteCookie.bind(this),
+      clear: this.clearCookie.bind(this),
+      apply: this.applyCookie.bind(this)
+    };
+  }
+  get(key) {
+    return this.res.getHeader(key);
+  }
+  set(key, value) {
+    return this.res.setHeader(key, value);
+  }
+  status(code) {
+    this.res.statusCode = code;
+  }
+  getCookie(key) {
+    return this._cookie[key];
+  }
+  setCookie(key, value) {
+    this._cookie[key] = value;
+  }
+  deleteCookie(key) {
+    if (this._cookie[key]) {
+      delete this._cookie[key];
+    }
+  }
+  clearCookie() {
+    this._cookie = {};
+  }
+  applyCookie() {
+    const str = Object.entries(this._cookie).map(([key, value]) => {
+      return cookie.serialize(key, value);
+    }).join("; ");
+    if (str) {
+      this.res.setHeader("set-cookie", str);
+    } else {
+      this.res.removeHeader("set-cookie");
+    }
+  }
+  raw(body, options) {
+    const { status, headers = {} } = options || {};
+    Object.entries(headers).forEach(([key, value]) => {
+      this.res.setHeader(key, value);
+    });
+    if (status) {
+      this.res.statusCode = status;
+    }
+    this.res.end(body);
+  }
+}
+class Request {
+  constructor(ctx) {
+    this.url = ctx.url;
+    this.host = ctx.host;
+    this.pathname = ctx.path;
+    this.query = ctx.query;
+    this.headers = ctx.headers;
+    this.cookie = ctx.headers.cookie || "";
+    this._cookie = cookie.parse(this.cookie);
+    this.cookies = {
+      get: this.getCookie.bind(this)
+    };
+  }
+  getCookie(key) {
+    return this._cookie[key];
+  }
+}
+const base = (context) => {
+  const { res } = context;
+  return {
+    response: new Response(res),
+    request: new Request(context),
+    logger: context.logger,
+    metrics: context.metrics
+  };
+};
+const createAfterMatchContext = (context, entryName) => {
+  const baseContext = base(context);
+  return __spreadProps(__spreadValues({}, baseContext), {
+    router: new RouteAPI(entryName)
+  });
+};
+const createAfterRenderContext = (context, content) => {
+  const baseContext = base(context);
+  return __spreadProps(__spreadValues({}, baseContext), {
+    template: new TemplateAPI(content)
+  });
+};
+const createMiddlewareContext = (context) => {
+  const baseContext = base(context);
+  return __spreadProps(__spreadValues({}, baseContext), {
+    response: __spreadProps(__spreadValues({}, baseContext.response), {
+      locals: context.res.locals || {}
+    }),
+    source: {
+      req: context.req,
+      res: context.res
+    }
+  });
+};
+export {
+  base,
+  createAfterMatchContext,
+  createAfterRenderContext,
+  createMiddlewareContext
+};

package/dist/js/modern/libs/hook-api/route.js

@@ -0,0 +1,20 @@
+class RouteAPI {
+  constructor(entryName) {
+    this.current = entryName;
+    this.status = 200;
+    this.url = "";
+  }
+  redirect(url, status = 302) {
+    this.url = url;
+    this.status = status;
+  }
+  rewrite(entryName) {
+    this.current = entryName;
+  }
+  use(entryName) {
+    this.rewrite(entryName);
+  }
+}
+export {
+  RouteAPI
+};

package/dist/js/modern/libs/hook-api/template.js

@@ -0,0 +1,73 @@
+import { Transform } from "stream";
+const RegList = {
+  before: {
+    head: "<head>",
+    body: "<body>"
+  },
+  after: {
+    head: "</head>",
+    body: "</body>"
+  }
+};
+class TemplateAPI {
+  constructor(content) {
+    this.content = content;
+  }
+  get() {
+    return this.content;
+  }
+  set(content) {
+    this.content = content;
+  }
+  prependHead(fragment) {
+    const { head } = RegList.before;
+    return this.replace(head, `${head}${fragment}`);
+  }
+  appendHead(fragment) {
+    const { head } = RegList.after;
+    return this.replace(head, `${fragment}${head}`);
+  }
+  prependBody(fragment) {
+    const { body } = RegList.before;
+    return this.replace(body, `${body}${fragment}`);
+  }
+  appendBody(fragment) {
+    const { body } = RegList.after;
+    return this.replace(body, `${fragment}${body}`);
+  }
+  replace(reg, text) {
+    this.content = this.content.replace(reg, text);
+  }
+}
+const templateInjectableStream = ({
+  prependHead,
+  appendHead,
+  prependBody,
+  appendBody
+}) => new Transform({
+  write(chunk, _, callback) {
+    let chunk_str = chunk.toString();
+    if (prependHead) {
+      const { head } = RegList.before;
+      chunk_str = chunk_str.replace(head, `${head}${prependHead}`);
+    }
+    if (appendHead) {
+      const { head } = RegList.after;
+      chunk_str = chunk_str.replace(head, `${appendHead}${head}`);
+    }
+    if (prependBody) {
+      const { body } = RegList.before;
+      chunk_str = chunk_str.replace(body, `${body}${prependBody}`);
+    }
+    if (appendBody) {
+      const { body } = RegList.after;
+      chunk_str = chunk_str.replace(body, `${appendBody}${body}`);
+    }
+    this.push(chunk_str);
+    callback();
+  }
+});
+export {
+  TemplateAPI,
+  templateInjectableStream
+};