@modern-js/plugin-data-loader 2.7.0 → 2.9.0

package/CHANGELOG.md

@@ -0,0 +1,17 @@
+# @modern-js/plugin-data-loader
+
+## 2.9.0
+
+### Patch Changes
+
+- @modern-js/utils@2.9.0
+
+## 2.8.0
+
+### Patch Changes
+
+- 0cf8540ffe: fix: should match the most similar entry
+  fix: 应该匹配最相似的 entry
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [1f6ca2c7fb]
+  - @modern-js/utils@2.8.0

package/README.md

@@ -19,8 +19,8 @@ Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-sta
 
 ## Contributing
 
-Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
 
 ## License
 
-Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).
+Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).

package/dist/cjs/runtime/index.js

@@ -37,6 +37,20 @@ function isRedirectResponse(status) {
 function isResponse(value) {
   return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
 }
+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;
+}
 function convertModernRedirectResponse(headers, basename) {
   const newHeaders = new Headers(headers);
   let redirectUrl = headers.get("Location");
@@ -89,6 +103,7 @@ const sendLoaderResponse = async (res, nodeResponse) => {
   }
 };
 const matchEntry = (pathname, entries) => {
+  sortByUrlPath(entries);
   return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
 const handleRequest = async ({

package/dist/esm/runtime/index.js

@@ -195,6 +195,20 @@ function isRedirectResponse(status) {
 function isResponse(value) {
     return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
 }
+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;
+}
 function convertModernRedirectResponse(headers, basename) {
     var newHeaders = new Headers(headers);
     var redirectUrl = headers.get("Location");
@@ -325,6 +339,7 @@ var sendLoaderResponse = function() {
     };
 }();
 var matchEntry = function(pathname, entries) {
+    sortByUrlPath(entries);
     return entries.find(function(entry) {
         return pathname.startsWith(entry.urlPath);
     });

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

@@ -20,6 +20,20 @@ function isRedirectResponse(status) {
 function isResponse(value) {
   return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";
 }
+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;
+}
 function convertModernRedirectResponse(headers, basename) {
   const newHeaders = new Headers(headers);
   let redirectUrl = headers.get("Location");
@@ -72,6 +86,7 @@ const sendLoaderResponse = async (res, nodeResponse) => {
   }
 };
 const matchEntry = (pathname, entries) => {
+  sortByUrlPath(entries);
   return entries.find((entry) => pathname.startsWith(entry.urlPath));
 };
 const handleRequest = async ({

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

@@ -1,6 +1,11 @@
 /**
- * modified from https://github.com/remix-run/remix/blob/main/packages/remix-react/data.ts
- * license at https://github.com/remix-run/remix/blob/main/LICENSE.md
+ * The following code is modified based on
+ * https://github.com/remix-run/remix/blob/2b5e1a72fc628d0408e27cf4d72e537762f1dc5b/packages/remix-react/data.ts
+ *
+ * MIT Licensed
+ * Author Michael Jackson
+ * Copyright 2021 Remix Software Inc.
+ * https://github.com/remix-run/remix/blob/2b5e1a72fc628d0408e27cf4d72e537762f1dc5b/LICENSE.md
  */
 import { UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/remix-router';
 export declare function parseDeferredReadableStream(stream: ReadableStream<Uint8Array>): Promise<DeferredData>;

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/plugin-data-loader",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.7.0",
+  "version": "2.9.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -52,7 +52,7 @@
     "@remix-run/node": "^1.12.0",
     "path-to-regexp": "^6.2.0",
     "react-router-dom": "^6.8.1",
-    "@modern-js/utils": "2.7.0"
+    "@modern-js/utils": "2.9.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -67,11 +67,11 @@
     "typescript": "^4",
     "webpack": "^5.75.0",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.7.0",
-    "@modern-js/server-core": "2.7.0",
-    "@modern-js/types": "2.7.0",
-    "@scripts/build": "2.7.0",
-    "@scripts/jest-config": "2.7.0"
+    "@modern-js/core": "2.9.0",
+    "@modern-js/server-core": "2.9.0",
+    "@modern-js/types": "2.9.0",
+    "@scripts/build": "2.9.0",
+    "@scripts/jest-config": "2.9.0"
   },
   "sideEffects": false,
   "publishConfig": {