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

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

@@ -46,8 +46,13 @@ import {
 import {
   matchRoutes
 } from "react-router-dom";
-import { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
+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");
 installGlobals();
 const redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 function isRedirectResponse(response) {
@@ -73,6 +78,7 @@ 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.`
@@ -124,6 +130,7 @@ 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()) {
@@ -150,12 +157,15 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   distDir
 }) {
   const { method, query } = context;
+  debug("handleRequest start");
   const routeId = query[LOADER_SEARCH_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(
@@ -165,6 +175,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   );
   const { routes } = yield import(routesPath);
   if (!routes) {
+    debug("routes not found");
     return;
   }
   const { res } = context;
@@ -192,6 +203,7 @@ 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");
@@ -208,6 +220,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
         "Content-Type": "text/plain"
       }
     });
+    debug("error response", error);
   }
   sendLoaderResponse(res, response);
 });

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

@@ -72,6 +72,7 @@ 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) {
@@ -97,6 +98,7 @@ 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.`
@@ -148,6 +150,7 @@ 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()) {
@@ -174,12 +177,15 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
   distDir
 }) {
   const { method, query } = context;
+  debug("handleRequest start");
   const routeId = query[import_constants.LOADER_SEARCH_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(
@@ -189,6 +195,7 @@ 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;
@@ -216,6 +223,7 @@ 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");
@@ -232,6 +240,7 @@ const handleRequest = (_0) => __async(void 0, [_0], function* ({
         "Content-Type": "text/plain"
       }
     });
+    debug("error response", error);
   }
   sendLoaderResponse(res, response);
 });

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

@@ -223,8 +223,9 @@ 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 { LOADER_ROUTES_DIR, MAIN_ENTRY_NAME } from "@modern-js/utils";
+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");
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([
     301,
@@ -259,6 +260,7 @@ 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.'));
                     }
@@ -374,6 +376,7 @@ 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;
@@ -443,14 +446,17 @@ 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];
                     if (!routeId || method.toLowerCase() !== "get") {
+                        debug("routId not found");
                         return [
                             2
                         ];
                     }
                     entry = matchEntry(context.path, serverRoutes);
                     if (!entry) {
+                        debug("entry not found");
                         return [
                             2
                         ];
@@ -463,6 +469,7 @@ var handleRequest = function() {
                 case 1:
                     routes = _state.sent().routes;
                     if (!routes) {
+                        debug("routes not found");
                         return [
                             2
                         ];
@@ -509,6 +516,7 @@ 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");
@@ -530,6 +538,7 @@ var handleRequest = function() {
                             "Content-Type": "text/plain"
                         }
                     });
+                    debug("error response", error);
                     return [
                         3,
                         5

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-canary.4",
+  "version": "2.0.0-canary.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",