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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/js/modern/cli/generate-client.js +3 -1
  2. package/dist/js/node/cli/create-request.js +13 -8
  3. package/dist/js/node/cli/generate-client.js +10 -4
  4. package/dist/js/node/cli/loader.js +8 -6
  5. package/dist/js/node/server/index.js +37 -48
  6. package/dist/js/treeshaking/cli/generate-client.js +3 -1
  7. package/package.json +13 -12
package/dist/js/modern/cli/generate-client.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import path from "path";
2
2
  const generateClient = ({ mapFile }) => {
3
+ delete require.cache[mapFile];
3
4
  const loadersMap = require(mapFile);
4
5
  const requestCode = Object.keys(loadersMap).map((loaderId) => {
5
6
  const routeId = loadersMap[loaderId];
@@ -16,11 +17,12 @@ const generateClient = ({ mapFile }) => {
16
17
  const importCode = `
17
18
  import { createRequest } from '${requestCreatorPath}';
18
19
  `;
19
- return `
20
+ const generatedCode = `
20
21
  ${importCode}
21
22
  ${requestCode}
22
23
  ${exportsCode}
23
24
  `;
25
+ return generatedCode;
24
26
  };
25
27
  export {
26
28
  generateClient
package/dist/js/node/cli/create-request.js CHANGED
@@ -15,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- createRequest: () => createRequest,
21
- getRequestUrl: () => getRequestUrl
22
- });
23
- module.exports = __toCommonJS(stdin_exports);
24
- var import_path_to_regexp = require("path-to-regexp");
25
- var import_react_router_dom = require("react-router-dom");
26
18
  var __async = (__this, __arguments, generator) => {
27
19
  return new Promise((resolve, reject) => {
28
20
  var fulfilled = (value) => {
@@ -43,6 +35,14 @@ var __async = (__this, __arguments, generator) => {
43
35
  step((generator = generator.apply(__this, __arguments)).next());
44
36
  });
45
37
  };
38
+ var create_request_exports = {};
39
+ __export(create_request_exports, {
40
+ createRequest: () => createRequest,
41
+ getRequestUrl: () => getRequestUrl
42
+ });
43
+ module.exports = __toCommonJS(create_request_exports);
44
+ var import_path_to_regexp = require("path-to-regexp");
45
+ var import_react_router_dom = require("react-router-dom");
46
46
  const getRequestUrl = ({
47
47
  params,
48
48
  request,
@@ -81,3 +81,8 @@ const createRequest = (routeId, method = "get") => {
81
81
  return handleRedirectResponse(res);
82
82
  });
83
83
  };
84
+ // Annotate the CommonJS export names for ESM import in node:
85
+ 0 && (module.exports = {
86
+ createRequest,
87
+ getRequestUrl
88
+ });
package/dist/js/node/cli/generate-client.js CHANGED
@@ -21,13 +21,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
21
21
  mod
22
22
  ));
23
23
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
24
+ var generate_client_exports = {};
25
+ __export(generate_client_exports, {
26
26
  generateClient: () => generateClient
27
27
  });
28
- module.exports = __toCommonJS(stdin_exports);
28
+ module.exports = __toCommonJS(generate_client_exports);
29
29
  var import_path = __toESM(require("path"));
30
30
  const generateClient = ({ mapFile }) => {
31
+ delete require.cache[mapFile];
31
32
  const loadersMap = require(mapFile);
32
33
  const requestCode = Object.keys(loadersMap).map((loaderId) => {
33
34
  const routeId = loadersMap[loaderId];
@@ -44,9 +45,14 @@ const generateClient = ({ mapFile }) => {
44
45
  const importCode = `
45
46
  import { createRequest } from '${requestCreatorPath}';
46
47
  `;
47
- return `
48
+ const generatedCode = `
48
49
  ${importCode}
49
50
  ${requestCode}
50
51
  ${exportsCode}
51
52
  `;
53
+ return generatedCode;
52
54
  };
55
+ // Annotate the CommonJS export names for ESM import in node:
56
+ 0 && (module.exports = {
57
+ generateClient
58
+ });
package/dist/js/node/cli/loader.js CHANGED
@@ -15,12 +15,6 @@ var __copyProps = (to, from, except, desc) => {
15
15
  return to;
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
- var stdin_exports = {};
19
- __export(stdin_exports, {
20
- default: () => loader
21
- });
22
- module.exports = __toCommonJS(stdin_exports);
23
- var import_generate_client = require("./generate-client");
24
18
  var __async = (__this, __arguments, generator) => {
25
19
  return new Promise((resolve, reject) => {
26
20
  var fulfilled = (value) => {
@@ -41,6 +35,12 @@ var __async = (__this, __arguments, generator) => {
41
35
  step((generator = generator.apply(__this, __arguments)).next());
42
36
  });
43
37
  };
38
+ var loader_exports = {};
39
+ __export(loader_exports, {
40
+ default: () => loader
41
+ });
42
+ module.exports = __toCommonJS(loader_exports);
43
+ var import_generate_client = require("./generate-client");
44
44
  function loader(source) {
45
45
  return __async(this, null, function* () {
46
46
  var _a;
@@ -56,3 +56,5 @@ function loader(source) {
56
56
  return code;
57
57
  });
58
58
  }
59
+ // Annotate the CommonJS export names for ESM import in node:
60
+ 0 && (module.exports = {});
package/dist/js/node/server/index.js CHANGED
@@ -1,53 +1,17 @@
1
1
  var __create = Object.create;
2
2
  var __defProp = Object.defineProperty;
3
+ var __defProps = Object.defineProperties;
3
4
  var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
5
+ var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
4
6
  var __getOwnPropNames = Object.getOwnPropertyNames;
7
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
8
  var __getProtoOf = Object.getPrototypeOf;
6
9
  var __hasOwnProp = Object.prototype.hasOwnProperty;
7
- var __export = (target, all) => {
8
- for (var name in all)
9
- __defProp(target, name, { get: all[name], enumerable: true });
10
- };
11
- var __copyProps = (to, from, except, desc) => {
12
- if (from && typeof from === "object" || typeof from === "function") {
13
- for (let key of __getOwnPropNames(from))
14
- if (!__hasOwnProp.call(to, key) && key !== except)
15
- __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
16
- }
17
- return to;
18
- };
19
- var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
20
- isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
21
- mod
22
- ));
23
- var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
24
- var stdin_exports = {};
25
- __export(stdin_exports, {
26
- default: () => server_default,
27
- getPathWithoutEntry: () => getPathWithoutEntry,
28
- handleRequest: () => handleRequest,
29
- isRedirectResponse: () => isRedirectResponse,
30
- isResponse: () => isResponse
31
- });
32
- module.exports = __toCommonJS(stdin_exports);
33
- var import_path = __toESM(require("path"));
34
- var import_node = require("@remix-run/node");
35
- var import_react_router_dom = require("react-router-dom");
36
- var import_utils = require("@modern-js/utils");
37
- var __create2 = Object.create;
38
- var __defProp2 = Object.defineProperty;
39
- var __defProps = Object.defineProperties;
40
- var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
41
- var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
42
- var __getOwnPropNames2 = Object.getOwnPropertyNames;
43
- var __getOwnPropSymbols = Object.getOwnPropertySymbols;
44
- var __getProtoOf2 = Object.getPrototypeOf;
45
- var __hasOwnProp2 = Object.prototype.hasOwnProperty;
46
10
  var __propIsEnum = Object.prototype.propertyIsEnumerable;
47
- var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
11
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
48
12
  var __spreadValues = (a, b) => {
49
13
  for (var prop in b || (b = {}))
50
- if (__hasOwnProp2.call(b, prop))
14
+ if (__hasOwnProp.call(b, prop))
51
15
  __defNormalProp(a, prop, b[prop]);
52
16
  if (__getOwnPropSymbols)
53
17
  for (var prop of __getOwnPropSymbols(b)) {
@@ -57,18 +21,23 @@ var __spreadValues = (a, b) => {
57
21
  return a;
58
22
  };
59
23
  var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
60
- var __copyProps2 = (to, from, except, desc) => {
24
+ var __export = (target, all) => {
25
+ for (var name in all)
26
+ __defProp(target, name, { get: all[name], enumerable: true });
27
+ };
28
+ var __copyProps = (to, from, except, desc) => {
61
29
  if (from && typeof from === "object" || typeof from === "function") {
62
- for (let key of __getOwnPropNames2(from))
63
- if (!__hasOwnProp2.call(to, key) && key !== except)
64
- __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
30
+ for (let key of __getOwnPropNames(from))
31
+ if (!__hasOwnProp.call(to, key) && key !== except)
32
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
65
33
  }
66
34
  return to;
67
35
  };
68
- var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
69
- isNodeMode || !mod || !mod.__esModule ? __defProp2(target, "default", { value: mod, enumerable: true }) : target,
36
+ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
37
+ isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
70
38
  mod
71
39
  ));
40
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
72
41
  var __async = (__this, __arguments, generator) => {
73
42
  return new Promise((resolve, reject) => {
74
43
  var fulfilled = (value) => {
@@ -89,6 +58,19 @@ var __async = (__this, __arguments, generator) => {
89
58
  step((generator = generator.apply(__this, __arguments)).next());
90
59
  });
91
60
  };
61
+ var server_exports = {};
62
+ __export(server_exports, {
63
+ default: () => server_default,
64
+ getPathWithoutEntry: () => getPathWithoutEntry,
65
+ handleRequest: () => handleRequest,
66
+ isRedirectResponse: () => isRedirectResponse,
67
+ isResponse: () => isResponse
68
+ });
69
+ module.exports = __toCommonJS(server_exports);
70
+ var import_path = __toESM(require("path"));
71
+ var import_node = require("@remix-run/node");
72
+ var import_react_router_dom = require("react-router-dom");
73
+ var import_utils = require("@modern-js/utils");
92
74
  (0, import_node.installGlobals)();
93
75
  const LOADER_SEARCH_PARAM = "_loader";
94
76
  const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
@@ -205,7 +187,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
205
187
  import_utils.LOADER_ROUTES_DIR,
206
188
  entry.entryName || import_utils.MAIN_ENTRY_NAME
207
189
  );
208
- const { routes } = yield Promise.resolve().then(() => __toESM2(require(routesPath)));
190
+ const { routes } = yield Promise.resolve().then(() => __toESM(require(routesPath)));
209
191
  if (!routes) {
210
192
  return;
211
193
  }
@@ -270,3 +252,10 @@ var server_default = () => ({
270
252
  }
271
253
  })
272
254
  });
255
+ // Annotate the CommonJS export names for ESM import in node:
256
+ 0 && (module.exports = {
257
+ getPathWithoutEntry,
258
+ handleRequest,
259
+ isRedirectResponse,
260
+ isResponse
261
+ });
package/dist/js/treeshaking/cli/generate-client.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import path from "path";
2
2
  var generateClient = function(param) {
3
3
  var mapFile = param.mapFile;
4
+ delete require.cache[mapFile];
4
5
  var loadersMap = require(mapFile);
5
6
  var requestCode = Object.keys(loadersMap).map(function(loaderId) {
6
7
  var routeId = loadersMap[loaderId];
@@ -30,6 +31,7 @@ var generateClient = function(param) {
30
31
  exportsCode += "}";
31
32
  var requestCreatorPath = path.join(__dirname, "./create-request").replace("/node/cli/", "/treeshaking/cli/").replace(/\\/g, "/");
32
33
  var importCode = "\n import { createRequest } from '".concat(requestCreatorPath, "';\n ");
33
- return "\n ".concat(importCode, "\n ").concat(requestCode, "\n ").concat(exportsCode, "\n ");
34
+ var generatedCode = "\n ".concat(importCode, "\n ").concat(requestCode, "\n ").concat(exportsCode, "\n ");
35
+ return generatedCode;
34
36
  };
35
37
  export { generateClient };
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "2.0.0-beta.4",
14
+ "version": "2.0.0-canary.0",
15
15
  "jsnext:source": "./src/index.ts",
16
16
  "types": "./dist/types/index.d.ts",
17
17
  "main": "./dist/js/node/index.js",
@@ -40,13 +40,18 @@
40
40
  "dependencies": {
41
41
  "@babel/core": "^7.18.0",
42
42
  "@babel/runtime": "^7.18.0",
43
- "@remix-run/node": "^1.7.0",
43
+ "@modern-js/babel-compiler": "2.0.0-beta.6",
44
+ "@modern-js/utils": "2.0.0-beta.6",
45
+ "@remix-run/node": "^1.9.0",
44
46
  "path-to-regexp": "^6.2.0",
45
- "react-router-dom": "^6.4.4",
46
- "@modern-js/babel-compiler": "2.0.0-beta.4",
47
- "@modern-js/utils": "2.0.0-beta.4"
47
+ "react-router-dom": "^6.6.0"
48
48
  },
49
49
  "devDependencies": {
50
+ "@modern-js/core": "2.0.0-beta.6",
51
+ "@modern-js/server-core": "2.0.0-beta.6",
52
+ "@modern-js/types": "2.0.0-beta.6",
53
+ "@scripts/build": "2.0.0-beta.6",
54
+ "@scripts/jest-config": "2.0.0-beta.6",
50
55
  "@types/babel__core": "^7.1.15",
51
56
  "@types/jest": "^27",
52
57
  "@types/node": "^14",
@@ -58,12 +63,7 @@
58
63
  "ts-jest": "^27.0.5",
59
64
  "typescript": "^4",
60
65
  "webpack": "^5.75.0",
61
- "webpack-chain": "^6.5.1",
62
- "@modern-js/core": "2.0.0-beta.4",
63
- "@modern-js/server-core": "2.0.0-beta.4",
64
- "@modern-js/types": "2.0.0-beta.4",
65
- "@scripts/build": "2.0.0-beta.4",
66
- "@scripts/jest-config": "2.0.0-beta.4"
66
+ "webpack-chain": "^6.5.1"
67
67
  },
68
68
  "sideEffects": false,
69
69
  "publishConfig": {
@@ -75,5 +75,6 @@
75
75
  "build": "modern-lib build",
76
76
  "dev": "modern-lib build --watch",
77
77
  "test": "jest --passWithNoTests"
78
- }
78
+ },
79
+ "readme": "\n<p align=\"center\">\n <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n <br/>\n <a href=\"https://modernjs.dev\" target=\"blank\">\n modernjs.dev\n </a>\n</p>\n<p align=\"center\">\n The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
79
80
  }