Skip to content
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ jobs:
- pnpm --filter '!*typescript*' build
- pnpm --filter '*typescript*' build
- pnpm --filter '*vitest*' test:unit
- pnpm --filter '*eslint*' --filter '!*nightwatch*' lint --no-fix --max-warnings=0
- pnpm --filter '*eslint*' --filter '!*nightwatch*' lint:oxlint --max-warnings=0 -A no-empty-file
- pnpm --filter '*eslint*' --filter '!*nightwatch*' lint:eslint --no-fix --max-warnings=0
- pnpm --filter '*prettier*' format
# FIXME: it's failing now
# - pnpm --filter '*with-tests*' test:unit
Expand Down
23 changes: 10 additions & 13 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ const FEATURE_OPTIONS = [
},
] as const
const EXPERIMENTAL_FEATURE_OPTIONS = [
{
value: 'oxlint',
label: language.needsOxlint.message,
},
{
value: 'oxfmt',
label: language.needsOxfmt.message,
Expand Down Expand Up @@ -162,7 +158,7 @@ const helpMessage = `\
Usage: create-vue [FEATURE_FLAGS...] [OPTIONS...] [DIRECTORY]

Create a new Vue.js project.
Start the CLI in interactive mode when no FEATURE_FLAGS is provided, or if the DIRECTORY argument is not a valid package name.
Runs in interactive mode if started without feature flags, or if DIRECTORY is missing or not a valid package name.

Options:
--force
Expand Down Expand Up @@ -197,12 +193,8 @@ Available feature flags:
If used without ${cyan('--vitest')}, it will also add Nightwatch Component Testing.
--eslint
Add ESLint for code quality.
--eslint-with-prettier (Deprecated in favor of ${cyan('--eslint --prettier')})
Add Prettier for code formatting in addition to ESLint.
--prettier
Add Prettier for code formatting.
--oxlint
Add Oxlint for code quality.
--oxfmt
Add Oxfmt for code formatting.
--vite-beta
Expand All @@ -212,6 +204,14 @@ Unstable feature flags:
--tests, --with-tests
Add both unit testing and end-to-end testing support.
Currently equivalent to ${cyan('--vitest --cypress')}, but may change in the future.

Deprecated feature flags:
--eslint-with-prettier
Please use ${cyan('--eslint --prettier')} instead.
--oxlint
Oxlint is now always included when ESLint is selected.
--rolldown-vite
Please use ${cyan('--vite-beta')} instead.
`

async function init() {
Expand Down Expand Up @@ -383,7 +383,6 @@ async function init() {
const needsEslint = argv.eslint || argv['eslint-with-prettier'] || features.includes('eslint')
const needsPrettier =
argv.prettier || argv['eslint-with-prettier'] || features.includes('prettier')
const needsOxlint = experimentFeatures.includes('oxlint') || argv['oxlint']
const needsOxfmt = experimentFeatures.includes('oxfmt') || argv['oxfmt']
const needsViteBeta =
experimentFeatures.includes('vite-beta') || argv['vite-beta'] || argv['rolldown-vite'] // keep `rolldown-vite` for backward compatibility
Expand Down Expand Up @@ -541,12 +540,10 @@ async function init() {
}

// These configs only disable rules, so they should be applied last.
render('linting/oxlint')
if (needsPrettier || needsOxfmt) {
render('linting/formatter')
}
if (needsOxlint) {
render('linting/oxlint')
}
}

if (needsPrettier) {
Expand Down
5 changes: 1 addition & 4 deletions locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"message": "End-to-End Testing"
},
"needsEslint": {
"message": "ESLint (error prevention)"
"message": "Linter (error prevention)"
},
"needsPrettier": {
"message": "Prettier (code formatting)"
Expand All @@ -59,9 +59,6 @@
}
}
},
"needsOxlint": {
"message": "Oxlint"
},
"needsExperimental": {
"message": "Enable experimental features"
},
Expand Down
5 changes: 1 addition & 4 deletions locales/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"message": "Tests de bout en bout"
},
"needsEslint": {
"message": "ESLint (prévention des erreurs)"
"message": "Linter (prévention des erreurs)"
},
"needsPrettier": {
"message": "Prettier (formatage du code)"
Expand All @@ -59,9 +59,6 @@
}
}
},
"needsOxlint": {
"message": "Oxlint"
},
"needsExperimental": {
"message": "Activer les fonctionnalités expérimentales"
},
Expand Down
5 changes: 1 addition & 4 deletions locales/tr-TR.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"message": "Uçtan Uca Test"
},
"needsEslint": {
"message": "ESLint (hata önleme)"
"message": "Linter (hata önleme)"
},
"needsPrettier": {
"message": "Prettier (kod formatlama)"
Expand All @@ -59,9 +59,6 @@
}
}
},
"needsOxlint": {
"message": "Oxlint"
},
"needsExperimental": {
"message": "Deneysel özellikleri etkinleştir"
},
Expand Down
5 changes: 1 addition & 4 deletions locales/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"message": "端到端测试"
},
"needsEslint": {
"message": "ESLint(错误预防)"
"message": "Linter(错误预防)"
},
"needsPrettier": {
"message": "Prettier(代码格式化)"
Expand All @@ -59,9 +59,6 @@
}
}
},
"needsOxlint": {
"message": "Oxlint"
},
"needsExperimental": {
"message": "启用试验特性"
},
Expand Down
5 changes: 1 addition & 4 deletions locales/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"message": "端對端測試"
},
"needsEslint": {
"message": "ESLint(錯誤預防)"
"message": "Linter(錯誤預防)"
},
"needsPrettier": {
"message": "Prettier(程式碼格式化)"
Expand All @@ -59,9 +59,6 @@
}
}
},
"needsOxlint": {
"message": "Oxlint"
},
"needsExperimental": {
"message": "启用試驗性功能"
},
Expand Down
4 changes: 0 additions & 4 deletions scripts/snapshot.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@ const featureFlags = [
'playwright',
'nightwatch',
'eslint',
// Skipped oxlint for now as too many files in playground
// caused GitHub Actions to fail with (EMFILE: too many open files)
// 'eslint-with-oxlint',
'prettier',
]
const featureFlagsDenylist = [
['cypress', 'playwright'],
['playwright', 'nightwatch'],
['cypress', 'nightwatch'],
['cypress', 'playwright', 'nightwatch'],
['eslint', 'eslint-with-oxlint'],
]

// The following code & comments are generated by GitHub CoPilot.
Expand Down
1 change: 0 additions & 1 deletion utils/getLanguage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ interface Language {
}
needsExperimental: LanguageItem
needsExperimentalFeatures: LanguageItem
needsOxlint: LanguageItem
needsViteBeta: LanguageItem
needsOxfmt: LanguageItem
needsBareboneTemplates: LanguageItem
Expand Down