Skip to content

Commit c68332f

Browse files
committed
feat: update
1 parent 45fe738 commit c68332f

File tree

7 files changed

+29
-75
lines changed

7 files changed

+29
-75
lines changed

index.ts

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ const FEATURE_FLAGS = [
3939
'playwright',
4040
'eslint',
4141
'prettier',
42+
'eslint-with-oxlint',
4243
'eslint-with-prettier',
43-
'oxlint',
44-
'rolldown-vite',
4544
] as const
4645

4746
const FEATURE_OPTIONS = [
@@ -77,20 +76,6 @@ const FEATURE_OPTIONS = [
7776
value: 'prettier',
7877
label: language.needsPrettier.message,
7978
},
80-
{
81-
value: 'experimental-features',
82-
label: language.needsExperimental.message,
83-
},
84-
] as const
85-
const EXPERIMENTAL_FEATURE_OPTIONS = [
86-
{
87-
value: 'oxlint',
88-
label: language.needsOxlint.message,
89-
},
90-
{
91-
value: 'rolldown-vite',
92-
label: language.needsRolldownVite.message,
93-
},
9479
] as const
9580

9681
type PromptResult = {
@@ -99,7 +84,8 @@ type PromptResult = {
9984
packageName?: string
10085
features?: (typeof FEATURE_OPTIONS)[number]['value'][]
10186
e2eFramework?: 'cypress' | 'nightwatch' | 'playwright'
102-
experimentFeatures?: (typeof EXPERIMENTAL_FEATURE_OPTIONS)[number]['value'][]
87+
experimentOxlint?: boolean
88+
experimentRolldownVite?: boolean
10389
}
10490

10591
function isValidPackageName(projectName) {
@@ -249,7 +235,8 @@ async function init() {
249235
packageName: defaultProjectName,
250236
features: [],
251237
e2eFramework: undefined,
252-
experimentFeatures: [],
238+
experimentOxlint: false,
239+
experimentRolldownVite: false,
253240
}
254241

255242
intro(
@@ -339,19 +326,23 @@ async function init() {
339326
)
340327
}
341328

342-
if (result.features.includes('experimental-features')) {
343-
result.experimentFeatures = await unwrapPrompt(
344-
multiselect({
345-
message: `${language.needsExperimentalFeatures.message} ${dim(language.needsExperimentalFeatures.hint)}`,
346-
// @ts-expect-error @clack/prompt's type doesn't support readonly array yet
347-
options: EXPERIMENTAL_FEATURE_OPTIONS,
348-
required: false,
329+
if (result.features.includes('eslint')) {
330+
result.experimentOxlint = await unwrapPrompt(
331+
confirm({
332+
message: language.needsOxlint.message,
333+
initialValue: false,
349334
}),
350335
)
351336
}
337+
result.experimentRolldownVite = await unwrapPrompt(
338+
confirm({
339+
message: language.needsRolldownVite.message,
340+
initialValue: false,
341+
}),
342+
)
352343
}
353344

354-
const { features, experimentFeatures } = result
345+
const { features } = result
355346

356347
const needsTypeScript = argv.ts || argv.typescript || features.includes('typescript')
357348
const needsJsx = argv.jsx || features.includes('jsx')
@@ -361,8 +352,8 @@ async function init() {
361352
const needsEslint = argv.eslint || argv['eslint-with-prettier'] || features.includes('eslint')
362353
const needsPrettier =
363354
argv.prettier || argv['eslint-with-prettier'] || features.includes('prettier')
364-
const needsOxlint = experimentFeatures.includes('oxlint') || argv['oxlint']
365-
const needsRolldownVite = experimentFeatures.includes('rolldown-vite') || argv['rolldown-vite']
355+
const needsOxlint = argv['eslint-with-oxlint'] || result.experimentOxlint
356+
const needsRolldownVite = argv['rolldown-vite'] || result.experimentRolldownVite
366357

367358
const { e2eFramework } = result
368359
const needsCypress = argv.cypress || argv.tests || e2eFramework === 'cypress'

locales/en-US.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,10 @@
6060
}
6161
},
6262
"needsOxlint": {
63-
"message": "Oxlint (experimental)"
64-
},
65-
"needsExperimental": {
66-
"message": "Enable experimental features"
67-
},
68-
"needsExperimentalFeatures": {
69-
"message": "Select experimental features to include in your project:",
70-
"hint": "(↑/↓ to navigate, space to select, a to toggle all, enter to confirm)"
63+
"message": "Install Oxlint for faster linting? (experimental)"
7164
},
7265
"needsRolldownVite": {
73-
"message": "rolldown-vite (experimental)"
66+
"message": "Install rolldown-vite as a build tool? (experimental)"
7467
},
7568
"errors": {
7669
"operationCancelled": "Operation cancelled"

locales/fr-FR.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,10 @@
6060
}
6161
},
6262
"needsOxlint": {
63-
"message": "Oxlint (expérimental)"
64-
},
65-
"needsExperimental": {
66-
"message": "Activer les fonctionnalités expérimentales"
67-
},
68-
"needsExperimentalFeatures": {
69-
"message": "Sélectionnez les fonctionnalités expérimentales à inclure\u00a0:",
70-
"hint": "(↑/↓ pour naviguer, espace pour sélectionner, a pour tout sélectionner, entrée pour confirmer)"
63+
"message": "Installer Oxlint pour un linting plus rapide\u00a0? (expérimental)"
7164
},
7265
"needsRolldownVite": {
73-
"message": "rolldown-vite (expérimental)"
66+
"message": "Installer rolldown-vite comme outil de construction\u00a0? (experimental)"
7467
},
7568
"errors": {
7669
"operationCancelled": "Operation annulée"

locales/tr-TR.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,10 @@
6060
}
6161
},
6262
"needsOxlint": {
63-
"message": "Oxlint (deneysel)"
64-
},
65-
"needsExperimental": {
66-
"message": "Deneysel özellikleri etkinleştir"
67-
},
68-
"needsExperimentalFeatures": {
69-
"message": "Dahil edilecek deneysel özellikleri seçin:",
70-
"hint": "(↑/↓ gezinmek için, boşluk seçmek için, a tümünü seçmek için, enter onaylamak için)"
63+
"message": "Daha hızlı linting için Oxlint eklensin mi? (deneysel)"
7164
},
7265
"needsRolldownVite": {
73-
"message": "rolldown-vite (deneysel)"
66+
"message": "Rolldown-vite'ı bir derleme aracı olarak kurmak ister misiniz? (deneysel)"
7467
},
7568
"errors": {
7669
"operationCancelled": "İşlem iptal edildi"

locales/zh-Hans.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,10 @@
6060
}
6161
},
6262
"needsOxlint": {
63-
"message": "Oxlint(试验阶段)"
64-
},
65-
"needsExperimental": {
66-
"message": "启用试验特性"
67-
},
68-
"needsExperimentalFeatures": {
69-
"message": "选择要包含的试验特性:",
70-
"hint": "(↑/↓ 切换,空格选择,a 全选,回车确认)"
63+
"message": "是否引入 Oxlint 以加快检测?(试验阶段)"
7164
},
7265
"needsRolldownVite": {
73-
"message": "rolldown-vite(试验阶段)"
66+
"message": "是否安装 rolldown-vite 作为构建工具?(试验阶段)"
7467
},
7568
"errors": {
7669
"operationCancelled": "操作取消"

locales/zh-Hant.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,10 @@
6060
}
6161
},
6262
"needsOxlint": {
63-
"message": "Oxlint(試驗性功能)"
64-
},
65-
"needsExperimental": {
66-
"message": "启用試驗性功能"
67-
},
68-
"needsExperimentalFeatures": {
69-
"message": "請選擇要包含的試驗特性:",
70-
"hint": "(↑/↓ 切換,空格選擇,a 全選,enter 確認)"
63+
"message": "是否引入 Oxlint 以加快檢測?(試驗性功能)"
7164
},
7265
"needsRolldownVite": {
73-
"message": "rolldown-vite(試驗性功能)"
66+
"message": "是否安装 rolldown-vite 作为构建工具?(試驗性功能)"
7467
},
7568
"errors": {
7669
"operationCancelled": "操作取消"

utils/getLanguage.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ interface Language {
3737
[key: string]: { title: string; desc?: string; hintOnComponentTesting?: string }
3838
}
3939
}
40-
needsExperimental: LanguageItem
41-
needsExperimentalFeatures: LanguageItem
4240
needsOxlint: LanguageItem
4341
needsRolldownVite: LanguageItem
4442
errors: {

0 commit comments

Comments
 (0)