feat: always include Oxlint with ESLint

.github/workflows/ci.yml

@@ -55,7 +55,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

index.ts

@@ -83,10 +83,6 @@ const FEATURE_OPTIONS = [
   },
 ] as const
 const EXPERIMENTAL_FEATURE_OPTIONS = [
-  {
-    value: 'oxlint',
-    label: language.needsOxlint.message,
-  },
   {
     value: 'rolldown-vite',
     label: language.needsRolldownVite.message,
@@ -378,7 +374,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 needsRolldownVite = experimentFeatures.includes('rolldown-vite') || argv['rolldown-vite']
 
   const { e2eFramework } = result
@@ -511,20 +506,16 @@ async function init() {
   }
 
   // Render ESLint config
-  if (needsEslint || needsOxlint) {
+  if (needsEslint) {
     renderEslint(root, {
       needsTypeScript,
-      needsOxlint,
       needsVitest,
       needsCypress,
       needsCypressCT,
       needsPrettier,
       needsPlaywright,
     })
     render('config/eslint')
-  }
-
-  if (needsOxlint) {
     render('config/oxlint')
   }
 

locales/en-US.json

@@ -37,7 +37,7 @@
     "message": "End-to-End Testing"
   },
   "needsEslint": {
-    "message": "ESLint (error prevention)"
+    "message": "Linter (error prevention)"
   },
   "needsPrettier": {
     "message": "Prettier (code formatting)"
@@ -59,9 +59,6 @@
       }
     }
   },
-  "needsOxlint": {
-    "message": "Oxlint"
-  },
   "needsExperimental": {
     "message": "Enable experimental features"
   },

locales/fr-FR.json

@@ -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)"
@@ -59,9 +59,6 @@
       }
     }
   },
-  "needsOxlint": {
-    "message": "Oxlint"
-  },
   "needsExperimental": {
     "message": "Activer les fonctionnalités expérimentales"
   },

locales/tr-TR.json

@@ -37,7 +37,7 @@
     "message": "Uçtan Uca Test"
   },
   "needsEslint": {
-    "message": "ESLint (hata önleme)"
+    "message": "Linter (hata önleme)"
   },
   "needsPrettier": {
     "message": "Prettier (kod formatlama)"
@@ -59,9 +59,6 @@
       }
     }
   },
-  "needsOxlint": {
-    "message": "Oxlint"
-  },
   "needsExperimental": {
     "message": "Deneysel özellikleri etkinleştir"
   },

locales/zh-Hans.json

@@ -37,7 +37,7 @@
     "message": "端到端测试"
   },
   "needsEslint": {
-    "message": "ESLint（错误预防）"
+    "message": "Linter（错误预防）"
   },
   "needsPrettier": {
     "message": "Prettier（代码格式化）"
@@ -59,9 +59,6 @@
       }
     }
   },
-  "needsOxlint": {
-    "message": "Oxlint"
-  },
   "needsExperimental": {
     "message": "启用试验特性"
   },

locales/zh-Hant.json

@@ -37,7 +37,7 @@
     "message": "端對端測試"
   },
   "needsEslint": {
-    "message": "ESLint（錯誤預防）"
+    "message": "Linter（錯誤預防）"
   },
   "needsPrettier": {
     "message": "Prettier（程式碼格式化）"
@@ -59,9 +59,6 @@
       }
     }
   },
-  "needsOxlint": {
-    "message": "Oxlint"
-  },
   "needsExperimental": {
     "message": "启用試驗性功能"
   },

scripts/snapshot.mjs

@@ -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.

utils/getLanguage.ts

@@ -38,7 +38,6 @@ interface Language {
   }
   needsExperimental: LanguageItem
   needsExperimentalFeatures: LanguageItem
-  needsOxlint: LanguageItem
   needsRolldownVite: LanguageItem
   needsBareboneTemplates: LanguageItem
   errors: {

utils/renderEslint.ts

@@ -11,15 +11,7 @@ const eslintDeps = eslintTemplatePackage.devDependencies
 
 export default function renderEslint(
   rootDir,
-  {
-    needsTypeScript,
-    needsVitest,
-    needsCypress,
-    needsCypressCT,
-    needsOxlint,
-    needsPrettier,
-    needsPlaywright,
-  },
+  { needsTypeScript, needsVitest, needsCypress, needsCypressCT, needsPrettier, needsPlaywright },
 ) {
   const additionalConfigs = getAdditionalConfigs({
     needsTypeScript,
@@ -32,10 +24,11 @@ export default function renderEslint(
   const { pkg, files } = createESLintConfig({
     styleGuide: 'default',
     hasTypeScript: needsTypeScript,
-    needsOxlint,
-    // Theoretically, we could add Prettier without requring ESLint.
+    needsOxlint: true,
+    // Theoretically, we could add Prettier without requiring ESLint.
     // But it doesn't seem to be a good practice, so we just let createESLintConfig handle it.
     needsPrettier,
+    needsOxfmt: false,
     additionalConfigs,
   })