🐛 delete defineProperty to recover doc.currentScript (#2372)

umijs · Jan 12, 2023 · 68d0e12 · 68d0e12 · vercel · Jan 12, 2023
1 parent 2fc395e
commit 68d0e12
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/sandbox/patchers/dynamicAppend/common.ts b/src/sandbox/patchers/dynamicAppend/common.ts
@@ -283,6 +283,7 @@ function getOverwrittenAppendChildOrInsertBefore(opts: {
           const scopedGlobalVariables = speedySandbox ? trustedGlobals : [];
 
           if (src) {
+            let isRedfinedCurrentScript = false;
             execScripts(null, [src], proxy, {
               fetch,
               strictGlobal,
@@ -299,14 +300,23 @@ function getOverwrittenAppendChildOrInsertBefore(opts: {
                     },
                     configurable: true,
                   });
+                  isRedfinedCurrentScript = true;
                 }
               },
               success: () => {
                 manualInvokeElementOnLoad(element);
+                if (isRedfinedCurrentScript) {
+                  // @ts-ignore
+                  delete document.currentScript;
+                }
                 element = null;
               },
               error: () => {
                 manualInvokeElementOnError(element);
+                if (isRedfinedCurrentScript) {
+                  // @ts-ignore
+                  delete document.currentScript;
+                }
                 element = null;
               },
             });

diff --git a/src/sandbox/proxySandbox.ts b/src/sandbox/proxySandbox.ts
@@ -161,7 +161,8 @@ export default class ProxySandbox implements SandBox {
   }
 
   // the descriptor of global variables in whitelist before it been modified
-  globalWhitelistPrevDescriptor: { [p in typeof globalVariableWhiteList[number]]: PropertyDescriptor | undefined } = {};
+  globalWhitelistPrevDescriptor: { [p in (typeof globalVariableWhiteList)[number]]: PropertyDescriptor | undefined } =
+    {};
   globalContext: typeof window;
 
   constructor(name: string, globalContext = window) {