Skip to content
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

feat(eslint-plugin): new nuxt-config-keys-order rule #491

Merged
merged 9 commits into from
Oct 14, 2024
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
36 changes: 18 additions & 18 deletions docs/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
export default defineNuxtConfig({
extends: '@nuxt/ui-pro',

routeRules: {
'/guide': { redirect: '/guide/getting-started' },
},

site: {
url: 'https://eslint.nuxt.com',
},

modules: [
'@nuxt/image',
'@nuxt/content',
Expand All @@ -20,6 +12,18 @@ export default defineNuxtConfig({
'nuxt-og-image',
],

$production: {
nitro: {
experimental: {
wasm: true,
},
},
},

site: {
url: 'https://eslint.nuxt.com',
},

colorMode: {
preference: 'dark',
},
Expand All @@ -28,6 +32,12 @@ export default defineNuxtConfig({
icons: ['heroicons', 'simple-icons', 'ph'],
},

routeRules: {
'/guide': { redirect: '/guide/getting-started' },
},

compatibilityDate: '2024-09-01',

nitro: {
prerender: {
routes: ['/api/search.json'],
Expand All @@ -46,14 +56,4 @@ export default defineNuxtConfig({
}
},
},

$production: {
nitro: {
experimental: {
wasm: true,
},
},
},

compatibilityDate: '2024-09-01',
})
24 changes: 20 additions & 4 deletions packages/eslint-config/src/flat/configs/nuxt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@ export default function nuxt(options: NuxtESLintConfigOptions): Linter.Config[]
...(dirs.components?.map(componentsDir => join(componentsDir, `**/*.server.${GLOB_EXTS}`)) || []),
].sort()

const {
sortConfigKeys = !!(options.features?.stylistic),
} = options.features?.nuxt || {}

const configs: Linter.Config[] = []

configs.push({
name: 'nuxt/configs',
name: 'nuxt/setup',
plugins: {
nuxt: nuxtPlugin,
},
languageOptions: {
globals: {
// Nuxt's runtime globals
Expand All @@ -38,13 +45,22 @@ export default function nuxt(options: NuxtESLintConfigOptions): Linter.Config[]

configs.push({
name: 'nuxt/rules',
plugins: {
nuxt: nuxtPlugin,
},
rules: {
'nuxt/prefer-import-meta': 'error',
},
})

if (sortConfigKeys) {
configs.push({
name: 'nuxt/sort-config',
files: [
'**/nuxt.config.?([cm])[jt]s?(x)',
],
rules: {
'nuxt/nuxt-config-keys-order': 'error',
},
})
}

return configs
}
14 changes: 14 additions & 0 deletions packages/eslint-config/src/flat/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ export interface ToolingOptions {
jsdoc?: boolean
}

export interface NuxtSpecificOptions {
/**
* Sort keys in nuxt.config to maintain a consistent order
*
* @default true when `features.stylistic` is enabled
*/
sortConfigKeys?: boolean
}

export interface NuxtESLintFeaturesOptions {
/**
* Setup basic JavaScript, TypeScript and Vue plugins and rules.
Expand All @@ -49,6 +58,11 @@ export interface NuxtESLintFeaturesOptions {
*/
stylistic?: boolean | StylisticCustomizeOptions<true>

/**
* Options for Nuxt specific rules
*/
nuxt?: NuxtSpecificOptions

/**
* Enable TypeScript support. Can also be an object to config the options.
*
Expand Down
1 change: 1 addition & 0 deletions packages/eslint-config/src/flat/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export function resolveOptions(
stylistic: false,
typescript: isPackageExists('typescript'),
tooling: false,
nuxt: {},
...config.features,
},
dirs,
Expand Down
106 changes: 103 additions & 3 deletions packages/eslint-config/test/__snapshots__/flat-compose.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ exports[`flat config composition > custom src dirs 1`] = `
"name": "nuxt/import/rules",
},
{
"name": "nuxt/configs",
"name": "nuxt/setup",
},
{
"files": [
Expand Down Expand Up @@ -148,7 +148,7 @@ exports[`flat config composition > empty 1`] = `
"name": "nuxt/import/rules",
},
{
"name": "nuxt/configs",
"name": "nuxt/setup",
},
{
"files": [
Expand Down Expand Up @@ -185,7 +185,7 @@ exports[`flat config composition > empty 1`] = `
exports[`flat config composition > non-standalone 1`] = `
[
{
"name": "nuxt/configs",
"name": "nuxt/setup",
},
{
"files": [
Expand Down Expand Up @@ -218,3 +218,103 @@ exports[`flat config composition > non-standalone 1`] = `
},
]
`;

exports[`flat config composition > with stylistic 1`] = `
[
{
"ignores": [
"**/node_modules",
"**/*.iml",
"**/.idea",
"**/*.log",
"**/.nuxt",
"**/.output",
"**/.yarn/cache",
"**/.yarn/*state*",
"**/dist",
"**/.eslintcache",
],
"name": "gitignore",
},
{
"ignores": [
"**/dist",
"**/node_modules",
"**/.nuxt",
"**/.output",
"**/.vercel",
"**/.netlify",
"**/public",
],
},
{
"name": "nuxt/javascript",
},
{
"name": "nuxt/typescript/setup",
},
{
"files": [
"**/*.ts",
"**/*.tsx",
"**/*.mts",
"**/*.cts",
"**/*.vue",
],
"name": "nuxt/typescript/rules",
},
{
"name": "nuxt/vue/setup",
},
{
"files": [
"**/*.vue",
],
"name": "nuxt/vue/rules",
},
{
"name": "nuxt/import/rules",
},
{
"name": "nuxt/setup",
},
{
"files": [
"app/components/**/*.server.{js,ts,jsx,tsx,vue}",
"app/layouts/**/*.{js,ts,jsx,tsx,vue}",
"app/pages/**/*.{js,ts,jsx,tsx,vue}",
"components/**/*.server.{js,ts,jsx,tsx,vue}",
"layouts/**/*.{js,ts,jsx,tsx,vue}",
"pages/**/*.{js,ts,jsx,tsx,vue}",
],
"name": "nuxt/vue/single-root",
},
{
"name": "nuxt/rules",
},
{
"files": [
"**/nuxt.config.?([cm])[jt]s?(x)",
],
"name": "nuxt/sort-config",
},
{
"name": "nuxt/stylistic",
},
{
"files": [
"app.{js,ts,jsx,tsx,vue}",
"app/app.{js,ts,jsx,tsx,vue}",
"app/components/*/**/*.{js,ts,jsx,tsx,vue}",
"app/error.{js,ts,jsx,tsx,vue}",
"app/layouts/**/*.{js,ts,jsx,tsx,vue}",
"app/pages/**/*.{js,ts,jsx,tsx,vue}",
"components/*/**/*.{js,ts,jsx,tsx,vue}",
"error.{js,ts,jsx,tsx,vue}",
"layouts/**/*.{js,ts,jsx,tsx,vue}",
"pages/**/*.{js,ts,jsx,tsx,vue}",
],
"name": "nuxt/disables/routes",
},
]
`;
11 changes: 11 additions & 0 deletions packages/eslint-config/test/flat-compose.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,15 @@ describe('flat config composition', () => {
expect(getFlatConfigDigest(configs))
.toMatchSnapshot()
})

it('with stylistic', async () => {
const configs = await createConfigForNuxt({
features: {
stylistic: true,
},
})

expect(getFlatConfigDigest(configs))
.toMatchSnapshot()
})
})
2 changes: 2 additions & 0 deletions packages/eslint-plugin/src/rules/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { rule as preferImportMetaRule } from './prefer-import-meta'
import { rule as nuxtConfigOrderKeysRule } from './nuxt-config-keys-order'

export default {
'prefer-import-meta': preferImportMetaRule,
'nuxt-config-keys-order': nuxtConfigOrderKeysRule,
}
Loading
Loading