From eb500a09e767bcc57396c6bc8aa0f86b02665a8f Mon Sep 17 00:00:00 2001
From: Beka Westberg <bwestberg@google.com>
Date: Wed, 21 Aug 2024 17:23:37 +0000
Subject: [PATCH] fix: PR comments

---
 gulpfile.js  | 8 +++++---
 package.json | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index a687352e8..0d4b9a8f3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -116,7 +116,7 @@ function exitIfNoReleaseDir(releaseDir, done) {
  */
 function publish(force) {
   return (done) => {
-    const releaseDir = 'dist';
+    const releaseDir = 'dist/plugins';
     exitIfNoReleaseDir(releaseDir, done);
 
     // Run lerna publish. Uses conventional commits for versioning
@@ -163,7 +163,7 @@ function forcePublish(done) {
  * @param {Function} done Completed callback.
  */
 function publishFromPackage(done) {
-  const releaseDir = 'dist';
+  const releaseDir = 'dist/plugins';
   exitIfNoReleaseDir(releaseDir, done);
 
   // Run lerna publish. Will not update versions.
@@ -185,7 +185,7 @@ function publishFromPackage(done) {
  * @param {Function} done Completed callback.
  */
 function checkVersions(done) {
-  const releaseDir = 'dist';
+  const releaseDir = 'dist/plugins';
   exitIfNoReleaseDir(releaseDir, done);
 
   // Check version numbers that would be created.
@@ -234,8 +234,10 @@ function deployToGhPages(repo) {
  */
 function preparePluginsForLocal(isBeta) {
   return (done) => {
+    const pluginsDirectory = 'plugins';
     if (isBeta) {
       execSync(`npx lerna exec -- npm install blockly@beta --force `, {
+        cwd: pluginsDirectory,
         stdio: 'inherit',
       });
     }
diff --git a/package.json b/package.json
index f7ce43488..30dd86583 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "clean:node": "cd plugins && lerna clean --yes",
     "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 && lerna run build && lerna run predeploy",
+    "deploy:prepare:plugins": "cd plugins && npm run clean && lerna run build && lerna run predeploy",
     "deploy": "npm run deploy:prepare && gulp deploy",
     "deploy:upstream": "npm run deploy:prepare && gulp deployUpstream",
     "format": "prettier --write .",