Merge ~weii-wang/charm-k8s-discourse:fix-terser-precompile into charm-k8s-discourse:master

[Weii Wang]

Enable terser to uglify JS assets

Set up the terser package and the SKIP_NODE_UGLIFY environment variable
correctly so discourse will use terser instead of uglifyjs to compress
all the Javascript assets.

LP: #1952681

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Barry Price (barryprice)]

Thanks for your work on this, looks good to me - couple of minor nitpicks inline below.

review: Approve

[Weii Wang (weii-wang)]

> Thanks for your work on this, looks good to me - couple of minor nitpicks
> inline below.

I made some modifications based on that, new commit has been squashed and uploaded.
Thanks!

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision d86ae45b79d2685989b869200a3a2566f832ed3b

diff --git a/image/build_scripts/build_app b/image/build_scripts/build_app
index 9d6d04a..6a0333c 100755
--- a/image/build_scripts/build_app
+++ b/image/build_scripts/build_app
@@ -16,9 +16,6 @@ git clone --depth 1 --branch ${CONTAINER_APP_VERSION} https://github.com/discour
 # Apply patch for LP#1903695
 git -C "${CONTAINER_APP_VERSION}" apply /srv/build_scripts/lp1903695.patch
 
-# Apply patch to use terser rather than uglifier
-git -C "${CONTAINER_APP_VERSION}" apply /srv/build_scripts/terser.patch
-
 chown -R ${CONTAINER_APP_USERNAME}:${CONTAINER_APP_GROUP} ${CONTAINER_APP_VERSION}
 ln -s ${CONTAINER_APP_ROOT}/${CONTAINER_APP_VERSION} app
 cd ${CONTAINER_APP_ROOT}/app
diff --git a/image/build_scripts/get_app_dependencies b/image/build_scripts/get_app_dependencies
index 8f9a0f6..2295656 100755
--- a/image/build_scripts/get_app_dependencies
+++ b/image/build_scripts/get_app_dependencies
@@ -16,7 +16,7 @@ apt-get install -y brotli \
                    libxml2-dev \
                    libxslt1-dev \
                    libz-dev \
-                   node-terser \
+                   uglifyjs.terser \
                    node-uglify \
                    optipng \
                    pngquant \
@@ -27,3 +27,11 @@ apt-get install -y brotli \
                    ruby2.7-dev \
                    zlib1g-dev
 
+# Older versions of the uglifyjs.terser package install a uglifyjs.terser
+# command but not the terser command, terser command exists in $PATH is
+# vital to trigger js assets compression using node. Manually create the
+# terser command if it does not exist. Please remove this line if the
+# base image is >= 22.04. Also, please consider removing the node-uglify
+# when upgrading to discourse >= 2.8.0, since the node-uglify is not
+# required to trigger node js assets compression, only terser will do fine.
+which terser || ln -s $(which uglifyjs.terser) /usr/local/bin/terser
\ No newline at end of file
diff --git a/image/build_scripts/terser.patch b/image/build_scripts/terser.patch
deleted file mode 100644
index 55e20ff..0000000
--- a/image/build_scripts/terser.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/config/environments/production.rb b/config/environments/production.rb
-index a523888a8d..7f41985b17 100644
---- a/config/environments/production.rb
-+++ b/config/environments/production.rb
-@@ -14,7 +14,7 @@ Discourse::Application.configure do
-   # Disable Rails's static asset server (Apache or nginx will already do this)
-   config.public_file_server.enabled = GlobalSetting.serve_static_assets || false
- 
--  config.assets.js_compressor = :uglifier
-+  config.assets.js_compressor = :terser
- 
-   # stuff should be pre-compiled
-   config.assets.compile = false
diff --git a/image/scripts/pod_setup b/image/scripts/pod_setup
index 4893723..ca5f8d4 100755
--- a/image/scripts/pod_setup
+++ b/image/scripts/pod_setup
@@ -36,15 +36,7 @@ else
 fi
 ### MIGRATION LOCK WORKAROUND ENDS HERE
 
-# It is safe to build assets in the background to improve startup time.
-export SKIP_NODE_UGLIFY="true"
-
-# LP#1952681: First run consistently fails to process discourse/tests/theme_qunit_helper JS
-su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 |sed 's/^/asset-build-1: /'
-# LP#1952681: Second run consistently fails to process application JS
-su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 |sed 's/^/asset-build-2: /'
-# LP#1952681: Third run consistently succeeds
-su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 |sed 's/^/asset-build-3: /'
+su -s /bin/bash -c "bin/bundle exec rake assets:precompile RAILS_ENV=$RAILS_ENV" ${CONTAINER_APP_USERNAME} 2>&1 | sed 's/^/asset-build: /'
 
 if [ ! -z "${DISCOURSE_USE_S3}" ] && [ "${DISCOURSE_USE_S3}" == "true" ]; then
 	echo "Discourse is configured to use S3:"