Skip to content

Commit

Permalink
Merge pull request #364 from aryaemami59/upgrade-to-yarn-4
Browse files Browse the repository at this point in the history
Upgrade to Yarn 4
  • Loading branch information
EskiMojo14 authored Mar 9, 2024
2 parents 98bffb1 + 19430a4 commit 32478ed
Show file tree
Hide file tree
Showing 7 changed files with 1,746 additions and 1,645 deletions.
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sandboxes": ["vanilla", "vanilla-ts"],
"node": "14",
"node": "18",
"buildCommand": "build",
"packages": ["."]
}
32 changes: 18 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ['16.x']
node: ['20.x']

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node ${{ matrix.node }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Pack
run: yarn pack

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: package
path: ./package.tgz
Expand All @@ -56,15 +56,15 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16.x']
node: ['20.x']
ts: ['4.7', '4.8', '4.9', '5.0', '5.1', '5.2']

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use node ${{ matrix.node }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
Expand All @@ -88,14 +88,14 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16.x']
node: ['20.x']
example: ['cra4', 'cra5', 'next', 'vite', 'node-standard', 'node-esm']
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use node ${{ matrix.node }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
Expand All @@ -108,9 +108,11 @@ jobs:

- name: Install deps
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: false
run: yarn install

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: package
path: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
Expand All @@ -129,6 +131,8 @@ jobs:

- name: Build example
working-directory: ./redux-toolkit/examples/publish-ci/${{ matrix.example }}
env:
NODE_OPTIONS: --openssl-legacy-provider
run: yarn build

- name: Run test step
Expand All @@ -143,12 +147,12 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ['16.x']
node: ['20.x']
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: package
path: .
Expand Down
801 changes: 0 additions & 801 deletions .yarn/releases/yarn-3.2.4.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.4.cjs
yarnPath: .yarn/releases/yarn-4.1.0.cjs
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@
"tsup": "7.0.0",
"typescript": "^5.0",
"vitest": "^0.32.0"
}
},
"packageManager": "yarn@4.1.0"
}
Loading

0 comments on commit 32478ed

Please sign in to comment.