@modern-js/plugin-data-loader 2.4.1-beta.0 → 2.5.0

package/dist/{js/node → cjs}/cli/create-request.js

@@ -15,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   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,
@@ -68,12 +48,12 @@ const handleRedirectResponse = (res) => {
   return res;
 };
 const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
+  return async ({
     params,
     request
-  }) {
+  }) => {
     const url = getRequestUrl({ params, request, routeId });
-    const res = yield fetch(url, {
+    const res = await fetch(url, {
       method,
       signal: request.signal
     });
@@ -81,7 +61,7 @@ const createRequest = (routeId, method = "get") => {
       throw res;
     }
     return handleRedirectResponse(res);
-  });
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/cli/generate-client.js

@@ -35,7 +35,7 @@ const generateClient = ({
   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 requestCreatorPath = import_path.default.join(__dirname, "./create-request").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;

package/dist/{js/node → cjs}/cli/loader.js

@@ -15,47 +15,25 @@ var __copyProps = (to, from, except, desc) => {
   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;
+async function loader(source) {
+  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 = {});

package/dist/{js/node → cjs}/server/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -38,26 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 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 server_exports = {};
 __export(server_exports, {
   default: () => server_default,
@@ -86,17 +49,18 @@ const json = (data, init = {}) => {
   if (!headers.has("Content-Type")) {
     headers.set("Content-Type", "application/json; charset=utf-8");
   }
-  return new import_node.Response(JSON.stringify(data), __spreadProps(__spreadValues({}, responseInit), {
+  return new import_node.Response(JSON.stringify(data), {
+    ...responseInit,
     headers
-  }));
+  });
 };
-const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
+const callRouteLoader = async ({
   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.`
@@ -104,7 +68,7 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
   }
   let result;
   try {
-    result = yield loader({
+    result = await loader({
       request,
       params
     });
@@ -120,7 +84,7 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
     );
   }
   return isResponse(result) ? result : json(result);
-});
+};
 const createLoaderHeaders = (requestHeaders) => {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders)) {
@@ -147,18 +111,18 @@ const createLoaderRequest = (context) => {
   };
   return new Request(url.href, init);
 };
-const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
+const sendLoaderResponse = async (res, nodeResponse) => {
   res.statusMessage = nodeResponse.statusText;
   res.statusCode = nodeResponse.status;
   for (const [key, value] of nodeResponse.headers.entries()) {
     res.setHeader(key, value);
   }
   if (nodeResponse.body) {
-    yield (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
+    await (0, import_node.writeReadableStreamToWritable)(nodeResponse.body, res);
   } else {
     res.end();
   }
-});
+};
 const getPathWithoutEntry = (pathname, entryPath) => {
   if (entryPath === "/") {
     return pathname;
@@ -168,11 +132,11 @@ const getPathWithoutEntry = (pathname, entryPath) => {
 const matchEntry = (pathname, entries) => {
   return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
-const handleRequest = (_0) => __async(void 0, [_0], function* ({
+const handleRequest = async ({
   context,
   serverRoutes,
   distDir
-}) {
+}) => {
   const { method, query } = context;
   const routeId = query[import_constants.LOADER_ID_PARAM];
   if (!routeId || method.toLowerCase() !== "get") {
@@ -187,7 +151,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     import_utils.SERVER_BUNDLE_DIRECTORY,
     `${entry.entryName || import_utils.MAIN_ENTRY_NAME}-server-loaders`
   );
-  const { routes } = yield Promise.resolve().then(() => __toESM(require(routesPath)));
+  const { routes } = await Promise.resolve().then(() => __toESM(require(routesPath)));
   if (!routes) {
     return;
   }
@@ -208,7 +172,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   const request = createLoaderRequest(context);
   let response;
   try {
-    response = yield callRouteLoader({
+    response = await callRouteLoader({
       loader: match.route.loader,
       routeId: match.route.id,
       params: match.params,
@@ -234,7 +198,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     });
   }
   sendLoaderResponse(res, response);
-});
+};
 var server_default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
@@ -242,13 +206,13 @@ var server_default = () => ({
       serverRoutes,
       distDir
     }) {
-      return (context) => __async(this, null, function* () {
+      return async (context) => {
         return handleRequest({
           serverRoutes,
           distDir,
           context
         });
-      });
+      };
     }
   })
 });

package/dist/{js/treeshaking → esm}/cli/generate-client.js

@@ -5,7 +5,7 @@ var generateClient = function(param) {
     var loadersMap = require(mapFile);
     var requestCode = "";
     var exportsCode = "";
-    var requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
+    var requestCreatorPath = path.join(__dirname, "./create-request").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
     var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
     if (!loaderId) {
         requestCode = Object.keys(loadersMap).map(function(loaderId2) {

package/dist/{js/modern → esm-node}/cli/create-request.js

@@ -1,23 +1,3 @@
-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";
@@ -45,12 +25,12 @@ const handleRedirectResponse = (res) => {
   return res;
 };
 const createRequest = (routeId, method = "get") => {
-  return (_0) => __async(void 0, [_0], function* ({
+  return async ({
     params,
     request
-  }) {
+  }) => {
     const url = getRequestUrl({ params, request, routeId });
-    const res = yield fetch(url, {
+    const res = await fetch(url, {
       method,
       signal: request.signal
     });
@@ -58,7 +38,7 @@ const createRequest = (routeId, method = "get") => {
       throw res;
     }
     return handleRedirectResponse(res);
-  });
+  };
 };
 export {
   createRequest,

package/dist/{js/modern → esm-node}/cli/generate-client.js

@@ -7,7 +7,7 @@ const generateClient = ({
   const loadersMap = require(mapFile);
   let requestCode = ``;
   let exportsCode = ``;
-  const requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
+  const requestCreatorPath = path.join(__dirname, "./create-request").replace("/cjs/cli/", "/esm/cli/").replace(/\\/g, "/");
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;

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

@@ -0,0 +1,18 @@
+import { generateClient } from "./generate-client";
+async function loader(source) {
+  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 → esm-node}/server/index.js

@@ -1,42 +1,3 @@
-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,
@@ -62,17 +23,18 @@ const json = (data, init = {}) => {
   if (!headers.has("Content-Type")) {
     headers.set("Content-Type", "application/json; charset=utf-8");
   }
-  return new NodeResponse(JSON.stringify(data), __spreadProps(__spreadValues({}, responseInit), {
+  return new NodeResponse(JSON.stringify(data), {
+    ...responseInit,
     headers
-  }));
+  });
 };
-const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
+const callRouteLoader = async ({
   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.`
@@ -80,7 +42,7 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
   }
   let result;
   try {
-    result = yield loader({
+    result = await loader({
       request,
       params
     });
@@ -96,7 +58,7 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
     );
   }
   return isResponse(result) ? result : json(result);
-});
+};
 const createLoaderHeaders = (requestHeaders) => {
   const headers = new Headers();
   for (const [key, values] of Object.entries(requestHeaders)) {
@@ -123,18 +85,18 @@ const createLoaderRequest = (context) => {
   };
   return new Request(url.href, init);
 };
-const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
+const sendLoaderResponse = async (res, nodeResponse) => {
   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);
+    await writeReadableStreamToWritable(nodeResponse.body, res);
   } else {
     res.end();
   }
-});
+};
 const getPathWithoutEntry = (pathname, entryPath) => {
   if (entryPath === "/") {
     return pathname;
@@ -144,11 +106,11 @@ const getPathWithoutEntry = (pathname, entryPath) => {
 const matchEntry = (pathname, entries) => {
   return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
-const handleRequest = (_0) => __async(void 0, [_0], function* ({
+const handleRequest = async ({
   context,
   serverRoutes,
   distDir
-}) {
+}) => {
   const { method, query } = context;
   const routeId = query[LOADER_ID_PARAM];
   if (!routeId || method.toLowerCase() !== "get") {
@@ -163,7 +125,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     SERVER_BUNDLE_DIRECTORY,
     `${entry.entryName || MAIN_ENTRY_NAME}-server-loaders`
   );
-  const { routes } = yield import(routesPath);
+  const { routes } = await import(routesPath);
   if (!routes) {
     return;
   }
@@ -184,7 +146,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   const request = createLoaderRequest(context);
   let response;
   try {
-    response = yield callRouteLoader({
+    response = await callRouteLoader({
       loader: match.route.loader,
       routeId: match.route.id,
       params: match.params,
@@ -210,7 +172,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     });
   }
   sendLoaderResponse(res, response);
-});
+};
 var server_default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
@@ -218,13 +180,13 @@ var server_default = () => ({
       serverRoutes,
       distDir
     }) {
-      return (context) => __async(this, null, function* () {
+      return async (context) => {
         return handleRequest({
           serverRoutes,
           distDir,
           context
         });
-      });
+      };
     }
   })
 });

package/package.json

@@ -11,20 +11,19 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     "./loader": {
       "jsnext:source": "./src/cli/loader.ts",
-      "default": "./dist/js/node/cli/loader.js"
+      "default": "./dist/cjs/cli/loader.js"
     },
     "./server": {
       "jsnext:source": "./src/server/index.ts",
-      "default": "./dist/js/node/server/index.js"
+      "default": "./dist/cjs/server/index.js"
     }
   },
   "typesVersions": {
@@ -43,7 +42,7 @@
     "@remix-run/node": "^1.9.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.6.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/utils": "2.5.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -58,11 +57,11 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/server-core": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/core": "2.5.0",
+    "@modern-js/server-core": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@scripts/jest-config": "2.5.0",
+    "@scripts/build": "2.5.0"
   },
   "sideEffects": false,
   "publishConfig": {

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
-};