From f48080f7421ffda377207fc66b1944703c45bf63 Mon Sep 17 00:00:00 2001
From: Hady Bazzi <122710550+HadyBazzi@users.noreply.github.com>
Date: Fri, 20 Oct 2023 18:44:53 -0400
Subject: [PATCH] fix: text join block warning when using block-plus-minus
 plugin (#2025)

* fix: text join block warning when using block-plus-minus plugin

* Update package.json

* fix(packaging): Don't advertise non-existent ESM entrypoints (#2022)

Fixes #1877.

Don't advertise module entrypoints on packages that are implemented
in TypeScript as at the moment our webpack configuration does not
generate any file called src/index.js.

* Revert "fix(packaging): Don't advertise non-existent ESM entrypoints (#2022)"

This reverts commit 3382ac73a1d539e84800d4c249b9bd3fc5e2dac8.

* update package-lock

---------

Co-authored-by: Christopher Allen <cpcallen+git@google.com>
Co-authored-by: Beka Westberg <bwestberg@google.com>
---
 plugins/block-plus-minus/package-lock.json | 16 ++++++++--------
 plugins/block-plus-minus/package.json      |  4 ++--
 plugins/block-plus-minus/src/text_join.js  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/block-plus-minus/package-lock.json b/plugins/block-plus-minus/package-lock.json
index fdfc267cc5..943a76f798 100644
--- a/plugins/block-plus-minus/package-lock.json
+++ b/plugins/block-plus-minus/package-lock.json
@@ -9,7 +9,7 @@
       "version": "6.0.8",
       "license": "Apache-2.0",
       "devDependencies": {
-        "blockly": "^10.0.0",
+        "blockly": "^10.3.0-beta.0",
         "chai": "^4.2.0",
         "mocha": "^10.2.0",
         "sinon": "^9.0.1"
@@ -18,7 +18,7 @@
         "node": ">=8.17.0"
       },
       "peerDependencies": {
-        "blockly": "^10.0.0"
+        "blockly": "^10.3.0-beta.0"
       }
     },
     "node_modules/@sinonjs/commons": {
@@ -137,9 +137,9 @@
       }
     },
     "node_modules/blockly": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.0.0.tgz",
-      "integrity": "sha512-4A+dn2wkY0y44seSCPDYh2UJ4e1ATgfb/qWPS5fQ3+N7nmy+MW21HG/rf7bPWxUsoyfx/Afu75b/DYPWpg6qnQ==",
+      "version": "10.3.0-beta.0",
+      "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.3.0-beta.0.tgz",
+      "integrity": "sha512-Crc1jCWTx+5UZRiLkdv5a2RtQFmlj4w3w8Pt+z/S/U1kcDZnzF2vsQ8u2ASkCUWxCrrevmXPFk9Hv3HomoY30Q==",
       "dev": true,
       "dependencies": {
         "jsdom": "22.1.0"
@@ -1668,9 +1668,9 @@
       "dev": true
     },
     "blockly": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.0.0.tgz",
-      "integrity": "sha512-4A+dn2wkY0y44seSCPDYh2UJ4e1ATgfb/qWPS5fQ3+N7nmy+MW21HG/rf7bPWxUsoyfx/Afu75b/DYPWpg6qnQ==",
+      "version": "10.3.0-beta.0",
+      "resolved": "https://registry.npmjs.org/blockly/-/blockly-10.3.0-beta.0.tgz",
+      "integrity": "sha512-Crc1jCWTx+5UZRiLkdv5a2RtQFmlj4w3w8Pt+z/S/U1kcDZnzF2vsQ8u2ASkCUWxCrrevmXPFk9Hv3HomoY30Q==",
       "dev": true,
       "requires": {
         "jsdom": "22.1.0"
diff --git a/plugins/block-plus-minus/package.json b/plugins/block-plus-minus/package.json
index 09e949bb91..f443f6875a 100644
--- a/plugins/block-plus-minus/package.json
+++ b/plugins/block-plus-minus/package.json
@@ -41,13 +41,13 @@
   "devDependencies": {
     "@blockly/dev-scripts": "^3.1.0",
     "@blockly/dev-tools": "^7.1.4",
-    "blockly": "^10.0.0",
+    "blockly": "^10.3.0-beta.0",
     "chai": "^4.2.0",
     "mocha": "^10.2.0",
     "sinon": "^9.0.1"
   },
   "peerDependencies": {
-    "blockly": "^10.0.0"
+    "blockly": "^10.3.0-beta.0"
   },
   "publishConfig": {
     "access": "public",
diff --git a/plugins/block-plus-minus/src/text_join.js b/plugins/block-plus-minus/src/text_join.js
index c213870c9f..eb262731f9 100644
--- a/plugins/block-plus-minus/src/text_join.js
+++ b/plugins/block-plus-minus/src/text_join.js
@@ -154,8 +154,8 @@ const textJoinMutator = {
  * mutator is provided the block has two inputs.
  * @this {Blockly.Block}
  */
-const textJoinHelper = function () {
-  Blockly.Extensions.apply('text_quotes', this, false);
+const textJoinHelper = function() {
+  Blockly.Extensions.apply('quote_image_mixin', this, false);
   this.updateShape_(2);
 };