fix: fix snapshot eval code with window context

web-infra-dev · Sep 17, 2021 · af21766 · af21766
1 parent 3b44114
commit af21766
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/runtime/browser-snapshot/src/index.ts b/packages/runtime/browser-snapshot/src/index.ts
@@ -25,10 +25,14 @@ export function GarfishBrowserSnapshot(op?: BrowserConfig) {
       openBrowser: false,
       afterLoad(appInfo, appInstance) {
         const sandboxConfig = appInfo.sandbox || Garfish?.options?.sandbox;
-        if (sandboxConfig === false || sandboxConfig.open === false)
+        if (
+          sandboxConfig === false ||
+          sandboxConfig.open === false ||
+          sandboxConfig?.snapshot === false
+        ) {
           config.open = false;
+        }
         if (sandboxConfig) {
-          config.open = sandboxConfig?.open && sandboxConfig?.snapshot === true;
           config.protectVariable = [
             ...(Garfish?.options.protectVariable || []),
             ...(appInfo.protectVariable || []),

diff --git a/packages/runtime/core/src/module/app.ts b/packages/runtime/core/src/module/app.ts
@@ -180,6 +180,14 @@ export class App {
       options.async,
     );
     code += url ? `\n//# sourceURL=${url}\n` : '';
+
+    if (!env['window']) {
+      env = {
+        window: this.global,
+        ...env,
+      };
+    }
+
     evalWithEnv(`;${code}`, env);
     revertCurrentScript();
   }