@modern-js/plugin-data-loader 2.19.1 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @modern-js/plugin-data-loader
 
+## 2.21.0
+
+### Patch Changes
+
+- e81eeaf: refactor: guard react-router version consistency
+  refactor: 保证 react-router 相关包的版本一致性
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- ad78387: chore(deps): bump babel-related dependencies to latest version
+
+  chore(deps): 升级 babel 相关依赖到最新版本
+
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [056627f]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/utils@2.21.0
+
+## 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]
+  - @modern-js/utils@2.20.0
+
 ## 2.19.1
 
 ### Patch Changes

package/dist/cjs/cli/data.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "parseDeferredReadableStream", {
   enumerable: true,
   get: () => parseDeferredReadableStream
 });
-const _router = require("@modern-js/utils/runtime/router");
+const _remixrouter = require("@modern-js/utils/runtime/remix-router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {
@@ -65,7 +65,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(new _router.AbortedDeferredError(`Deferred ${key} will never resolved`));
+          resolver.reject(new _remixrouter.AbortedDeferredError(`Deferred ${key} will never resolved`));
         }
       } catch (error) {
         for (const resolver of Object.values(deferredResolvers)) {
@@ -73,7 +73,7 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new _router.UNSAFE_DeferredData({
+    return new _remixrouter.UNSAFE_DeferredData({
       ...criticalData,
       ...deferredData
     });

package/dist/cjs/cli/generateClient.js

@@ -6,12 +6,8 @@ Object.defineProperty(exports, "generateClient", {
   enumerable: true,
   get: () => generateClient
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);

package/dist/cjs/runtime/index.js

@@ -15,7 +15,8 @@ _export(exports, {
   handleRequest: () => handleRequest
 });
 const _node = require("@remix-run/node");
-const _router = require("@modern-js/utils/runtime/router");
+const _remixrouter = require("@modern-js/utils/runtime/remix-router");
+const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
 const _lodash = require("@modern-js/utils/lodash");
 const _constants = require("../common/constants");
 const _utils = require("../common/utils");
@@ -96,8 +97,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     throw new Error("CSR data loader request only support http GET method");
   }
   const basename = entry.urlPath;
-  const routes = (0, _router.transformNestedRoutes)(routesConfig);
-  const { queryRoute } = (0, _router.createStaticHandler)(routes, {
+  const routes = (0, _nestedroutes.transformNestedRoutes)(routesConfig);
+  const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
     basename
   });
   const { res, logger } = context;
@@ -109,8 +110,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);
-    } else if ((0, _lodash.isPlainObject)(response) && _router.UNSAFE_DEFERRED_SYMBOL in response) {
-      const deferredData = response[_router.UNSAFE_DEFERRED_SYMBOL];
+    } else if ((0, _lodash.isPlainObject)(response) && _remixrouter.UNSAFE_DEFERRED_SYMBOL in response) {
+      const deferredData = response[_remixrouter.UNSAFE_DEFERRED_SYMBOL];
       const body = (0, _response.createDeferredReadableStream)(deferredData, request.signal);
       const init = deferredData.init || {};
       if (init.status && isRedirectResponse(init.status)) {
@@ -132,7 +133,7 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
       });
     }
   } catch (error) {
-    const message = error instanceof _router.ErrorResponse ? error.data : String(error);
+    const message = error instanceof _remixrouter.ErrorResponse ? error.data : String(error);
     logger === null || logger === void 0 ? void 0 : logger.error(message);
     response = new _node.Response(message, {
       status: 500,

package/dist/cjs/server/index.js

@@ -6,55 +6,12 @@ Object.defineProperty(exports, "default", {
   enumerable: true,
   get: () => _default
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
-const _fs = /* @__PURE__ */ _interop_require_default(require("fs"));
+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 _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
 const _utils = require("@modern-js/utils");
 const _utils1 = require("../common/utils");
-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 _default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
@@ -68,7 +25,7 @@ const _default = () => ({
         if (!_fs.default.existsSync(routesPath)) {
           return;
         }
-        const { routes, handleRequest } = await Promise.resolve(routesPath).then((p) => /* @__PURE__ */ _interop_require_wildcard(require(p)));
+        const { routes, handleRequest } = await Promise.resolve(routesPath).then((p) => /* @__PURE__ */ _interop_require_wildcard._(require(p)));
         if (!routes) {
           return;
         }

package/dist/esm/cli/createRequest.js

@@ -1,134 +1,5 @@
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
-  try {
-    var info = gen[key](arg);
-    var value = info.value;
-  } catch (error) {
-    reject(error);
-    return;
-  }
-  if (info.done) {
-    resolve(value);
-  } else {
-    Promise.resolve(value).then(_next, _throw);
-  }
-}
-function _async_to_generator(fn) {
-  return function() {
-    var self = this, args = arguments;
-    return new Promise(function(resolve, reject) {
-      var gen = fn.apply(self, args);
-      function _next(value) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
-      }
-      function _throw(err) {
-        asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
-      }
-      _next(void 0);
-    });
-  };
-}
-var __generator = function(thisArg, body) {
-  var f, y, t, g, _ = {
-    label: 0,
-    sent: function() {
-      if (t[0] & 1)
-        throw t[1];
-      return t[1];
-    },
-    trys: [],
-    ops: []
-  };
-  return g = {
-    next: verb(0),
-    "throw": verb(1),
-    "return": verb(2)
-  }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-    return this;
-  }), g;
-  function verb(n) {
-    return function(v) {
-      return step([
-        n,
-        v
-      ]);
-    };
-  }
-  function step(op) {
-    if (f)
-      throw new TypeError("Generator is already executing.");
-    while (_)
-      try {
-        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
-          return t;
-        if (y = 0, t)
-          op = [
-            op[0] & 2,
-            t.value
-          ];
-        switch (op[0]) {
-          case 0:
-          case 1:
-            t = op;
-            break;
-          case 4:
-            _.label++;
-            return {
-              value: op[1],
-              done: false
-            };
-          case 5:
-            _.label++;
-            y = op[1];
-            op = [
-              0
-            ];
-            continue;
-          case 7:
-            op = _.ops.pop();
-            _.trys.pop();
-            continue;
-          default:
-            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-              _ = 0;
-              continue;
-            }
-            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-              _.label = op[1];
-              break;
-            }
-            if (op[0] === 6 && _.label < t[1]) {
-              _.label = t[1];
-              t = op;
-              break;
-            }
-            if (t && _.label < t[2]) {
-              _.label = t[2];
-              _.ops.push(op);
-              break;
-            }
-            if (t[2])
-              _.ops.pop();
-            _.trys.pop();
-            continue;
-        }
-        op = body.call(thisArg, _);
-      } catch (e) {
-        op = [
-          6,
-          e
-        ];
-        y = 0;
-      } finally {
-        f = t = 0;
-      }
-    if (op[0] & 5)
-      throw op[1];
-    return {
-      value: op[0] ? op[1] : void 0,
-      done: true
-    };
-  }
-};
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
 import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
@@ -156,7 +27,7 @@ var handleRedirectResponse = function(res) {
 var handleDeferredResponse = function() {
   var _ref = _async_to_generator(function(res) {
     var _res_headers_get;
-    return __generator(this, function(_state) {
+    return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           if (!(((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(CONTENT_TYPE_DEFERRED)) && res.body))
@@ -190,7 +61,7 @@ export var createRequest = function(routeId) {
   return function() {
     var _ref = _async_to_generator(function(param) {
       var params, request, url, res;
-      return __generator(this, function(_state) {
+      return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             params = param.params, request = param.request;