From cd1ae77d30b4b02332e1cc334e4bd0f0efa6b634 Mon Sep 17 00:00:00 2001
From: Zoey Li <31378877+alicialics@users.noreply.github.com>
Date: Thu, 19 Oct 2023 19:12:20 +0000
Subject: [PATCH 1/2] fix: bundle blockly test images in block-test plugin

---
 plugins/block-test/media/200px.png      | Bin 0 -> 1709 bytes
 plugins/block-test/media/30px.png       | Bin 0 -> 683 bytes
 plugins/block-test/media/arrow.png      | Bin 0 -> 363 bytes
 plugins/block-test/package.json         |   6 ++++--
 plugins/block-test/src/fields/images.js |   6 +++---
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 plugins/block-test/media/200px.png
 create mode 100644 plugins/block-test/media/30px.png
 create mode 100644 plugins/block-test/media/arrow.png

diff --git a/plugins/block-test/media/200px.png b/plugins/block-test/media/200px.png
new file mode 100644
index 0000000000000000000000000000000000000000..8671954e8c5e8f1cd08b3f241ed34b3957af5a90
GIT binary patch
literal 1709
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

literal 0
HcmV?d00001

diff --git a/plugins/block-test/media/30px.png b/plugins/block-test/media/30px.png
new file mode 100644
index 0000000000000000000000000000000000000000..adf98a5f6068af334224ed798991b31258614239
GIT binary patch
literal 683
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+
z;1OBOz`!jG!i)^F=12eq*-JcqUD+RTiVI5_t`PmTje&u2o~Mgrh{frxS2tz{2Z|j3
zc)t2&cG$w+t<J3hmo}CN$Z+*8&1P4>%d$Oc)0g-Od9L1$+K-fc1-V$67lueLF<Cje
zG~nRHwR)VBthmoVb!|$x?|r~HhVRe2@Ar!Nz8`;jU+~-7nab)u3sk*5#ZIL<Ha}^Q
zdG)IP)4WMSsgF-QzK}SnS36yE=B#2?gKRO8n(tPD!Cibc-$cIe{cy)N=l7JQ9|Bqq
zOexpf6C|8HLrCG2)z4M=?<`8MuaJ*RYfd|(t@SJO=+0TvJDyH|-SzBj%)PgrH&))>
zSM|bsQOwnCZ}#3e`E+jo%xU4*0*w>}7A{z=lYc8>+9UCp9Zho-8pSsyEDY3nHS0(R
zhwv^j!&!E3If|`nrJZGqJ0}$xtGXwZR)2eYJ6JqhW2toxOLmg<s<O8?Hm=Tc&e07F
ze!!mO%YH8_v+}V+aE_`hpTWvSi{74D6`FoaOKV-KVQRkfVXKJpFViPAJ-@h#b=#H+
z=i9!;+}*-yW_o$<pZEvveeLbrYbE5?RT$~WNLmzGe5<JVu{fPmhKH>^qOADC{8j%o
zmo3=OIDbLP`iX+9g22dAEpd$~Nl7e8wMs5Z1yT$~28I^829~-;#vz85Rz_x4CYIU;
n237_J`?jwXL(!0%pOTqYiCe?@SAwg68W=oX{an^LB{Ts5%25lC

literal 0
HcmV?d00001

diff --git a/plugins/block-test/media/arrow.png b/plugins/block-test/media/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..d310bd2a61b2eb23f2bf634edc049b4861903e47
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-_7YEDSN2CdvSOmrp$nP<fI{LW
zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0<JOnD?C@JuB2g(=&*$iF{n({!3CEd~2
zk%3`jKlh(RRv@1($=lt9;Xep2*t>i(P~@1Wi(^Q|oVQmD`C1GFoCDw0ztmx!(#>+?
z-{B0da*v<>jyJDGMYlg>WR~>!_>=!e|BvndjzKf-T%B!b*dZ<4YGGK|!QJd2Bf+!i
z*a87nw)PbU7EY}P8MS!i)*pKC5J;^(^xz<nT74*{?nmp^#yK;@CL~uJa5%U1$JSrA
z`%6|Z1xgjM2Z|Mm2MT>+3FP}E63F$5Es*V#SRm6PhX(?pOsyJ%5-z<C3VbdykDOc-
u{akn+xw$BCy1a2y+V02BlcI3+JM-xbo{;2EBHchAF?hQAxvX<aXaWG=_<9Ba

literal 0
HcmV?d00001

diff --git a/plugins/block-test/package.json b/plugins/block-test/package.json
index 2e3c252fd9..87b91d8ce0 100644
--- a/plugins/block-test/package.json
+++ b/plugins/block-test/package.json
@@ -32,11 +32,13 @@
   "license": "Apache 2.0",
   "directories": {
     "dist": "dist",
-    "src": "src"
+    "src": "src",
+    "media": "media"
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "media"
   ],
   "devDependencies": {
     "@blockly/dev-scripts": "^2.0.1",
diff --git a/plugins/block-test/src/fields/images.js b/plugins/block-test/src/fields/images.js
index a2c20b1815..75fcff2d1a 100644
--- a/plugins/block-test/src/fields/images.js
+++ b/plugins/block-test/src/fields/images.js
@@ -37,7 +37,7 @@ Blockly.defineBlocksWithJsonArray([
     'args0': [
       {
         'type': 'field_image',
-        'src': 'media/30px.png',
+        'src': new URL('../../media/30px.png', import.meta.url).toString(),
         'width': 50,
         'height': 50,
         'alt': '*',
@@ -51,7 +51,7 @@ Blockly.defineBlocksWithJsonArray([
     'args0': [
       {
         'type': 'field_image',
-        'src': 'media/200px.png',
+        'src': new URL('../../media/200px.png', import.meta.url).toString(),
         'width': 50,
         'height': 50,
         'alt': '*',
@@ -65,7 +65,7 @@ Blockly.defineBlocksWithJsonArray([
     'args0': [
       {
         'type': 'field_image',
-        'src': 'media/arrow.png',
+        'src': new URL('../../media/arrow.png', import.meta.url).toString(),
         'width': 50,
         'height': 50,
         'alt': '*',

From 2282c555499cd9b79d60fdce211c71845783bd4b Mon Sep 17 00:00:00 2001
From: Zoey Li <31378877+alicialics@users.noreply.github.com>
Date: Sat, 21 Oct 2023 16:44:41 +0000
Subject: [PATCH 2/2] fix webpack publicPath

---
 plugins/dev-scripts/config/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dev-scripts/config/webpack.config.js b/plugins/dev-scripts/config/webpack.config.js
index d1a8726910..e3044816ab 100644
--- a/plugins/dev-scripts/config/webpack.config.js
+++ b/plugins/dev-scripts/config/webpack.config.js
@@ -74,7 +74,7 @@ module.exports = (env) => {
     devtool: isProduction ? 'source-map' : 'eval-source-map',
     output: {
       path: isProduction ? resolveApp('dist') : resolveApp('build'),
-      publicPath: isProduction ? '/dist/' : '/build/',
+      publicPath: isProduction ? 'auto' : '/build/',
       filename: outputFile,
       libraryTarget: 'umd',
       globalObject: 'this',