Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pnpm to v8, node to v20 #1185

Merged
merged 6 commits into from
Nov 9, 2023
Merged

Bump pnpm to v8, node to v20 #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12c1c16
Bump pnpm to v8, node to 18
askoufis Sep 16, 2023
da4017c
Test node 16 instead of 14 on CI
askoufis Sep 16, 2023
f8dd267
Merge branch 'master' of github.com:vanilla-extract-css/vanilla-extra…
askoufis Oct 24, 2023
6629655
Bump pnpm to 8.9.2
askoufis Oct 24, 2023
1270fa6
enable running CI against Node.js LTS
mrm007 Nov 8, 2023
187d498
bump pnpm, Node.js v20
mrm007 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@main

- uses: pnpm/action-setup@v2.2.2
- uses: pnpm/action-setup@master

- name: Set up Node.js
uses: actions/setup-node@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}

- uses: pnpm/action-setup@v2.2.2
- uses: pnpm/action-setup@master

- name: Set up Node.js
uses: actions/setup-node@main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0
token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}

- uses: pnpm/action-setup@v2.2.2
- uses: pnpm/action-setup@master

- name: Set up Node.js
uses: actions/setup-node@main
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
matrix:
# Blank string allows us to test against version in nvmrc file
# configured in 'Set up Node.js' down below.
node: [14, ''] # Add 'lts/*' to this list when ready
node: ['', 'lts/*']
name: Lint & Test (${{ (matrix.node && matrix.node != 'lts/*') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
runs-on: ubuntu-latest
env:
Expand All @@ -17,7 +17,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@main

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@master

- name: Set up Node.js
uses: actions/setup-node@main
Expand All @@ -42,7 +42,7 @@ jobs:
matrix:
# Blank string allows us to test against version in nvmrc file
# configured in 'Set up Node.js' down below.
node: [''] # Add 'lts/*' to this list when ready
node: ['', 'lts/*']
name: Windows Tests (${{ (matrix.node && matrix.node != 'lts/*') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
runs-on: windows-latest
env:
Expand All @@ -51,7 +51,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@main

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@master

- name: Set up Node.js
uses: actions/setup-node@main
Expand All @@ -77,7 +77,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@main

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@master

- name: Set up Node.js
uses: actions/setup-node@main
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.17.0
v20.9.0
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@
"prepare-release": "pnpm copy-readme-to-packages && pnpm build",
"release": "pnpm prepare-release && changeset publish"
},
"preconstruct": {
"packages": [
"packages/*"
]
},
"volta": {
"node": "16.17.0"
},
"dependencies": {
"@babel/core": "^7.20.7",
"@babel/preset-env": "^7.20.2",
Expand Down Expand Up @@ -60,10 +52,18 @@
"typescript": "^4.9.4",
"vitest": "^0.28.5"
},
"packageManager": "[email protected]",
"preconstruct": {
"packages": [
"packages/*"
]
},
"packageManager": "[email protected]",
"pnpm": {
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
}
},
"volta": {
"node": "20.9.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we keep the pnpm volta config, or does this cause an error if you don't enable have the volta envar set?

Copy link
Contributor

@mrm007 mrm007 Nov 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can, however it's prone to be forgotten (as was the case with this PR). Upgrading pnpm means you need to change packageManager, as well as the volta.pnpm key.

packageManager is more of a de facto standard, which is why I added it.

}
}
Loading