@modern-js/plugin-data-loader 2.68.18 → 2.68.20

package/dist/cjs/runtime/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var runtime_exports = {};
 __export(runtime_exports, {
   handleRequest: () => handleRequest,
+  hasFileExtension: () => hasFileExtension,
   isRedirectResponse: () => isRedirectResponse,
   isResponse: () => isResponse
 });
@@ -61,9 +62,21 @@ function convertModernRedirectResponse(headers, basename) {
     headers: newHeaders
   });
 }
+function hasFileExtension(pathname) {
+  const lastSegment = pathname.split("/").pop() || "";
+  const dotIndex = lastSegment.lastIndexOf(".");
+  if (dotIndex === -1) {
+    return false;
+  }
+  const extension = lastSegment.substring(dotIndex).toLowerCase();
+  return extension !== ".html";
+}
 const handleRequest = async ({ request, serverRoutes, routes: routesConfig, context, onTiming }) => {
   const url = new URL(request.url);
   const routeId = url.searchParams.get(import_constants2.LOADER_ID_PARAM);
+  if (hasFileExtension(url.pathname)) {
+    return;
+  }
   const entry = (0, import_server.matchEntry)(url.pathname, serverRoutes);
   if (!routeId || !entry) {
     return;
@@ -150,6 +163,7 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   handleRequest,
+  hasFileExtension,
   isRedirectResponse,
   isResponse
 });

package/dist/esm/runtime/index.js

@@ -40,6 +40,15 @@ function convertModernRedirectResponse(headers, basename) {
     headers: newHeaders
   });
 }
+function hasFileExtension(pathname) {
+  var lastSegment = pathname.split("/").pop() || "";
+  var dotIndex = lastSegment.lastIndexOf(".");
+  if (dotIndex === -1) {
+    return false;
+  }
+  var extension = lastSegment.substring(dotIndex).toLowerCase();
+  return extension !== ".html";
+}
 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, activeDeferreds;
@@ -47,6 +56,11 @@ var handleRequest = function() {
       request = param.request, serverRoutes = param.serverRoutes, routesConfig = param.routes, context = param.context, onTiming = param.onTiming;
       url = new URL(request.url);
       routeId = url.searchParams.get(LOADER_ID_PARAM);
+      if (hasFileExtension(url.pathname)) {
+        return [
+          2
+        ];
+      }
       entry = matchEntry(url.pathname, serverRoutes);
       if (!routeId || !entry) {
         return [
@@ -171,6 +185,7 @@ var handleRequest = function() {
 }();
 export {
   handleRequest,
+  hasFileExtension,
   isRedirectResponse,
   isResponse
 };

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

@@ -36,9 +36,21 @@ function convertModernRedirectResponse(headers, basename) {
     headers: newHeaders
   });
 }
+function hasFileExtension(pathname) {
+  const lastSegment = pathname.split("/").pop() || "";
+  const dotIndex = lastSegment.lastIndexOf(".");
+  if (dotIndex === -1) {
+    return false;
+  }
+  const extension = lastSegment.substring(dotIndex).toLowerCase();
+  return extension !== ".html";
+}
 const handleRequest = async ({ request, serverRoutes, routes: routesConfig, context, onTiming }) => {
   const url = new URL(request.url);
   const routeId = url.searchParams.get(LOADER_ID_PARAM);
+  if (hasFileExtension(url.pathname)) {
+    return;
+  }
   const entry = matchEntry(url.pathname, serverRoutes);
   if (!routeId || !entry) {
     return;
@@ -124,6 +136,7 @@ const handleRequest = async ({ request, serverRoutes, routes: routesConfig, cont
 };
 export {
   handleRequest,
+  hasFileExtension,
   isRedirectResponse,
   isResponse
 };

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

@@ -1,4 +1,5 @@
 import type { ServerLoaderBundle } from '@modern-js/server-core';
 export declare function isRedirectResponse(status: number): boolean;
 export declare function isResponse(value: any): value is Response;
+export declare function hasFileExtension(pathname: string): boolean;
 export declare const handleRequest: ServerLoaderBundle['handleRequest'];

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.18",
+  "version": "2.68.20",
   "engines": {
     "node": ">=16.2.0"
   },
@@ -49,8 +49,8 @@
     "@babel/core": "^7.26.0",
     "@swc/helpers": "^0.5.17",
     "path-to-regexp": "^6.3.0",
-    "@modern-js/runtime-utils": "2.68.18",
-    "@modern-js/utils": "2.68.18"
+    "@modern-js/runtime-utils": "2.68.20",
+    "@modern-js/utils": "2.68.20"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -66,11 +66,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.102.1",
-    "@modern-js/core": "2.68.18",
-    "@modern-js/server-core": "2.68.18",
-    "@modern-js/types": "2.68.18",
-    "@scripts/jest-config": "2.66.0",
-    "@scripts/build": "2.66.0"
+    "@modern-js/core": "2.68.20",
+    "@modern-js/server-core": "2.68.20",
+    "@modern-js/types": "2.68.20",
+    "@scripts/build": "2.66.0",
+    "@scripts/jest-config": "2.66.0"
   },
   "peerDependencies": {
     "react": ">=17.0.0"