@modern-js/prod-server 1.15.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @modern-js/prod-server
 
+## 1.18.0
+
+### Patch Changes
+
+- 3d5e3a5: chore: get api mode from bff core
+  chore: 从 bff core 中获取 api mode
+- Updated dependencies [8280920]
+- Updated dependencies [3d5e3a5]
+- Updated dependencies [5227370]
+- Updated dependencies [7928bae]
+  - @modern-js/utils@1.18.0
+  - @modern-js/server-core@1.18.0
+
+## 1.17.0
+
+### Patch Changes
+
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/server-core@1.17.0
+
+## 1.16.0
+
+### Patch Changes
+
+- 81c66e4a4: fix: compatibility issues of dev server in iOS 10
+
+  fix: 修复 dev server 代码在 iOS 10 下的兼容性问题
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/server-core@1.16.0
+
 ## 1.15.0
 
 ### Patch Changes

package/dist/js/modern/libs/proxy.js

@@ -1,6 +1,36 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { formatProxyOptions } from '@modern-js/utils';
 import { debug } from "../utils";
+export function formatProxyOptions(proxyOptions) {
+  const formattedProxy = [];
+
+  if (!Array.isArray(proxyOptions)) {
+    if ('target' in proxyOptions) {
+      formattedProxy.push(proxyOptions);
+    } else {
+      Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
+        const option = proxyOptions[source];
+        total.push(_objectSpread({
+          context: source,
+          changeOrigin: true,
+          logLevel: 'warn'
+        }, typeof option === 'string' ? {
+          target: option
+        } : option));
+        return total;
+      }, []));
+    }
+  } else {
+    formattedProxy.push(...proxyOptions);
+  }
+
+  return formattedProxy;
+}
 export const createProxyHandler = proxyOptions => {
   debug('createProxyHandler', proxyOptions);
 

package/dist/js/modern/server/modern-server-split.js

@@ -2,7 +2,7 @@ import { RUN_MODE } from "../constants";
 import { ModernServer } from "./modern-server";
 
 class ModernSSRServer extends ModernServer {
-  prepareAPIHandler(_m, _) {
+  prepareAPIHandler(_) {
     return null;
   }
 

package/dist/js/modern/server/modern-server.js

@@ -24,7 +24,7 @@ import { createErrorDocument, createMiddlewareCollecter, getStaticReg, mergeExte
 import * as reader from "../libs/render/reader";
 import { createProxyHandler } from "../libs/proxy";
 import { createContext } from "../libs/context";
-import { AGGRED_DIR, ApiServerMode, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE } from "../constants";
+import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE } from "../constants";
 import { createTemplateAPI } from "../libs/hook-api/template";
 import { createRouteAPI } from "../libs/hook-api/route";
 const API_DIR = './api';
@@ -257,11 +257,8 @@ export class ModernServer {
     }
 
     if (fs.existsSync(apiDir) && !onlyWeb) {
-      const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func;
-      debug('exists api dir', mode); // if use lambda/, mean framework style of writing, then discard user extension
-
       const apiExtension = mergeExtension(pluginAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
+      this.frameAPIHandler = await this.prepareAPIHandler(apiExtension);
     }
   }
 
@@ -278,7 +275,7 @@ export class ModernServer {
     });
   }
 
-  async prepareAPIHandler(mode, extension) {
+  async prepareAPIHandler(extension) {
     const {
       workDir,
       runner,
@@ -290,7 +287,6 @@ export class ModernServer {
     const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
     return runner.prepareApiServer({
       pwd: workDir,
-      mode,
       config: extension,
       prefix: Array.isArray(prefix) ? prefix[0] : prefix
     }, {

package/dist/js/node/libs/proxy.js

@@ -4,15 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createProxyHandler = void 0;
+exports.formatProxyOptions = formatProxyOptions;
 
 var _httpProxyMiddleware = require("http-proxy-middleware");
 
-var _utils = require("@modern-js/utils");
+var _utils = require("../utils");
 
-var _utils2 = require("../utils");
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
+function formatProxyOptions(proxyOptions) {
+  const formattedProxy = [];
+
+  if (!Array.isArray(proxyOptions)) {
+    if ('target' in proxyOptions) {
+      formattedProxy.push(proxyOptions);
+    } else {
+      Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
+        const option = proxyOptions[source];
+        total.push(_objectSpread({
+          context: source,
+          changeOrigin: true,
+          logLevel: 'warn'
+        }, typeof option === 'string' ? {
+          target: option
+        } : option));
+        return total;
+      }, []));
+    }
+  } else {
+    formattedProxy.push(...proxyOptions);
+  }
+
+  return formattedProxy;
+}
 
 const createProxyHandler = proxyOptions => {
-  (0, _utils2.debug)('createProxyHandler', proxyOptions);
+  (0, _utils.debug)('createProxyHandler', proxyOptions);
 
   if (!proxyOptions) {
     return null;
@@ -20,7 +51,7 @@ const createProxyHandler = proxyOptions => {
   // or an object in the form of { source: ProxyDetail }
 
 
-  const formattedProxy = (0, _utils.formatProxyOptions)(proxyOptions);
+  const formattedProxy = formatProxyOptions(proxyOptions);
   const middlewares = formattedProxy.map(option => {
     const middleware = (0, _httpProxyMiddleware.createProxyMiddleware)(option.context, option); // eslint-disable-next-line consistent-return
 

package/dist/js/node/server/modern-server-split.js

@@ -10,7 +10,7 @@ var _constants = require("../constants");
 var _modernServer = require("./modern-server");
 
 class ModernSSRServer extends _modernServer.ModernServer {
-  prepareAPIHandler(_m, _) {
+  prepareAPIHandler(_) {
     return null;
   }
 

package/dist/js/node/server/modern-server.js

@@ -293,11 +293,8 @@ class ModernServer {
     }
 
     if (_utils.fs.existsSync(apiDir) && !onlyWeb) {
-      const mode = _utils.fs.existsSync(_path.default.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func;
-      (0, _utils2.debug)('exists api dir', mode); // if use lambda/, mean framework style of writing, then discard user extension
-
       const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
+      this.frameAPIHandler = await this.prepareAPIHandler(apiExtension);
     }
   }
 
@@ -314,7 +311,7 @@ class ModernServer {
     });
   }
 
-  async prepareAPIHandler(mode, extension) {
+  async prepareAPIHandler(extension) {
     const {
       workDir,
       runner,
@@ -326,7 +323,6 @@ class ModernServer {
     const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || '/api';
     return runner.prepareApiServer({
       pwd: workDir,
-      mode,
       config: extension,
       prefix: Array.isArray(prefix) ? prefix[0] : prefix
     }, {

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

@@ -1,4 +1,5 @@
-import { NextFunction, BffProxyOptions } from '@modern-js/types';
+import { ProxyDetail, NextFunction, BffProxyOptions } from '@modern-js/types';
 import { ModernServerContext } from './context';
 export type { BffProxyOptions };
+export declare function formatProxyOptions(proxyOptions: BffProxyOptions): ProxyDetail[];
 export declare const createProxyHandler: (proxyOptions?: BffProxyOptions) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;

package/dist/types/libs/render/type.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { BaseSSRServerContext } from '@modern-js/types/server';
 declare type MetaKeyMap = {
   header?: string[];

package/dist/types/server/modern-server.d.ts

@@ -7,7 +7,6 @@ import { RouteMatchManager, ModernRouteInterface, ModernRoute } from '../libs/ro
 import { mergeExtension } from '../utils';
 import * as reader from '../libs/render/reader';
 import { ModernServerContext } from '../libs/context';
-import { ApiServerMode } from '../constants';
 declare type ModernServerHandler = (context: ModernServerContext, next: NextFunction) => Promise<void> | void;
 declare type ModernServerAsyncHandler = (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export declare class ModernServer implements ModernServerInterface {
@@ -60,7 +59,7 @@ export declare class ModernServer implements ModernServerInterface {
     onlyWeb: boolean;
   }): Promise<void>;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<Adapter>;
+  protected prepareAPIHandler(extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected emitRouteHook(eventName: HookNames, input: {
     context: ModernServerContext;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.0",
+  "version": "1.18.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "1.15.0",
+    "@modern-js/utils": "1.18.0",
     "@babel/compat-data": "^7.17.10",
-    "@modern-js/server-core": "1.15.0",
+    "@modern-js/server-core": "1.18.0",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -43,10 +43,10 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.15.0",
-    "@modern-js/core": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
-    "@scripts/build": "1.15.0",
+    "@modern-js/types": "1.18.0",
+    "@modern-js/core": "1.18.0",
+    "@scripts/jest-config": "1.18.0",
+    "@scripts/build": "1.18.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",