Skip to content

Commit 5c23bf6

Browse files
committed
Merge branch 'main' into chore-use-rolldown
2 parents ab33cc6 + 85330ef commit 5c23bf6

File tree

4 files changed

+56
-53
lines changed

4 files changed

+56
-53
lines changed

index.ts

+4
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,10 @@ async function init() {
484484
render('config/eslint')
485485
}
486486

487+
if (needsOxlint) {
488+
render('config/oxlint')
489+
}
490+
487491
if (needsPrettier) {
488492
render('config/prettier')
489493
}

pnpm-lock.yaml

+48-52
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

template/base/.vscode/settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"explorer.fileNesting.patterns": {
44
"tsconfig.json": "tsconfig.*.json, env.d.ts",
55
"vite.config.*": "jsconfig*, vitest.config.*, cypress.config.*, playwright.config.*",
6-
"package.json": "package-lock.json, pnpm*, .yarnrc*, yarn*, .eslint*, eslint*, .prettier*, prettier*, .editorconfig"
6+
"package.json": "package-lock.json, pnpm*, .yarnrc*, yarn*, .eslint*, eslint*, .oxlint*, oxlint*, .prettier*, prettier*, .editorconfig"
77
}
88
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["oxc.oxc-vscode"]
3+
}

0 commit comments

Comments
 (0)