Skip to content

Commit 37bc282

Browse files
committed
feat: migrate to yarn berry
1 parent c99c674 commit 37bc282

18 files changed

Lines changed: 25654 additions & 165665 deletions

File tree

.gitignore

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

Dockerfile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,8 @@ ADD . .
1717

1818
USER 0
1919

20-
ARG YARN_VERSION=v1.22.22
21-
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}; \
26-
else \
27-
npm install https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz; \
28-
fi
20+
# Enable Corepack for Yarn v4 (version specified in package.json packageManager field)
21+
RUN corepack enable
2922

3023
# The REMOTE_SOURCES value is set by the build system to indicate the location of the cachito-backed artifacts cache.
3124
# As cachito might not be available in all environments, we need to make sure the value is set before trying to use it and
@@ -39,7 +32,7 @@ COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
3932
# use dependencies provided by Cachito
4033
RUN test -d ${REMOTE_SOURCES}/cachito-gomod-with-deps || exit 0; \
4134
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/
35+
&& cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/frontend/{.npmrc,.yarnrc.yml,yarn.lock} frontend/
4336

4437
# prevent download of cypress binary as part of module installs
4538
ENV CYPRESS_INSTALL_BINARY=0

frontend/.yarn/install-state.gz

2.44 MB
Binary file not shown.

0 commit comments

Comments
 (0)