Skip to content

Commit a84c453

Browse files
authored
fix: lock file maintenance (#133)
BREAKING CHANGE: drop nuxt 2 support
1 parent ee5101b commit a84c453

File tree

15 files changed

+20297
-15695
lines changed

15 files changed

+20297
-15695
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"features": {
3-
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
3+
"ghcr.io/devcontainers/features/node:1": {
4+
"version": 20
5+
}
46
},
5-
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-20",
6-
"updateContentCommand": "yarn --frozen-lockfile"
7+
"postCreateCommand": "COREPACK_INTEGRITY_KEYS=0 pnpm install --frozen-lockfile"
78
}

.github/workflows/build.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,25 @@ jobs:
1818
- uses: actions/setup-node@v4
1919
with:
2020
node-version: 20
21+
- run: corepack enable
2122
- run: git config --global user.email "actions@github.com"
2223
- run: git config --global user.name "GitHub Actions"
23-
- run: yarn --frozen-lockfile
24-
- run: yarn checkUnknownFiles
25-
- run: yarn lint
24+
- env:
25+
COREPACK_INTEGRITY_KEYS: 0
26+
run: pnpm install --frozen-lockfile
27+
- run: pnpm checkUnknownFiles
28+
- run: pnpm lint
2629
- env:
2730
GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
2831
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2932
name: Push changed files
30-
run: yarn dw-ci push-changed-files
33+
run: pnpm dw-ci push-changed-files
3134
- env:
3235
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3336
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
3437
if: github.ref == 'refs/heads/master'
3538
name: Release
36-
run: yarn semantic-release
39+
run: pnpm semantic-release
3740
test:
3841
needs: cancel-existing
3942
runs-on: ${{ matrix.os }}
@@ -44,13 +47,17 @@ jobs:
4447
lfs: true
4548
- uses: actions/setup-node@v4
4649
with:
50+
check-latest: true
4751
node-version: ${{ matrix.node }}
48-
- run: yarn --frozen-lockfile
52+
- run: corepack enable
53+
- env:
54+
COREPACK_INTEGRITY_KEYS: 0
55+
run: pnpm install --frozen-lockfile
4956
- env:
5057
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51-
run: yarn test
58+
run: pnpm test
5259
- if: failure()
53-
uses: actions/upload-artifact@v3
60+
uses: actions/upload-artifact@v4
5461
with:
5562
name: Image Snapshot Diffs
5663
path: "**/__image_snapshots__/__diff_output__"

.gitpod.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ RUN git lfs install
1010
RUN bash -c 'source $HOME/.nvm/nvm.sh && nvm install 20'
1111
RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix
1212

13-
RUN echo "\nexport PATH=$(yarn global bin):\$PATH" >> /home/gitpod/.bashrc
14-
1513
RUN yarn global add gitpod-env-per-project @babel/node @babel/core
1614

1715
RUN sudo apt-get install -y graphviz

.gitpod.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
image:
22
file: .gitpod.Dockerfile
33
tasks:
4-
- before: >-
5-
echo "export
6-
PUPPETEER_CACHE_DIR=/workspace/nuxt-content-git/node_modules/.cache/puppeteer"
7-
>> /home/gitpod/.bashrc
8-
9-
gitpod-env-per-project >> /home/gitpod/.bashrc && source
10-
/home/gitpod/.bashrc
4+
- before: |-
5+
echo "corepack enable" >> /home/gitpod/.bashrc
6+
echo "export COREPACK_ENABLE_DOWNLOAD_PROMPT=0" >> /home/gitpod/.bashrc
7+
gitpod-env-per-project >> /home/gitpod/.bashrc
8+
echo "export PUPPETEER_CACHE_DIR=/workspace/nuxt-content-git/node_modules/.cache/puppeteer" >> /home/gitpod/.bashrc
9+
echo "export PLAYWRIGHT_BROWSERS_PATH=0" >> /home/gitpod/.bashrc
10+
source /home/gitpod/.bashrc
1111
init: |-
1212
git config --global user.name "Sebastian Landwehr"
1313
git config diff.lfs.textconv cat
1414
git lfs pull
15-
yarn --frozen-lockfile
15+
COREPACK_INTEGRITY_KEYS=0 pnpm install --frozen-lockfile
1616
vscode:
1717
extensions:
1818
- https://sebastianlandwehr.com/vscode-extensions/karlito40.fix-irregular-whitespace-0.1.1.vsix

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node-linker=hoisted

.renovaterc.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,20 @@
2525
"\\.js$"
2626
],
2727
"matchStrings": [
28-
"(^|\\s)gitHubAction`(?<depName>.*?)@v(?<currentValue>.*?)`"
28+
"(^|[^\\w])gitHubAction`(?<depName>.*?)@v(?<currentValue>.*?)`"
2929
],
3030
"versioningTemplate": "npm"
31+
},
32+
{
33+
"datasourceTemplate": "node-version",
34+
"depNameTemplate": "node",
35+
"fileMatch": [
36+
"\\.js$"
37+
],
38+
"matchStrings": [
39+
"(^|[^\\w])nodejsVersion`(?<currentValue>.*?)`"
40+
],
41+
"versioningTemplate": "node"
3142
}
3243
],
3344
"semanticCommitScope": null

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
".gitpod.Dockerfile": true,
1414
".gitpod.yml": true,
1515
".husky": true,
16+
".npmrc": true,
1617
".nyc_output": true,
1718
".releaserc.json": true,
1819
".renovaterc.json": true,
@@ -23,7 +24,7 @@
2324
"coverage": true,
2425
"dist": true,
2526
"node_modules": true,
26-
"yarn.lock": true
27+
"pnpm-lock.yaml": true
2728
},
2829
"workbench.editor.enablePreview": false
2930
}

LICENSE.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,17 @@ MIT License
1414

1515
Copyright (c) <year> <copyright holders>
1616

17-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
18-
19-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
20-
21-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
18+
associated documentation files (the "Software"), to deal in the Software without restriction, including
19+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
20+
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
21+
following conditions:
22+
23+
The above copyright notice and this permission notice shall be included in all copies or substantial
24+
portions of the Software.
25+
26+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
27+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
28+
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
29+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
30+
USE OR OTHER DEALINGS IN THE SOFTWARE.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@
4949
"@nuxt/content": "^2.6.0",
5050
"axios": "^1.4.0",
5151
"depcheck-package-name": "^3.0.0",
52-
"execa": "^8.0.1",
52+
"execa": "^9.5.2",
5353
"fs-extra": "^11.1.1",
5454
"nuxt": "^3.5.3",
5555
"nuxt-dev-ready": "^3.0.0",
56-
"ora": "^8.0.1",
5756
"output-files": "^2.0.0",
5857
"tree-kill-promise": "^3.0.14"
5958
},
59+
"packageManager": "pnpm@10.8.1+sha512.c50088ba998c67b8ca8c99df8a5e02fd2ae2e2b29aaf238feaa9e124248d3f48f9fb6db2424949ff901cffbb5e0f0cc1ad6aedb602cd29450751d11c35023677",
6060
"engines": {
6161
"node": ">=18"
6262
},

0 commit comments

Comments
 (0)