From 18034e19b4a32e03c8b2a5d476ab302db099c5a9 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Aug 2024 13:28:35 -0700
Subject: [PATCH 1/3] fix: add lerna commands to plugins package.json

---
 package.json         | 12 ++++++------
 plugins/package.json |  8 +++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 4fce79ce2..0de5beb8a 100644
--- a/package.json
+++ b/package.json
@@ -5,14 +5,14 @@
   "author": "Blockly Team",
   "license": "Apache-2.0",
   "scripts": {
-    "audit:fix": "cd plugins && lerna run audit:fix && lerna bootstrap",
+    "audit:fix": "cd plugins && npm run audit:fix && npm run bootstrap",
     "boot": "cd plugins && npm ci",
-    "build": "cd plugins && lerna run build",
-    "clean": "cd plugins && lerna run clean",
-    "clean:node": "cd plugins && lerna clean --yes",
+    "build": "cd plugins && npm run build",
+    "clean": "cd plugins && npm run clean",
+    "clean:node": "cd plugins && npm run clean:node",
     "deploy:prepare": "npm run deploy:prepare:plugins && npm run deploy:prepare:examples && gulp predeploy",
     "deploy:prepare:examples": "cd examples && npm run predeploy",
-    "deploy:prepare:plugins": "npm run clean && cd plugins && lerna run build && lerna run predeploy",
+    "deploy:prepare:plugins": "npm run clean && cd plugins && npm run build && npm run predeploy",
     "deploy": "npm run deploy:prepare && gulp deploy",
     "deploy:upstream": "npm run deploy:prepare && gulp deployUpstream",
     "format": "prettier --write .",
@@ -21,7 +21,7 @@
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "postinstall": "npm run boot",
-    "test": "cd plugins && lerna run test",
+    "test": "cd plugins && npm run test",
     "publish:prepare": "gulp prepareForPublish",
     "publish:manual": "gulp publishManual",
     "publish:force": "gulp forcePublish",
diff --git a/plugins/package.json b/plugins/package.json
index 3cfb74344..8783b26f7 100644
--- a/plugins/package.json
+++ b/plugins/package.json
@@ -3,8 +3,14 @@
   "private": true,
   "scripts": {
     "audit": "lerna run audit",
+    "audit:fix": "lerna run audit:fix",
     "boot": "lerna bootstrap",
-    "postinstall": "npm run boot"
+    "build": "lerna run build",
+    "clean": "lerna run clean",
+    "clean:node": "lerna run clean --yes",
+    "postinstall": "npm run boot",
+    "predeploy": "lerna run predeploy",
+    "test": "lerna run test"
   },
   "devDependencies": {
     "@lerna/legacy-package-management": "^8.1.7",

From 9696d64d75c9d9b621796c6b0130b7a0dd9b68a6 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Aug 2024 13:40:40 -0700
Subject: [PATCH 2/3] fix: call to boot command

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0de5beb8a..177396cc5 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "Blockly Team",
   "license": "Apache-2.0",
   "scripts": {
-    "audit:fix": "cd plugins && npm run audit:fix && npm run bootstrap",
+    "audit:fix": "cd plugins && npm run audit:fix && npm run boot",
     "boot": "cd plugins && npm ci",
     "build": "cd plugins && npm run build",
     "clean": "cd plugins && npm run clean",

From 3ef869175089fb4fa51c622f723fa948a5bac191 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Fri, 30 Aug 2024 13:47:29 -0700
Subject: [PATCH 3/3] chore: don't let prettier format package-lock.json files

---
 .prettierignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.prettierignore b/.prettierignore
index 8415c4d8e..0f127ee27 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -13,6 +13,7 @@ gh-pages/*
 examples/blockly-svelte/public/bundle.js
 examples/blockly-angular/.angular
 **/node_modules/*
+**/package-lock.json
 **/CHANGELOG.md
 CHANGELOG.md
 PULL_REQUEST_TEMPLATE.md