From c99385fc144d1f1b303b2c5b9eca2c89bb40dde9 Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Tue, 4 Oct 2022 15:16:45 +0100
Subject: [PATCH] chore(build): Write intermediate langfiles to build/msg

Write the results of create_messages.py to build/msg instead of
build/msg/js.
---
 core/main.js                       | 2 +-
 scripts/gulpfiles/build_tasks.js   | 4 ++--
 scripts/gulpfiles/package_tasks.js | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/main.js b/core/main.js
index 280920375..10a0d5db0 100644
--- a/core/main.js
+++ b/core/main.js
@@ -290,7 +290,7 @@ Object.defineProperties(WidgetDiv, {
 // CJS or ES module there will not be a Blockly global variable
 // created.  This can cause problems because a very common way of
 // loading translations is to use a <script> tag to load one of
-// msg/js/*.js, which consists of lines like:
+// the generated msg/*.js files, which consists of lines like:
 //
 // Blockly.Msg["ADD_COMMENT"] = "Add Comment";
 // Blockly.Msg["CLEAN_UP"] = "Clean up Blocks";
diff --git a/scripts/gulpfiles/build_tasks.js b/scripts/gulpfiles/build_tasks.js
index 33feb361d..756d9520a 100644
--- a/scripts/gulpfiles/build_tasks.js
+++ b/scripts/gulpfiles/build_tasks.js
@@ -415,7 +415,7 @@ this removal!
  */
 function buildLangfiles(done) {
   // Create output directory.
-  const outputDir = path.join(BUILD_DIR, 'msg', 'js');
+  const outputDir = path.join(BUILD_DIR, 'msg');
   fs.mkdirSync(outputDir, {recursive: true});
 
   // Run create_messages.py.
@@ -714,7 +714,7 @@ function checkinBuilt() {
   return gulp.src([
     `${RELEASE_DIR}/*_compressed.js`,
     `${RELEASE_DIR}/*_compressed.js.map`,
-    // `${BUILD_DIR}/msg/js/*.js`,  // Temporarily disabled (base mismatch).
+    // `${BUILD_DIR}/msg/*.js`,  // Temporarily disabled (base mismatch).
   ], {base: RELEASE_DIR}).pipe(gulp.dest('.'));
 }
 
diff --git a/scripts/gulpfiles/package_tasks.js b/scripts/gulpfiles/package_tasks.js
index 6ec80dde0..fda1b5c94 100644
--- a/scripts/gulpfiles/package_tasks.js
+++ b/scripts/gulpfiles/package_tasks.js
@@ -272,12 +272,12 @@ function packagePHP() {
 };
 
 /**
- * This task wraps each of the ${BUILD_DIR}/msg/js/* files into a UMD module.
+ * This task wraps each of the files in ${BUILD_DIR/msg/ into a UMD module.
  * @example import * as En from 'blockly/msg/en';
  */
 function packageLocales() {
   // Remove references to goog.provide and goog.require.
-  return gulp.src(`${BUILD_DIR}/msg/js/*.js`)
+  return gulp.src(`${BUILD_DIR}/msg/*.js`)
       .pipe(gulp.replace(/goog\.[^\n]+/g, ''))
       .pipe(packageUMD('Blockly.Msg', [], 'umd-msg.template'))
       .pipe(gulp.dest(`${RELEASE_DIR}/msg`));