@modern-js/plugin-data-loader 2.13.4 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @modern-js/plugin-data-loader
 
+## 2.15.0
+
+### Patch Changes
+
+- @modern-js/utils@2.15.0
+
+## 2.14.0
+
+### Patch Changes
+
+- d05651a: fix: set encoding for defered loader
+  fix: 为 defer loader 设置 encoding
+- Updated dependencies [4779152]
+- Updated dependencies [9321bef]
+- Updated dependencies [9b45c58]
+- Updated dependencies [52d0cb1]
+- Updated dependencies [60a81d0]
+- Updated dependencies [dacef96]
+- Updated dependencies [16399fd]
+  - @modern-js/utils@2.14.0
+
 ## 2.13.4
 
 ### Patch Changes

package/dist/cjs/runtime/index.js

@@ -107,7 +107,7 @@ const handleRequest = async ({
   const { queryRoute } = (0, import_remix_router.createStaticHandler)(routes, {
     basename
   });
-  const { res } = context;
+  const { res, logger } = context;
   const request = createLoaderRequest(context);
   let response;
   try {
@@ -130,7 +130,7 @@ const handleRequest = async ({
         );
       } else {
         const headers = new Headers(init.headers);
-        headers.set("Content-Type", import_constants.CONTENT_TYPE_DEFERRED);
+        headers.set("Content-Type", `${import_constants.CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
         init.headers = headers;
         response = new import_node.Response(body, init);
       }
@@ -143,6 +143,7 @@ const handleRequest = async ({
     }
   } catch (error) {
     const message = error instanceof import_remix_router.ErrorResponse ? error.data : String(error);
+    logger == null ? void 0 : logger.error(message);
     response = new import_node.Response(message, {
       status: 500,
       headers: {

package/dist/esm/runtime/index.js

@@ -327,7 +327,7 @@ var sendLoaderResponse = function() {
 }();
 var handleRequest = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, routes, queryRoute, res, request, response, deferredData, body, init, headers, error, message;
+        var context, serverRoutes, routesConfig, method, query, routeId, entry, basename, routes, queryRoute, res, logger, request, response, deferredData, body, init, headers, error, message;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -348,7 +348,7 @@ var handleRequest = function() {
                     queryRoute = createStaticHandler(routes, {
                         basename: basename
                     }).queryRoute;
-                    res = context.res;
+                    res = context.res, logger = context.logger;
                     request = createLoaderRequest(context);
                     _state.label = 1;
                 case 1:
@@ -379,7 +379,7 @@ var handleRequest = function() {
                             response = convertModernRedirectResponse(new Headers(init.headers), basename);
                         } else {
                             headers = new Headers(init.headers);
-                            headers.set("Content-Type", CONTENT_TYPE_DEFERRED);
+                            headers.set("Content-Type", "".concat(CONTENT_TYPE_DEFERRED, "; charset=UTF-8"));
                             init.headers = headers;
                             response = new NodeResponse(body, init);
                         }
@@ -397,6 +397,7 @@ var handleRequest = function() {
                 case 3:
                     error = _state.sent();
                     message = _instanceof(error, ErrorResponse) ? error.data : String(error);
+                    logger === null || logger === void 0 ? void 0 : logger.error(message);
                     response = new NodeResponse(message, {
                         status: 500,
                         headers: {

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

@@ -91,7 +91,7 @@ const handleRequest = async ({
   const { queryRoute } = createStaticHandler(routes, {
     basename
   });
-  const { res } = context;
+  const { res, logger } = context;
   const request = createLoaderRequest(context);
   let response;
   try {
@@ -114,7 +114,7 @@ const handleRequest = async ({
         );
       } else {
         const headers = new Headers(init.headers);
-        headers.set("Content-Type", CONTENT_TYPE_DEFERRED);
+        headers.set("Content-Type", `${CONTENT_TYPE_DEFERRED}; charset=UTF-8`);
         init.headers = headers;
         response = new NodeResponse(body, init);
       }
@@ -127,6 +127,7 @@ const handleRequest = async ({
     }
   } catch (error) {
     const message = error instanceof ErrorResponse ? error.data : String(error);
+    logger == null ? void 0 : logger.error(message);
     response = new NodeResponse(message, {
       status: 500,
       headers: {

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

@@ -1,3 +1,3 @@
 import { ModernServerContext, ServerRoute } from '@modern-js/types';
-export type ServerContext = Pick<ModernServerContext, 'req' | 'res' | 'params' | 'headers' | 'method' | 'url' | 'host' | 'protocol' | 'origin' | 'href' | 'path' | 'query'>;
+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;

package/package.json

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