🎨 optimize code and support for scenario of dynamic script comment as…

… reference node (#2576)
umijs · Aug 7, 2023 · 3878cea · 3878cea · vercel · Aug 7, 2023
1 parent 425110e
commit 3878cea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/sandbox/patchers/dynamicAppend/common.ts b/src/sandbox/patchers/dynamicAppend/common.ts
@@ -22,12 +22,12 @@ type DynamicDomMutationTarget = 'head' | 'body';
 declare global {
   interface HTMLLinkElement {
     [styleElementTargetSymbol]: DynamicDomMutationTarget;
-    [styleElementRefNodeNo]?: number;
+    [styleElementRefNodeNo]?: Exclude<number, -1>;
   }
 
   interface HTMLStyleElement {
     [styleElementTargetSymbol]: DynamicDomMutationTarget;
-    [styleElementRefNodeNo]?: number;
+    [styleElementRefNodeNo]?: Exclude<number, -1>;
   }
 
   interface Function {

diff --git a/src/sandbox/patchers/dynamicAppend/forStrictSandbox.ts b/src/sandbox/patchers/dynamicAppend/forStrictSandbox.ts
@@ -284,11 +284,10 @@ export function patchStrictSandbox(
           const refNo = stylesheetElement[styleElementRefNodeNo];
 
           if (typeof refNo === 'number' && refNo !== -1) {
-            const refNode = mountDom.childNodes[refNo];
-            if (refNode) {
-              rawHeadInsertBefore.call(mountDom, stylesheetElement, refNode);
-              return true;
-            }
+            // the reference node may be dynamic script comment which is not rebuilt while remounting thus reference node no longer exists
+            const refNode = mountDom.childNodes[refNo] || null;
+            rawHeadInsertBefore.call(mountDom, stylesheetElement, refNode);
+            return true;
           } else {
             rawHeadAppendChild.call(mountDom, stylesheetElement);
             return true;