Switch to pnpm #35274
+13,197
−14,451
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| audit=false | ||
| fund=false | ||
| update-notifier=false | ||
| save-exact=true | ||
| auto-install-peers=true | ||
| dedupe-peer-dependents=false | ||
| enable-pre-post-scripts=true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -218,9 +218,9 @@ node-check: | |
| $(eval MIN_NODE_VERSION_STR := $(shell grep -Eo '"node":.*[0-9.]+"' package.json | sed -n 's/.*[^0-9.]\([0-9.]*\)"/\1/p')) | ||
| $(eval MIN_NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell echo '$(MIN_NODE_VERSION_STR)' | tr '.' ' '))) | ||
| $(eval NODE_VERSION := $(shell printf "%03d%03d%03d" $(shell node -v | cut -c2- | tr '.' ' ');)) | ||
| $(eval PNPM_MISSING := $(shell hash pnpm > /dev/null 2>&1 || echo 1)) | ||
| @if [ "$(NODE_VERSION)" -lt "$(MIN_NODE_VERSION)" -o "$(PNPM_MISSING)" = "1" ]; then \ | ||
| echo "Gitea requires Node.js $(MIN_NODE_VERSION_STR) or greater and pnpm to build. You can get it at https://nodejs.org/en/download/"; \ | ||
| exit 1; \ | ||
| fi | ||
|
|
||
|
|
@@ -334,29 +334,29 @@ lint-backend-fix: lint-go-fix lint-go-gitea-vet lint-editorconfig ## lint backen | |
|
|
||
| .PHONY: lint-js | ||
| lint-js: node_modules ## lint js files | ||
| pnpm exec eslint --color --max-warnings=0 --ext js,ts,vue $(ESLINT_FILES) | ||
| pnpm exec vue-tsc | ||
|
|
||
| .PHONY: lint-js-fix | ||
| lint-js-fix: node_modules ## lint js files and fix issues | ||
| pnpm exec eslint --color --max-warnings=0 --ext js,ts,vue $(ESLINT_FILES) --fix | ||
| pnpm exec vue-tsc | ||
|
|
||
| .PHONY: lint-css | ||
| lint-css: node_modules ## lint css files | ||
| pnpm exec stylelint --color --max-warnings=0 $(STYLELINT_FILES) | ||
|
|
||
| .PHONY: lint-css-fix | ||
| lint-css-fix: node_modules ## lint css files and fix issues | ||
| pnpm exec stylelint --color --max-warnings=0 $(STYLELINT_FILES) --fix | ||
|
|
||
| .PHONY: lint-swagger | ||
| lint-swagger: node_modules ## lint swagger files | ||
| pnpm exec spectral lint -q -F hint $(SWAGGER_SPEC) | ||
|
|
||
| .PHONY: lint-md | ||
| lint-md: node_modules ## lint markdown files | ||
| pnpm exec markdownlint *.md | ||
|
|
||
| .PHONY: lint-spell | ||
| lint-spell: ## lint spelling | ||
|
|
@@ -417,7 +417,7 @@ watch: ## watch everything and continuously rebuild | |
| .PHONY: watch-frontend | ||
| watch-frontend: node-check node_modules ## watch frontend files and continuously rebuild | ||
| @rm -rf $(WEBPACK_DEST_ENTRIES) | ||
| NODE_ENV=development pnpm exec webpack --watch --progress | ||
|
|
||
| .PHONY: watch-backend | ||
| watch-backend: go-check ## watch backend files and continuously rebuild | ||
|
|
@@ -433,7 +433,7 @@ test-backend: ## test backend files | |
|
|
||
| .PHONY: test-frontend | ||
| test-frontend: node_modules ## test frontend files | ||
| pnpm exec vitest | ||
|
|
||
| .PHONY: test-check | ||
| test-check: | ||
|
|
@@ -576,7 +576,7 @@ test-mssql-migration: migrations.mssql.test migrations.individual.mssql.test | |
|
|
||
| .PHONY: playwright | ||
| playwright: deps-frontend | ||
| pnpm exec playwright install $(PLAYWRIGHT_FLAGS) | ||
|
|
||
| .PHONY: test-e2e% | ||
| test-e2e%: TEST_TYPE ?= e2e | ||
|
|
@@ -839,8 +839,8 @@ deps-tools: ## install tool dependencies | |
| $(GO) install $(GOPLS_MODERNIZE_PACKAGE) & \ | ||
| wait | ||
|
|
||
| node_modules: pnpm-lock.yaml | ||
| pnpm install --frozen-lockfile | ||
| @touch node_modules | ||
|
|
||
| .venv: uv.lock | ||
|
|
@@ -852,28 +852,28 @@ update: update-js update-py ## update js and py dependencies | |
|
|
||
| .PHONY: update-js | ||
| update-js: node-check | node_modules ## update js dependencies | ||
| pnpm exec updates -u -f package.json | ||
| rm -rf node_modules pnpm-lock.yaml | ||
| pnpm install | ||
| pnpm exec nolyfill install | ||
| pnpm install | ||
| @touch node_modules | ||
|
|
||
| .PHONY: update-py | ||
| update-py: node-check | node_modules ## update py dependencies | ||
| pnpm exec updates -u -f pyproject.toml | ||
| rm -rf .venv uv.lock | ||
| uv sync | ||
| @touch .venv | ||
|
|
||
| .PHONY: webpack | ||
| webpack: $(WEBPACK_DEST) ## build webpack files | ||
|
|
||
| $(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) pnpm-lock.yaml | ||
| @$(MAKE) -s node-check node_modules | ||
| @rm -rf $(WEBPACK_DEST_ENTRIES) | ||
| @echo "Running webpack..." | ||
| @BROWSERSLIST_IGNORE_OLD_DATA=true pnpm exec webpack | ||
| @touch $(WEBPACK_DEST) | ||
|
|
||
| .PHONY: svg | ||
|
|
@@ -893,11 +893,11 @@ svg-check: svg | |
|
|
||
| .PHONY: lockfile-check | ||
| lockfile-check: | ||
| pnpm install --frozen-lockfile | ||
| @diff=$$(git diff --color=always pnpm-lock.yaml); \ | ||
| if [ -n "$$diff" ]; then \ | ||
| echo "pnpm-lock.yaml is inconsistent with package.json"; \ | ||
| echo "Please run 'pnpm install --frozen-lockfile' and commit the result:"; \ | ||
| printf "%s" "$${diff}"; \ | ||
| exit 1; \ | ||
| fi | ||
|
|
@@ -918,7 +918,7 @@ generate-gitignore: ## update gitignore files | |
|
|
||
| .PHONY: generate-images | ||
| generate-images: | node_modules | ||
| pnpm install --no-save fabric@6 imagemin-zopfli@7 | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. Apparently there is open issue pnpm/pnpm#1237 about it. I'm not sure how to solve. There was a problem hiding this comment. I guess what we should do is make a second There was a problem hiding this comment. Good catch. I separated it out, and added cairo and pixman to the flake so that at least those who use nix can ensure they have the expected build deps. I'll have to add a mention of those two to the docs as turns out that prebuilt versions of canvas aren't available for at least my combination of devices and node versions. There was a problem hiding this comment. Looks good. I think there might be some wasm-based svg-to-png solution somewhere which would work everywhere, but this is good enough for now. Edit: Likely https://github.com/ssssota/svg2png-wasm |
||
| node tools/generate-images.js $(TAGS) | ||
|
|
||
| .PHONY: generate-manpage | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.