@modern-js/plugin-data-loader 2.34.1-alpha.1 → 2.35.1

package/dist/cjs/cli/createRequest.js

@@ -18,7 +18,7 @@ _export(exports, {
   }
 });
 const _pathtoregexp = require("path-to-regexp");
-const _router = require("@modern-js/utils/runtime/router");
+const _router = require("@modern-js/runtime-utils/router");
 const _constants = require("../common/constants");
 const _data = require("./data");
 const getRequestUrl = ({ params, request, routeId }) => {

package/dist/cjs/cli/data.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "parseDeferredReadableStream", {
     return parseDeferredReadableStream;
   }
 });
-const _remixrouter = require("@modern-js/utils/runtime/remix-router");
+const _remixrouter = require("@modern-js/runtime-utils/remix-router");
 const DEFERRED_VALUE_PLACEHOLDER_PREFIX = "__deferred_promise:";
 async function parseDeferredReadableStream(stream) {
   if (!stream) {

package/dist/cjs/runtime/index.js

@@ -21,11 +21,11 @@ _export(exports, {
   }
 });
 const _node = require("@remix-run/node");
-const _remixrouter = require("@modern-js/utils/runtime/remix-router");
-const _nestedroutes = require("@modern-js/utils/runtime/nested-routes");
+const _remixrouter = require("@modern-js/runtime-utils/remix-router");
+const _browser = require("@modern-js/runtime-utils/browser");
 const _lodash = require("@modern-js/utils/lodash");
-const _runtimenode = require("@modern-js/utils/runtime-node");
-const _time = require("@modern-js/utils/universal/time");
+const _node1 = require("@modern-js/runtime-utils/node");
+const _time = require("@modern-js/runtime-utils/time");
 const _constants = require("@modern-js/utils/universal/constants");
 const _constants1 = require("../common/constants");
 const _response = require("./response");
@@ -97,7 +97,7 @@ const sendLoaderResponse = async (res, nodeResponse) => {
 const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
   const { method, query } = context;
   const routeId = query[_constants1.LOADER_ID_PARAM];
-  const entry = (0, _runtimenode.matchEntry)(context.path, serverRoutes);
+  const entry = (0, _node1.matchEntry)(context.path, serverRoutes);
   if (!routeId || !entry) {
     return;
   }
@@ -107,13 +107,13 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
   const basename = entry.urlPath;
   const end = (0, _time.time)();
   const { res, logger, reporter } = context;
-  const routes = (0, _nestedroutes.transformNestedRoutes)(routesConfig, reporter);
+  const routes = (0, _browser.transformNestedRoutes)(routesConfig, reporter);
   const { queryRoute } = (0, _remixrouter.createStaticHandler)(routes, {
     basename
   });
   const request = createLoaderRequest(context);
-  const requestContext = (0, _runtimenode.createRequestContext)();
-  requestContext.set(_runtimenode.reporterCtx, reporter);
+  const requestContext = (0, _node1.createRequestContext)();
+  requestContext.set(_node1.reporterCtx, reporter);
   let response;
   try {
     response = await queryRoute(request, {
@@ -145,9 +145,8 @@ const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) =>
       });
     }
   } catch (error) {
-    var _logger;
     const message = error instanceof _remixrouter.ErrorResponse ? error.data : String(error);
-    (_logger = logger) === null || _logger === void 0 ? void 0 : _logger.error(message);
+    logger === null || logger === void 0 ? void 0 : logger.error(message);
     response = new _node.Response(message, {
       status: 500,
       headers: {

package/dist/cjs/runtime/response.js

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

package/dist/cjs/server/index.js

@@ -13,13 +13,13 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _fs = /* @__PURE__ */ _interop_require_default._(require("fs"));
 const _utils = require("@modern-js/utils");
-const _runtimenode = require("@modern-js/utils/runtime-node");
+const _node = require("@modern-js/runtime-utils/node");
 const _default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
     prepareLoaderHandler({ serverRoutes, distDir }) {
       return async (context) => {
-        const entry = (0, _runtimenode.matchEntry)(context.path, serverRoutes);
+        const entry = (0, _node.matchEntry)(context.path, serverRoutes);
         if (!entry) {
           return;
         }

package/dist/esm/cli/createRequest.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { compile } from "path-to-regexp";
-import { redirect } from "@modern-js/utils/runtime/router";
+import { redirect } from "@modern-js/runtime-utils/router";
 import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
 import { parseDeferredReadableStream } from "./data";
 export var getRequestUrl = function(param) {

package/dist/esm/cli/data.js

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

package/dist/esm/runtime/index.js

@@ -3,11 +3,11 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/runtime/remix-router";
-import { transformNestedRoutes } from "@modern-js/utils/runtime/nested-routes";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/runtime-utils/remix-router";
+import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { isPlainObject } from "@modern-js/utils/lodash";
-import { matchEntry, createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { matchEntry, createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { createDeferredReadableStream } from "./response";
@@ -157,7 +157,7 @@ var sendLoaderResponse = function() {
 }();
 export var handleRequest = function() {
   var _ref = _async_to_generator(function(param) {
-    var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, end, res, logger, reporter, routes, queryRoute, request, requestContext, response, deferredData, body, init, headers, error, _logger, message, cost;
+    var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, end, res, logger, reporter, routes, queryRoute, request, requestContext, response, deferredData, body, init, headers, error, message, cost;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -231,7 +231,7 @@ export var handleRequest = function() {
         case 3:
           error = _state.sent();
           message = _instanceof(error, ErrorResponse) ? error.data : String(error);
-          (_logger = logger) === null || _logger === void 0 ? void 0 : _logger.error(message);
+          logger === null || logger === void 0 ? void 0 : logger.error(message);
           response = new NodeResponse(message, {
             status: 500,
             headers: {

package/dist/esm/runtime/response.js

@@ -3,7 +3,7 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { TextEncoder } from "util";
-import { serializeJson } from "@modern-js/utils/runtime-node";
+import { serializeJson } from "@modern-js/runtime-utils/node";
 function isTrackedPromise(value) {
   return value != null && typeof value.then === "function" && value._tracked === true;
 }

package/dist/esm/server/index.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import fs from "fs";
 import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
-import { matchEntry } from "@modern-js/utils/runtime-node";
+import { matchEntry } from "@modern-js/runtime-utils/node";
 export default function() {
   return {
     name: "@modern-js/plugin-data-loader",

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

@@ -1,5 +1,5 @@
 import { compile } from "path-to-regexp";
-import { redirect } from "@modern-js/utils/runtime/router";
+import { redirect } from "@modern-js/runtime-utils/router";
 import { LOADER_ID_PARAM, DIRECT_PARAM, CONTENT_TYPE_DEFERRED } from "../common/constants";
 import { parseDeferredReadableStream } from "./data";
 export const getRequestUrl = ({ params, request, routeId }) => {

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

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

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

@@ -1,9 +1,9 @@
 import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse } from "@remix-run/node";
-import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/utils/runtime/remix-router";
-import { transformNestedRoutes } from "@modern-js/utils/runtime/nested-routes";
+import { createStaticHandler, ErrorResponse, UNSAFE_DEFERRED_SYMBOL as DEFERRED_SYMBOL } from "@modern-js/runtime-utils/remix-router";
+import { transformNestedRoutes } from "@modern-js/runtime-utils/browser";
 import { isPlainObject } from "@modern-js/utils/lodash";
-import { matchEntry, createRequestContext, reporterCtx } from "@modern-js/utils/runtime-node";
-import { time } from "@modern-js/utils/universal/time";
+import { matchEntry, createRequestContext, reporterCtx } from "@modern-js/runtime-utils/node";
+import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
 import { createDeferredReadableStream } from "./response";
@@ -123,9 +123,8 @@ export const handleRequest = async ({ context, serverRoutes, routes: routesConfi
       });
     }
   } catch (error) {
-    var _logger;
     const message = error instanceof ErrorResponse ? error.data : String(error);
-    (_logger = logger) === null || _logger === void 0 ? void 0 : _logger.error(message);
+    logger === null || logger === void 0 ? void 0 : logger.error(message);
     response = new NodeResponse(message, {
       status: 500,
       headers: {

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

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

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

@@ -1,7 +1,7 @@
 import path from "path";
 import fs from "fs";
 import { MAIN_ENTRY_NAME, SERVER_BUNDLE_DIRECTORY } from "@modern-js/utils";
-import { matchEntry } from "@modern-js/utils/runtime-node";
+import { matchEntry } from "@modern-js/runtime-utils/node";
 export default () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({

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

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

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

@@ -1,6 +1,6 @@
 import type { NestedRoute, ServerRoute } from '@modern-js/types';
 import { Response as NodeResponse } from '@remix-run/node';
-import { ServerContext } from '@modern-js/utils/runtime-node';
+import { ServerContext } from '@modern-js/runtime-utils/node';
 export declare function isRedirectResponse(status: number): boolean;
 export declare function isResponse(value: any): value is NodeResponse;
 export declare const handleRequest: ({

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

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

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.34.1-alpha.1",
+  "version": "2.35.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -58,7 +58,8 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.34.0"
+    "@modern-js/utils": "2.35.1",
+    "@modern-js/runtime-utils": "2.35.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -74,11 +75,11 @@
     "webpack": "^5.88.1",
     "react": "^18",
     "react-dom": "^18",
-    "@modern-js/types": "2.34.0",
-    "@modern-js/server-core": "2.34.0",
-    "@scripts/build": "2.34.0",
-    "@modern-js/core": "2.34.0",
-    "@scripts/jest-config": "2.34.0"
+    "@modern-js/types": "2.35.1",
+    "@modern-js/core": "2.35.1",
+    "@modern-js/server-core": "2.35.1",
+    "@scripts/build": "2.35.1",
+    "@scripts/jest-config": "2.35.1"
   },
   "peerDependencies": {
     "react": ">=17.0.0"