Skip to content

feat: add experimental Oxlint integration #601

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 22 additions & 6 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ async function init() {
needsPinia?: boolean
needsVitest?: boolean
needsE2eTesting?: false | 'cypress' | 'nightwatch' | 'playwright'
needsEslint?: boolean
needsEslint?: false | 'eslintOnly' | 'speedUpWithOxlint'
needsOxlint?: boolean
needsPrettier?: boolean
needsDevTools?: boolean
} = {}
Expand Down Expand Up @@ -274,11 +275,23 @@ async function init() {
},
{
name: 'needsEslint',
type: () => (isFeatureFlagsUsed ? null : 'toggle'),
type: () => (isFeatureFlagsUsed ? null : 'select'),
message: language.needsEslint.message,
initial: false,
active: language.defaultToggleOptions.active,
inactive: language.defaultToggleOptions.inactive,
initial: 0,
choices: [
{
title: language.needsEslint.selectOptions.negative.title,
value: false,
},
{
title: language.needsEslint.selectOptions.eslintOnly.title,
value: 'eslintOnly',
},
{
title: language.needsEslint.selectOptions.speedUpWithOxlint.title,
value: 'speedUpWithOxlint',
},
],
},
{
name: 'needsPrettier',
Expand Down Expand Up @@ -324,11 +337,13 @@ async function init() {
needsRouter = argv.router || argv['vue-router'],
needsPinia = argv.pinia,
needsVitest = argv.vitest || argv.tests,
needsEslint = argv.eslint || argv['eslint-with-prettier'],
needsPrettier = argv['eslint-with-prettier'],
needsDevTools = argv.devtools || argv['vue-devtools'],
} = result

const needsEslint = Boolean(argv.eslint || argv['eslint-with-prettier'] || result.needsEslint)
const needsOxlint = result.needsEslint === 'speedUpWithOxlint'

const { needsE2eTesting } = result
const needsCypress = argv.cypress || argv.tests || needsE2eTesting === 'cypress'
const needsCypressCT = needsCypress && !needsVitest
Expand Down Expand Up @@ -459,6 +474,7 @@ async function init() {
if (needsEslint) {
renderEslint(root, {
needsTypeScript,
needsOxlint,
needsVitest,
needsCypress,
needsCypressCT,
Expand Down
11 changes: 10 additions & 1 deletion locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@
}
},
"needsEslint": {
"message": "Add ESLint for code quality?"
"message": "Add ESLint for code quality?",
"selectOptions": {
"negative": { "title": "No" },
"eslintOnly": {
"title": "Yes"
},
"speedUpWithOxlint": {
"title": "Yes, and speed up with Oxlint (experimental)"
}
}
},
"needsPrettier": {
"message": "Add Prettier for code formatting?"
Expand Down
11 changes: 10 additions & 1 deletion locales/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@
}
},
"needsEslint": {
"message": "Ajouter ESLint pour la qualité du code\u00a0?"
"message": "Ajouter ESLint pour la qualité du code\u00a0?",
"selectOptions": {
"negative": { "title": "Non" },
"eslintOnly": {
"title": "Oui"
},
"speedUpWithOxlint": {
"title": "Oui, et accélérer avec Oxlint (expérimental)"
}
}
},
"needsPrettier": {
"message": "Ajouter Prettier pour le formatage du code\u00a0?"
Expand Down
11 changes: 10 additions & 1 deletion locales/tr-TR.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@
}
},
"needsEslint": {
"message": "Kod kalitesi için ESLint eklensin mi?"
"message": "Kod kalitesi için ESLint eklensin mi?",
"selectOptions": {
"negative": { "title": "Hayır" },
"eslintOnly": {
"title": "Evet"
},
"speedUpWithOxlint": {
"title": "Evet ve Oxlint ile hızlanın (deneysel)"
}
}
},
"needsPrettier": {
"message": "Kod formatlama için Prettier eklensin mi?"
Expand Down
11 changes: 10 additions & 1 deletion locales/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@
}
},
"needsEslint": {
"message": "是否引入 ESLint 用于代码质量检测?"
"message": "是否引入 ESLint 用于代码质量检测?",
"selectOptions": {
"negative": { "title": "否" },
"eslintOnly": {
"title": "是"
},
"speedUpWithOxlint": {
"title": "是,并同时引入 Oxlint 以加快检测(试验阶段)"
}
}
},
"needsPrettier": {
"message": "是否引入 Prettier 用于代码格式化?"
Expand Down
11 changes: 10 additions & 1 deletion locales/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,16 @@
}
},
"needsEslint": {
"message": "是否引入 ESLint 用於程式碼品質檢測?"
"message": "是否引入 ESLint 用於程式碼品質檢測?",
"selectOptions": {
"negative": { "title": "否" },
"eslintOnly": {
"title": "是"
},
"speedUpWithOxlint": {
"title": "是,並同時引入 Oxlint 以加快檢測(試驗性功能)"
}
}
},
"needsPrettier": {
"message": "是否引入 Prettier 用於程式碼格式化?"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@types/eslint": "^9.6.1",
"@types/node": "^20.17.6",
"@types/prompts": "^2.4.9",
"@vue/create-eslint-config": "0.5.0",
"@vue/create-eslint-config": "^0.6.0",
"@vue/tsconfig": "^0.5.1",
"ejs": "^3.1.10",
"esbuild": "^0.24.0",
Expand Down
20 changes: 6 additions & 14 deletions pnpm-lock.yaml

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

32 changes: 14 additions & 18 deletions utils/renderEslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@ const eslintDeps = eslintTemplatePackage.devDependencies

export default function renderEslint(
rootDir,
{ needsTypeScript, needsVitest, needsCypress, needsCypressCT, needsPrettier, needsPlaywright },
{
needsTypeScript,
needsVitest,
needsCypress,
needsCypressCT,
needsOxlint,
needsPrettier,
needsPlaywright,
},
) {
const additionalConfigs = getAdditionalConfigs({
needsVitest,
Expand All @@ -23,32 +31,20 @@ export default function renderEslint(
const { pkg, files } = createESLintConfig({
styleGuide: 'default',
hasTypeScript: needsTypeScript,
needsOxlint,
// Theoretically, we could add Prettier without requring ESLint.
// But it doesn't seem to be a good practice, so we just let createESLintConfig handle it.
needsPrettier,

additionalConfigs,
})

const scripts: Record<string, string> = {
lint: 'eslint . --fix',
}

// Theoretically, we could add Prettier without requring ESLint.
// But it doesn't seem to be a good practice, so we just leave it here.
if (needsPrettier) {
// Default to only format the `src/` directory to avoid too much noise, and
// the need for a `.prettierignore` file.
// Users can still append any paths they'd like to format to the command,
// e.g. `npm run format cypress/`.
scripts.format = 'prettier --write src/'
}

// update package.json
const packageJsonPath = path.resolve(rootDir, 'package.json')
const existingPkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
const updatedPkg = sortDependencies(deepMerge(deepMerge(existingPkg, pkg), { scripts }))
const updatedPkg = sortDependencies(deepMerge(existingPkg, pkg))
fs.writeFileSync(packageJsonPath, JSON.stringify(updatedPkg, null, 2) + '\n', 'utf8')

// write to eslint.config.mjs, .prettierrc.json, .editorconfig, etc.
// write to eslint.config.js, .prettierrc.json, .editorconfig, etc.
for (const [fileName, content] of Object.entries(files)) {
const fullPath = path.resolve(rootDir, fileName)
fs.writeFileSync(fullPath, content as string, 'utf8')
Expand Down