chore: yarn 4

tenstad · tenstad · commit 8be49b069fda · 2024-12-29T15:46:28.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,11 @@ gha-creds-*.json
 # macOS
 .DS_Store
 gitops-server.dockerfile
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarn/releases/yarn-4.5.3.cjs b/.yarn/releases/yarn-4.5.3.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,2 @@
+yarnPath: .yarn/releases/yarn-4.5.3.cjs
+nodeLinker: node-modules
diff --git a/Makefile b/Makefile
@@ -169,7 +169,7 @@ ui: node_modules $(shell find ui -type f) ## Build the UI
 
 node_modules: ## Install node modules
 	rm -rf .parcel-cache
-	yarn config set network-timeout 600000 && yarn --frozen-lockfile
+	yarn --immutable --network-timeout 600000
 
 ui-lint: ## Run linter against the UI
 	yarn lint
@@ -188,7 +188,7 @@ ui-test: ## Run UI tests
 	yarn test
 
 ui-audit: ## Run audit against the UI
-	yarn audit --production
+	yarn npm audit --environment production
 
 ui-audit-fix: ## Fix UI audit errors
 	yarn yarn-audit-fix
diff --git a/gitops-server.dockerfile b/gitops-server.dockerfile
@@ -10,6 +10,8 @@ COPY --chown=node:node Makefile /home/app/
 COPY --chown=node:node tsconfig.json /home/app/
 COPY --chown=node:node .parcelrc /home/app/
 COPY --chown=node:node .npmrc /home/app/
+COPY --chown=node:node .yarn /home/app/.yarn
+COPY --chown=node:node .yarnrc.yml /home/app/
 RUN make node_modules
 COPY --chown=node:node ui /home/app/ui
 RUN --mount=type=cache,target=/home/app/ui/.parcel-cache make ui
diff --git a/package.json b/package.json
@@ -139,5 +139,6 @@
   },
   "engines": {
     "node": ">=22.0"
-  }
+  },
+  "packageManager": "yarn@4.5.3"
 }
diff --git a/test/library/test.sh b/test/library/test.sh
@@ -4,7 +4,7 @@ set -x
 
 git clone https://github.com/weaveworks-gitops-test/wego-library-test.git test/library/wego-library-test
 cd test/library/wego-library-test
-yarn install --frozen-lockfile
+yarn install --immutable
 yarn build
 go mod tidy
 go build main.go
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+yarnPath: .yarn/releases/yarn-4.5.3.cjs`
	`2`	`+nodeLinker: node-modules`
Original file line number	Diff line number	Diff line change
`@@ -139,5 +139,6 @@`
`139`	`139`	`},`
`140`	`140`	`"engines": {`
`141`	`141`	`"node": ">=22.0"`
`142`		`- }`
	`142`	`+ },`
	`143`	`+ "packageManager": "yarn@4.5.3"`
`143`	`144`	`}`