@modern-js/plugin-data-loader 2.17.1 → 2.18.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/plugin-data-loader
 
+## 2.18.1
+
+### Patch Changes
+
+- @modern-js/utils@2.18.1
+
+## 2.18.0
+
+### Patch Changes
+
+- @modern-js/utils@2.18.0
+
 ## 2.17.1
 
 ### Patch Changes

package/dist/cjs/cli/data.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "parseDeferredReadableStream", {
   enumerable: true,
   get: () => parseDeferredReadableStream
 });
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _router = require("@modern-js/utils/runtime/router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {
@@ -65,7 +65,7 @@ async function parseDeferredReadableStream(stream) {
           }
         }
         for (const [key, resolver] of Object.entries(deferredResolvers)) {
-          resolver.reject(new _remixrouter.AbortedDeferredError(`Deferred ${key} will never resolved`));
+          resolver.reject(new _router.AbortedDeferredError(`Deferred ${key} will never resolved`));
         }
       } catch (error) {
         for (const resolver of Object.values(deferredResolvers)) {
@@ -73,7 +73,7 @@ async function parseDeferredReadableStream(stream) {
         }
       }
     })();
-    return new _remixrouter.UNSAFE_DeferredData({
+    return new _router.UNSAFE_DeferredData({
       ...criticalData,
       ...deferredData
     });

package/dist/cjs/runtime/index.js

@@ -15,9 +15,8 @@ _export(exports, {
   handleRequest: () => handleRequest
 });
 const _node = require("@remix-run/node");
-const _remixrouter = require("@modern-js/utils/universal/remix-router");
+const _router = require("@modern-js/utils/runtime/router");
 const _lodash = require("@modern-js/utils/lodash");
-const _nestedRoutes = require("@modern-js/utils/universal/nestedRoutes");
 const _constants = require("../common/constants");
 const _utils = require("../common/utils");
 const _response = require("./response");
@@ -97,8 +96,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     throw new Error("CSR data loader request only support http GET method");
   }
   const basename = entry.urlPath;
-  const routes = (0, _nestedRoutes.transformNestedRoutes)(routesConfig);
-  const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
+  const routes = (0, _router.transformNestedRoutes)(routesConfig);
+  const { queryRoute } = (0, _router.createStaticHandler)(routes, {
     basename
   });
   const { res, logger } = context;
@@ -110,8 +109,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
     });
     if (isResponse(response) && isRedirectResponse(response.status)) {
       response = convertModernRedirectResponse(response.headers, basename);
-    } else if ((0, _lodash.isPlainObject)(response) && _remixrouter.UNSAFE_DEFERRED_SYMBOL in response) {
-      const deferredData = response[_remixrouter.UNSAFE_DEFERRED_SYMBOL];
+    } else if ((0, _lodash.isPlainObject)(response) && _router.UNSAFE_DEFERRED_SYMBOL in response) {
+      const deferredData = response[_router.UNSAFE_DEFERRED_SYMBOL];
       const body = (0, _response.createDeferredReadableStream)(deferredData, request.signal);
       const init = deferredData.init || {};
       if (init.status && isRedirectResponse(init.status)) {
@@ -133,7 +132,7 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
       });
     }
   } catch (error) {
-    const message = error instanceof _remixrouter.ErrorResponse ? error.data : String(error);
+    const message = error instanceof _router.ErrorResponse ? error.data : String(error);
     logger === null || logger === void 0 ? void 0 : logger.error(message);
     response = new _node.Response(message, {
       status: 500,

package/dist/cjs/runtime/response.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "createDeferredReadableStream", {
   get: () => createDeferredReadableStream
 });
 const _util = require("util");
-const _serialize = require("@modern-js/utils/universal/serialize");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }
@@ -49,7 +49,7 @@ function createDeferredReadableStream(deferredData, signal) {
 function enqueueTrackedPromise(controller, encoder, settledKey, promise) {
   if ("_error" in promise) {
     const { _error } = promise;
-    controller.enqueue(encoder.encode(`error:${(0, _serialize.serializeJson)({
+    controller.enqueue(encoder.encode(`error:${(0, _runtimenode.serializeJson)({
       [settledKey]: {
         message: _error.message,
         stack: _error.stack

package/dist/cjs/server/index.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "default", {
 });
 const _path = /* @__PURE__ */ _interop_require_default(require("path"));
 const _fs = /* @__PURE__ */ _interop_require_default(require("fs"));
-const _constants = require("@modern-js/utils/constants");
-const _utils = require("../common/utils");
+const _utils = require("@modern-js/utils");
+const _utils1 = require("../common/utils");
 function _interop_require_default(obj) {
   return obj && obj.__esModule ? obj : {
     default: obj
@@ -60,11 +60,11 @@ const _default = () => ({
   setup: () => ({
     prepareLoaderHandler({ serverRoutes, distDir }) {
       return async (context) => {
-        const entry = (0, _utils.matchEntry)(context.path, serverRoutes);
+        const entry = (0, _utils1.matchEntry)(context.path, serverRoutes);
         if (!entry) {
           return;
         }
-        const routesPath = _path.default.join(distDir, _constants.SERVER_BUNDLE_DIRECTORY, `${entry.entryName || _constants.MAIN_ENTRY_NAME}-server-loaders.js`);
+        const routesPath = _path.default.join(distDir, _utils.SERVER_BUNDLE_DIRECTORY, `${entry.entryName || _utils.MAIN_ENTRY_NAME}-server-loaders.js`);
         if (!_fs.default.existsSync(routesPath)) {
           return;
         }

package/dist/esm/cli/createRequest.js

@@ -195,14 +195,14 @@ export var createRequest = function(routeId) {
           case 0:
             params = param.params, request = param.request;
             url = getRequestUrl({
-              params,
-              request,
-              routeId
+              params: params,
+              request: request,
+              routeId: routeId
             });
             return [
               4,
               fetch(url, {
-                method,
+                method: method,
                 signal: request.signal
               })
             ];

package/dist/esm/cli/data.js

@@ -18,10 +18,10 @@ function _async_generator(gen) {
   function send(key, arg) {
     return new Promise(function(resolve, reject) {
       var request = {
-        key,
-        arg,
-        resolve,
-        reject,
+        key: key,
+        arg: arg,
+        resolve: resolve,
+        reject: reject,
         next: null
       };
       if (back) {
@@ -54,7 +54,7 @@ function _async_generator(gen) {
     switch (type) {
       case "return":
         front.resolve({
-          value,
+          value: value,
           done: true
         });
         break;
@@ -63,7 +63,7 @@ function _async_generator(gen) {
         break;
       default:
         front.resolve({
-          value,
+          value: value,
           done: false
         });
         break;
@@ -112,8 +112,8 @@ function AsyncFromSyncIterator(s) {
     var done = r.done;
     return Promise.resolve(r.value).then(function(value) {
       return {
-        value,
-        done
+        value: value,
+        done: done
       };
     });
   }
@@ -128,7 +128,7 @@ function AsyncFromSyncIterator(s) {
     return: function(value) {
       var ret = this.s.return;
       return void 0 === ret ? Promise.resolve({
-        value,
+        value: value,
         done: true
       }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments));
     },
@@ -176,7 +176,7 @@ function _await_value(value) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -368,7 +368,7 @@ var __generator = function(thisArg, body) {
     };
   }
 };
-import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/universal/remix-router";
+import { UNSAFE_DeferredData as DeferredData, AbortedDeferredError } from "@modern-js/utils/runtime/router";
 var DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 export function parseDeferredReadableStream(stream) {
   return _parseDeferredReadableStream.apply(this, arguments);

package/dist/esm/runtime/index.js

@@ -195,9 +195,8 @@ var __generator = function(thisArg, body) {
   }
 };
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/universal/remix-router";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, transformNestedRoutes } from "@modern-js/utils/runtime/router";
 import { isPlainObject } from "@modern-js/utils/lodash";
-import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";
 import { createDeferredReadableStream } from "./response";
@@ -366,7 +365,7 @@ export var handleRequest = function() {
           basename = entry.urlPath;
           routes = transformNestedRoutes(routesConfig);
           queryRoute = createStaticHandler(routes, {
-            basename
+            basename: basename
           }).queryRoute;
           res = context.res, logger = context.logger;
           request = createLoaderRequest(context);
@@ -381,7 +380,7 @@ export var handleRequest = function() {
           return [
             4,
             queryRoute(request, {
-              routeId
+              routeId: routeId
             })
           ];
         case 2:

package/dist/esm/runtime/response.js

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -201,7 +201,7 @@ var __generator = function(thisArg, body) {
   }
 };
 import { TextEncoder } from "util";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }

package/dist/esm/server/index.js

@@ -131,7 +131,7 @@ var __generator = function(thisArg, body) {
 };
 import path from "path";
 import fs from "fs";
-import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { matchEntry } from "../common/utils";
 export default function() {
   return {
@@ -172,9 +172,9 @@ export default function() {
                     return [
                       2,
                       handleRequest({
-                        serverRoutes,
-                        context,
-                        routes
+                        serverRoutes: serverRoutes,
+                        context: context,
+                        routes: routes
                       })
                     ];
                 }

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

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

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

@@ -1,7 +1,6 @@
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/universal/remix-router";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL, transformNestedRoutes } from "@modern-js/utils/runtime/router";
 import { isPlainObject } from "@modern-js/utils/lodash";
-import { transformNestedRoutes } from "@modern-js/utils/universal/nestedRoutes";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { matchEntry } from "../common/utils";
 import { createDeferredReadableStream } from "./response";

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

@@ -1,5 +1,5 @@
 import { TextEncoder } from "util";
-import { serializeJson } from "@modern-js/utils/universal/serialize";
+import { serializeJson } from "@modern-js/utils/runtime-node";
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }

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

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs";
-import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils/constants";
+import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
 import { matchEntry } from "../common/utils";
 export default () => ({
   name: "@modern-js/plugin-data-loader",

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

@@ -1,4 +1,4 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
+import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/router';
 export declare const getRequestUrl: ({
   params,
   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/utils/universal/remix-router';
+import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/router';
 export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;

package/dist/types/runtime/response.d.ts

@@ -1,2 +1,2 @@
-import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/universal/remix-router';
+import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/router';
 export declare function createDeferredReadableStream(deferredData: DeferredData, signal: AbortSignal): any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.17.1",
+  "version": "2.18.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -59,7 +59,7 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/utils": "2.17.1"
+    "@modern-js/utils": "2.18.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -76,11 +76,11 @@
     "webpack-chain": "^6.5.1",
     "react": ">=17.0.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/core": "2.17.1",
-    "@modern-js/server-core": "2.17.1",
-    "@modern-js/types": "2.17.1",
-    "@scripts/build": "2.17.1",
-    "@scripts/jest-config": "2.17.1"
+    "@modern-js/core": "2.18.1",
+    "@modern-js/server-core": "2.18.1",
+    "@modern-js/types": "2.18.1",
+    "@scripts/jest-config": "2.18.1",
+    "@scripts/build": "2.18.1"
   },
   "peerDependencies": {
     "react": ">=17.0.0",