Use gstatic URL for canvaskit, to avoid CORS errors (#2965)

* Use gstatic URL for canvaskit, to avoid CORS errors * remove CORS header configuration
dart-lang · May 13, 2024 · 20da963 · 20da963
1 parent edcd12a
commit 20da963
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/pkgs/dartpad_ui/firebase.json b/pkgs/dartpad_ui/firebase.json
@@ -83,15 +83,6 @@
             }
           ]
         },
-        {
-          "source": "/canvaskit/chromium/canvaskit.wasm",
-          "headers": [
-            {
-              "key": "Access-Control-Allow-Origin",
-              "value": "*"
-            }
-          ]
-        },
         {
           "source": "**",
           "headers": [

diff --git a/pkgs/dartpad_ui/web/frame.js b/pkgs/dartpad_ui/web/frame.js
@@ -22,17 +22,19 @@ function messageHandler(e) {
   var obj = e.data;
 
   if (obj.command === 'execute') {
-    runFlutterApp(obj.js);
+    runFlutterApp(obj.js, obj.canvasKitBaseUrl);
   }
 };
 
-function runFlutterApp(compiledScript) {
+function runFlutterApp(compiledScript, canvasKitBaseUrl) {
   var blob = new Blob([compiledScript], {type: 'text/javascript'});
   var url = URL.createObjectURL(blob);
   _flutter.loader.loadEntrypoint({
     entrypointUrl: url,
     onEntrypointLoaded: async function(engineInitializer) {
-      let appRunner = await engineInitializer.initializeEngine();
+      let appRunner = await engineInitializer.initializeEngine(
+          {canvasKitBaseUrl: canvasKitBaseUrl}
+      );
       appRunner.runApp();
     }
   });