Skip to content

Commit 9639566

Browse files
authored
Merge pull request #705 from aryaemami59/upgrade-to-yarn-4
2 parents fa91cf6 + 68c3c84 commit 9639566

File tree

11 files changed

+6042
-6495
lines changed

11 files changed

+6042
-6495
lines changed

.codesandbox/ci.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"sandboxes": ["vanilla", "vanilla-ts"],
3-
"node": "16"
3+
"node": "18"
44
}

.github/workflows/build-and-test-types.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
node: ['18.x']
15+
node: ['20.x']
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020

2121
- name: Set up Node
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 18.x
24+
node-version: 20.x
2525
cache: 'yarn'
2626

2727
- name: Install dependencies
@@ -43,7 +43,7 @@ jobs:
4343
- name: Pack
4444
run: yarn pack
4545

46-
- uses: actions/upload-artifact@v2
46+
- uses: actions/upload-artifact@v4
4747
with:
4848
name: package
4949
path: ./package.tgz
@@ -56,12 +56,12 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
node: ['18.x']
59+
node: ['20.x']
6060
ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2', '5.3', '5.4']
6161

6262
steps:
6363
- name: Checkout repo
64-
uses: actions/checkout@v3
64+
uses: actions/checkout@v4
6565

6666
- name: Use node ${{ matrix.node }}
6767
uses: actions/setup-node@v4
@@ -103,12 +103,12 @@ jobs:
103103
strategy:
104104
fail-fast: false
105105
matrix:
106-
node: ['18.x']
106+
node: ['20.x']
107107
steps:
108108
- name: Checkout repo
109-
uses: actions/checkout@v3
109+
uses: actions/checkout@v4
110110

111-
- uses: actions/download-artifact@v3
111+
- uses: actions/download-artifact@v4
112112
with:
113113
name: package
114114
path: .
@@ -125,7 +125,7 @@ jobs:
125125
strategy:
126126
fail-fast: false
127127
matrix:
128-
node: ['18.x']
128+
node: ['20.x']
129129
example:
130130
[
131131
'cra4',
@@ -165,14 +165,16 @@ jobs:
165165

166166
- name: Install deps
167167
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
168-
run: rm yarn.lock && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
168+
env:
169+
YARN_ENABLE_IMMUTABLE_INSTALLS: false
170+
run: rm yarn.lock && yarn install
169171

170172
- name: Install Playwright browser if necessary
171173
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
172174
continue-on-error: true
173175
run: yarn playwright install
174176

175-
- uses: actions/download-artifact@v2
177+
- uses: actions/download-artifact@v4
176178
with:
177179
name: package
178180
path: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
@@ -202,7 +204,9 @@ jobs:
202204

203205
- name: Build example
204206
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
205-
run: NODE_OPTIONS=--openssl-legacy-provider yarn build
207+
env:
208+
NODE_OPTIONS: --openssl-legacy-provider
209+
run: yarn build
206210

207211
- name: Run test step
208212
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
id-token: write
1212
contents: read
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: actions/setup-node@v4
1616
with:
17-
node-version: '18.x'
17+
node-version: '20.x'
1818
registry-url: 'https://registry.npmjs.org'
1919
cache: 'yarn'
2020
- run: yarn install --frozen-lockfile

.yarn/plugins/@yarnpkg/plugin-version.cjs

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

.yarn/releases/yarn-3.2.4.cjs

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

.yarn/releases/yarn-4.1.0.cjs

Lines changed: 893 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
enableGlobalCache: false
2+
13
enableTransparentWorkspaces: false
24

3-
nodeLinker: node-modules
5+
compressionLevel: mixed
46

5-
plugins:
6-
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
7-
spec: "@yarnpkg/plugin-version"
7+
nodeLinker: node-modules
88

9-
yarnPath: .yarn/releases/yarn-3.2.4.cjs
9+
yarnPath: .yarn/releases/yarn-4.1.0.cjs

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ignore = "git diff --quiet HEAD^ HEAD -- ./docs/ ."
66

77
[build.environment]
8-
NODE_VERSION = "18.15.0"
8+
NODE_VERSION = "20"
99
NODE_OPTIONS = "--max_old_space_size=4096"
1010
NETLIFY_USE_YARN = "true"
1111
YARN_VERSION = "1.22.10"

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,5 +83,6 @@
8383
"tsup": "^6.7.0",
8484
"typescript": "^5.4.2",
8585
"vitest": "^1.1.1"
86-
}
86+
},
87+
"packageManager": "[email protected]"
8788
}

0 commit comments

Comments
 (0)