Skip to content

Commit 2f6636b

Browse files
committed
chore: migrate to yarn berry
1 parent 1a68f54 commit 2f6636b

32 files changed

Lines changed: 30315 additions & 169029 deletions

File tree

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
vendor/* linguist-generated=true
2+
.yarn/releases/** binary
3+
.yarn/plugins/** binary

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
.env
22
.idea
33
.vscode
4+
5+
# Yarn v4 (Berry)
6+
.pnp.*
7+
.yarn/*
8+
install-state.gz
9+
!.yarn/patches
10+
!.yarn/plugins
11+
!.yarn/releases
12+
!.yarn/sdks
13+
!.yarn/versions
414
!/vendor/**
515
!.vscode/settings.json
616
.DS_Store

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ ADD . .
1717

1818
USER 0
1919

20-
ARG YARN_VERSION=v1.22.22
20+
ARG COREPACK_VERSION=0.34.6
2121

22-
# bootstrap yarn so we can install and run the other tools.
23-
RUN CACHED_YARN=./artifacts/yarn-${YARN_VERSION}.tar.gz; \
24-
if [ -f ${CACHED_YARN} ]; then \
25-
npm install ${CACHED_YARN}; \
22+
# bootstrap corepack so we can install and run the other tools.
23+
RUN CACHED_COREPACK=./artifacts/corepack-${COREPACK_VERSION}.tar.gz; \
24+
if [ -f ${CACHED_COREPACK} ]; then \
25+
npm install ${CACHED_COREPACK}; \
2626
else \
27-
npm install https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz; \
27+
npm install https://github.com/nodejs/corepack/releases/download/v${COREPACK_VERSION}/corepack.tgz; \
2828
fi
2929

3030
# The REMOTE_SOURCES value is set by the build system to indicate the location of the cachito-backed artifacts cache.
@@ -39,7 +39,7 @@ COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
3939
# use dependencies provided by Cachito
4040
RUN test -d ${REMOTE_SOURCES}/cachito-gomod-with-deps || exit 0; \
4141
cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/registry-ca.pem . \
42-
&& cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/frontend/{.npmrc,.yarnrc,yarn.lock} frontend/
42+
&& cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/frontend/{.npmrc,.yarnrc.yml,yarn.lock} frontend/
4343

4444
# prevent download of cypress binary as part of module installs
4545
ENV CYPRESS_INSTALL_BINARY=0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The console is a more friendly `kubectl` in the form of a single page webapp. It
1515

1616
### Dependencies:
1717

18-
1. [node.js](https://nodejs.org/) >= 22 & [yarn classic](https://classic.yarnpkg.com/en/docs/install) >= 1.20
18+
1. [node.js](https://nodejs.org/) >= 22 & [yarn berry](https://yarnpkg.com/getting-started/install) >= 4.12.0
1919
2. [go](https://golang.org/) >= 1.22+
2020
3. [oc](https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/) or [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) and an OpenShift or Kubernetes cluster
2121
4. [jq](https://stedolan.github.io/jq/download/) (for `contrib/environment.sh`)

dynamic-demo-plugin/.yarn/releases

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../frontend/.yarn/releases

dynamic-demo-plugin/.yarnrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

dynamic-demo-plugin/.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../frontend/.yarnrc.yml

dynamic-demo-plugin/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@
7777
"utilityConsumer": "./components/UtilityConsumer.tsx",
7878
"yamlEditor": "./components/YAMLEditorPage.tsx"
7979
}
80-
}
80+
},
81+
"packageManager": "yarn@4.12.0"
8182
}

dynamic-demo-plugin/yarn.lock

Lines changed: 4592 additions & 3336 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)