Skip to content

Commit

Permalink
Merge branch 'main' into docs/ephemeral-pull
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobwgillespie authored Jul 10, 2024
2 parents 104553a + 909c456 commit 19ba2e6
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 29 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/[email protected]
uses: pnpm/action-setup@v4
- name: Install Node 20
uses: actions/setup-node@v4
with:
version: 8.x.x
- name: Install Node 18
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'
cache: pnpm
- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"typescript.enablePromptUseWorkspaceTsdk": true,
"typescript.tsdk": "node_modules/typescript/lib",
"prettier.prettierPath": "node_modules/prettier/index.cjs",
"[mdx]": {
"editor.wordWrap": "on"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"private": true,
"packageManager": "[email protected]",
"scripts": {
"fmt": "prettier --write .",
"fmt:check": "prettier --check ."
},
"devDependencies": {
"prettier": "^2.8.8",
"prettier-plugin-pkg": "^0.17.1"
"prettier": "^3.3.2",
"prettier-plugin-pkg": "^0.18.1"
},
"prettier": {
"bracketSpacing": false,
"printWidth": 120,
"semi": false,
"singleQuote": true,
"trailingComma": "all",
"pluginSearchDirs": false,
"plugins": [
"prettier-plugin-pkg"
]
Expand Down
49 changes: 30 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 19ba2e6

Please sign in to comment.