Fix release expansion issue

[zeripath]

Use native makefile foreach expansion instead of bash specific brace expansion

Fix #14578

Signed-off-by: Andrew Thornton art27@cantab.net

[silverwind]

Better alternative for the eval above:

$(eval ESBUILD_VERSION := $(shell node -p "require('./package-lock.json').dependencies.esbuild.version"))

[silverwind]

Got below to work. apparenly the .npmrc changes were not committed and make .npm-cache left the files dirty. I'm not sure why the .npmrc changes were reverted, they were there already in a previous version of that PR.

diff --git a/.npmrc b/.npmrc
index c5ac9901c..25ed63413 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,4 +1,5 @@
 audit=false
 fund=false
 package-lock=true
 save-exact=true
+cache=.npm-cache
diff --git a/Makefile b/Makefile
index f2114b643..c99483dec 100644
--- a/Makefile
+++ b/Makefile
@@ -670,9 +670,9 @@ node_modules: package-lock.json
 npm-cache: .npm-cache $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui

 .npm-cache: package-lock.json
 	rm -rf .npm-cache
-	$(eval ESBUILD_VERSION := `node -p "require('./package-lock.json').dependencies.esbuild.version"`)
+	$(eval ESBUILD_VERSION := $(shell node -p "require('./package-lock.json').dependencies.esbuild.version"))
 	npm config --userconfig=.npmrc set cache=.npm-cache
 	rm -rf node_modules && npm install --no-save
 	npm config --userconfig=$(FOMANTIC_WORK_DIR)/.npmrc set cache=../../.npm-cache
 	echo $(foreach build, darwin-64 $(foreach arch,arm arm64 32 64,linux-${arch}) $(foreach arch,32 64,windows-${arch}), esbuild-${build}@$(ESBUILD_VERSION)) | tr " " "\n" | xargs -n 1 -P 4 npm cache add
diff --git a/web_src/fomantic/.npmrc b/web_src/fomantic/.npmrc
index cc243d01b..5f8054bbb 100644
--- a/web_src/fomantic/.npmrc
+++ b/web_src/fomantic/.npmrc
@@ -1,2 +1,3 @@
 optional=false
 package-lock=false
+cache=../../.npm-cache

[zeripath]

lol I was just discovering this myself

[CL-Jeremy]

Sorry, those cache= lines were not meant to be committed per my design. After all, .npm-cache is not included when doing git clone, so the cache settings should only take effect when make npm-cache is executed manually, which is what happens during the release of tarball.

Could you please revert this last commit @zeripath ? Thanks in advance.

[silverwind]

Can we somehow make those npm commands not write into the .npmrc files? Make targets should not leave a unclean git worktree.

[zeripath]

@CL-Jeremy just make another pr removing the .npm-cache files

[CL-Jeremy]

Can we somehow make those npm commands not write into the .npmrc files? Make targets should not leave a unclean git worktree.

It's possible to make .npm-cache auto-detected for Makefile (i. e. run npm with corresponding arguments if cache exists), but I'd like to have plain npm also working to give the user as much freedom as possible.

Is it feasible to make a pre-commit hook to prevent commit when .npm-cache exists? That'll be perfect. Not possible to apply globally.

Trying to implement this: https://stackoverflow.com/questions/16244969/how-to-tell-git-to-ignore-individual-lines-i-e-gitignore-for-specific-lines-of

[silverwind]

Is it feasible to make a pre-commit hook to prevent commit when .npm-cache exists?

Out of question for me at least, I hate all kinds of pre-commit hooks. I think we should just keep it simple and go with #14578 (comment). Will probably follow up on that later today.