@umijs/server 3.5.17 → 4.0.0-beta.1

package/README.md

@@ -1 +1,3 @@
 # @umijs/server
+
+See our website [umijs](https://umijs.org) for more information.

package/dist/index.d.ts

@@ -0,0 +1 @@
+export * from './server';

package/dist/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./server"), exports);

package/dist/routes.d.ts

@@ -0,0 +1,16 @@
+import { IRoute, IRoutesById } from './types';
+export declare function createServerRoutes(opts: {
+    routesById: IRoutesById;
+    parentId?: string;
+}): {
+    id: string;
+    path: string | undefined;
+    index: boolean | undefined;
+}[];
+export declare function createServerRoute(opts: {
+    route: IRoute;
+}): {
+    id: string;
+    path: string | undefined;
+    index: boolean | undefined;
+};

package/dist/routes.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServerRoute = exports.createServerRoutes = void 0;
+function createServerRoutes(opts) {
+    const { routesById, parentId } = opts;
+    return Object.keys(routesById)
+        .filter((id) => routesById[id].parentId === parentId)
+        .map((id) => {
+        const route = createServerRoute({
+            route: routesById[id],
+        });
+        const children = createServerRoutes({
+            routesById,
+            parentId: route.id,
+        });
+        if (children.length > 0) {
+            // @ts-ignore
+            route.children = children;
+        }
+        return route;
+    });
+}
+exports.createServerRoutes = createServerRoutes;
+function createServerRoute(opts) {
+    const { route } = opts;
+    return {
+        id: route.id,
+        path: route.path,
+        index: route.index,
+    };
+}
+exports.createServerRoute = createServerRoute;

package/dist/scripts.d.ts

@@ -0,0 +1,12 @@
+export declare type IScript = string | {
+    src?: string;
+    content?: string;
+};
+export declare function normalizeScripts(scripts: IScript[]): {
+    src?: string | undefined;
+    content?: string | undefined;
+}[];
+export declare function normalizeScript(script: IScript): {
+    src?: string | undefined;
+    content?: string | undefined;
+};

package/dist/scripts.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeScript = exports.normalizeScripts = void 0;
+const assert_1 = __importDefault(require("assert"));
+function normalizeScripts(scripts) {
+    return scripts.map(normalizeScript);
+}
+exports.normalizeScripts = normalizeScripts;
+const RE_URL = /^(http:|https:)?\/\//;
+function normalizeScript(script) {
+    if (typeof script === 'string') {
+        const isUrl = RE_URL.test(script) ||
+            script.startsWith('/') ||
+            script.startsWith('./') ||
+            script.startsWith('../');
+        return isUrl
+            ? {
+                src: script,
+            }
+            : { content: script };
+    }
+    else if (typeof script === 'object') {
+        (0, assert_1.default)(typeof script.src === 'string' || typeof script.content === 'string', `Script must have either a "src" or a "content" property.`);
+        return script;
+    }
+    else {
+        throw new Error(`Invalid script type: ${typeof script}`);
+    }
+}
+exports.normalizeScript = normalizeScript;

package/dist/server.d.ts

@@ -0,0 +1,21 @@
+import type { RequestHandler } from 'express';
+interface IOpts {
+    routes: Record<string, {
+        path: string;
+        file: string;
+        id: string;
+        parentId?: string;
+    }>;
+    config: Record<string, any>;
+    scripts: string[];
+    esmScript?: boolean;
+    modifyHTML?: (opts: {
+        html: string;
+        path?: string;
+    }) => Promise<string>;
+}
+export declare function getMarkup(opts: Pick<IOpts, 'scripts' | 'esmScript' | 'modifyHTML' | 'config'> & {
+    path?: string;
+}): Promise<string>;
+export declare function createRequestHandler(opts: IOpts): RequestHandler;
+export {};

package/dist/server.js

@@ -0,0 +1,81 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRequestHandler = exports.getMarkup = void 0;
+const react_1 = __importDefault(require("react"));
+const server_1 = __importDefault(require("react-dom/server"));
+const react_router_dom_1 = require("react-router-dom");
+const routes_1 = require("./routes");
+const scripts_1 = require("./scripts");
+function getMarkup(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // TODO: use real component
+        let markup = server_1.default.renderToString(react_1.default.createElement('div', { id: 'root' }));
+        function getScriptContent(script) {
+            return script.src
+                ? `<script${opts.esmScript ? ' type="module"' : ''} src='${script.src}'></script>`
+                : `<script${opts.esmScript ? ' type="module"' : ''}>${script.content}</script>`;
+        }
+        const favicon = opts.config.favicon
+            ? `<link rel="shortcut icon" href="${opts.config.favicon}">`
+            : '';
+        const headScripts = (0, scripts_1.normalizeScripts)(opts.config.headScripts || []).map(getScriptContent);
+        const scripts = (0, scripts_1.normalizeScripts)(opts.scripts.concat(opts.config.scripts || [])).map(getScriptContent);
+        markup = [
+            `<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8" />
+<meta
+  name="viewport"
+  content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+/>
+<meta http-equiv="X-UA-Compatible" content="ie=edge" />`,
+            favicon,
+            headScripts.join('\n'),
+            `</head>
+<body>`,
+            markup,
+            scripts.join('\n'),
+            `</body>
+</html>`,
+        ]
+            .filter(Boolean)
+            .join('\n');
+        if (opts.modifyHTML) {
+            markup = yield opts.modifyHTML({ html: markup, path: opts.path });
+        }
+        return markup;
+    });
+}
+exports.getMarkup = getMarkup;
+function createRequestHandler(opts) {
+    return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+        // 匹配路由，不匹配走 next()
+        // TODO: cache
+        const routes = (0, routes_1.createServerRoutes)({
+            routesById: opts.routes,
+        });
+        const matches = (0, react_router_dom_1.matchRoutes)(routes, req.path);
+        if (matches) {
+            res.set('Content-Type', 'text/html');
+            const markup = yield getMarkup(Object.assign(Object.assign({}, opts), { path: req.path }));
+            res.end(markup);
+        }
+        else {
+            next();
+        }
+    });
+}
+exports.createRequestHandler = createRequestHandler;

package/dist/types.d.ts

@@ -0,0 +1,9 @@
+export interface IRoute {
+    id: string;
+    path?: string;
+    index?: boolean;
+    parentId?: string;
+}
+export interface IRoutesById {
+    [id: string]: IRoute;
+}

package/dist/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,30 +1,36 @@
 {
   "name": "@umijs/server",
-  "version": "3.5.17",
+  "version": "4.0.0-beta.1",
   "description": "@umijs/server",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
-    "lib"
+    "dist"
   ],
+  "scripts": {
+    "build": "pnpm tsc",
+    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "dev": "pnpm build -- --watch"
+  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi"
+    "url": "https://github.com/umijs/umi-next"
   },
-  "keywords": [
-    "umi"
-  ],
   "authors": [
     "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
   ],
   "license": "MIT",
-  "bugs": "http://github.com/umijs/umi/issues",
-  "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/server#readme",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@umijs/deps": "3.5.17",
-    "@umijs/utils": "3.5.17"
+    "react": "18.0.0-alpha-4298ddbc5-20211023",
+    "react-dom": "18.0.0-alpha-4298ddbc5-20211023",
+    "react-router-dom": "6.0.0-beta.8"
+  },
+  "devDependencies": {
+    "@types/express": "4.17.13"
   }
 }

package/lib/Server/Server.d.ts

@@ -1,87 +0,0 @@
-/// <reference types="node" />
-import { CompressionOptions } from '@umijs/deps/compiled/compression';
-import { Express, RequestHandler } from '@umijs/deps/compiled/express';
-import { Filter as ProxyFilter, Options as ProxyOptions, RequestHandler as ProxyRequestHandler } from '@umijs/deps/compiled/http-proxy-middleware';
-import { Connection, Server as SocketServer } from '@umijs/deps/compiled/sockjs';
-import { ServerOptions } from '@umijs/deps/compiled/spdy';
-import * as http from 'http';
-interface IServerProxyConfigItem extends ProxyOptions {
-    path?: string | string[];
-    context?: string | string[] | ProxyFilter;
-    bypass?: (req: Express.Request, res: Express.Response, proxyConfig: IServerProxyConfigItem) => string | null;
-}
-declare type IServerProxyConfig = IServerProxyConfigItem | Record<string, IServerProxyConfigItem> | (IServerProxyConfigItem | (() => IServerProxyConfigItem))[] | null;
-export interface IHttps extends ServerOptions {
-}
-export interface IServerOpts {
-    afterMiddlewares?: RequestHandler<any>[];
-    beforeMiddlewares?: RequestHandler<any>[];
-    compilerMiddleware?: RequestHandler<any> | null;
-    https?: IHttps | boolean;
-    headers?: {
-        [key: string]: string;
-    };
-    host?: string;
-    port?: number;
-    compress?: CompressionOptions | boolean;
-    proxy?: IServerProxyConfig;
-    onListening?: {
-        ({ port, hostname, listeningApp, server, }: {
-            port: number;
-            hostname: string;
-            listeningApp: http.Server;
-            server: Server;
-        }): void;
-    };
-    onConnection?: (param: {
-        connection: Connection;
-        server: Server;
-    }) => void;
-    onConnectionClose?: (param: {
-        connection: Connection;
-    }) => void;
-    writeToDisk?: boolean | ((filePath: string) => boolean);
-}
-declare class Server {
-    app: Express;
-    opts: Required<IServerOpts>;
-    socketServer?: SocketServer;
-    listeningApp: http.Server;
-    listeninspdygApp: http.Server;
-    sockets: Connection[];
-    socketProxies: ProxyRequestHandler[];
-    constructor(opts: IServerOpts);
-    private getHttpsOptions;
-    setupFeatures(): void;
-    /**
-     * response headers
-     */
-    setupHeaders(): void;
-    /**
-     * dev server compress to gzip assets
-     */
-    setupCompress(): void;
-    deleteRoutes(): void;
-    /**
-     * proxy middleware for dev
-     * not coupled with build tools (like webpack, rollup, ...)
-     */
-    setupProxy(proxyOpts?: IServerProxyConfig, isWatch?: boolean): void;
-    sockWrite({ sockets, type, data, }: {
-        sockets?: Connection[];
-        type: string;
-        data?: string | object;
-    }): void;
-    createServer(): void;
-    listen({ port, hostname, }: {
-        port?: number;
-        hostname: string;
-    }): Promise<{
-        port: number;
-        hostname: string;
-        listeningApp: http.Server;
-        server: Server;
-    }>;
-    createSocketServer(): void;
-}
-export default Server;

package/lib/Server/Server.js

@@ -1,500 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _core() {
-  const data = require("@umijs/core");
-
-  _core = function _core() {
-    return data;
-  };
-
-  return data;
-}
-
-function _compression() {
-  const data = _interopRequireDefault(require("@umijs/deps/compiled/compression"));
-
-  _compression = function _compression() {
-    return data;
-  };
-
-  return data;
-}
-
-function _express() {
-  const data = _interopRequireDefault(require("@umijs/deps/compiled/express"));
-
-  _express = function _express() {
-    return data;
-  };
-
-  return data;
-}
-
-function _httpProxyMiddleware() {
-  const data = require("@umijs/deps/compiled/http-proxy-middleware");
-
-  _httpProxyMiddleware = function _httpProxyMiddleware() {
-    return data;
-  };
-
-  return data;
-}
-
-function _sockjs() {
-  const data = _interopRequireDefault(require("@umijs/deps/compiled/sockjs"));
-
-  _sockjs = function _sockjs() {
-    return data;
-  };
-
-  return data;
-}
-
-function _spdy() {
-  const data = _interopRequireDefault(require("@umijs/deps/compiled/spdy"));
-
-  _spdy = function _spdy() {
-    return data;
-  };
-
-  return data;
-}
-
-function _utils() {
-  const data = require("@umijs/utils");
-
-  _utils = function _utils() {
-    return data;
-  };
-
-  return data;
-}
-
-function http() {
-  const data = _interopRequireWildcard(require("http"));
-
-  http = function http() {
-    return data;
-  };
-
-  return data;
-}
-
-function url() {
-  const data = _interopRequireWildcard(require("url"));
-
-  url = function url() {
-    return data;
-  };
-
-  return data;
-}
-
-var _utils2 = require("./utils");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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 }; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
-
-const logger = new (_core().Logger)('@umijs/server');
-const debug = (0, _utils().createDebug)('umi:server:Server');
-const defaultOpts = {
-  afterMiddlewares: [],
-  beforeMiddlewares: [],
-  compilerMiddleware: null,
-  compress: true,
-  // enable by default if add HTTP2
-  https: !!process.env.HTTP2 ? true : !!process.env.HTTPS,
-  onListening: argv => argv,
-  onConnection: () => {},
-  onConnectionClose: () => {},
-  proxy: null,
-  headers: {},
-  // not use
-  host: 'localhost',
-  port: 8000,
-  writeToDisk: false
-};
-
-class Server {
-  // @ts-ignore
-  // @ts-ignore
-  // Proxy sockets
-  constructor(opts) {
-    this.app = void 0;
-    this.opts = void 0;
-    this.socketServer = void 0;
-    this.listeningApp = void 0;
-    this.listeninspdygApp = void 0;
-    this.sockets = [];
-    this.socketProxies = [];
-    this.opts = _objectSpread(_objectSpread({}, defaultOpts), _utils().lodash.omitBy(opts, _utils().lodash.isUndefined));
-    this.app = (0, _express().default)();
-    this.setupFeatures();
-    this.createServer();
-    this.socketProxies.forEach(wsProxy => {
-      // subscribe to http 'upgrade'
-      // @ts-ignore
-      this.listeningApp.on('upgrade', wsProxy.upgrade);
-    }, this);
-  }
-
-  getHttpsOptions() {
-    if (this.opts.https) {
-      const credential = (0, _utils2.getCredentials)(this.opts); // note that options.spdy never existed. The user was able
-      // to set options.https.spdy before, though it was not in the
-      // docs. Keep options.https.spdy if the user sets it for
-      // backwards compatibility, but log a deprecation warning.
-
-      if (typeof this.opts.https === 'object' && this.opts.https.spdy) {
-        // for backwards compatibility: if options.https.spdy was passed in before,
-        // it was not altered in any way
-        logger.warn('Providing custom spdy server options is deprecated and will be removed in the next major version.');
-        return credential;
-      } else {
-        return _objectSpread({
-          spdy: {
-            protocols: ['h2', 'http/1.1']
-          }
-        }, credential);
-      }
-    }
-
-    return;
-  }
-
-  setupFeatures() {
-    const features = {
-      compress: () => {
-        if (this.opts.compress) {
-          this.setupCompress();
-        }
-      },
-      headers: () => {
-        if (_utils().lodash.isPlainObject(this.opts.headers)) {
-          this.setupHeaders();
-        }
-      },
-      beforeMiddlewares: () => {
-        this.opts.beforeMiddlewares.forEach(middleware => {
-          // @ts-ignore
-          this.app.use(middleware);
-        });
-      },
-      proxy: () => {
-        if (this.opts.proxy) {
-          this.setupProxy();
-        }
-      },
-      compilerMiddleware: () => {
-        if (this.opts.compilerMiddleware) {
-          // @ts-ignore
-          this.app.use(this.opts.compilerMiddleware);
-        }
-      },
-      afterMiddlewares: () => {
-        this.opts.afterMiddlewares.forEach(middleware => {
-          // @ts-ignore
-          this.app.use(middleware);
-        });
-      }
-    };
-    Object.keys(features).forEach(stage => {
-      features[stage]();
-    });
-  }
-  /**
-   * response headers
-   */
-
-
-  setupHeaders() {
-    this.app.all('*', (req, res, next) => {
-      // eslint-disable-next-line
-      res.set(this.opts.headers);
-      next();
-    });
-  }
-  /**
-   * dev server compress to gzip assets
-   */
-
-
-  setupCompress() {
-    const compressOpts = _utils().lodash.isBoolean(this.opts.compress) ? {} : this.opts.compress;
-    this.app.use((0, _compression().default)(compressOpts));
-  }
-
-  deleteRoutes() {
-    let startIndex = null;
-    let endIndex = null;
-
-    this.app._router.stack.forEach((item, index) => {
-      if (item.name === 'PROXY_START') startIndex = index;
-      if (item.name === 'PROXY_END') endIndex = index;
-    });
-
-    debug(`routes before changed: ${this.app._router.stack.map(item => item.name || 'undefined name').join(', ')}`);
-
-    if (startIndex !== null && endIndex !== null) {
-      this.app._router.stack.splice(startIndex, endIndex - startIndex + 1);
-    }
-
-    debug(`routes after changed: ${this.app._router.stack.map(item => item.name || 'undefined name').join(', ')}`);
-  }
-  /**
-   * proxy middleware for dev
-   * not coupled with build tools (like webpack, rollup, ...)
-   */
-
-
-  setupProxy(proxyOpts, isWatch = false) {
-    let proxy = proxyOpts || this.opts.proxy;
-
-    if (!Array.isArray(proxy)) {
-      if (proxy && 'target' in proxy) {
-        proxy = [proxy];
-      } else {
-        proxy = Object.keys(proxy || {}).map(context => {
-          var _proxy;
-
-          let proxyOptions; // For backwards compatibility reasons.
-
-          const correctedContext = context.replace(/^\*$/, '**').replace(/\/\*$/, '');
-
-          if (typeof ((_proxy = proxy) === null || _proxy === void 0 ? void 0 : _proxy[context]) === 'string') {
-            proxyOptions = {
-              context: correctedContext,
-              target: proxy[context]
-            };
-          } else {
-            var _proxy2;
-
-            proxyOptions = _objectSpread(_objectSpread({}, ((_proxy2 = proxy) === null || _proxy2 === void 0 ? void 0 : _proxy2[context]) || {}), {}, {
-              context: correctedContext
-            });
-          }
-
-          proxyOptions.logLevel = proxyOptions.logLevel || 'warn';
-          return proxyOptions;
-        });
-      }
-    }
-
-    const getProxyMiddleware = proxyConfig => {
-      const context = proxyConfig.context || proxyConfig.path; // It is possible to use the `bypass` method without a `target`.
-      // However, the proxy middleware has no use in this case, and will fail to instantiate.
-
-      if (proxyConfig.target) {
-        return (0, _httpProxyMiddleware().createProxyMiddleware)(context, _objectSpread(_objectSpread({}, proxyConfig), {}, {
-          onProxyRes(proxyRes, req, res) {
-            var _URL, _proxyConfig$onProxyR;
-
-            const target = typeof proxyConfig.target === 'object' ? url().format(proxyConfig.target) : proxyConfig.target;
-            const realUrl = ((_URL = new URL(req.url || '', target)) === null || _URL === void 0 ? void 0 : _URL.href) || '';
-            proxyRes.headers['x-real-url'] = realUrl;
-            (_proxyConfig$onProxyR = proxyConfig.onProxyRes) === null || _proxyConfig$onProxyR === void 0 ? void 0 : _proxyConfig$onProxyR.call(proxyConfig, proxyRes, req, res);
-          }
-
-        }));
-      }
-
-      return;
-    }; // refresh proxy config
-
-
-    let startIndex = null;
-    let endIndex = null;
-    let routesLength = null; // when proxy opts change, delete before proxy middlwares
-
-    if (isWatch) {
-      this.app._router.stack.forEach((item, index) => {
-        if (item.name === 'PROXY_START') startIndex = index;
-        if (item.name === 'PROXY_END') endIndex = index;
-      });
-
-      if (startIndex !== null && endIndex !== null) {
-        this.app._router.stack.splice(startIndex, endIndex - startIndex + 1);
-      }
-
-      routesLength = this.app._router.stack.length;
-      this.deleteRoutes();
-    } // log proxy middleware before
-
-
-    this.app.use(function PROXY_START(req, res, next) {
-      next();
-    });
-    proxy.forEach(proxyConfigOrCallback => {
-      let proxyMiddleware;
-      let proxyConfig = typeof proxyConfigOrCallback === 'function' ? proxyConfigOrCallback() : proxyConfigOrCallback;
-      proxyMiddleware = getProxyMiddleware(proxyConfig);
-
-      if (proxyConfig.ws && proxyMiddleware) {
-        this.socketProxies.push(proxyMiddleware);
-      }
-
-      this.app.use((req, res, next) => {
-        if (typeof proxyConfigOrCallback === 'function') {
-          const newProxyConfig = proxyConfigOrCallback();
-
-          if (newProxyConfig !== proxyConfig) {
-            proxyConfig = newProxyConfig;
-            proxyMiddleware = getProxyMiddleware(proxyConfig);
-          }
-        } // - Check if we have a bypass function defined
-        // - In case the bypass function is defined we'll retrieve the
-        // bypassUrl from it otherwise bypassUrl would be null
-
-
-        const bypassUrl = _utils().lodash.isFunction(proxyConfig.bypass) ? proxyConfig.bypass(req, res, proxyConfig) : null;
-
-        if (typeof bypassUrl === 'boolean') {
-          // skip the proxy
-          // @ts-ignore
-          req.url = null;
-          next();
-        } else if (typeof bypassUrl === 'string') {
-          // byPass to that url
-          req.url = bypassUrl;
-          next();
-        } else if (proxyMiddleware) {
-          return proxyMiddleware(req, res, next);
-        } else {
-          next();
-        }
-      });
-    });
-    this.app.use(function PROXY_END(req, res, next) {
-      next();
-    }); // log proxy middleware after
-
-    if (isWatch) {
-      const newRoutes = this.app._router.stack.splice(routesLength, this.app._router.stack.length - routesLength);
-
-      this.app._router.stack.splice(startIndex, 0, ...newRoutes);
-    }
-  }
-
-  sockWrite({
-    sockets = this.sockets,
-    type,
-    data
-  }) {
-    sockets.forEach(socket => {
-      socket.write(JSON.stringify({
-        type,
-        data
-      }));
-    });
-  }
-
-  createServer() {
-    const httpsOpts = this.getHttpsOptions();
-
-    if (httpsOpts) {
-      // http2 using spdy, HTTP/2 by default when using https
-      this.listeningApp = _spdy().default.createServer(httpsOpts, this.app);
-    } else {
-      this.listeningApp = http().createServer(this.app);
-    }
-  }
-
-  listen({
-    port = 8000,
-    hostname
-  }) {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      const foundPort = yield _utils().portfinder.getPortPromise({
-        port
-      });
-      return new Promise(resolve => {
-        _this.listeningApp.listen(foundPort, hostname, 5, () => {
-          _this.createSocketServer();
-
-          const ret = {
-            port: foundPort,
-            hostname,
-            listeningApp: _this.listeningApp,
-            server: _this
-          };
-
-          _this.opts.onListening(ret);
-
-          resolve(ret);
-        });
-      });
-    })();
-  }
-
-  createSocketServer() {
-    const server = _sockjs().default.createServer({
-      log: (severity, line) => {
-        if (line.includes('bound to')) return; // console.log(`${chalk.gray('[sockjs]')} ${line}`);
-      }
-    });
-
-    server.installHandlers(this.listeningApp, {
-      prefix: '/dev-server'
-    });
-    server.on('connection', connection => {
-      // Windows connection might be undefined
-      // https://github.com/webpack/webpack-dev-server/issues/2199
-      // https://github.com/sockjs/sockjs-node/issues/121
-      // https://github.com/meteor/meteor/pull/10891/files
-      if (!connection) {
-        return;
-      }
-
-      this.opts.onConnection({
-        connection,
-        server: this
-      });
-      this.sockets.push(connection);
-      connection.on('close', () => {
-        this.opts.onConnectionClose({
-          connection
-        });
-        const index = this.sockets.indexOf(connection);
-
-        if (index >= 0) {
-          this.sockets.splice(index, 1);
-        }
-      });
-    });
-    this.socketServer = server;
-  }
-
-}
-
-var _default = Server;
-exports.default = _default;

package/lib/Server/cert/cert.pem

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIETDCCArSgAwIBAgIQKxt9OXlPUkkQASISMtxezDANBgkqhkiG9w0BAQsFADBh
-MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExGzAZBgNVBAsMEmpjbEB5
-Y2pjbDg2OC5sb2NhbDEiMCAGA1UEAwwZbWtjZXJ0IGpjbEB5Y2pjbDg2OC5sb2Nh
-bDAeFw0xOTA2MDEwMDAwMDBaFw0zMDA2MDEwOTMzNTdaMEkxJzAlBgNVBAoTHm1r
-Y2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTEeMBwGA1UECwwVamNsQHVtaWpz
-LmxvY2FsICh1bWkpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvKA/
-Oz9az6kEZ5zSZyufpYXt5gOAnE/f8VY2hP3g7JDRCMk6w0XgkmGDJ45nY9fVVhCy
-oqg8bIkLcLbvp69/I5O8ae0TbyS95mgBflhgsqjSkydhn7bZmAe5OdZv+JtGBjd2
-2YDpzseK0z1VkXxgEAKYOsxszaCj6aktAhTQvER2DYGo0XaM62SOQNL4qLn97Zrg
-+g8GSjS/Cg/vb+k42tCghOm0Ks26CDBl92Dwl5modEkfzewrjC2WNletiZupsX6p
-rnRDBcGYHl+S/+D/iHCSu83IkxoorsIigGlSah/nVfetsKHBTXFXnSxL86T9MA1R
-5ZcXoVv1cWZNiiMMawIDAQABo4GXMIGUMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUE
-DDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFFRTg3QdwqVq
-CLRjdLfglrJZqTrzMD4GA1UdEQQ3MDWCCWxvY2FsaG9zdIIQbG9jYWwuYWxpcGF5
-Lm5ldIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAYEA
-lFgca57CNAoaq8MC6bTZo10FC/LDTnUh/p20w5uCp8iSKGtVM+HvulrWXwUGRkUl
-jnukYeMwl4tONzwHeUV1oVT8DATFLAFIHE4ikGDM7V+Ximxv5yQQ9hD8fzeOWdYO
-SKA5eDjd+ut+HiSfItqgM+8t1RxPxsYlGeOMp65cKt1NaIdRxQHwESGba6H0sez7
-p5Eu95pXp/BUy7lnvqudXgfTAUpSzxpSG+49hzMKuN/CAZyFNp52qDDHpRtuxHns
-q0pjGHBOC2aYc1eXNgn2g0wMDp3+BYh9yjoWNkMKqY7hpcB9PY5zw0u8R0wG8z+n
-d915bZT3FKjx5sxmDmVaDNdARwi9ExqFvIs+hje1IUrszR7pnT7EUcUOhWNbKKkf
-jRH3sy+TyA+TsYm1AAcnnY/Ne/Ce4OcMGcYwjb1L/gu/PWoup4f/GIziEw8cbPti
-1+Exm+AOSjcSspPPfQmpHqupNaDJSjo6xYX3wn3oIb34WvH8INL3liiVedn+LTy4
------END CERTIFICATE-----

package/lib/Server/cert/key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8oD87P1rPqQRn
-nNJnK5+lhe3mA4CcT9/xVjaE/eDskNEIyTrDReCSYYMnjmdj19VWELKiqDxsiQtw
-tu+nr38jk7xp7RNvJL3maAF+WGCyqNKTJ2GfttmYB7k51m/4m0YGN3bZgOnOx4rT
-PVWRfGAQApg6zGzNoKPpqS0CFNC8RHYNgajRdozrZI5A0viouf3tmuD6DwZKNL8K
-D+9v6Tja0KCE6bQqzboIMGX3YPCXmah0SR/N7CuMLZY2V62Jm6mxfqmudEMFwZge
-X5L/4P+IcJK7zciTGiiuwiKAaVJqH+dV962wocFNcVedLEvzpP0wDVHllxehW/Vx
-Zk2KIwxrAgMBAAECggEAUdiitz2dVN/85kyYy2WVZ0g+2wCIDMtn25tSGtDiiSOp
-YEuYsOSgNkQTmdVjrWIY0rh6GrQvS9UHXsgyIyu2WiSfq8LQHPjvYYudokoM41j3
-zhxXcurvbdVkHOGcQl51uvrUGjqiuTPCXDiP6YnzUN8fWNwdFfhvR1M+EVog3J+F
-RpSavm+SCOkyqCBWgQDb/p59kvlISJuDXKr3tV5HaKVKYfDBQLvuiZBweDwXjxop
-z2Srs2GEmJPuKXU32deqNg7KgPvd6ADxb+GXhrGVBaj7dxi77E8nHL/aGutVE4ON
-VqMwdWoRPkEPU33rF+CCxHqHJFcNS+62ozzeUYGlaQKBgQDR2mPnjthIgMkX+cw5
-ROSadd5gZtQFXAzjAv685k+Xqm2IGk2Z2d5VydHO7cKwVLTB6cEJ+CbLZ1kIS6yV
-GxBHaZ+LQxGkt4QD9IBSnL9Cxe7uvo+bpvV3eXbANG0tNl482RctS/u+g+OGSu05
-6KIIlYag5hcMjr7ozuhv8LVytwKBgQDmGuIKFHXXqeRJNW+QvJfwQFKNQViqASlY
-W4Y5guS6s85inJ3bRKwYtZsczne2uwYqQHlPw8X4TQMXApM+04mJtqwrYDpcX6Ad
-VYPmo+J/k917QwlN8VP4AzlDdz8PU+zenmWgpKaG8GMtYia9qCIbWY/+hwwBk0sG
-FNpguWnv7QKBgFSGT2ksSwdhAB5tGgoTKrTgNvLDWDDUc8hYI3y4k2R2W+nPFmSa
-sYgCY0Si1aEqbSgR3BQE5LNW7DCAMoJYRUVOUNnJ6Ohclor1R15/DjZ5/RQioztB
-k2tM/DzMoRDt7iU6F7DCAyMoglNMCKMjhWhJudFC/BOtx02EUXENFjifAoGAD966
-yEcw+XbWL9Zno2vebsuA5g0juFXsLBPj5gOJEvdjvJlgqcbKt8mOsSXsS8YKXs+j
-jkTKWp21INkknqioS781kKhKXiSaPmuvdTDIZlQkamPtOFr0l55hTK3kw4HeTFxQ
-VgwFEDl0HaUvVtVJxOkgbUWTJmiqO/kkNpeTHuECgYEAtD4dRK3w65d9BWHqgeOV
-IVSDeYjA6gNuC3tuGzk9bA70U0X/T8+EQMuKNvRZC61/JzAlzEH1oGIw8md8Ki86
-aRT96Gce7Q0FA3SaQ+h+w+kgsJG/aly3IThaJh/mx6HN7Xry6BFO1vlYlgdlm/1G
-iKX/ppCt7bJYqfrptWs42u4=
------END PRIVATE KEY-----

package/lib/Server/utils.d.ts

@@ -1,2 +0,0 @@
-import { IHttps, IServerOpts } from './Server';
-export declare const getCredentials: (opts: IServerOpts) => IHttps;

package/lib/Server/utils.js

@@ -1,108 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getCredentials = void 0;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _core() {
-  const data = require("@umijs/core");
-
-  _core = function _core() {
-    return data;
-  };
-
-  return data;
-}
-
-function _immer() {
-  const data = _interopRequireDefault(require("@umijs/deps/compiled/immer"));
-
-  _immer = function _immer() {
-    return data;
-  };
-
-  return data;
-}
-
-function fs() {
-  const data = _interopRequireWildcard(require("fs"));
-
-  fs = function fs() {
-    return data;
-  };
-
-  return data;
-}
-
-function _path() {
-  const data = require("path");
-
-  _path = function _path() {
-    return data;
-  };
-
-  return data;
-}
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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 }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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; }
-
-const logger = new (_core().Logger)('@umijs/server:utils');
-
-const getCredentials = opts => {
-  const https = opts.https;
-  const defautlServerOptions = {
-    key: (0, _path().join)(__dirname, 'cert', 'key.pem'),
-    cert: (0, _path().join)(__dirname, 'cert', 'cert.pem')
-  }; // custom cert using https: { key: '', cert: '' }
-
-  const serverOptions = https === true ? defautlServerOptions : https;
-
-  if (!(serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.key) || !(serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.cert)) {
-    const err = new Error(`Both options.https.key and options.https.cert are required.`);
-    logger.error(err);
-    throw err;
-  }
-
-  const credentials = (0, _immer().default)(_objectSpread(_objectSpread({}, serverOptions), {}, {
-    key: fs().readFileSync(serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.key, 'utf-8'),
-    cert: fs().readFileSync(serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.cert, 'utf-8')
-  }), draft => {
-    if (typeof serverOptions === 'object' && serverOptions.ca) {
-      const newServerOptions = (0, _immer().default)(serverOptions, optDraft => {
-        // @ts-ignore
-        optDraft.ca = !Array.isArray(optDraft.ca) ? [optDraft.ca] : optDraft.ca;
-      });
-
-      if (Array.isArray(newServerOptions.ca)) {
-        // @ts-ignore
-        draft.ca = newServerOptions.ca.map(function (ca) {
-          return fs().readFileSync(ca, 'utf-8');
-        });
-      }
-    }
-  });
-  return credentials;
-};
-
-exports.getCredentials = getCredentials;

package/lib/index.d.ts

@@ -1,2 +0,0 @@
-export { createProxyMiddleware, Options, RequestHandler, } from '@umijs/deps/compiled/http-proxy-middleware';
-export { default as Server, IServerOpts } from './Server/Server';

package/lib/index.js

@@ -1,41 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createProxyMiddleware", {
-  enumerable: true,
-  get: function get() {
-    return _httpProxyMiddleware().createProxyMiddleware;
-  }
-});
-Object.defineProperty(exports, "Server", {
-  enumerable: true,
-  get: function get() {
-    return _Server.default;
-  }
-});
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _httpProxyMiddleware() {
-  const data = require("@umijs/deps/compiled/http-proxy-middleware");
-
-  _httpProxyMiddleware = function _httpProxyMiddleware() {
-    return data;
-  };
-
-  return data;
-}
-
-var _Server = _interopRequireDefault(require("./Server/Server"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }