@modern-js/plugin-data-loader 2.35.2-alpha.0 → 2.36.0

package/dist/cjs/runtime/index.js

@@ -83,7 +83,10 @@ const createRequest = (context) => {
     headers: createLoaderHeaders(context.headers),
     signal: controller.signal
   };
-  if (context.method.toUpperCase() !== "GET" && context.method !== "HEAD") {
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(context.method.toUpperCase())) {
     init.body = context.req;
   }
   const request = new Request(url.href, init);

package/dist/esm/runtime/index.js

@@ -96,7 +96,10 @@ var createRequest = function(context) {
     headers: createLoaderHeaders(context.headers),
     signal: controller.signal
   };
-  if (context.method.toUpperCase() !== "GET" && context.method !== "HEAD") {
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(context.method.toUpperCase())) {
     init.body = context.req;
   }
   var request = new Request(url.href, init);

package/dist/esm-node/runtime/index.js

@@ -58,7 +58,10 @@ const createRequest = (context) => {
     headers: createLoaderHeaders(context.headers),
     signal: controller.signal
   };
-  if (context.method.toUpperCase() !== "GET" && context.method !== "HEAD") {
+  if (![
+    "GET",
+    "HEAD"
+  ].includes(context.method.toUpperCase())) {
     init.body = context.req;
   }
   const request = new Request(url.href, init);

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.2-alpha.0",
+  "version": "2.36.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -58,8 +58,8 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/runtime-utils": "2.35.1",
-    "@modern-js/utils": "2.35.1"
+    "@modern-js/utils": "2.36.0",
+    "@modern-js/runtime-utils": "2.36.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -75,11 +75,11 @@
     "webpack": "^5.88.1",
     "react": "^18",
     "react-dom": "^18",
-    "@modern-js/server-core": "2.35.1",
-    "@modern-js/types": "2.35.1",
-    "@scripts/build": "2.35.1",
-    "@modern-js/core": "2.35.1",
-    "@scripts/jest-config": "2.35.1"
+    "@modern-js/server-core": "2.36.0",
+    "@scripts/build": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@modern-js/core": "2.36.0",
+    "@scripts/jest-config": "2.36.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0"

package/dist/js/modern/cli/create-request.js

@@ -1,66 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { compile } from "path-to-regexp";
-import { redirect } from "react-router-dom";
-import { LOADER_ID_PARAM, DIRECT_PARAM } from "../common/constants";
-const getRequestUrl = ({
-  params,
-  request,
-  routeId
-}) => {
-  const url = new URL(request.url);
-  const toPath = compile(url.pathname, {
-    encode: encodeURIComponent
-  });
-  const newPathName = toPath(params);
-  url.pathname = newPathName;
-  url.searchParams.append(LOADER_ID_PARAM, routeId);
-  url.searchParams.append(DIRECT_PARAM, "true");
-  return url;
-};
-const handleRedirectResponse = (res) => {
-  const { headers } = res;
-  const location = headers.get("X-Modernjs-Redirect");
-  if (location) {
-    return redirect(location);
-  }
-  return res;
-};
-const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
-    params,
-    request
-  }) {
-    const url = getRequestUrl({ params, request, routeId });
-    const res = yield fetch(url, {
-      method,
-      signal: request.signal
-    });
-    if (!res.ok) {
-      throw res;
-    }
-    return handleRedirectResponse(res);
-  });
-};
-export {
-  createRequest,
-  getRequestUrl
-};

package/dist/js/modern/cli/generate-client.js

@@ -1,42 +0,0 @@
-import path from "path";
-const generateClient = ({
-  mapFile,
-  loaderId
-}) => {
-  delete require.cache[mapFile];
-  const loadersMap = require(mapFile);
-  let requestCode = ``;
-  let exportsCode = ``;
-  const requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
-  const importCode = `
-    import { createRequest } from '${requestCreatorPath}';
-  `;
-  if (!loaderId) {
-    requestCode = Object.keys(loadersMap).map((loaderId2) => {
-      const { routeId } = loadersMap[loaderId2];
-      return `
-      const ${loaderId2} = createRequest('${routeId}');
-    `;
-    }).join("");
-    exportsCode = `export {`;
-    for (const loader of Object.keys(loadersMap)) {
-      exportsCode += `${loader},`;
-    }
-    exportsCode += "}";
-  } else {
-    const loader = loadersMap[loaderId];
-    requestCode = `
-      const loader = createRequest('${loader.routeId}');
-    `;
-    exportsCode = `export default loader;`;
-  }
-  const generatedCode = `
-    ${importCode}
-    ${requestCode}
-    ${exportsCode}
-  `;
-  return generatedCode;
-};
-export {
-  generateClient
-};

package/dist/js/modern/cli/loader.js

@@ -1,40 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import { generateClient } from "./generate-client";
-function loader(source) {
-  return __async(this, null, function* () {
-    var _a;
-    this.cacheable();
-    const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
-    if (target === "node") {
-      return source;
-    }
-    const options = this.getOptions();
-    const code = generateClient({
-      mapFile: options.mapFile,
-      loaderId: options.loaderId
-    });
-    return code;
-  });
-}
-export {
-  loader as default
-};

package/dist/js/modern/common/constants.js

@@ -1,6 +0,0 @@
-const LOADER_ID_PARAM = "__loader";
-const DIRECT_PARAM = "__ssrDirect";
-export {
-  DIRECT_PARAM,
-  LOADER_ID_PARAM
-};

package/dist/js/modern/server/index.js

@@ -1,237 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import path from "path";
-import {
-  installGlobals,
-  writeReadableStreamToWritable,
-  Response as NodeResponse
-} from "@remix-run/node";
-import {
-  matchRoutes
-} from "react-router-dom";
-import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
-import { LOADER_ID_PARAM } from "../common/constants";
-installGlobals();
-const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
-function isRedirectResponse(response) {
-  return redirectStatusCodes.has(response.status);
-}
-function isResponse(value) {
-  return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
-}
-const json = (data, init = {}) => {
-  const responseInit = typeof init === "number" ? { status: init } : init;
-  const headers = new Headers(responseInit.headers);
-  if (!headers.has("Content-Type")) {
-    headers.set("Content-Type", "application/json; charset=utf-8");
-  }
-  return new NodeResponse(JSON.stringify(data), __spreadProps(__spreadValues({}, responseInit), {
-    headers
-  }));
-};
-const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
-  routeId,
-  loader,
-  params,
-  request,
-  loadContext
-}) {
-  if (!loader) {
-    throw new Error(
-      `You made a ${request.method} request to ${request.url} but did not provide a default component or \`loader\` for route "${routeId}", so there is no way to handle the request.`
-    );
-  }
-  let result;
-  try {
-    result = yield loader({
-      request,
-      params
-    });
-  } catch (error) {
-    if (!isResponse(error)) {
-      throw error;
-    }
-    result = error;
-  }
-  if (result === void 0) {
-    throw new Error(
-      `You defined a loader for route "${routeId}" but didn't return anything from your \`loader\` function. Please return a value or \`null\`.`
-    );
-  }
-  return isResponse(result) ? result : json(result);
-});
-const createLoaderHeaders = (requestHeaders) => {
-  const headers = new Headers();
-  for (const [key, values] of Object.entries(requestHeaders)) {
-    if (values) {
-      if (Array.isArray(values)) {
-        for (const value of values) {
-          headers.append(key, value);
-        }
-      } else {
-        headers.set(key, values);
-      }
-    }
-  }
-  return headers;
-};
-const createLoaderRequest = (context) => {
-  const origin = `${context.protocol}://${context.host}`;
-  const url = new URL(context.url, origin);
-  const controller = new AbortController();
-  const init = {
-    method: context.method,
-    headers: createLoaderHeaders(context.headers),
-    signal: controller.signal
-  };
-  return new Request(url.href, init);
-};
-const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
-  res.statusMessage = nodeResponse.statusText;
-  res.statusCode = nodeResponse.status;
-  for (const [key, value] of nodeResponse.headers.entries()) {
-    res.setHeader(key, value);
-  }
-  if (nodeResponse.body) {
-    yield writeReadableStreamToWritable(nodeResponse.body, res);
-  } else {
-    res.end();
-  }
-});
-const getPathWithoutEntry = (pathname, entryPath) => {
-  if (entryPath === "/") {
-    return pathname;
-  }
-  return pathname.replace(entryPath, "");
-};
-const matchEntry = (pathname, entries) => {
-  return entries.find((entry) => pathname.startsWith(entry.urlPath));
-};
-const handleRequest = (_0) => __async(void 0, [_0], function* ({
-  context,
-  serverRoutes,
-  distDir
-}) {
-  const { method, query } = context;
-  const routeId = query[LOADER_ID_PARAM];
-  if (!routeId || method.toLowerCase() !== "get") {
-    return;
-  }
-  const entry = matchEntry(context.path, serverRoutes);
-  if (!entry) {
-    return;
-  }
-  const routesPath = path.join(
-    distDir,
-    SERVER_BUNDLE_DIRECTORY,
-    `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders`
-  );
-  const { routes } = yield import(routesPath);
-  if (!routes) {
-    return;
-  }
-  const { res } = context;
-  const pathname = getPathWithoutEntry(context.path, entry.urlPath);
-  const matches = matchRoutes(routes, pathname);
-  if (!matches) {
-    res.statusCode = 403;
-    res.end(`Route ${pathname} was not matched`);
-    return;
-  }
-  const match = matches == null ? void 0 : matches.find((match2) => match2.route.id === routeId);
-  if (!match) {
-    res.statusCode = 403;
-    res.end(`Route ${routeId} does not match URL ${context.path}`);
-    return;
-  }
-  const request = createLoaderRequest(context);
-  let response;
-  try {
-    response = yield callRouteLoader({
-      loader: match.route.loader,
-      routeId: match.route.id,
-      params: match.params,
-      request,
-      loadContext: {}
-    });
-    if (isRedirectResponse(response)) {
-      const headers = new Headers(response.headers);
-      headers.set("X-Modernjs-Redirect", headers.get("Location"));
-      headers.delete("Location");
-      response = new NodeResponse(null, {
-        status: 204,
-        headers
-      });
-    }
-  } catch (error) {
-    const message = String(error);
-    response = new NodeResponse(message, {
-      status: 500,
-      headers: {
-        "Content-Type": "text/plain"
-      }
-    });
-  }
-  sendLoaderResponse(res, response);
-});
-var server_default = () => ({
-  name: "@modern-js/plugin-data-loader",
-  setup: () => ({
-    preparebeforeRouteHandler({
-      serverRoutes,
-      distDir
-    }) {
-      return (context) => __async(this, null, function* () {
-        return handleRequest({
-          serverRoutes,
-          distDir,
-          context
-        });
-      });
-    }
-  })
-});
-export {
-  server_default as default,
-  getPathWithoutEntry,
-  handleRequest,
-  isRedirectResponse,
-  isResponse
-};

package/dist/js/node/cli/create-request.js

@@ -1,90 +0,0 @@
-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 __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-var create_request_exports = {};
-__export(create_request_exports, {
-  createRequest: () => createRequest,
-  getRequestUrl: () => getRequestUrl
-});
-module.exports = __toCommonJS(create_request_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");
-const getRequestUrl = ({
-  params,
-  request,
-  routeId
-}) => {
-  const url = new URL(request.url);
-  const toPath = (0, import_path_to_regexp.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");
-  return url;
-};
-const handleRedirectResponse = (res) => {
-  const { headers } = res;
-  const location = headers.get("X-Modernjs-Redirect");
-  if (location) {
-    return (0, import_react_router_dom.redirect)(location);
-  }
-  return res;
-};
-const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
-    params,
-    request
-  }) {
-    const url = getRequestUrl({ params, request, routeId });
-    const res = yield fetch(url, {
-      method,
-      signal: request.signal
-    });
-    if (!res.ok) {
-      throw res;
-    }
-    return handleRedirectResponse(res);
-  });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createRequest,
-  getRequestUrl
-});

package/dist/js/node/cli/generate-client.js

@@ -1,71 +0,0 @@
-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(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var generate_client_exports = {};
-__export(generate_client_exports, {
-  generateClient: () => generateClient
-});
-module.exports = __toCommonJS(generate_client_exports);
-var import_path = __toESM(require("path"));
-const generateClient = ({
-  mapFile,
-  loaderId
-}) => {
-  delete require.cache[mapFile];
-  const loadersMap = require(mapFile);
-  let requestCode = ``;
-  let exportsCode = ``;
-  const requestCreatorPath = import_path.default.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
-  const importCode = `
-    import { createRequest } from '${requestCreatorPath}';
-  `;
-  if (!loaderId) {
-    requestCode = Object.keys(loadersMap).map((loaderId2) => {
-      const { routeId } = loadersMap[loaderId2];
-      return `
-      const ${loaderId2} = createRequest('${routeId}');
-    `;
-    }).join("");
-    exportsCode = `export {`;
-    for (const loader of Object.keys(loadersMap)) {
-      exportsCode += `${loader},`;
-    }
-    exportsCode += "}";
-  } else {
-    const loader = loadersMap[loaderId];
-    requestCode = `
-      const loader = createRequest('${loader.routeId}');
-    `;
-    exportsCode = `export default loader;`;
-  }
-  const generatedCode = `
-    ${importCode}
-    ${requestCode}
-    ${exportsCode}
-  `;
-  return generatedCode;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateClient
-});

package/dist/js/node/cli/loader.js

@@ -1,61 +0,0 @@
-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 __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-var loader_exports = {};
-__export(loader_exports, {
-  default: () => loader
-});
-module.exports = __toCommonJS(loader_exports);
-var import_generate_client = require("./generate-client");
-function loader(source) {
-  return __async(this, null, function* () {
-    var _a;
-    this.cacheable();
-    const target = (_a = this._compiler) == null ? void 0 : _a.options.target;
-    if (target === "node") {
-      return source;
-    }
-    const options = this.getOptions();
-    const code = (0, import_generate_client.generateClient)({
-      mapFile: options.mapFile,
-      loaderId: options.loaderId
-    });
-    return code;
-  });
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});