@modern-js/plugin-data-loader 2.0.0-beta.4 → 2.0.0-beta.7

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

@@ -1,5 +1,6 @@
 import path from "path";
 const generateClient = ({ mapFile }) => {
+  delete require.cache[mapFile];
   const loadersMap = require(mapFile);
   const requestCode = Object.keys(loadersMap).map((loaderId) => {
     const routeId = loadersMap[loaderId];
@@ -16,11 +17,12 @@ const generateClient = ({ mapFile }) => {
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
-  return `
+  const generatedCode = `
     ${importCode}
     ${requestCode}
     ${exportsCode}
   `;
+  return generatedCode;
 };
 export {
   generateClient

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

@@ -15,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  createRequest: () => createRequest,
-  getRequestUrl: () => getRequestUrl
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path_to_regexp = require("path-to-regexp");
-var import_react_router_dom = require("react-router-dom");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -43,6 +35,14 @@ var __async = (__this, __arguments, generator) => {
     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");
 const getRequestUrl = ({
   params,
   request,
@@ -81,3 +81,8 @@ const createRequest = (routeId, method = "get") => {
     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

@@ -21,13 +21,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var generate_client_exports = {};
+__export(generate_client_exports, {
   generateClient: () => generateClient
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(generate_client_exports);
 var import_path = __toESM(require("path"));
 const generateClient = ({ mapFile }) => {
+  delete require.cache[mapFile];
   const loadersMap = require(mapFile);
   const requestCode = Object.keys(loadersMap).map((loaderId) => {
     const routeId = loadersMap[loaderId];
@@ -44,9 +45,14 @@ const generateClient = ({ mapFile }) => {
   const importCode = `
     import { createRequest } from '${requestCreatorPath}';
   `;
-  return `
+  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

@@ -15,12 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => loader
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_generate_client = require("./generate-client");
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -41,6 +35,12 @@ var __async = (__this, __arguments, generator) => {
     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;
@@ -56,3 +56,5 @@ function loader(source) {
     return code;
   });
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/server/index.js

@@ -1,53 +1,17 @@
 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 __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 stdin_exports = {};
-__export(stdin_exports, {
-  default: () => server_default,
-  getPathWithoutEntry: () => getPathWithoutEntry,
-  handleRequest: () => handleRequest,
-  isRedirectResponse: () => isRedirectResponse,
-  isResponse: () => isResponse
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_node = require("@remix-run/node");
-var import_react_router_dom = require("react-router-dom");
-var import_utils = require("@modern-js/utils");
-var __create2 = Object.create;
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf2 = Object.getPrototypeOf;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+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 (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -57,18 +21,23 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __copyProps2 = (to, from, except, desc) => {
+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 __getOwnPropNames2(from))
-      if (!__hasOwnProp2.call(to, key) && key !== except)
-        __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+    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 __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-  isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
+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 __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -89,6 +58,19 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var server_exports = {};
+__export(server_exports, {
+  default: () => server_default,
+  getPathWithoutEntry: () => getPathWithoutEntry,
+  handleRequest: () => handleRequest,
+  isRedirectResponse: () => isRedirectResponse,
+  isResponse: () => isResponse
+});
+module.exports = __toCommonJS(server_exports);
+var import_path = __toESM(require("path"));
+var import_node = require("@remix-run/node");
+var import_react_router_dom = require("react-router-dom");
+var import_utils = require("@modern-js/utils");
 (0, import_node.installGlobals)();
 const LOADER_SEARCH_PARAM = "_loader";
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
@@ -205,7 +187,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
     import_utils.LOADER_ROUTES_DIR,
     entry.entryName || import_utils.MAIN_ENTRY_NAME
   );
-  const { routes } = yield Promise.resolve().then(() => __toESM2(require(routesPath)));
+  const { routes } = yield Promise.resolve().then(() => __toESM(require(routesPath)));
   if (!routes) {
     return;
   }
@@ -270,3 +252,10 @@ var server_default = () => ({
     }
   })
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getPathWithoutEntry,
+  handleRequest,
+  isRedirectResponse,
+  isResponse
+});

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

@@ -1,6 +1,7 @@
 import path from "path";
 var generateClient = function(param) {
     var mapFile = param.mapFile;
+    delete require.cache[mapFile];
     var loadersMap = require(mapFile);
     var requestCode = Object.keys(loadersMap).map(function(loaderId) {
         var routeId = loadersMap[loaderId];
@@ -30,6 +31,7 @@ var generateClient = function(param) {
     exportsCode += "}";
     var requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
     var importCode = "\n    import { createRequest } from '".concat(requestCreatorPath, "';\n  ");
-    return "\n    ".concat(importCode, "\n    ").concat(requestCode, "\n    ").concat(exportsCode, "\n  ");
+    var generatedCode = "\n    ".concat(importCode, "\n    ").concat(requestCode, "\n    ").concat(exportsCode, "\n  ");
+    return generatedCode;
 };
 export { generateClient };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,11 +40,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@remix-run/node": "^1.7.0",
+    "@remix-run/node": "^1.9.0",
     "path-to-regexp": "^6.2.0",
-    "react-router-dom": "^6.4.4",
-    "@modern-js/babel-compiler": "2.0.0-beta.4",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "react-router-dom": "^6.6.0",
+    "@modern-js/babel-compiler": "2.0.0-beta.7",
+    "@modern-js/utils": "2.0.0-beta.7"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -59,11 +59,11 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/server-core": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/core": "2.0.0-beta.7",
+    "@modern-js/server-core": "2.0.0-beta.7",
+    "@modern-js/types": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7",
+    "@scripts/build": "2.0.0-beta.7"
   },
   "sideEffects": false,
   "publishConfig": {