@modern-js/plugin-data-loader 2.0.0-canary.5 → 2.0.0-canary.7

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

@@ -20,7 +20,7 @@ var __async = (__this, __arguments, generator) => {
 };
 import { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
-import { LOADER_SEARCH_PARAM } from "../common/constants";
+import { LOADER_ID_PARAM, DIRECT_PARAM } from "../common/constants";
 const getRequestUrl = ({
   params,
   request,
@@ -32,7 +32,8 @@ const getRequestUrl = ({
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append(LOADER_SEARCH_PARAM, routeId);
+  url.searchParams.append(LOADER_ID_PARAM, routeId);
+  url.searchParams.append(DIRECT_PARAM, "true");
   return url;
 };
 const handleRedirectResponse = (res) => {

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

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

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

@@ -47,7 +47,7 @@ import {
   matchRoutes
 } from "react-router-dom";
 import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
-import { LOADER_SEARCH_PARAM } from "../common/constants";
+import { LOADER_ID_PARAM } from "../common/constants";
 installGlobals();
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 function isRedirectResponse(response) {
@@ -150,7 +150,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   distDir
 }) {
   const { method, query } = context;
-  const routeId = query[LOADER_SEARCH_PARAM];
+  const routeId = query[LOADER_ID_PARAM];
   if (!routeId || method.toLowerCase() !== "get") {
     return;
   }

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

@@ -55,7 +55,8 @@ const getRequestUrl = ({
   });
   const newPathName = toPath(params);
   url.pathname = newPathName;
-  url.searchParams.append(import_constants.LOADER_SEARCH_PARAM, routeId);
+  url.searchParams.append(import_constants.LOADER_ID_PARAM, routeId);
+  url.searchParams.append(import_constants.DIRECT_PARAM, "true");
   return url;
 };
 const handleRedirectResponse = (res) => {

package/dist/js/node/common/constants.js

@@ -17,11 +17,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var constants_exports = {};
 __export(constants_exports, {
-  LOADER_SEARCH_PARAM: () => LOADER_SEARCH_PARAM
+  DIRECT_PARAM: () => DIRECT_PARAM,
+  LOADER_ID_PARAM: () => LOADER_ID_PARAM
 });
 module.exports = __toCommonJS(constants_exports);
-const LOADER_SEARCH_PARAM = "_ssrDirect";
+const LOADER_ID_PARAM = "__loader";
+const DIRECT_PARAM = "__ssrDirect";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  LOADER_SEARCH_PARAM
+  DIRECT_PARAM,
+  LOADER_ID_PARAM
 });

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

@@ -174,7 +174,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   distDir
 }) {
   const { method, query } = context;
-  const routeId = query[import_constants.LOADER_SEARCH_PARAM];
+  const routeId = query[import_constants.LOADER_ID_PARAM];
   if (!routeId || method.toLowerCase() !== "get") {
     return;
   }

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

@@ -124,7 +124,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { compile } from "path-to-regexp";
 import { redirect } from "react-router-dom";
-import { LOADER_SEARCH_PARAM } from "../common/constants";
+import { LOADER_ID_PARAM, DIRECT_PARAM } from "../common/constants";
 var getRequestUrl = function(param) {
     var params = param.params, request = param.request, routeId = param.routeId;
     var url = new URL(request.url);
@@ -133,7 +133,8 @@ var getRequestUrl = function(param) {
     });
     var newPathName = toPath(params);
     url.pathname = newPathName;
-    url.searchParams.append(LOADER_SEARCH_PARAM, routeId);
+    url.searchParams.append(LOADER_ID_PARAM, routeId);
+    url.searchParams.append(DIRECT_PARAM, "true");
     return url;
 };
 var handleRedirectResponse = function(res) {

package/dist/js/treeshaking/common/constants.js

@@ -1,2 +1,3 @@
-var LOADER_SEARCH_PARAM = "_ssrDirect";
-export { LOADER_SEARCH_PARAM };
+var LOADER_ID_PARAM = "__loader";
+var DIRECT_PARAM = "__ssrDirect";
+export { DIRECT_PARAM, LOADER_ID_PARAM };

package/dist/js/treeshaking/server/index.js

@@ -224,7 +224,7 @@ import path from "path";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
 import { matchRoutes } from "react-router-dom";
 import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
-import { LOADER_SEARCH_PARAM } from "../common/constants";
+import { LOADER_ID_PARAM } from "../common/constants";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([
     301,
@@ -443,7 +443,7 @@ var handleRequest = function() {
                 case 0:
                     context = param.context, serverRoutes = param.serverRoutes, distDir = param.distDir;
                     method = context.method, query = context.query;
-                    routeId = query[LOADER_SEARCH_PARAM];
+                    routeId = query[LOADER_ID_PARAM];
                     if (!routeId || method.toLowerCase() !== "get") {
                         return [
                             2

package/dist/types/common/constants.d.ts

@@ -1 +1,2 @@
-export declare const LOADER_SEARCH_PARAM = "_ssrDirect";
+export declare const LOADER_ID_PARAM = "__loader";
+export declare const DIRECT_PARAM = "__ssrDirect";

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-canary.5",
+  "version": "2.0.0-canary.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,18 +40,18 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "2.0.0-beta.6",
-    "@modern-js/utils": "2.0.0-beta.6",
+    "@modern-js/babel-compiler": "2.0.0-beta.7",
+    "@modern-js/utils": "2.0.0-beta.7",
     "@remix-run/node": "^1.9.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.6.0"
   },
   "devDependencies": {
-    "@modern-js/core": "2.0.0-beta.6",
-    "@modern-js/server-core": "2.0.0-beta.6",
-    "@modern-js/types": "2.0.0-beta.6",
-    "@scripts/build": "2.0.0-beta.6",
-    "@scripts/jest-config": "2.0.0-beta.6",
+    "@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/build": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -75,6 +75,5 @@
     "build": "modern-lib build",
     "dev": "modern-lib build --watch",
     "test": "jest --passWithNoTests"
-  },
-  "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"
+  }
 }