build-system: fix unminified watch mode. (#33334)

* build-system: fix unminified watch mode. * nits * address second nit
ampproject · Mar 18, 2021 · 2de6baf · 2de6baf
1 parent 396a6f9
commit 2de6baf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/build-system/compile/pre-closure-babel.js b/build-system/compile/pre-closure-babel.js
@@ -52,7 +52,7 @@ function getBabelCacheDir() {
  * so it can be retransformed during a watch build.
  * @param {string} fileOrDir
  */
-function removeFromBabelCache(fileOrDir) {
+function removeFromClosureBabelCache(fileOrDir) {
   const cachedPath = path.join(cacheDir, fileOrDir);
   if (fs.existsSync(cachedPath)) {
     fs.removeSync(cachedPath);
@@ -138,6 +138,6 @@ function handlePreClosureError(err, outputFilename, options) {
 
 module.exports = {
   getBabelCacheDir,
-  removeFromBabelCache,
+  removeFromClosureBabelCache,
   preClosureBabel,
 };
diff --git a/build-system/tasks/extension-helpers.js b/build-system/tasks/extension-helpers.js
@@ -33,7 +33,7 @@ const {isCiBuild} = require('../common/ci');
 const {jsifyCssAsync} = require('./css/jsify-css');
 const {log} = require('../common/logging');
 const {maybeToEsmName, compileJs, mkdirSync} = require('./helpers');
-const {removeFromBabelCache} = require('../compile/pre-closure-babel');
+const {removeFromClosureBabelCache} = require('../compile/pre-closure-babel');
 const {watch} = require('chokidar');
 
 /**
@@ -384,8 +384,11 @@ async function doBuildExtension(extensions, extension, options) {
  * @param {?Object} options
  */
 function watchExtension(extDir, name, version, latestVersion, hasCss, options) {
-  const watchFunc = function () {
-    removeFromBabelCache(extDir);
+  function watchFunc() {
+    if (options.minify) {
+      removeFromClosureBabelCache(extDir);
+    }
+
     const bundleComplete = buildExtension(
       name,
       version,
@@ -396,7 +399,7 @@ function watchExtension(extDir, name, version, latestVersion, hasCss, options) {
     if (options.onWatchBuild) {
       options.onWatchBuild(bundleComplete);
     }
-  };
+  }
   watch(`${extDir}/**/*`).on('change', debounce(watchFunc, watchDebounceDelay));
 }
 

diff --git a/build-system/tasks/helpers.js b/build-system/tasks/helpers.js
@@ -37,7 +37,7 @@ const {green, red, cyan} = require('kleur/colors');
 const {isCiBuild} = require('../common/ci');
 const {jsBundles} = require('../compile/bundles.config');
 const {log, logLocalDev} = require('../common/logging');
-const {removeFromBabelCache} = require('../compile/pre-closure-babel');
+const {removeFromClosureBabelCache} = require('../compile/pre-closure-babel');
 const {thirdPartyFrames} = require('../test-configs/config');
 const {transpileTs} = require('../compile/typescript');
 const {watch: fileWatch} = require('chokidar');
@@ -163,7 +163,9 @@ async function compileCoreRuntime(options) {
   if (options.watch) {
     /** @return {Promise<void>} */
     async function watchFunc() {
-      removeFromBabelCache('src');
+      if (options.minify) {
+        removeFromClosureBabelCache('src');
+      }
       const bundleComplete = await doBuildJs(jsBundles, 'amp.js', {
         ...options,
         continueOnError: true,
@@ -331,13 +333,15 @@ async function compileMinifiedJs(srcDir, srcFilename, destDir, options) {
   const minifiedName = maybeToEsmName(options.minifiedName);
 
   if (options.watch) {
-    const watchFunc = async () => {
-      removeFromBabelCache(entryPoint);
+    async function watchFunc() {
+      if (options.minify) {
+        removeFromClosureBabelCache(entryPoint);
+      }
       const compileDone = await doCompileMinifiedJs(/* continueOnError */ true);
       if (options.onWatchBuild) {
         options.onWatchBuild(compileDone);
       }
-    };
+    }
     fileWatch(entryPoint).on('change', debounce(watchFunc, watchDebounceDelay));
   }