Move prepared frame assets to prevent overriding DartPad manifest (#2982

)
dart-lang · Jun 5, 2024 · 59f503c · 59f503c
1 parent dc44acd
commit 59f503c
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 33 deletions.
diff --git a/pkgs/dartpad_ui/firebase.json b/pkgs/dartpad_ui/firebase.json
@@ -48,34 +48,7 @@
       ],
       "headers": [
         {
-          "source": "/assets/AssetManifest.json",
-          "headers": [
-            {
-              "key": "Access-Control-Allow-Origin",
-              "value": "*"
-            }
-          ]
-        },
-        {
-          "source": "/assets/FontManifest.json",
-          "headers": [
-            {
-              "key": "Access-Control-Allow-Origin",
-              "value": "*"
-            }
-          ]
-        },
-        {
-          "source": "/assets/fonts/MaterialIcons-Regular.otf",
-          "headers": [
-            {
-              "key": "Access-Control-Allow-Origin",
-              "value": "*"
-            }
-          ]
-        },
-        {
-          "source": "/assets/packages/cupertino_icons/assets/CupertinoIcons.ttf",
+          "source": "/frame/assets/**",
           "headers": [
             {
               "key": "Access-Control-Allow-Origin",

diff --git a/pkgs/dartpad_ui/web/assets/AssetManifest.bin b/pkgs/dartpad_ui/web/assets/AssetManifest.bin
diff --git a/pkgs/dartpad_ui/web/assets/AssetManifest.json b/pkgs/dartpad_ui/web/assets/AssetManifest.json
diff --git a/pkgs/dartpad_ui/web/frame.js b/pkgs/dartpad_ui/web/frame.js
@@ -32,9 +32,10 @@ function runFlutterApp(compiledScript, canvasKitBaseUrl) {
   _flutter.loader.loadEntrypoint({
     entrypointUrl: url,
     onEntrypointLoaded: async function(engineInitializer) {
-      let appRunner = await engineInitializer.initializeEngine(
-          {canvasKitBaseUrl: canvasKitBaseUrl}
-      );
+      let appRunner = await engineInitializer.initializeEngine({
+        canvasKitBaseUrl: canvasKitBaseUrl,
+        assetBase: 'frame/',
+      });
       appRunner.runApp();
     }
   });

diff --git a/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin
@@ -0,0 +1 @@
+&assets/fonts/MaterialIcons-Regular.otfasset&assets/fonts/MaterialIcons-Regular.otf9assets/packages/cupertino_icons/assets/CupertinoIcons.ttfasset9assets/packages/cupertino_icons/assets/CupertinoIcons.ttf2packages/cupertino_icons/assets/CupertinoIcons.ttfasset2packages/cupertino_icons/assets/CupertinoIcons.ttf

diff --git a/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin.json b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin.json
@@ -0,0 +1 @@
+"DQMHJmFzc2V0cy9mb250cy9NYXRlcmlhbEljb25zLVJlZ3VsYXIub3RmDAENAQcFYXNzZXQHJmFzc2V0cy9mb250cy9NYXRlcmlhbEljb25zLVJlZ3VsYXIub3RmBzlhc3NldHMvcGFja2FnZXMvY3VwZXJ0aW5vX2ljb25zL2Fzc2V0cy9DdXBlcnRpbm9JY29ucy50dGYMAQ0BBwVhc3NldAc5YXNzZXRzL3BhY2thZ2VzL2N1cGVydGlub19pY29ucy9hc3NldHMvQ3VwZXJ0aW5vSWNvbnMudHRmBzJwYWNrYWdlcy9jdXBlcnRpbm9faWNvbnMvYXNzZXRzL0N1cGVydGlub0ljb25zLnR0ZgwBDQEHBWFzc2V0BzJwYWNrYWdlcy9jdXBlcnRpbm9faWNvbnMvYXNzZXRzL0N1cGVydGlub0ljb25zLnR0Zg=="
diff --git a/pkgs/dartpad_ui/web/frame/assets/AssetManifest.json b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.json
@@ -0,0 +1 @@
+{"assets/fonts/MaterialIcons-Regular.otf":["assets/fonts/MaterialIcons-Regular.otf"],"assets/packages/cupertino_icons/assets/CupertinoIcons.ttf":["assets/packages/cupertino_icons/assets/CupertinoIcons.ttf"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
diff --git a/pkgs/dartpad_ui/web/assets/FontManifest.json → ...pad_ui/web/frame/assets/FontManifest.json b/pkgs/dartpad_ui/web/assets/FontManifest.json → ...pad_ui/web/frame/assets/FontManifest.json
diff --git a/...eb/assets/fonts/MaterialIcons-Regular.otf → ...me/assets/fonts/MaterialIcons-Regular.otf b/...eb/assets/fonts/MaterialIcons-Regular.otf → ...me/assets/fonts/MaterialIcons-Regular.otf
diff --git a/...cupertino_icons/assets/CupertinoIcons.ttf → ...cupertino_icons/assets/CupertinoIcons.ttf b/...cupertino_icons/assets/CupertinoIcons.ttf → ...cupertino_icons/assets/CupertinoIcons.ttf