@modern-js/server 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/server
 
+## 1.4.3
+
+### Patch Changes
+
+- deeaa602: support svg/proxy/multi-version in unbundled
+- fab92861: fix: @modern-js/core phantom dep
+- Updated dependencies [deeaa602]
+- Updated dependencies [54786e58]
+  - @modern-js/hmr-client@1.2.2
+  - @modern-js/utils@1.3.2
+  - @modern-js/core@1.4.3
+
 ## 1.4.2
 
 ### Patch Changes

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

@@ -1,10 +1,5 @@
-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';
 export const createProxyHandler = proxyOptions => {
   if (!proxyOptions) {
     return null;
@@ -12,28 +7,7 @@ export const createProxyHandler = proxyOptions => {
   // or an object in the form of { source: ProxyDetail }
 
 
-  const formatedProxy = [];
-
-  if (!Array.isArray(proxyOptions)) {
-    if ('target' in proxyOptions) {
-      formatedProxy.push(proxyOptions);
-    } else {
-      Array.prototype.push.apply(formatedProxy, 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 {
-    formatedProxy.push(...proxyOptions);
-  }
-
+  const formatedProxy = formatProxyOptions(proxyOptions);
   const middlewares = formatedProxy.map(option => {
     const middleware = createProxyMiddleware(option.context, option); // eslint-disable-next-line consistent-return
 

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

@@ -7,11 +7,7 @@ exports.createProxyHandler = void 0;
 
 var _httpProxyMiddleware = require("http-proxy-middleware");
 
-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; }
+var _utils = require("@modern-js/utils");
 
 const createProxyHandler = proxyOptions => {
   if (!proxyOptions) {
@@ -20,28 +16,7 @@ const createProxyHandler = proxyOptions => {
   // or an object in the form of { source: ProxyDetail }
 
 
-  const formatedProxy = [];
-
-  if (!Array.isArray(proxyOptions)) {
-    if ('target' in proxyOptions) {
-      formatedProxy.push(proxyOptions);
-    } else {
-      Array.prototype.push.apply(formatedProxy, 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 {
-    formatedProxy.push(...proxyOptions);
-  }
-
+  const formatedProxy = (0, _utils.formatProxyOptions)(proxyOptions);
   const middlewares = formatedProxy.map(option => {
     const middleware = (0, _httpProxyMiddleware.createProxyMiddleware)(option.context, option); // eslint-disable-next-line consistent-return
 

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

@@ -1,16 +1,4 @@
-/// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'http';
-import { NextFunction } from '../type';
+import { NextFunction, ProxyOptions } from '@modern-js/types';
 import { ModernServerContext } from './context';
-declare type ProxyDetail = {
-  target: string;
-  pathRewrite?: Record<string, string>;
-  secure?: boolean;
-  logLevel?: 'debug' | 'info' | 'warn' | 'error' | 'silent';
-  bypass?: (req: IncomingMessage, res: ServerResponse, proxyOptions: ProxyOptions) => string | undefined | null | false;
-  context?: string | string[];
-  changeOrigin?: boolean;
-};
-export declare type ProxyOptions = Record<string, string> | Record<string, ProxyDetail> | ProxyDetail[] | ProxyDetail;
-export declare const createProxyHandler: (proxyOptions: ProxyOptions) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;
-export {};
+export type { ProxyOptions };
+export declare const createProxyHandler: (proxyOptions: ProxyOptions) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.2",
+  "version": "1.4.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -34,12 +34,11 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.4.2",
-    "@modern-js/hmr-client": "^1.2.1",
+    "@modern-js/hmr-client": "^1.2.2",
     "@modern-js/server-core": "^1.2.2",
     "@modern-js/server-utils": "^1.2.1",
     "@modern-js/bff-utils": "^1.2.2",
-    "@modern-js/utils": "^1.3.1",
+    "@modern-js/utils": "^1.3.2",
     "axios": "^0.24.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -64,8 +63,9 @@
     "cookie": "^0.4.2"
   },
   "devDependencies": {
+    "@modern-js/core": "^1.4.3",
     "@scripts/build": "0.0.0",
-    "@modern-js/types": "^1.3.2",
+    "@modern-js/types": "^1.3.3",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -90,7 +90,8 @@
     "websocket": "^1"
   },
   "peerDependencies": {
-    "webpack": "^5.54.0"
+    "webpack": "^5.54.0",
+    "@modern-js/core": "^1.4.3"
   },
   "sideEffects": false,
   "modernConfig": {