@modern-js/plugin-data-loader 2.22.1 → 2.23.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/plugin-data-loader
 
+## 2.23.0
+
+### Patch Changes
+
+- 7e6fb5f: chore: publishConfig add provenance config
+
+  chore: publishConfig 增加 provenance 配置
+
+- a7a7ad7: chore: move some public code to the utils package
+  chore: 移动一些公共的代码到 utils 包
+- 6dec7c2: test(utils): reuse the snapshot serializer of vitest config
+
+  test(utils): 复用 vitest 的 snapshot serializer
+
+- e5259fb: fix: absoluteEntryDir should support directory entry
+  fix: absoluteEntryDir 应该支持配置目录 entry，这里 document 会使用
+- Updated dependencies [7e6fb5f]
+- Updated dependencies [a7a7ad7]
+- Updated dependencies [6dec7c2]
+- Updated dependencies [c3216b5]
+  - @modern-js/utils@2.23.0
+
 ## 2.22.1
 
 ### Patch Changes

package/dist/cjs/cli/createRequest.js

@@ -18,7 +18,7 @@ _export(exports, {
   }
 });
 const _pathtoregexp = require("path-to-regexp");
-const _reactrouterdom = require("react-router-dom");
+const _router = require("@modern-js/utils/runtime/router");
 const _constants = require("../common/constants");
 const _data = require("./data");
 const getRequestUrl = ({ params, request, routeId }) => {
@@ -36,7 +36,7 @@ const handleRedirectResponse = (res) => {
   const { headers } = res;
   const location = headers.get("X-Modernjs-Redirect");
   if (location) {
-    throw (0, _reactrouterdom.redirect)(location);
+    throw (0, _router.redirect)(location);
   }
   return res;
 };

package/dist/cjs/runtime/index.js

@@ -24,8 +24,8 @@ 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 _lodash = require("@modern-js/utils/lodash");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _constants = require("../common/constants");
-const _utils = require("../common/utils");
 const _response = require("./response");
 (0, _node.installGlobals)();
 const redirectStatusCodes = /* @__PURE__ */ new Set([
@@ -95,7 +95,7 @@ const sendLoaderResponse = async (res, nodeResponse) => {
 const handleRequest = async ({ context, serverRoutes, routes: routesConfig }) => {
   const { method, query } = context;
   const routeId = query[_constants.LOADER_ID_PARAM];
-  const entry = (0, _utils.matchEntry)(context.path, serverRoutes);
+  const entry = (0, _runtimenode.matchEntry)(context.path, serverRoutes);
   if (!routeId || !entry) {
     return;
   }

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 _utils1 = require("../common/utils");
+const _runtimenode = require("@modern-js/utils/runtime-node");
 const _default = () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({
     prepareLoaderHandler({ serverRoutes, distDir }) {
       return async (context) => {
-        const entry = (0, _utils1.matchEntry)(context.path, serverRoutes);
+        const entry = (0, _runtimenode.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 "react-router-dom";
+import { redirect } from "@modern-js/utils/runtime/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/runtime/index.js

@@ -6,8 +6,8 @@ import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse
 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 { isPlainObject } from "@modern-js/utils/lodash";
+import { matchEntry } from "@modern-js/utils/runtime-node";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
-import { matchEntry } from "../common/utils";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
 var redirectStatusCodes = /* @__PURE__ */ new Set([

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 "../common/utils";
+import { matchEntry } from "@modern-js/utils/runtime-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 "react-router-dom";
+import { redirect } from "@modern-js/utils/runtime/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/runtime/index.js

@@ -2,8 +2,8 @@ import { installGlobals, writeReadableStreamToWritable, Response as NodeResponse
 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 { isPlainObject } from "@modern-js/utils/lodash";
+import { matchEntry } from "@modern-js/utils/runtime-node";
 import { CONTENT_TYPE_DEFERRED, LOADER_ID_PARAM } from "../common/constants";
-import { matchEntry } from "../common/utils";
 import { createDeferredReadableStream } from "./response";
 installGlobals();
 const redirectStatusCodes = /* @__PURE__ */ new Set([

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 "../common/utils";
+import { matchEntry } from "@modern-js/utils/runtime-node";
 export default () => ({
   name: "@modern-js/plugin-data-loader",
   setup: () => ({

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 '../common/utils';
+import { ServerContext } from '@modern-js/utils/runtime-node';
 export declare function isRedirectResponse(status: number): boolean;
 export declare function isResponse(value: any): value is NodeResponse;
 export declare const handleRequest: ({

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.22.1",
+  "version": "2.23.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -57,9 +57,8 @@
     "@babel/core": "^7.21.8",
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
-    "react-router-dom": "^6.8.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.22.1"
+    "@modern-js/utils": "2.23.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -76,21 +75,20 @@
     "webpack-chain": "^6.5.1",
     "react": "^18",
     "react-dom": "^18",
-    "react-router-dom": "^6.8.1",
-    "@modern-js/server-core": "2.22.1",
-    "@modern-js/core": "2.22.1",
-    "@modern-js/types": "2.22.1",
-    "@scripts/build": "2.22.1",
-    "@scripts/jest-config": "2.22.1"
+    "@modern-js/types": "2.23.0",
+    "@modern-js/server-core": "2.23.0",
+    "@modern-js/core": "2.23.0",
+    "@scripts/build": "2.23.0",
+    "@scripts/jest-config": "2.23.0"
   },
   "peerDependencies": {
-    "react": ">=17.0.0",
-    "react-router-dom": "^6.8.1"
+    "react": ">=17.0.0"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "new": "modern-lib new",

package/dist/cjs/common/utils.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "matchEntry", {
-  enumerable: true,
-  get: function() {
-    return matchEntry;
-  }
-});
-function sortByUrlPath(entries) {
-  entries.sort(function(a, b) {
-    const length1 = a.urlPath.length;
-    const length2 = b.urlPath.length;
-    if (length1 < length2) {
-      return 1;
-    }
-    if (length1 > length2) {
-      return -1;
-    }
-    return 0;
-  });
-  return entries;
-}
-const matchEntry = (pathname, entries) => {
-  sortByUrlPath(entries);
-  return entries.find((entry) => pathname.startsWith(entry.urlPath));
-};

package/dist/esm/common/utils.js

@@ -1,20 +0,0 @@
-function sortByUrlPath(entries) {
-  entries.sort(function(a, b) {
-    var length1 = a.urlPath.length;
-    var length2 = b.urlPath.length;
-    if (length1 < length2) {
-      return 1;
-    }
-    if (length1 > length2) {
-      return -1;
-    }
-    return 0;
-  });
-  return entries;
-}
-export var matchEntry = function(pathname, entries) {
-  sortByUrlPath(entries);
-  return entries.find(function(entry) {
-    return pathname.startsWith(entry.urlPath);
-  });
-};

package/dist/esm-node/common/utils.js

@@ -1,18 +0,0 @@
-function sortByUrlPath(entries) {
-  entries.sort(function(a, b) {
-    const length1 = a.urlPath.length;
-    const length2 = b.urlPath.length;
-    if (length1 < length2) {
-      return 1;
-    }
-    if (length1 > length2) {
-      return -1;
-    }
-    return 0;
-  });
-  return entries;
-}
-export const matchEntry = (pathname, entries) => {
-  sortByUrlPath(entries);
-  return entries.find((entry) => pathname.startsWith(entry.urlPath));
-};

package/dist/types/common/utils.d.ts

@@ -1,3 +0,0 @@
-import { ModernServerContext, ServerRoute } from '@modern-js/types';
-export type ServerContext = Pick<ModernServerContext, 'logger' | 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
-export declare const matchEntry: (pathname: string, entries: ServerRoute[]) => ServerRoute | undefined;