@modern-js/plugin-data-loader 2.67.3 → 2.67.5

package/dist/cjs/cli/createRequest.js

@@ -75,6 +75,7 @@ const handleNetworkErrorResponse = async (res) => {
   throw error;
 };
 const createRequest = (routeId, method = "get") => {
+  const isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
   return async ({ params, request }) => {
     const url = getRequestUrl({
       params,
@@ -98,7 +99,8 @@ const createRequest = (routeId, method = "get") => {
       throw res;
     }
     if (isDeferredResponse(res)) {
-      return await (0, import_data.parseDeferredReadableStream)(res.body);
+      const deferredData = await (0, import_data.parseDeferredReadableStream)(res.body);
+      return isRouterV7 ? deferredData.data : deferredData;
     }
     if (isOtherErrorResponse(res)) {
       return await handleNetworkErrorResponse(res);

package/dist/cjs/cli/data.js

@@ -21,7 +21,7 @@ __export(data_exports, {
   parseDeferredReadableStream: () => parseDeferredReadableStream
 });
 module.exports = __toCommonJS(data_exports);
-var import_remix_router = require("@modern-js/runtime-utils/remix-router");
+var import_browser = require("@modern-js/runtime-utils/browser");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {
@@ -80,7 +80,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(new import_remix_router.AbortedDeferredError(`Deferred ${key} will never resolved`));
+          resolver.reject(new import_browser.AbortedDeferredError(`Deferred ${key} will never resolved`));
         }
       } catch (error) {
         for (const resolver of Object.values(deferredResolvers)) {
@@ -88,7 +88,7 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new import_remix_router.UNSAFE_DeferredData({
+    return new import_browser.DeferredData({
       ...criticalData,
       ...deferredData
     });

package/dist/cjs/runtime/index.js

@@ -72,10 +72,12 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
   const end = (0, import_time.time)();
   const { reporter, loaderContext, monitors } = context;
   const headersData = (0, import_request.parseHeaders)(request);
+  const activeDeferreds = /* @__PURE__ */ new Map();
   return import_node2.storage.run({
     headers: headersData,
     monitors,
-    request
+    request,
+    activeDeferreds
   }, async () => {
     const routes = (0, import_browser.transformNestedRoutes)(routesConfig);
     const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
@@ -91,9 +93,18 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
       });
       if (isResponse(response) && isRedirectResponse(response.status)) {
         response = convertModernRedirectResponse(response.headers, basename);
-      } else if ((0, import_lodash.isPlainObject)(response) && import_remix_router.UNSAFE_DEFERRED_SYMBOL in response) {
-        const deferredData = response[import_remix_router.UNSAFE_DEFERRED_SYMBOL];
-        const body = (0, import_response.createDeferredReadableStream)(deferredData, request.signal);
+      } else if ((0, import_lodash.isPlainObject)(response) && (import_remix_router.UNSAFE_DEFERRED_SYMBOL in response || activeDeferreds.get(routeId))) {
+        let deferredData;
+        if (import_remix_router.UNSAFE_DEFERRED_SYMBOL in response) {
+          deferredData = response[import_remix_router.UNSAFE_DEFERRED_SYMBOL];
+        } else {
+          deferredData = activeDeferreds.get(routeId);
+        }
+        const body = (0, import_response.createDeferredReadableStream)(
+          // @ts-ignore
+          deferredData,
+          request.signal
+        );
         const init = deferredData.init || {};
         if (init.status && isRedirectResponse(init.status)) {
           if (!init.headers) {
@@ -124,10 +135,11 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
         response = (0, import_errors.errorResponseToJson)(error);
       } else {
         const errorInstance = error instanceof Error || error instanceof DOMException ? error : new Error("Unexpected Server Error");
-        response = (0, import_remix_router.json)((0, import_errors.serializeError)(errorInstance), {
+        response = new Response(JSON.stringify((0, import_errors.serializeError)(errorInstance)), {
           status: 500,
           headers: {
-            "X-Modernjs-Error": "yes"
+            "X-Modernjs-Error": "yes",
+            "Content-Type": "application/json"
           }
         });
       }

package/dist/esm/cli/createRequest.js

@@ -86,9 +86,10 @@ var handleNetworkErrorResponse = function() {
 }();
 var createRequest = function(routeId) {
   var method = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "get";
+  var isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
   return function() {
     var _ref = _async_to_generator(function(param) {
-      var params, request, url, res;
+      var params, request, url, res, deferredData;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -143,9 +144,10 @@ var createRequest = function(routeId) {
               parseDeferredReadableStream(res.body)
             ];
           case 4:
+            deferredData = _state.sent();
             return [
               2,
-              _state.sent()
+              isRouterV7 ? deferredData.data : deferredData
             ];
           case 5:
             if (!isOtherErrorResponse(res))

package/dist/esm/cli/data.js

@@ -8,7 +8,7 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _wrap_async_generator } from "@swc/helpers/_/_wrap_async_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { AbortedDeferredError, UNSAFE_DeferredData as DeferredData } from "@modern-js/runtime-utils/remix-router";
+import { AbortedDeferredError, DeferredData } from "@modern-js/runtime-utils/browser";
 var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 function parseDeferredReadableStream(stream) {
   return _parseDeferredReadableStream.apply(this, arguments);

package/dist/esm/runtime/index.js

@@ -5,7 +5,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
 import { storage } from "@modern-js/runtime-utils/node";
-import { UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse, json } from "@modern-js/runtime-utils/remix-router";
+import { UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { matchEntry } from "@modern-js/runtime-utils/server";
 import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
@@ -42,7 +42,7 @@ function convertModernRedirectResponse(headers, basename) {
 }
 var handleRequest = function() {
   var _ref = _async_to_generator(function(param) {
-    var request, serverRoutes, routesConfig, context, onTiming, url, routeId, entry, basename, end, reporter, loaderContext, monitors, headersData;
+    var request, serverRoutes, routesConfig, context, onTiming, url, routeId, entry, basename, end, reporter, loaderContext, monitors, headersData, activeDeferreds;
     return _ts_generator(this, function(_state) {
       request = param.request, serverRoutes = param.serverRoutes, routesConfig = param.routes, context = param.context, onTiming = param.onTiming;
       url = new URL(request.url);
@@ -57,12 +57,14 @@ var handleRequest = function() {
       end = time();
       reporter = context.reporter, loaderContext = context.loaderContext, monitors = context.monitors;
       headersData = parseHeaders(request);
+      activeDeferreds = /* @__PURE__ */ new Map();
       return [
         2,
         storage.run({
           headers: headersData,
           monitors,
-          request
+          request,
+          activeDeferreds
         }, /* @__PURE__ */ _async_to_generator(function() {
           var routes, queryRoute, requestContext, response, deferredData, body, init, headers, cost, error, errorInstance;
           return _ts_generator(this, function(_state2) {
@@ -93,9 +95,18 @@ var handleRequest = function() {
                 response = _state2.sent();
                 if (isResponse(response) && isRedirectResponse(response.status)) {
                   response = convertModernRedirectResponse(response.headers, basename);
-                } else if (isPlainObject(response) && DEFERRED_SYMBOL in response) {
-                  deferredData = response[DEFERRED_SYMBOL];
-                  body = createDeferredReadableStream(deferredData, request.signal);
+                } else if (isPlainObject(response) && (DEFERRED_SYMBOL in response || activeDeferreds.get(routeId))) {
+                  ;
+                  if (DEFERRED_SYMBOL in response) {
+                    deferredData = response[DEFERRED_SYMBOL];
+                  } else {
+                    deferredData = activeDeferreds.get(routeId);
+                  }
+                  body = createDeferredReadableStream(
+                    // @ts-ignore
+                    deferredData,
+                    request.signal
+                  );
                   init = deferredData.init || {};
                   if (init.status && isRedirectResponse(init.status)) {
                     if (!init.headers) {
@@ -131,10 +142,11 @@ var handleRequest = function() {
                   response = errorResponseToJson(error);
                 } else {
                   errorInstance = _instanceof(error, Error) || _instanceof(error, DOMException) ? error : new Error("Unexpected Server Error");
-                  response = json(serializeError(errorInstance), {
+                  response = new Response(JSON.stringify(serializeError(errorInstance)), {
                     status: 500,
                     headers: {
-                      "X-Modernjs-Error": "yes"
+                      "X-Modernjs-Error": "yes",
+                      "Content-Type": "application/json"
                     }
                   });
                 }

package/dist/esm-node/cli/createRequest.js

@@ -50,6 +50,7 @@ const handleNetworkErrorResponse = async (res) => {
   throw error;
 };
 const createRequest = (routeId, method = "get") => {
+  const isRouterV7 = process.env._MODERN_ROUTER_VERSION === "v7";
   return async ({ params, request }) => {
     const url = getRequestUrl({
       params,
@@ -73,7 +74,8 @@ const createRequest = (routeId, method = "get") => {
       throw res;
     }
     if (isDeferredResponse(res)) {
-      return await parseDeferredReadableStream(res.body);
+      const deferredData = await parseDeferredReadableStream(res.body);
+      return isRouterV7 ? deferredData.data : deferredData;
     }
     if (isOtherErrorResponse(res)) {
       return await handleNetworkErrorResponse(res);

package/dist/esm-node/cli/data.js

@@ -1,4 +1,4 @@
-import { AbortedDeferredError, UNSAFE_DeferredData as DeferredData } from "@modern-js/runtime-utils/remix-router";
+import { AbortedDeferredError, DeferredData } from "@modern-js/runtime-utils/browser";
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {

package/dist/esm-node/runtime/index.js

@@ -1,7 +1,7 @@
 import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
 import { storage } from "@modern-js/runtime-utils/node";
-import { UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse, json } from "@modern-js/runtime-utils/remix-router";
+import { UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, createStaticHandler, isRouteErrorResponse } from "@modern-js/runtime-utils/remix-router";
 import { matchEntry } from "@modern-js/runtime-utils/server";
 import { time } from "@modern-js/runtime-utils/time";
 import { parseHeaders } from "@modern-js/runtime-utils/universal/request";
@@ -47,10 +47,12 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
   const end = time();
   const { reporter, loaderContext, monitors } = context;
   const headersData = parseHeaders(request);
+  const activeDeferreds = /* @__PURE__ */ new Map();
   return storage.run({
     headers: headersData,
     monitors,
-    request
+    request,
+    activeDeferreds
   }, async () => {
     const routes = transformNestedRoutes(routesConfig);
     const { queryRoute } = createStaticHandler(routes, {
@@ -66,9 +68,18 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
       });
       if (isResponse(response) && isRedirectResponse(response.status)) {
         response = convertModernRedirectResponse(response.headers, basename);
-      } else if (isPlainObject(response) && DEFERRED_SYMBOL in response) {
-        const deferredData = response[DEFERRED_SYMBOL];
-        const body = createDeferredReadableStream(deferredData, request.signal);
+      } else if (isPlainObject(response) && (DEFERRED_SYMBOL in response || activeDeferreds.get(routeId))) {
+        let deferredData;
+        if (DEFERRED_SYMBOL in response) {
+          deferredData = response[DEFERRED_SYMBOL];
+        } else {
+          deferredData = activeDeferreds.get(routeId);
+        }
+        const body = createDeferredReadableStream(
+          // @ts-ignore
+          deferredData,
+          request.signal
+        );
         const init = deferredData.init || {};
         if (init.status && isRedirectResponse(init.status)) {
           if (!init.headers) {
@@ -99,10 +110,11 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
         response = errorResponseToJson(error);
       } else {
         const errorInstance = error instanceof Error || error instanceof DOMException ? error : new Error("Unexpected Server Error");
-        response = json(serializeError(errorInstance), {
+        response = new Response(JSON.stringify(serializeError(errorInstance)), {
           status: 500,
           headers: {
-            "X-Modernjs-Error": "yes"
+            "X-Modernjs-Error": "yes",
+            "Content-Type": "application/json"
           }
         });
       }

package/dist/types/cli/createRequest.d.ts

@@ -1,4 +1,4 @@
-import type { UNSAFE_DeferredData as DeferredData } from '@modern-js/runtime-utils/remix-router';
+import type { DeferredData } from '@modern-js/runtime-utils/browser';
 export declare const getRequestUrl: ({ params, request, routeId, }: {
     params: Record<string, string>;
     request: Request;
@@ -7,7 +7,7 @@ export declare const getRequestUrl: ({ params, request, routeId, }: {
 export declare const createRequest: (routeId: string, method?: string) => ({ params, request, }: {
     params: Record<string, string>;
     request: Request;
-}) => Promise<DeferredData | Response>;
+}) => Promise<DeferredData | Record<string, unknown> | Response>;
 export declare const createActionRequest: (routeId: string) => ({ params, request, }: {
     params: Record<string, string>;
     request: Request;

package/dist/types/cli/data.d.ts

@@ -7,5 +7,5 @@
  * Copyright 2021 Remix Software Inc.
  * https://github.com/remix-run/remix/blob/2b5e1a72fc628d0408e27cf4d72e537762f1dc5b/LICENSE.md
  */
-import { UNSAFE_DeferredData as DeferredData } from '@modern-js/runtime-utils/remix-router';
+import { DeferredData } from '@modern-js/runtime-utils/browser';
 export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.3",
+  "version": "2.67.5",
   "engines": {
     "node": ">=16.2.0"
   },
@@ -47,10 +47,10 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.0",
-    "@swc/helpers": "0.5.13",
+    "@swc/helpers": "^0.5.17",
     "path-to-regexp": "^6.2.0",
-    "@modern-js/runtime-utils": "2.67.3",
-    "@modern-js/utils": "2.67.3"
+    "@modern-js/runtime-utils": "2.67.5",
+    "@modern-js/utils": "2.67.5"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -59,17 +59,17 @@
     "@types/supertest": "^2.0.11",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^29",
-    "memfs": "^3.5.1",
+    "memfs": "^3.5.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "supertest": "^6.1.6",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.98.0",
-    "@modern-js/core": "2.67.3",
-    "@modern-js/server-core": "2.67.3",
+    "webpack": "^5.99.8",
+    "@modern-js/core": "2.67.5",
+    "@modern-js/server-core": "2.67.5",
+    "@modern-js/types": "2.67.5",
     "@scripts/build": "2.66.0",
-    "@modern-js/types": "2.67.3",
     "@scripts/jest-config": "2.66.0"
   },
   "peerDependencies": {