web-infra-dev · GiveMe-A-Name · Dec 19, 2023 · Dec 15, 2023 · Dec 15, 2023 · Dec 15, 2023
diff --git a/.changeset/honest-papayas-mix.md b/.changeset/honest-papayas-mix.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/runtime': patch
+---
+
+fix: unsafeReplace fn fix
+fix: unsafeReplace 函数修复, 处理找不到 searchValue 的边界 case
diff --git a/packages/runtime/plugin-runtime/src/ssr/serverRender/helmet.ts b/packages/runtime/plugin-runtime/src/ssr/serverRender/helmet.ts
@@ -1,7 +1,7 @@
 // 用于 react-helmet 正则替换
 import { EOL } from 'os';
 import { HelmetData } from 'react-helmet';
-import { unsafeReplace } from './utils';
+import { safeReplace } from './utils';
 
 const RE_HTML_ATTR = /<html[^>]*>/;
 const RE_BODY_ATTR = /<body[^>]*>/;
@@ -15,12 +15,12 @@ export default function helmet(content: string, helmetData: HelmetData) {
   let result = content;
   const bodyAttributes = helmetData.bodyAttributes.toString();
   if (bodyAttributes) {
-    result = unsafeReplace(result, RE_BODY_ATTR, `<body ${bodyAttributes}>`);
+    result = safeReplace(result, RE_BODY_ATTR, `<body ${bodyAttributes}>`);
   }
 
   const htmlAttributes = helmetData.htmlAttributes.toString();
   if (htmlAttributes) {
-    result = unsafeReplace(result, RE_HTML_ATTR, `<html ${htmlAttributes}>`);
+    result = safeReplace(result, RE_HTML_ATTR, `<html ${htmlAttributes}>`);
   }
 
   const base = helmetData.base.toString();
@@ -36,7 +36,7 @@ export default function helmet(content: string, helmetData: HelmetData) {
   const shouldReplaceTitle =
     existTitleTag && TEST_TITLE_CONTENT.test(title.trim());
   if (shouldReplaceTitle) {
-    result = result.replace(RE_TITLE, title);
+    result = safeReplace(result, RE_TITLE, title);
   }
 
   const helmetStr = [
@@ -51,5 +51,5 @@ export default function helmet(content: string, helmetData: HelmetData) {
     return pre + (cur.length > 0 ? `  ${cur}${EOL}` : '');
   }, '');
 
-  return unsafeReplace(result, RE_LAST_IN_HEAD, `${helmetStr}</head>`);
+  return safeReplace(result, RE_LAST_IN_HEAD, `${helmetStr}</head>`);
 }
diff --git a/packages/runtime/plugin-runtime/src/ssr/serverRender/index.ts b/packages/runtime/plugin-runtime/src/ssr/serverRender/index.ts
@@ -3,14 +3,14 @@
 
 import { isReact18 } from '../utils';
 import { ServerRenderOptions } from './types';
-import { CHUNK_JS_PLACEHOLDER } from './constants';
+import { CHUNK_CSS_PLACEHOLDER } from './constants';
 
 export default async function serverRender(options: ServerRenderOptions) {
   if (options.context.ssrContext?.template) {
     options.context.ssrContext.template =
       options.context.ssrContext?.template.replace(
         '</head>',
-        `${CHUNK_JS_PLACEHOLDER}</head>`,
+        `${CHUNK_CSS_PLACEHOLDER}</head>`,
       );
   }
 

diff --git a/packages/runtime/plugin-runtime/src/ssr/serverRender/renderToStream/buildTemplate.after.ts b/packages/runtime/plugin-runtime/src/ssr/serverRender/renderToStream/buildTemplate.after.ts
@@ -1,6 +1,6 @@
 import { serializeJson } from '@modern-js/runtime-utils/node';
 import { RenderLevel, RuntimeContext } from '../types';
-import { attributesToString, unsafeReplace } from '../utils';
+import { attributesToString, safeReplace } from '../utils';
 import { SSR_DATA_PLACEHOLDER } from '../constants';
 import { BuildTemplateCb, buildTemplate } from './buildTemplate.share';
 
@@ -18,7 +18,7 @@ export function buildShellAfterTemplate(
   function injectSSRDataScript(template: string) {
     const ssrDataScript = buildSSRDataScript();
 
-    return unsafeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
+    return safeReplace(template, SSR_DATA_PLACEHOLDER, ssrDataScript);
 
     function buildSSRDataScript() {
       const {

diff --git a/packages/runtime/plugin-runtime/src/ssr/serverRender/renderToStream/bulidTemplate.before.ts b/packages/runtime/plugin-runtime/src/ssr/serverRender/renderToStream/bulidTemplate.before.ts
@@ -4,7 +4,7 @@ import { matchRoutes } from '@modern-js/runtime-utils/router';
 import helmetReplace from '../helmet';
 import { RuntimeContext } from '../types';
 import { CHUNK_CSS_PLACEHOLDER } from '../constants';
-import { unsafeReplace } from '../utils';
+import { safeReplace } from '../utils';
 import {
   HEAD_REG_EXP,
   BuildTemplateCb,
@@ -31,7 +31,7 @@ function getHeadTemplate(beforeEntryTemplate: string, context: RuntimeContext) {
   return buildTemplate(headTemplate, callbacks);
 
   function injectCss(headTemplate: string) {
-    return unsafeReplace(headTemplate, CHUNK_CSS_PLACEHOLDER, getCssChunks());
+    return safeReplace(headTemplate, CHUNK_CSS_PLACEHOLDER, getCssChunks());
 
     function getCssChunks() {
       const { routeManifest, routerContext, routes } = context;

diff --git a/packages/runtime/plugin-runtime/src/ssr/serverRender/renderToString/buildHtml.ts b/packages/runtime/plugin-runtime/src/ssr/serverRender/renderToString/buildHtml.ts
@@ -1,4 +1,4 @@
-import { unsafeReplace } from '../utils';
+import { safeReplace } from '../utils';
 import {
   HTML_PLACEHOLDER,
   SSR_DATA_PLACEHOLDER,
@@ -13,20 +13,19 @@ export function buildHtml(template: string, callbacks: BuildHtmlCb[]) {
 }
 
 export function createReplaceHtml(html: string): BuildHtmlCb {
-  return (template: string) => unsafeReplace(template, HTML_PLACEHOLDER, html);
+  return (template: string) => safeReplace(template, HTML_PLACEHOLDER, html);
 }
 
 export function createReplaceSSRDataScript(data: string): BuildHtmlCb {
   return (template: string) =>
-    unsafeReplace(template, SSR_DATA_PLACEHOLDER, data);
+    safeReplace(template, SSR_DATA_PLACEHOLDER, data);
 }
 
 export function createReplaceChunkJs(js: string): BuildHtmlCb {
-  return (template: string) =>
-    unsafeReplace(template, CHUNK_JS_PLACEHOLDER, js);
+  return (template: string) => safeReplace(template, CHUNK_JS_PLACEHOLDER, js);
 }
 
 export function createReplaceChunkCss(css: string): BuildHtmlCb {
   return (template: string) =>
-    unsafeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
+    safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
 }
diff --git a/packages/runtime/plugin-runtime/src/ssr/serverRender/utils.ts b/packages/runtime/plugin-runtime/src/ssr/serverRender/utils.ts
@@ -6,17 +6,15 @@ export function attributesToString(attributes: Record<string, any>) {
 }
 
 /**
- * It is unsafe unsafeReplace, only support serachValue exsit one time.
  * @param source
  * @param searchValue
  * @param replaceValue
  * @returns
  */
-export function unsafeReplace(
+export function safeReplace(
   source: string,
-  searchValue: RegExp | string,
+  searchValue: string | RegExp,
   replaceValue: string,
 ) {
-  const [s1, s2] = source.split(searchValue);
-  return s1 + replaceValue + s2;
+  return source.replace(searchValue, () => replaceValue);
 }