diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-04-02 08:11:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-02 02:11:04 +0200 |
| commit | 42efa14f51587542db9e118812171d2dcbe2b385 (patch) | |
| tree | f549b971f6e41125c51973fc01123dd4c92f7ce0 /Makefile | |
| parent | bc1f2117f1be539e971c90877658a8e456ce9e25 (diff) | |
| download | gitea-42efa14f51587542db9e118812171d2dcbe2b385.tar.gz gitea-42efa14f51587542db9e118812171d2dcbe2b385.zip | |
Introduce esbuild on webpack (#14578)
* Vendor node mods as cache; fix esbuild/fomantic offline build
* Fix --exclude; use bsdtar for consistent globbing
* Fall back to GNU tar; forward-compatible for APT 2.0
* Avoid having extd. attrs with bsdtar
* Dependency and misc. optimizations
* Remove extra code after esbuild-loader update
Co-authored-by: Mike L <cl.jeremy@qq.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 55 |
1 files changed, 43 insertions, 12 deletions
@@ -14,6 +14,8 @@ else # This is the "normal" part of the Makefile +TAR := $(shell hash bsdtar > /dev/null 2>&1 && echo "bsdtar --no-xattrs" || echo "tar" ) + DIST := dist DIST_DIRS := $(DIST)/binaries $(DIST)/release IMPORT := code.gitea.io/gitea @@ -93,7 +95,7 @@ GO_PACKAGES ?= $(filter-out code.gitea.io/gitea/models/migrations code.gitea.io/ FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables FOMANTIC_DEST := web_src/fomantic/build/semantic.js web_src/fomantic/build/semantic.css -FOMANTIC_DEST_DIR := web_src/fomantic/build +FOMANTIC_WORK_DIR := web_src/fomantic WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f) WEBPACK_CONFIGS := webpack.config.js @@ -642,14 +644,16 @@ release-compress: | $(DIST_DIRS) cd $(DIST)/release/; for file in `find . -type f -name "*"`; do echo "compressing $${file}" && gxz -k -9 $${file}; done; .PHONY: release-sources -release-sources: | $(DIST_DIRS) node_modules +release-sources: | $(DIST_DIRS) npm-cache echo $(VERSION) > $(STORED_VERSION_FILE) - tar --exclude=./$(DIST) --exclude=./.git --exclude=./$(MAKE_EVIDENCE_DIR) --exclude=./node_modules/.cache --exclude=./$(AIR_TMP_DIR) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz . + $(eval EXCL := --exclude=$(shell [ ! "$(TAR)" = "tar" ] && echo "^" )./) + $(eval EXCL_RECURSIVE := --exclude=) + $(TAR) $(EXCL)$(DIST) $(EXCL).git $(EXCL)$(MAKE_EVIDENCE_DIR) $(EXCL_RECURSIVE)node_modules $(EXCL)$(AIR_TMP_DIR) -czf $(DIST)/release/gitea-src-$(VERSION).tar.gz . rm -f $(STORED_VERSION_FILE) .PHONY: release-docs release-docs: | $(DIST_DIRS) docs - tar -czf $(DIST)/release/gitea-docs-$(VERSION).tar.gz -C ./docs/public . + $(TAR) -czf $(DIST)/release/gitea-docs-$(VERSION).tar.gz -C ./docs/public . .PHONY: docs docs: @@ -662,6 +666,25 @@ node_modules: package-lock.json npm install --no-save @touch node_modules +.PHONY: npm-cache +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"`) + 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 esbuild-{darwin-64,linux-{arm,arm64,32,64},windows-{32,64}}@$(ESBUILD_VERSION) | tr " " "\n" | xargs -n 1 -P 4 npm cache add + rm -rf $(FOMANTIC_WORK_DIR)/node_modules + @touch .npm-cache + +.PHONY: npm-uncache +npm-uncache: + rm -rf .npm-cache + npm config --userconfig=$(FOMANTIC_WORK_DIR)/.npmrc rm cache + npm config --userconfig=.npmrc rm cache + .PHONY: npm-update npm-update: node-check | node_modules npx updates -cu @@ -672,14 +695,22 @@ npm-update: node-check | node_modules .PHONY: fomantic fomantic: $(FOMANTIC_DEST) -$(FOMANTIC_DEST): $(FOMANTIC_CONFIGS) | node_modules - @if [ ! -d node_modules/fomantic-ui ]; then \ - npm install --no-save --no-package-lock fomantic-ui@2.8.7; \ - fi - rm -rf $(FOMANTIC_DEST_DIR) - cp -f web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config - cp -rf web_src/fomantic/_site/* node_modules/fomantic-ui/src/_site/ - npx gulp -f node_modules/fomantic-ui/gulpfile.js build +$(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui: + ln -sf ../../semantic.json $(FOMANTIC_WORK_DIR) + cd $(FOMANTIC_WORK_DIR); \ + rm -rf node_modules && mkdir node_modules && \ + npm install fomantic-ui; \ + rm -f semantic.json + @touch $(FOMANTIC_WORK_DIR)/node_modules + +$(FOMANTIC_DEST): $(FOMANTIC_CONFIGS) $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui + ln -sf ../../semantic.json $(FOMANTIC_WORK_DIR) + rm -rf $(FOMANTIC_WORK_DIR)/build + cd $(FOMANTIC_WORK_DIR); \ + cp -f theme.config.less node_modules/fomantic-ui/src/theme.config; \ + cp -rf _site node_modules/fomantic-ui/src/; \ + npx gulp -f node_modules/fomantic-ui/gulpfile.js build; \ + rm -f semantic.json @touch $(FOMANTIC_DEST) .PHONY: webpack |