@umijs/server 3.5.38 → 3.5.39

package/lib/Server/Server.d.ts

@@ -12,6 +12,7 @@ interface IServerProxyConfigItem extends ProxyOptions {
 }
 declare type IServerProxyConfig = IServerProxyConfigItem | Record<string, IServerProxyConfigItem> | (IServerProxyConfigItem | (() => IServerProxyConfigItem))[] | null;
 export interface IHttps extends ServerOptions {
+    http2?: boolean;
 }
 export interface IServerOpts {
     afterMiddlewares?: RequestHandler<any>[];

package/lib/Server/Server.js

@@ -95,6 +95,16 @@ function http() {
   return data;
 }
 
+function https() {
+  const data = _interopRequireWildcard(require("https"));
+
+  https = function https() {
+    return data;
+  };
+
+  return data;
+}
+
 function url() {
   const data = _interopRequireWildcard(require("url"));
 
@@ -179,11 +189,30 @@ class Server {
         logger.warn('Providing custom spdy server options is deprecated and will be removed in the next major version.');
         return credential;
       } else {
-        return _objectSpread({
+        var _this$opts$https;
+
+        // If user config forces using http2, we should configure spdy
+        if (process.env.HTTP2) {
+          return _objectSpread(_objectSpread({}, credential), {}, {
+            spdy: {
+              protocols: ['h2', 'http/1.1']
+            }
+          });
+        } // If user config explicitly sets http2 to false, we should not configure spdy
+
+
+        if (typeof this.opts.https === 'object' && ((_this$opts$https = this.opts.https) === null || _this$opts$https === void 0 ? void 0 : _this$opts$https.http2) === false) {
+          return _objectSpread(_objectSpread({}, credential), {}, {
+            spdy: undefined
+          });
+        } // Default to use spdy(google's http2 implementation) when https is enabled
+
+
+        return _objectSpread(_objectSpread({}, credential), {}, {
           spdy: {
             protocols: ['h2', 'http/1.1']
           }
-        }, credential);
+        });
       }
     }
 
@@ -426,8 +455,12 @@ class Server {
     const httpsOpts = this.getHttpsOptions();
 
     if (httpsOpts) {
-      // http2 using spdy, HTTP/2 by default when using https
-      this.listeningApp = _spdy().default.createServer(httpsOpts, this.app);
+      // If spdy is configured, use spdy server
+      if (httpsOpts.spdy) {
+        this.listeningApp = _spdy().default.createServer(httpsOpts, this.app); // Otherwise fallback to plain https server
+      } else {
+        this.listeningApp = https().createServer(httpsOpts, this.app);
+      }
     } else {
       this.listeningApp = http().createServer(this.app);
     }

package/lib/Server/utils.js

@@ -69,14 +69,26 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const logger = new (_core().Logger)('@umijs/server:utils');
 
-const getCredentials = opts => {
-  const https = opts.https;
-  const defautlServerOptions = {
+function useDefaultKeyCertOptions(httpsOptions) {
+  const defaultKeyCertOptions = {
     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 (httpsOptions === true) {
+    return defaultKeyCertOptions;
+  }
+
+  if (typeof httpsOptions === 'object') {
+    return _objectSpread(_objectSpread({}, defaultKeyCertOptions), httpsOptions);
+  }
+
+  return {};
+}
+
+const getCredentials = opts => {
+  const https = opts.https;
+  const serverOptions = useDefaultKeyCertOptions(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.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "3.5.38",
+  "version": "3.5.39",
   "description": "@umijs/server",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,8 +24,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@umijs/core": "3.5.38",
-    "@umijs/deps": "3.5.38",
-    "@umijs/utils": "3.5.38"
+    "@umijs/core": "3.5.39",
+    "@umijs/deps": "3.5.39",
+    "@umijs/utils": "3.5.39"
   }
 }