From 59f503c50cc06d726a1f825fd1ace2cac203e4a0 Mon Sep 17 00:00:00 2001 From: Parker Lougheed Date: Wed, 5 Jun 2024 09:04:49 -0500 Subject: [PATCH] Move prepared frame assets to prevent overriding DartPad manifest (#2982) --- pkgs/dartpad_ui/firebase.json | 29 +----------------- pkgs/dartpad_ui/web/assets/AssetManifest.bin | 1 - pkgs/dartpad_ui/web/assets/AssetManifest.json | 1 - pkgs/dartpad_ui/web/frame.js | 7 +++-- .../web/frame/assets/AssetManifest.bin | 1 + .../web/frame/assets/AssetManifest.bin.json | 1 + .../web/frame/assets/AssetManifest.json | 1 + .../web/{ => frame}/assets/FontManifest.json | 0 .../assets/fonts/MaterialIcons-Regular.otf | Bin .../cupertino_icons/assets/CupertinoIcons.ttf | Bin 10 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 pkgs/dartpad_ui/web/assets/AssetManifest.bin delete mode 100644 pkgs/dartpad_ui/web/assets/AssetManifest.json create mode 100644 pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin create mode 100644 pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin.json create mode 100644 pkgs/dartpad_ui/web/frame/assets/AssetManifest.json rename pkgs/dartpad_ui/web/{ => frame}/assets/FontManifest.json (100%) rename pkgs/dartpad_ui/web/{ => frame}/assets/fonts/MaterialIcons-Regular.otf (100%) rename pkgs/dartpad_ui/web/{ => frame}/assets/packages/cupertino_icons/assets/CupertinoIcons.ttf (100%) diff --git a/pkgs/dartpad_ui/firebase.json b/pkgs/dartpad_ui/firebase.json index 6936614ae..a49f4f904 100644 --- 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 deleted file mode 100644 index 8fe7af5a3..000000000 --- a/pkgs/dartpad_ui/web/assets/AssetManifest.bin +++ /dev/null @@ -1 +0,0 @@ - 2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf \ No newline at end of file diff --git a/pkgs/dartpad_ui/web/assets/AssetManifest.json b/pkgs/dartpad_ui/web/assets/AssetManifest.json deleted file mode 100644 index 03eaddffb..000000000 --- a/pkgs/dartpad_ui/web/assets/AssetManifest.json +++ /dev/null @@ -1 +0,0 @@ -{"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file diff --git a/pkgs/dartpad_ui/web/frame.js b/pkgs/dartpad_ui/web/frame.js index 1997240d0..4f3e6cbdc 100644 --- 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 new file mode 100644 index 000000000..01b53144c --- /dev/null +++ b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin @@ -0,0 +1 @@ + &assets/fonts/MaterialIcons-Regular.otf  asset&assets/fonts/MaterialIcons-Regular.otf9assets/packages/cupertino_icons/assets/CupertinoIcons.ttf  asset9assets/packages/cupertino_icons/assets/CupertinoIcons.ttf2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf \ No newline at end of file diff --git a/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin.json b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin.json new file mode 100644 index 000000000..0a2c34788 --- /dev/null +++ b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.bin.json @@ -0,0 +1 @@ +"DQMHJmFzc2V0cy9mb250cy9NYXRlcmlhbEljb25zLVJlZ3VsYXIub3RmDAENAQcFYXNzZXQHJmFzc2V0cy9mb250cy9NYXRlcmlhbEljb25zLVJlZ3VsYXIub3RmBzlhc3NldHMvcGFja2FnZXMvY3VwZXJ0aW5vX2ljb25zL2Fzc2V0cy9DdXBlcnRpbm9JY29ucy50dGYMAQ0BBwVhc3NldAc5YXNzZXRzL3BhY2thZ2VzL2N1cGVydGlub19pY29ucy9hc3NldHMvQ3VwZXJ0aW5vSWNvbnMudHRmBzJwYWNrYWdlcy9jdXBlcnRpbm9faWNvbnMvYXNzZXRzL0N1cGVydGlub0ljb25zLnR0ZgwBDQEHBWFzc2V0BzJwYWNrYWdlcy9jdXBlcnRpbm9faWNvbnMvYXNzZXRzL0N1cGVydGlub0ljb25zLnR0Zg==" \ No newline at end of file diff --git a/pkgs/dartpad_ui/web/frame/assets/AssetManifest.json b/pkgs/dartpad_ui/web/frame/assets/AssetManifest.json new file mode 100644 index 000000000..ac02dad2c --- /dev/null +++ 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"]} \ No newline at end of file diff --git a/pkgs/dartpad_ui/web/assets/FontManifest.json b/pkgs/dartpad_ui/web/frame/assets/FontManifest.json similarity index 100% rename from pkgs/dartpad_ui/web/assets/FontManifest.json rename to pkgs/dartpad_ui/web/frame/assets/FontManifest.json diff --git a/pkgs/dartpad_ui/web/assets/fonts/MaterialIcons-Regular.otf b/pkgs/dartpad_ui/web/frame/assets/fonts/MaterialIcons-Regular.otf similarity index 100% rename from pkgs/dartpad_ui/web/assets/fonts/MaterialIcons-Regular.otf rename to pkgs/dartpad_ui/web/frame/assets/fonts/MaterialIcons-Regular.otf diff --git a/pkgs/dartpad_ui/web/assets/packages/cupertino_icons/assets/CupertinoIcons.ttf b/pkgs/dartpad_ui/web/frame/assets/packages/cupertino_icons/assets/CupertinoIcons.ttf similarity index 100% rename from pkgs/dartpad_ui/web/assets/packages/cupertino_icons/assets/CupertinoIcons.ttf rename to pkgs/dartpad_ui/web/frame/assets/packages/cupertino_icons/assets/CupertinoIcons.ttf