@modern-js/prod-server 1.2.2 → 1.17.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @modern-js/prod-server
 
+## 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
+
+- c087148: chore: remove cookie in error log
+  chore: 删除错误日志中的 cookie 信息
+- Updated dependencies [8658a78]
+- Updated dependencies [05d4a4f]
+- Updated dependencies [ad05af9]
+- Updated dependencies [5d53d1c]
+- Updated dependencies [37cd159]
+  - @modern-js/utils@1.15.0
+  - @modern-js/server-core@1.15.0
+
 ## 1.2.2
 
 ### Patch Changes

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

@@ -2,6 +2,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { URL } from 'url';
 import qs from 'querystring';
+import { headersWithoutCookie } from "../../utils";
 export class ModernServerContext {
   /**
    * http request
@@ -173,7 +174,7 @@ export class ModernServerContext {
   }
 
   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, this.headers);
+    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));
   }
 
 }

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/libs/render/measure.js

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { headersWithoutCookie } from "../../utils";
 export const createMetrics = (context, metrics) => {
   const {
     entryName: entry,
@@ -48,7 +49,7 @@ export const createLogger = (serverContext, logger) => {
   };
 
   const error = (message, e) => {
-    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headers);
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
   };
 
   return {

package/dist/js/modern/utils.js

@@ -1,3 +1,9 @@
+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 { compile } from 'path-to-regexp';
 import { createDebugger, isProd } from '@modern-js/utils';
 export const debug = createDebugger('prod-server');
@@ -110,4 +116,14 @@ export const prepareFavicons = (favicon, faviconByEntries) => {
   }
 
   return faviconNames;
+};
+export const headersWithoutCookie = headers => {
+  if (typeof headers.cookie !== 'undefined') {
+    const safeHeaders = _objectSpread({}, headers);
+
+    delete safeHeaders.cookie;
+    return safeHeaders;
+  }
+
+  return headers;
 };

package/dist/js/node/libs/context/context.js

@@ -9,6 +9,8 @@ var _url = require("url");
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
+var _utils = require("../../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -184,7 +186,7 @@ class ModernServerContext {
   }
 
   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, this.headers);
+    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, (0, _utils.headersWithoutCookie)(this.headers));
   }
 
 }

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/libs/render/measure.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createMetrics = exports.createLogger = void 0;
 
+var _utils = 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; }
@@ -58,7 +60,7 @@ const createLogger = (serverContext, logger) => {
   };
 
   const error = (message, e) => {
-    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headers);
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, (0, _utils.headersWithoutCookie)(headers));
   };
 
   return {

package/dist/js/node/utils.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useLocalPrefix = exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
+exports.useLocalPrefix = exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.headersWithoutCookie = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
 
 var _pathToRegexp = require("path-to-regexp");
 
 var _utils = require("@modern-js/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; }
+
 const debug = (0, _utils.createDebugger)('prod-server');
 exports.debug = debug;
 
@@ -144,4 +150,17 @@ const prepareFavicons = (favicon, faviconByEntries) => {
   return faviconNames;
 };
 
-exports.prepareFavicons = prepareFavicons;
+exports.prepareFavicons = prepareFavicons;
+
+const headersWithoutCookie = headers => {
+  if (typeof headers.cookie !== 'undefined') {
+    const safeHeaders = _objectSpread({}, headers);
+
+    delete safeHeaders.cookie;
+    return safeHeaders;
+  }
+
+  return headers;
+};
+
+exports.headersWithoutCookie = headersWithoutCookie;

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/utils.d.ts

@@ -1,3 +1,7 @@
+/// <reference path="type.d.ts" />
+/// <reference types="node" />
+/// <reference types="node/http" />
+import { IncomingMessage } from 'http';
 import type { NormalizedConfig } from '@modern-js/core';
 export declare const debug: any;
 export declare const mergeExtension: (users: any[]) => {
@@ -17,4 +21,5 @@ export declare const createMiddlewareCollecter: () => {
 export declare const toPath: (reg: string, params: Record<string, any>) => string;
 export declare const useLocalPrefix: (url: string) => boolean;
 export declare const getStaticReg: (output?: NormalizedConfig['output']) => RegExp;
-export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
+export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];
+export declare const headersWithoutCookie: (headers: IncomingMessage['headers']) => import("http").IncomingHttpHeaders;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.2",
+  "version": "1.17.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.8.0",
+    "@modern-js/utils": "1.17.0",
     "@babel/compat-data": "^7.17.10",
-    "@modern-js/server-core": "^1.4.1",
+    "@modern-js/server-core": "1.17.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.6.1",
-    "@modern-js/core": "1.13.2",
-    "@scripts/jest-config": "0.0.0",
-    "@scripts/build": "0.0.0",
+    "@modern-js/types": "1.17.0",
+    "@modern-js/core": "1.17.0",
+    "@scripts/jest-config": "1.17.0",
+    "@scripts/build": "1.17.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",