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

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

@@ -46,13 +46,8 @@ import {
 import {
   matchRoutes
 } from "react-router-dom";
-import {
-  createDebugger,
-  LOADER_ROUTES_DIR,
-  MAIN_ENTRY_NAME
-} from "@modern-js/utils";
-import { LOADER_SEARCH_PARAM } from "../common/constants";
-const debug = createDebugger("plugin-data-loader");
+import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } 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) {
@@ -78,7 +73,6 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
   request,
   loadContext
 }) {
-  debug("callRouteLoader", routeId, params);
   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.`
@@ -130,7 +124,6 @@ const createLoaderRequest = (context) => {
   return new Request(url.href, init);
 };
 const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
-  debug("sendLoaderResponse");
   res.statusMessage = nodeResponse.statusText;
   res.statusCode = nodeResponse.status;
   for (const [key, value] of nodeResponse.headers.entries()) {
@@ -157,15 +150,12 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   distDir
 }) {
   const { method, query } = context;
-  debug("handleRequest start");
-  const routeId = query[LOADER_SEARCH_PARAM];
+  const routeId = query[LOADER_ID_PARAM];
   if (!routeId || method.toLowerCase() !== "get") {
-    debug("routId not found");
     return;
   }
   const entry = matchEntry(context.path, serverRoutes);
   if (!entry) {
-    debug("entry not found");
     return;
   }
   const routesPath = path.join(
@@ -175,7 +165,6 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   );
   const { routes } = yield import(routesPath);
   if (!routes) {
-    debug("routes not found");
     return;
   }
   const { res } = context;
@@ -203,7 +192,6 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
       loadContext: {}
     });
     if (isRedirectResponse(response)) {
-      debug("redirect response, location is", response.headers.get("Location"));
       const headers = new Headers(response.headers);
       headers.set("X-Modernjs-Redirect", headers.get("Location"));
       headers.delete("Location");
@@ -220,7 +208,6 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
         "Content-Type": "text/plain"
       }
     });
-    debug("error response", error);
   }
   sendLoaderResponse(res, response);
 });

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

@@ -72,7 +72,6 @@ var import_node = require("@remix-run/node");
 var import_react_router_dom = require("react-router-dom");
 var import_utils = require("@modern-js/utils");
 var import_constants = require("../common/constants");
-const debug = (0, import_utils.createDebugger)("plugin-data-loader");
 (0, import_node.installGlobals)();
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 function isRedirectResponse(response) {
@@ -98,7 +97,6 @@ const callRouteLoader = (_0) => __async(void 0, [_0], function* ({
   request,
   loadContext
 }) {
-  debug("callRouteLoader", routeId, params);
   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.`
@@ -150,7 +148,6 @@ const createLoaderRequest = (context) => {
   return new Request(url.href, init);
 };
 const sendLoaderResponse = (res, nodeResponse) => __async(void 0, null, function* () {
-  debug("sendLoaderResponse");
   res.statusMessage = nodeResponse.statusText;
   res.statusCode = nodeResponse.status;
   for (const [key, value] of nodeResponse.headers.entries()) {
@@ -177,15 +174,12 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   distDir
 }) {
   const { method, query } = context;
-  debug("handleRequest start");
-  const routeId = query[import_constants.LOADER_SEARCH_PARAM];
+  const routeId = query[import_constants.LOADER_ID_PARAM];
   if (!routeId || method.toLowerCase() !== "get") {
-    debug("routId not found");
     return;
   }
   const entry = matchEntry(context.path, serverRoutes);
   if (!entry) {
-    debug("entry not found");
     return;
   }
   const routesPath = import_path.default.join(
@@ -195,7 +189,6 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   );
   const { routes } = yield Promise.resolve().then(() => __toESM(require(routesPath)));
   if (!routes) {
-    debug("routes not found");
     return;
   }
   const { res } = context;
@@ -223,7 +216,6 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
       loadContext: {}
     });
     if (isRedirectResponse(response)) {
-      debug("redirect response, location is", response.headers.get("Location"));
       const headers = new Headers(response.headers);
       headers.set("X-Modernjs-Redirect", headers.get("Location"));
       headers.delete("Location");
@@ -240,7 +232,6 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
         "Content-Type": "text/plain"
       }
     });
-    debug("error response", error);
   }
   sendLoaderResponse(res, response);
 });

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

@@ -223,9 +223,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
 import path from "path";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
 import { matchRoutes } from "react-router-dom";
-import { createDebugger, LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
-import { LOADER_SEARCH_PARAM } from "../common/constants";
-var debug = createDebugger("plugin-data-loader");
+import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
+import { LOADER_ID_PARAM } from "../common/constants";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([
     301,
@@ -260,7 +259,6 @@ var callRouteLoader = function() {
             switch(_state.label){
                 case 0:
                     routeId = param.routeId, loader = param.loader, params = param.params, request = param.request, loadContext = param.loadContext;
-                    debug("callRouteLoader", routeId, params);
                     if (!loader) {
                         throw new Error("You made a ".concat(request.method, " request to ").concat(request.url, ' but did not provide a default component or `loader` for route "').concat(routeId, '", so there is no way to handle the request.'));
                     }
@@ -376,7 +374,6 @@ var sendLoaderResponse = function() {
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    debug("sendLoaderResponse");
                     res.statusMessage = nodeResponse.statusText;
                     res.statusCode = nodeResponse.status;
                     _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -446,17 +443,14 @@ var handleRequest = function() {
                 case 0:
                     context = param.context, serverRoutes = param.serverRoutes, distDir = param.distDir;
                     method = context.method, query = context.query;
-                    debug("handleRequest start");
-                    routeId = query[LOADER_SEARCH_PARAM];
+                    routeId = query[LOADER_ID_PARAM];
                     if (!routeId || method.toLowerCase() !== "get") {
-                        debug("routId not found");
                         return [
                             2
                         ];
                     }
                     entry = matchEntry(context.path, serverRoutes);
                     if (!entry) {
-                        debug("entry not found");
                         return [
                             2
                         ];
@@ -469,7 +463,6 @@ var handleRequest = function() {
                 case 1:
                     routes = _state.sent().routes;
                     if (!routes) {
-                        debug("routes not found");
                         return [
                             2
                         ];
@@ -516,7 +509,6 @@ var handleRequest = function() {
                 case 3:
                     response = _state.sent();
                     if (isRedirectResponse(response)) {
-                        debug("redirect response, location is", response.headers.get("Location"));
                         headers = new Headers(response.headers);
                         headers.set("X-Modernjs-Redirect", headers.get("Location"));
                         headers.delete("Location");
@@ -538,7 +530,6 @@ var handleRequest = function() {
                             "Content-Type": "text/plain"
                         }
                     });
-                    debug("error response", error);
                     return [
                         3,
                         5

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/dist/types/server/index.d.ts

@@ -1,7 +1,7 @@
 import type { ServerPlugin } from '@modern-js/server-core';
 import type { ModernServerContext, ServerRoute } from '@modern-js/types';
 import { Response as NodeResponse } from '@remix-run/node';
-export declare type ServerContext = Pick<ModernServerContext, 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
+export type ServerContext = Pick<ModernServerContext, 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
 export declare function isRedirectResponse(response: NodeResponse): boolean;
 export declare function isResponse(value: any): value is NodeResponse;
 export declare const getPathWithoutEntry: (pathname: string, entryPath: string) => string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-canary.6",
+  "version": "2.0.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -40,18 +40,13 @@
   "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",
     "@remix-run/node": "^1.9.0",
     "path-to-regexp": "^6.2.0",
-    "react-router-dom": "^6.6.0"
+    "react-router-dom": "^6.6.0",
+    "@modern-js/babel-compiler": "2.0.0",
+    "@modern-js/utils": "2.0.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",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
@@ -63,7 +58,12 @@
     "ts-jest": "^27.0.5",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "webpack-chain": "^6.5.1"
+    "webpack-chain": "^6.5.1",
+    "@modern-js/core": "2.0.0",
+    "@modern-js/server-core": "2.0.0",
+    "@modern-js/types": "2.0.0",
+    "@scripts/build": "2.0.0",
+    "@scripts/jest-config": "2.0.0"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -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"
+  }
 }