Skip to content

Commit 409a16d

Browse files
authored
Merge pull request #4222 from aryaemami59/upgrade-yarn
Upgrade to Yarn 4
2 parents 9577c69 + b1cf032 commit 409a16d

File tree

12 files changed

+10459
-10911
lines changed

12 files changed

+10459
-10911
lines changed

.codesandbox/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"/examples/action-listener/counter",
99
"/examples/publish-ci/cra5"
1010
],
11-
"node": "16",
11+
"node": "18",
1212
"buildCommand": "build:packages",
1313
"packages": [
1414
"packages/toolkit",

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v3
2525
- uses: actions/setup-node@v3
2626
with:
27-
node-version: '18.x'
27+
node-version: '20.x'
2828
registry-url: 'https://registry.npmjs.org'
2929
cache: 'yarn'
3030
- run: yarn install --frozen-lockfile

.github/workflows/test-codegen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
strategy:
3333
matrix:
34-
node-version: ['18.x']
34+
node-version: ['20.x']
3535

3636
steps:
3737
- uses: actions/checkout@v2

.github/workflows/tests.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
strategy:
3232
matrix:
33-
node: ['18.x']
33+
node: ['20.x']
3434

3535
steps:
3636
- name: Checkout repo
@@ -67,7 +67,7 @@ jobs:
6767
strategy:
6868
fail-fast: false
6969
matrix:
70-
node: ['18.x']
70+
node: ['20.x']
7171
steps:
7272
- name: Checkout repo
7373
uses: actions/checkout@v2
@@ -104,7 +104,7 @@ jobs:
104104
strategy:
105105
fail-fast: false
106106
matrix:
107-
node: ['18.x']
107+
node: ['20.x']
108108
ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2', '5.3']
109109
steps:
110110
- name: Checkout repo
@@ -148,7 +148,7 @@ jobs:
148148
strategy:
149149
fail-fast: false
150150
matrix:
151-
node: ['18.x']
151+
node: ['20.x']
152152
example:
153153
[
154154
'cra4',
@@ -163,6 +163,8 @@ jobs:
163163
defaults:
164164
run:
165165
working-directory: ./examples/publish-ci/${{ matrix.example }}
166+
env:
167+
YARN_ENABLE_IMMUTABLE_INSTALLS: "false"
166168
steps:
167169
- name: Checkout repo
168170
uses: actions/checkout@v2
@@ -214,7 +216,7 @@ jobs:
214216
strategy:
215217
fail-fast: false
216218
matrix:
217-
node: ['18.x']
219+
node: ['20.x']
218220
steps:
219221
- name: Checkout repo
220222
uses: actions/checkout@v2

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

-550
This file was deleted.

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

-28
This file was deleted.

.yarn/releases/yarn-3.2.4.cjs

-801
This file was deleted.

.yarn/releases/yarn-4.1.0.cjs

+893
Large diffs are not rendered by default.

.yarnrc.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
nodeLinker: node-modules
1+
compressionLevel: mixed
2+
3+
enableGlobalCache: false
24

3-
plugins:
4-
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
5-
spec: '@yarnpkg/plugin-workspace-tools'
6-
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
7-
spec: '@yarnpkg/plugin-version'
5+
nodeLinker: node-modules
86

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

netlify.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ignore = "git diff --quiet HEAD^ HEAD docs website"
66

77
[build.environment]
8-
NODE_VERSION = "16"
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

+5-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,11 @@
7171
"scripts": {
7272
"build": "yarn build:packages",
7373
"test": "yarn test:packages",
74-
"build:examples": "yarn workspaces foreach --include '@reduxjs/*' --include '@examples-query-react/*' --include '@examples-action-listener/*' -vtp run build",
74+
"build:examples": "yarn workspaces foreach -A --include '@reduxjs/*' --include '@examples-query-react/*' --include '@examples-action-listener/*' -vtp run build",
7575
"build:docs": "yarn workspace website run build",
76-
"build:packages": "yarn workspaces foreach --include '@reduxjs/*' --include '@rtk-query/*' --topological-dev run build",
77-
"test:packages": "yarn workspaces foreach --include '@reduxjs/*' --include '@rtk-query/*' --include '@rtk-incubator/*' run test",
76+
"build:packages": "yarn workspaces foreach -A --include '@reduxjs/*' --include '@rtk-query/*' --topological-dev run build",
77+
"test:packages": "yarn workspaces foreach -A --include '@reduxjs/*' --include '@rtk-query/*' --include '@rtk-incubator/*' run test",
7878
"dev:docs": "yarn workspace website run start"
79-
}
79+
},
80+
"packageManager": "yarn@4.1.0"
8081
}

0 commit comments

Comments
 (0)