@modern-js/plugin-data-loader 2.15.0 → 2.17.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @modern-js/plugin-data-loader
 
+## 2.17.0
+
+### Patch Changes
+
+- @modern-js/utils@2.17.0
+
+## 2.16.0
+
+### Patch Changes
+
+- 4e876ab: chore: package.json include the monorepo-relative directory
+
+  chore: 在 package.json 中声明 monorepo 的子路径
+
+- Updated dependencies [5954330]
+- Updated dependencies [7596520]
+- Updated dependencies [4e876ab]
+  - @modern-js/utils@2.16.0
+
 ## 2.15.0
 
 ### Patch Changes

package/dist/cjs/cli/createRequest.js

@@ -1,66 +1,55 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var createRequest_exports = {};
-__export(createRequest_exports, {
-  createRequest: () => createRequest,
-  getRequestUrl: () => getRequestUrl
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  getRequestUrl: () => getRequestUrl,
+  createRequest: () => createRequest
 });
-module.exports = __toCommonJS(createRequest_exports);
-var import_path_to_regexp = require("path-to-regexp");
-var import_react_router_dom = require("react-router-dom");
-var import_constants = require("../common/constants");
-var import_data = require("./data");
-const getRequestUrl = ({
-  params,
-  request,
-  routeId
-}) => {
+const _pathtoregexp = require("path-to-regexp");
+const _reactrouterdom = require("react-router-dom");
+const _constants = require("../common/constants");
+const _data = require("./data");
+const getRequestUrl = ({ params, request, routeId }) => {
   const url = new URL(request.url);
-  const toPath = (0, import_path_to_regexp.compile)(url.pathname, {
+  const toPath = (0, _pathtoregexp.compile)(url.pathname, {
     encode: encodeURIComponent
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append(import_constants.LOADER_ID_PARAM, routeId);
-  url.searchParams.append(import_constants.DIRECT_PARAM, "true");
+  url.searchParams.append(_constants.LOADER_ID_PARAM, routeId);
+  url.searchParams.append(_constants.DIRECT_PARAM, "true");
   return url;
 };
 const handleRedirectResponse = (res) => {
   const { headers } = res;
   const location = headers.get("X-Modernjs-Redirect");
   if (location) {
-    throw (0, import_react_router_dom.redirect)(location);
+    throw (0, _reactrouterdom.redirect)(location);
   }
   return res;
 };
 const handleDeferredResponse = async (res) => {
-  var _a;
-  if (((_a = res.headers.get("Content-Type")) == null ? void 0 : _a.match(import_constants.CONTENT_TYPE_DEFERRED)) && res.body) {
-    return await (0, import_data.parseDeferredReadableStream)(res.body);
+  var _res_headers_get;
+  if (((_res_headers_get = res.headers.get("Content-Type")) === null || _res_headers_get === void 0 ? void 0 : _res_headers_get.match(_constants.CONTENT_TYPE_DEFERRED)) && res.body) {
+    return await (0, _data.parseDeferredReadableStream)(res.body);
   }
   return res;
 };
 const createRequest = (routeId, method = "get") => {
-  return async ({
-    params,
-    request
-  }) => {
-    const url = getRequestUrl({ params, request, routeId });
+  return async ({ params, request }) => {
+    const url = getRequestUrl({
+      params,
+      request,
+      routeId
+    });
     let res;
     res = await fetch(url, {
       method,
@@ -74,8 +63,3 @@ const createRequest = (routeId, method = "get") => {
     return res;
   };
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createRequest,
-  getRequestUrl
-});

package/dist/cjs/cli/data.js

@@ -1,26 +1,12 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var data_exports = {};
-__export(data_exports, {
-  parseDeferredReadableStream: () => parseDeferredReadableStream
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "parseDeferredReadableStream", {
+  enumerable: true,
+  get: () => parseDeferredReadableStream
 });
-module.exports = __toCommonJS(data_exports);
-var import_remix_router = require("@modern-js/utils/universal/remix-router");
+const _remixrouter = require("@modern-js/utils/universal/remix-router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {
@@ -79,9 +65,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(
-            new import_remix_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)) {
@@ -89,7 +73,10 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new import_remix_router.UNSAFE_DeferredData({ ...criticalData, ...deferredData });
+    return new _remixrouter.UNSAFE_DeferredData({
+      ...criticalData,
+      ...deferredData
+    });
   } catch (error) {
     for (const resolver of Object.values(deferredResolvers)) {
       resolver.reject(error);
@@ -120,7 +107,9 @@ async function* readStreamSections(stream) {
         const splitSections = bufferedString.split("\n\n");
         if (splitSections.length >= 2) {
           sections.push(...splitSections.slice(0, -1));
-          buffer = [encoder.encode(splitSections.slice(-1).join("\n\n"))];
+          buffer = [
+            encoder.encode(splitSections.slice(-1).join("\n\n"))
+          ];
         }
         if (sections.length > 0) {
           break;
@@ -146,9 +135,7 @@ async function* readStreamSections(stream) {
   }
 }
 function mergeArrays(...arrays) {
-  const out = new Uint8Array(
-    arrays.reduce((total, arr) => total + arr.length, 0)
-  );
+  const out = new Uint8Array(arrays.reduce((total, arr) => total + arr.length, 0));
   let offset = 0;
   for (const arr of arrays) {
     out.set(arr, offset);
@@ -156,7 +143,3 @@ function mergeArrays(...arrays) {
   }
   return out;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  parseDeferredReadableStream
-});

package/dist/cjs/cli/generateClient.js

@@ -1,45 +1,23 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var generateClient_exports = {};
-__export(generateClient_exports, {
-  generateClient: () => generateClient
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(generateClient_exports);
-var import_path = __toESM(require("path"));
-const generateClient = ({
-  mapFile,
-  loaderId
-}) => {
+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 generateClient = ({ mapFile, loaderId }) => {
   delete require.cache[mapFile];
   const loadersMap = require(mapFile);
   let requestCode = ``;
   let exportsCode = ``;
-  const requestCreatorPath = import_path.default.join(__dirname, "./createRequest").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
+  const requestCreatorPath = _path.default.join(__dirname, "./createRequest").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
@@ -69,7 +47,3 @@ const generateClient = ({
   `;
   return generatedCode;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateClient
-});

package/dist/cjs/cli/loader.js

@@ -1,30 +1,16 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var loader_exports = {};
-__export(loader_exports, {
-  default: () => loader
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: () => loader
 });
-module.exports = __toCommonJS(loader_exports);
-var import_generateClient = require("./generateClient");
+const _generateClient = require("./generateClient");
 async function loader(source) {
-  var _a;
+  var _this__compiler;
   this.cacheable();
-  const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
+  const target = (_this__compiler = this._compiler) === null || _this__compiler === void 0 ? void 0 : _this__compiler.options.target;
   if (target === "node") {
     return source;
   }
@@ -45,11 +31,9 @@ async function loader(source) {
   if (!options.mapFile) {
     return source;
   }
-  const code = (0, import_generateClient.generateClient)({
+  const code = (0, _generateClient.generateClient)({
     mapFile: options.mapFile,
     loaderId: options.loaderId
   });
   return code;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/dist/cjs/common/constants.js

@@ -1,33 +1,19 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var constants_exports = {};
-__export(constants_exports, {
-  CONTENT_TYPE_DEFERRED: () => CONTENT_TYPE_DEFERRED,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  LOADER_ID_PARAM: () => LOADER_ID_PARAM,
   DIRECT_PARAM: () => DIRECT_PARAM,
-  LOADER_ID_PARAM: () => LOADER_ID_PARAM
+  CONTENT_TYPE_DEFERRED: () => CONTENT_TYPE_DEFERRED
 });
-module.exports = __toCommonJS(constants_exports);
 const LOADER_ID_PARAM = "__loader";
 const DIRECT_PARAM = "__ssrDirect";
 const CONTENT_TYPE_DEFERRED = "text/modernjs-deferred";
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  CONTENT_TYPE_DEFERRED,
-  DIRECT_PARAM,
-  LOADER_ID_PARAM
-});

package/dist/cjs/common/utils.js

@@ -1,25 +1,11 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
-  matchEntry: () => matchEntry
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "matchEntry", {
+  enumerable: true,
+  get: () => matchEntry
 });
-module.exports = __toCommonJS(utils_exports);
 function sortByUrlPath(entries) {
   entries.sort(function(a, b) {
     const length1 = a.urlPath.length;
@@ -38,7 +24,3 @@ const matchEntry = (pathname, entries) => {
   sortByUrlPath(entries);
   return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  matchEntry
-});

package/dist/cjs/runtime/index.js

@@ -1,36 +1,34 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
   for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var runtime_exports = {};
-__export(runtime_exports, {
-  handleRequest: () => handleRequest,
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
   isRedirectResponse: () => isRedirectResponse,
-  isResponse: () => isResponse
+  isResponse: () => isResponse,
+  handleRequest: () => handleRequest
 });
-module.exports = __toCommonJS(runtime_exports);
-var import_node = require("@remix-run/node");
-var import_remix_router = require("@modern-js/utils/universal/remix-router");
-var import_lodash = require("@modern-js/utils/lodash");
-var import_nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
-var import_constants = require("../common/constants");
-var import_utils = require("../common/utils");
-var import_response = require("./response");
-(0, import_node.installGlobals)();
-const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+const _node = require("@remix-run/node");
+const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _lodash = require("@modern-js/utils/lodash");
+const _nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
+const _constants = require("../common/constants");
+const _utils = require("../common/utils");
+const _response = require("./response");
+(0, _node.installGlobals)();
+const redirectStatusCodes = /* @__PURE__ */ new Set([
+  301,
+  302,
+  303,
+  307,
+  308
+]);
 function isRedirectResponse(status) {
   return redirectStatusCodes.has(status);
 }
@@ -45,7 +43,7 @@ function convertModernRedirectResponse(headers, basename) {
   }
   newHeaders.set("X-Modernjs-Redirect", redirectUrl);
   newHeaders.delete("Location");
-  return new import_node.Response(null, {
+  return new _node.Response(null, {
     status: 204,
     headers: newHeaders
   });
@@ -83,19 +81,15 @@ const sendLoaderResponse = async (res, nodeResponse) => {
     res.setHeader(key, value);
   }
   if (nodeResponse.body) {
-    await (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
+    await (0, _node.writeReadableStreamToWritable)(nodeResponse.body, res);
   } else {
     res.end();
   }
 };
-const handleRequest = async ({
-  context,
-  serverRoutes,
-  routes: routesConfig
-}) => {
+const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
   const { method, query } = context;
-  const routeId = query[import_constants.LOADER_ID_PARAM];
-  const entry = (0, import_utils.matchEntry)(context.path, serverRoutes);
+  const routeId = query[_constants.LOADER_ID_PARAM];
+  const entry = (0, _utils.matchEntry)(context.path, serverRoutes);
   if (!routeId || !entry) {
     return;
   }
@@ -103,8 +97,8 @@ const handleRequest = async ({
     throw new Error("CSR data loader request only support http GET method");
   }
   const basename = entry.urlPath;
-  const routes = (0, import_nestedRoutes.transformNestedRoutes)(routesConfig);
-  const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
+  const routes = (0, _nestedRoutes.transformNestedRoutes)(routesConfig);
+  const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
     basename
   });
   const { res, logger } = context;
@@ -116,35 +110,32 @@ const handleRequest = async ({
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);
-    } else if ((0, import_lodash.isPlainObject)(response) && import_remix_router.UNSAFE_DEFERRED_SYMBOL in response) {
-      const deferredData = response[import_remix_router.UNSAFE_DEFERRED_SYMBOL];
-      const body = (0, import_response.createDeferredReadableStream)(deferredData, request.signal);
+    } 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)) {
         if (!init.headers) {
           throw new Error("redirect response includes no headers");
         }
-        response = convertModernRedirectResponse(
-          new Headers(init.headers),
-          basename
-        );
+        response = convertModernRedirectResponse(new Headers(init.headers), basename);
       } else {
         const headers = new Headers(init.headers);
-        headers.set("Content-Type", `${import_constants.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
+        headers.set("Content-Type", `${_constants.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
         init.headers = headers;
-        response = new import_node.Response(body, init);
+        response = new _node.Response(body, init);
       }
     } else {
-      response = isResponse(response) ? response : new import_node.Response(JSON.stringify(response), {
+      response = isResponse(response) ? response : new _node.Response(JSON.stringify(response), {
         headers: {
           "Content-Type": "application/json; charset=utf-8"
         }
       });
     }
   } catch (error) {
-    const message = error instanceof import_remix_router.ErrorResponse ? error.data : String(error);
-    logger == null ? void 0 : logger.error(message);
-    response = new import_node.Response(message, {
+    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,
       headers: {
         "Content-Type": "text/plain"
@@ -153,9 +144,3 @@ const handleRequest = async ({
   }
   await sendLoaderResponse(res, response);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  handleRequest,
-  isRedirectResponse,
-  isResponse
-});