@modern-js/server 2.19.1 → 2.20.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @modern-js/server
 
+## 2.20.0
+
+### Patch Changes
+
+- 6b9d90a: chore: remove @babel/runtime. add @swc/helper and enable `externalHelper` config.
+  chore: 移除 @babel/runtime 依赖. 增加 @swc/helpers 依赖并且开启 `externalHelpers` 配置
+- Updated dependencies [3c4e0a5]
+- Updated dependencies [6b9d90a]
+- Updated dependencies [5f055ab]
+- Updated dependencies [4425fd6]
+  - @modern-js/utils@2.20.0
+  - @modern-js/prod-server@2.20.0
+  - @modern-js/server-utils@2.20.0
+  - @modern-js/types@2.20.0
+
 ## 2.19.1
 
 ### Patch Changes

package/dist/cjs/dev-tools/dev-middleware/hmr-client/index.js

@@ -2,14 +2,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-const _stripansi = /* @__PURE__ */ _interop_require_default(require("@modern-js/utils/strip-ansi"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _stripansi = /* @__PURE__ */ _interop_require_default._(require("@modern-js/utils/strip-ansi"));
 const _formatwebpack = require("@modern-js/utils/universal/format-webpack");
 const _createSocketUrl = require("./createSocketUrl");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const hadRuntimeError = false;
 const socketUrl = (0, _createSocketUrl.createSocketUrl)(__resourceQuery);
 const connection = new WebSocket(socketUrl);

package/dist/cjs/dev-tools/dev-middleware/index.js

@@ -6,26 +6,10 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => DevMiddleware
 });
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _events = require("events");
-const _socketServer = /* @__PURE__ */ _interop_require_default(require("./socketServer"));
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _socketServer = /* @__PURE__ */ _interop_require_default._(require("./socketServer"));
 const noop = () => {
 };
 function getHMRClientPath(client) {
@@ -73,9 +57,9 @@ class DevMiddleware extends _events.EventEmitter {
   }
   constructor({ dev, devMiddleware }) {
     super();
-    _define_property(this, "middleware", void 0);
-    _define_property(this, "devOptions", void 0);
-    _define_property(this, "socketServer", void 0);
+    _define_property._(this, "middleware", void 0);
+    _define_property._(this, "devOptions", void 0);
+    _define_property._(this, "socketServer", void 0);
     this.devOptions = dev;
     this.socketServer = new _socketServer.default(dev);
     if (devMiddleware) {

package/dist/cjs/dev-tools/dev-middleware/socketServer.js

@@ -6,26 +6,10 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => SocketServer
 });
-const _ws = /* @__PURE__ */ _interop_require_default(require("ws"));
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _ws = /* @__PURE__ */ _interop_require_default._(require("ws"));
 const _utils = require("@modern-js/utils");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 class SocketServer {
   // create socket, install socket handler, bind socket event
   prepare(app) {
@@ -159,12 +143,12 @@ class SocketServer {
     connection.send(message);
   }
   constructor(options) {
-    _define_property(this, "wsServer", void 0);
-    _define_property(this, "sockets", []);
-    _define_property(this, "options", void 0);
-    _define_property(this, "app", void 0);
-    _define_property(this, "stats", void 0);
-    _define_property(this, "timer", null);
+    _define_property._(this, "wsServer", void 0);
+    _define_property._(this, "sockets", []);
+    _define_property._(this, "options", void 0);
+    _define_property._(this, "app", void 0);
+    _define_property._(this, "stats", void 0);
+    _define_property._(this, "timer", null);
     this.options = options;
   }
 }

package/dist/cjs/dev-tools/mock/index.js

@@ -6,55 +6,12 @@ Object.defineProperty(exports, "createMockHandler", {
   enumerable: true,
   get: () => createMockHandler
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _prodserver = require("@modern-js/prod-server");
-const _getMockData = /* @__PURE__ */ _interop_require_wildcard(require("./getMockData"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(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;
-}
+const _getMockData = /* @__PURE__ */ _interop_require_wildcard._(require("./getMockData"));
 const createMockHandler = ({ pwd }) => {
   const exts = [
     ".ts",

package/dist/cjs/dev-tools/register/index.js

@@ -6,14 +6,10 @@ Object.defineProperty(exports, "enableRegister", {
   enumerable: true,
   get: () => enableRegister
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _serverutils = require("@modern-js/server-utils");
 const _utils = require("@modern-js/utils");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const debug = (0, _utils.createDebugger)("server");
 const checkDep = (depName, paths) => {
   let packagePath = "";

package/dist/cjs/dev-tools/watcher/dependencyTree.js

@@ -13,25 +13,9 @@ _export(exports, {
   defaultIgnores: () => defaultIgnores,
   DependencyTree: () => DependencyTree
 });
-const _minimatch = /* @__PURE__ */ _interop_require_default(require("minimatch"));
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _minimatch = /* @__PURE__ */ _interop_require_default._(require("minimatch"));
 const defaultIgnores = [
   "**/bower_components/**",
   "**/coverage/**",
@@ -89,8 +73,8 @@ class DependencyTree {
     }).length > 0));
   }
   constructor() {
-    _define_property(this, "tree", void 0);
-    _define_property(this, "ignore", void 0);
+    _define_property._(this, "tree", void 0);
+    _define_property._(this, "ignore", void 0);
     this.tree = /* @__PURE__ */ new Map();
     this.ignore = [
       ...defaultIgnores

package/dist/cjs/dev-tools/watcher/index.js

@@ -15,28 +15,12 @@ _export(exports, {
   getWatchedFiles: () => getWatchedFiles,
   mergeWatchOptions: () => mergeWatchOptions
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _dependencyTree = require("./dependencyTree");
 const _statsCache = require("./statsCache");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const defaultWatchOptions = {
   // 初始化的时候不触发 add、addDir 事件
   ignoreInitial: true,
@@ -124,7 +108,7 @@ class Watcher {
     return this.watcher.close();
   }
   constructor() {
-    _define_property(this, "dependencyTree", null);
-    _define_property(this, "watcher", void 0);
+    _define_property._(this, "dependencyTree", null);
+    _define_property._(this, "watcher", void 0);
   }
 }

package/dist/cjs/dev-tools/watcher/statsCache.js

@@ -6,26 +6,10 @@ Object.defineProperty(exports, "StatsCache", {
   enumerable: true,
   get: () => StatsCache
 });
-const _fs = /* @__PURE__ */ _interop_require_default(require("fs"));
-const _crypto = /* @__PURE__ */ _interop_require_default(require("crypto"));
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
+const _crypto = /* @__PURE__ */ _interop_require_default._(require("crypto"));
 class StatsCache {
   add(files) {
     const { cachedHash, cachedSize } = this;
@@ -75,7 +59,7 @@ class StatsCache {
     return _crypto.default.createHash("md5").update(_fs.default.readFileSync(filename)).digest("hex");
   }
   constructor() {
-    _define_property(this, "cachedHash", {});
-    _define_property(this, "cachedSize", {});
+    _define_property._(this, "cachedHash", {});
+    _define_property._(this, "cachedSize", {});
   }
 }

package/dist/cjs/server/devServer.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "ModernDevServer", {
   enumerable: true,
   get: () => ModernDevServer
 });
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _http = require("http");
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _https = require("https");
 const _utils = require("@modern-js/utils");
 const _prodserver = require("@modern-js/prod-server");
@@ -15,66 +18,8 @@ const _lodash = require("@modern-js/utils/lodash");
 const _constants = require("../constants");
 const _mock = require("../dev-tools/mock");
 const _register = require("../dev-tools/register");
-const _watcher = /* @__PURE__ */ _interop_require_wildcard(require("../dev-tools/watcher"));
-const _devmiddleware = /* @__PURE__ */ _interop_require_default(require("../dev-tools/dev-middleware"));
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(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;
-}
+const _watcher = /* @__PURE__ */ _interop_require_wildcard._(require("../dev-tools/watcher"));
+const _devmiddleware = /* @__PURE__ */ _interop_require_default._(require("../dev-tools/dev-middleware"));
 class ModernDevServer extends _prodserver.ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
@@ -182,7 +127,7 @@ class ModernDevServer extends _prodserver.ModernServer {
       }
     });
     if (dev.historyApiFallback) {
-      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard(require("connect-history-api-fallback")));
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("connect-history-api-fallback")));
       const historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
       this.addHandler((ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next));
     }
@@ -314,11 +259,11 @@ class ModernDevServer extends _prodserver.ModernServer {
   }
   constructor(options) {
     super(options);
-    _define_property(this, "mockHandler", null);
-    _define_property(this, "dev", void 0);
-    _define_property(this, "appContext", void 0);
-    _define_property(this, "devMiddleware", void 0);
-    _define_property(this, "watcher", void 0);
+    _define_property._(this, "mockHandler", null);
+    _define_property._(this, "dev", void 0);
+    _define_property._(this, "appContext", void 0);
+    _define_property._(this, "devMiddleware", void 0);
+    _define_property._(this, "watcher", void 0);
     this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.dev = this.getDevOptions(options);