Skip to content

Commit ff2f828

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

23 files changed

Lines changed: 30264 additions & 169006 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: 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
399 KB
Binary file not shown.

dynamic-demo-plugin/.yarnrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2-
# yarn lockfile v1
3-
4-
5-
yarn-path "../frontend/.yarn/releases/yarn-1.22.22.js"
6-
network-timeout "600000"
7-
disable-self-update-check true
1+
yarn-path "../frontend/.yarn/releases/yarn-4.12.0.cjs"

dynamic-demo-plugin/.yarnrc.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
enableTelemetry: false
2+
3+
httpTimeout: 600000
4+
5+
nodeLinker: node-modules
6+
7+
enableInlineBuilds: true # Shows the STDOUT of all postinstall scripts
8+
9+
npmMinimalAgeGate: "3d" # Enforce 3 days of maturity
10+
11+
enableScripts: false # Disable postinstall scripts unless specified in package.json

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.

frontend/.yarn/install-state.gz

2.44 MB
Binary file not shown.

0 commit comments

Comments
 (0)