From c30569dfd3ce493020847be21ea5301a3c0acd7e Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 29 Jun 2023 23:39:26 +0200 Subject: [PATCH] Release 10.1.5 Found another bug while trying to make the release. Running `npm run nodeps` last breaks dynamic importing of the DayJS translations. I'm not sure why, I think maybe because of broken `.map` files. The fix for now is to move the js-po files out of the way, and then copy them back in after running `npm run build`. Hopefully all of this won't be necessary with gettext 0.22 which should support template literals --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5244a57a1..614174405 100644 --- a/Makefile +++ b/Makefile @@ -205,12 +205,16 @@ src/headless/dist/converse-headless.min.js: src webpack/webpack.common.js node_m dist:: node_modules src/* | dist/website.css dist/website.min.css npm run headless - npm run build - # This step is necessary to properly generate JSON files from the .po - # files. The nodeps config uses preset-env with IE11 to turn all template - # literals into old JS strings, which is required because gettext 0.21 - # doesn't support template literals. + # Ideally this should just be `npm run nodeps`. + # The additional steps are necessary to properly generate JSON files from + # the .po files. The nodeps config uses preset-env with IE11 to turn all + # template literals into old JS strings, which is required because + # gettext 0.21 doesn't support template literals. npm run nodeps + mkdir tmp && mv dist/locales tmp + npm run build + cp tmp/locales/*-po.js dist/locales/ + rm -rf tmp .PHONY: install install:: dist