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

package/dist/types/libs/context/context.d.ts

@@ -1,11 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/i8fchs4liml2xhpvizgjb/src/type" />
+/// <reference types=".dts-temp/NDUXdKuJhf-jlCWomBMz2/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
-import { URL } from 'url';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
 export type ContextOptions = {
@@ -32,6 +30,7 @@ export declare class ModernServerContext implements ModernServerContextInterface
   serverData: Record<string, any>;
   private options;
   constructor(req: IncomingMessage, res: ServerResponse, options?: ContextOptions);
+  private get parsedURL();
   private bind;
   send(body: ResponseBody): void;
   setParams(params: Record<string, string>): void;
@@ -46,7 +45,6 @@ export declare class ModernServerContext implements ModernServerContextInterface
   get protocol(): string;
   get origin(): string;
   get href(): string;
-  get parsedURL(): URL;
   get path(): string;
   set path(p: string);
   get querystring(): string;

package/dist/types/libs/serveFile.d.ts

@@ -1,4 +1,3 @@
-import { ServerOptions } from '@modern-js/server-core';
 import type { ModernServerContext } from '@modern-js/types';
 import { NextFunction, ModernServerHandler } from '../type';
 type Rule = {
@@ -6,5 +5,5 @@ type Rule = {
   target: string;
 };
 export declare const faviconFallbackHandler: ModernServerHandler;
-export declare const createStaticFileHandler: (rules: Rule[], output?: ServerOptions['output']) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
+export declare const createStaticFileHandler: (rules: Rule[], assetPrefix?: string) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export {};

package/dist/types/server/modernServer.d.ts

@@ -22,7 +22,6 @@ export declare class ModernServer implements ModernServerInterface {
   protected readonly runMode: string;
   protected reader: typeof reader;
   protected readonly proxyTarget: ModernServerOptions['proxyTarget'];
-  private staticFileHandler;
   private routeRenderHandler;
   private beforeRouteHandler;
   private frameWebHandler;
@@ -63,6 +62,7 @@ export declare class ModernServer implements ModernServerInterface {
   protected prepareAPIHandler(extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ServerRoute[];
   protected setupBeforeProdMiddleware(): Promise<void>;
+  protected setupStaticMiddleware(prefix?: string): (context: ModernServerContext, next: NextFunction) => Promise<void>;
   protected handleAPI(context: ModernServerContext): Promise<void>;
   protected handleWeb(context: ModernServerContext, route: ModernRoute): Promise<import("../type").RenderResult | null>;
   protected proxy(): Promise<any>;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/i8fchs4liml2xhpvizgjb/src/type" />
+/// <reference types=".dts-temp/NDUXdKuJhf-jlCWomBMz2/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;
@@ -18,8 +18,7 @@ export declare const createMiddlewareCollecter: () => {
   addWebMiddleware: (input: any) => void;
   addAPIMiddleware: (input: any) => void;
 };
-export declare const useLocalPrefix: (url: string) => boolean;
-export declare const getStaticReg: (output?: OutputNormalizedConfig, html?: HtmlNormalizedConfig) => RegExp;
+export declare const getStaticReg: (output?: OutputNormalizedConfig, html?: HtmlNormalizedConfig, prefix?: string) => RegExp;
 export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
 export declare const headersWithoutCookie: (headers: IncomingMessage['headers']) => import("http").IncomingHttpHeaders;
 export declare const isRedirect: (code: number) => boolean;

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/prod-server",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.6.1-alpha.0",
+  "version": "2.8.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -45,8 +45,6 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "2.6.0",
-    "@modern-js/server-core": "2.6.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
     "cookie": "^0.4.2",
@@ -55,13 +53,11 @@
     "lru-cache": "^6.0.0",
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
-    "serve-static": "^1.14.1"
+    "serve-static": "^1.14.1",
+    "@modern-js/utils": "2.8.0",
+    "@modern-js/server-core": "2.8.0"
   },
   "devDependencies": {
-    "@modern-js/types": "2.6.0",
-    "@modern-js/server-core": "2.6.0",
-    "@scripts/jest-config": "2.6.0",
-    "@scripts/build": "2.6.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",
@@ -74,7 +70,11 @@
     "jest": "^27",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@modern-js/types": "2.8.0",
+    "@modern-js/server-core": "2.8.0",
+    "@scripts/jest-config": "2.8.0",
+    "@scripts/build": "2.8.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/js/modern/constants.js

@@ -1,35 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,160 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,134 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,73 +0,0 @@
-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
-};

package/dist/js/modern/libs/loadConfig.js

@@ -1,62 +0,0 @@
-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 * as path from "path";
-import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
-import mergeDeep from "merge-deep";
-const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
-  const serverConfigPath = path.join(distDirectory, serverConfigFile);
-  return `${serverConfigPath}.js`;
-};
-const requireConfig = (serverConfigPath) => {
-  if (fs.pathExistsSync(serverConfigPath)) {
-    return compatRequire(serverConfigPath);
-  }
-  return {};
-};
-const loadConfig = ({
-  cliConfig,
-  serverConfig,
-  resolvedConfigPath
-}) => {
-  let config = null;
-  if (process.env.NODE_ENV === "production") {
-    const resolvedConfig = requireConfig(resolvedConfigPath);
-    config = mergeDeep(
-      __spreadProps(__spreadValues({}, resolvedConfig), {
-        plugins: []
-      }),
-      serverConfig,
-      cliConfig
-    );
-  } else {
-    config = mergeDeep(
-      __spreadProps(__spreadValues({}, cliConfig), {
-        plugins: []
-      }),
-      serverConfig
-    );
-  }
-  return config;
-};
-export {
-  getServerConfigPath,
-  loadConfig,
-  requireConfig
-};