chore: cr

Author: zllkjc

.changeset/great-wolves-flash.md

@@ -4,4 +4,5 @@
 '@modern-js/server-core': patch
 ---
 
-feat: unify server monitors usage, add logger for data loader
+feat: unify server monitors usage, add error logger for data loader
+feat: 统一 server 监控的使用方式，为 data loader 添加错误日志

packages/runtime/plugin-runtime/src/core/server/stream/createReadableStream.ts

@@ -4,7 +4,6 @@ import checkIsBot from 'isbot';
 import { ServerStyleSheet } from 'styled-components';
 import { ESCAPED_SHELL_STREAM_END_MARK } from '../../../common';
 import { RenderLevel } from '../../constants';
-import { SSRErrors } from '../tracer';
 import {
   type CreateReadableStreamFromElement,
   ShellChunkStatus,
@@ -118,12 +117,13 @@ export const createReadableStreamFromElement: CreateReadableStreamFromElement =
 
             const readableStream = getReadableStreamFromString(fallbackHtml);
             resolve(readableStream);
-            options.onShellError?.(error);
+            options?.onShellError?.(error);
           });
         },
         onError(error: unknown) {
           renderLevel = RenderLevel.CLIENT_RENDER;
-          options.onError(error);
+
+          options?.onError?.(error);
         },
       });
     });

packages/runtime/plugin-runtime/src/core/server/stream/createReadableStream.worker.ts

@@ -40,8 +40,7 @@ export const createReadableStreamFromElement: CreateReadableStreamFromElement =
         nonce: config.nonce,
         rscRoot,
         onError(error: unknown) {
-          // TODO: add error key
-          options.onError(error);
+          options.onError?.(error);
         },
       });
 

packages/server/core/src/types/render.ts

@@ -10,7 +10,7 @@ import type {
 } from '@modern-js/types';
 import type { ServerManifest } from './server';
 
-// TODO combine with RequestHandlerOptions
+// TODO: combine some field with RequestHandlerOptions
 export interface RenderOptions {
   loaderContext?: Map<string, unknown>;
 

tests/integration/ssr/fixtures/base/modern.config.ts

@@ -5,7 +5,6 @@ export default applyBaseConfig({
     router: true,
   },
   server: {
-    baseUrl: '/lala',
     ssr: {
       disablePrerender: true,
       unsafeHeaders: ['Host'],