Skip to content

Commit

Permalink
feat: turn on consistent-type-imports
Browse files Browse the repository at this point in the history
  • Loading branch information
antfu committed Mar 27, 2024
1 parent 6bbc357 commit 6a61b37
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion packages/eslint-config/src/flat/configs/disables.ts
@@ -1,7 +1,7 @@
import { join } from 'pathe'
import { GLOB_EXTS } from '../constants'
import type { NuxtESLintConfigOptions } from '../types'
import { FlatConfigItem } from 'eslint-flat-config-utils'
import type { FlatConfigItem } from 'eslint-flat-config-utils'

export default function disables(options: NuxtESLintConfigOptions): FlatConfigItem[] {
const dirs = options.dirs ?? {}
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/src/flat/configs/javascript.ts
@@ -1,6 +1,6 @@
// @ts-expect-error missing types
import pluginESLint from '@eslint/js'
import { FlatConfigItem } from 'eslint-flat-config-utils'
import type { FlatConfigItem } from 'eslint-flat-config-utils'
import globals from 'globals'

export default function javascript(): FlatConfigItem[] {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/src/flat/configs/nuxt.ts
Expand Up @@ -2,7 +2,7 @@ import { join } from 'pathe'
import type { NuxtESLintConfigOptions } from '../types'
import nuxtPlugin from '@nuxt/eslint-plugin'
import { GLOB_EXTS } from '../constants'
import { FlatConfigItem } from 'eslint-flat-config-utils'
import type { FlatConfigItem } from 'eslint-flat-config-utils'

export default function nuxt(options: NuxtESLintConfigOptions): FlatConfigItem[] {
const dirs = options.dirs ?? {}
Expand Down
6 changes: 4 additions & 2 deletions packages/eslint-config/src/flat/configs/typescript.ts
@@ -1,6 +1,6 @@
import * as parserTs from '@typescript-eslint/parser'
import pluginTs from '@typescript-eslint/eslint-plugin'
import { FlatConfigItem } from 'eslint-flat-config-utils'
import type { FlatConfigItem } from 'eslint-flat-config-utils'

export default function typescript(): FlatConfigItem[] {
return [
Expand All @@ -13,14 +13,16 @@ export default function typescript(): FlatConfigItem[] {
},
{
name: 'nuxt:typescript',
files: ['**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts'],
files: ['**/*.ts', '**/*.tsx', '**/*.mts', '**/*.cts', '**/*.vue'],
languageOptions: {
parser: parserTs,
},
rules: {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
...pluginTs.configs['eslint-recommended'].overrides![0].rules as any,
...pluginTs.configs.recommended.rules,

'@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false, prefer: 'type-imports' }],
},
},
{
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/src/flat/configs/vue.ts
Expand Up @@ -3,9 +3,9 @@ import * as parserTs from '@typescript-eslint/parser'

// @ts-expect-error missing types
import pluginVue from 'eslint-plugin-vue'
import { NuxtESLintConfigOptions } from '../types'
import type { NuxtESLintConfigOptions } from '../types'
import { removeUndefined } from '../utils'
import { FlatConfigItem } from 'eslint-flat-config-utils'
import type { FlatConfigItem } from 'eslint-flat-config-utils'

export default function vue(options: NuxtESLintConfigOptions): FlatConfigItem[] {
return [
Expand Down
3 changes: 2 additions & 1 deletion packages/eslint-config/src/flat/index.ts
Expand Up @@ -6,7 +6,8 @@ import javascript from './configs/javascript'
import typescript from './configs/typescript'
import vue from './configs/vue'
import stylistic from './configs/stylistic'
import { pipe, FlatConfigPipeline, FlatConfigItem } from 'eslint-flat-config-utils'
import type { FlatConfigPipeline, FlatConfigItem } from 'eslint-flat-config-utils'
import { pipe } from 'eslint-flat-config-utils'

export * from './types'

Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/src/flat/types.ts
@@ -1,4 +1,4 @@
import { StylisticCustomizeOptions } from '@stylistic/eslint-plugin'
import type { StylisticCustomizeOptions } from '@stylistic/eslint-plugin'

export interface NuxtESLintFeaturesOptions {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-config/src/legacy.ts
@@ -1,5 +1,5 @@
import '@rushstack/eslint-patch/modern-module-resolution'
import { ESLint } from 'eslint'
import type { ESLint } from 'eslint'

const config: ESLint.ConfigData = {
parserOptions: {
Expand Down
2 changes: 1 addition & 1 deletion packages/module/src/module.ts
@@ -1,6 +1,6 @@
import { defineNuxtModule } from '@nuxt/kit'
import { setupConfigGen } from './modules/config'
import { ModuleOptions } from './types'
import type { ModuleOptions } from './types'

export * from './types'

Expand Down
4 changes: 2 additions & 2 deletions packages/module/src/modules/checker.ts
@@ -1,5 +1,5 @@
import { Nuxt } from '@nuxt/schema'
import { CheckerOptions, ModuleOptions } from '../module'
import type { Nuxt } from '@nuxt/schema'
import type { CheckerOptions, ModuleOptions } from '../module'
import { addVitePlugin, addWebpackPlugin, useLogger } from '@nuxt/kit'
import { relative, resolve } from 'pathe'
import { watch } from 'chokidar'
Expand Down
2 changes: 1 addition & 1 deletion packages/module/src/modules/config.ts
Expand Up @@ -6,7 +6,7 @@ import { relative, resolve } from 'pathe'
import { getPort } from 'get-port-please'
import type { ESLintConfigGenAddon } from '../types'
import type { NuxtESLintConfigOptions } from '@nuxt/eslint-config/flat'
import { ConfigGenOptions, ModuleOptions } from '../module'
import type { ConfigGenOptions, ModuleOptions } from '../module'
import { createAddonGlobals } from '../config-addons/globals'

export async function setupConfigGen(options: ModuleOptions, nuxt: Nuxt) {
Expand Down
2 changes: 1 addition & 1 deletion packages/module/src/types.ts
@@ -1,7 +1,7 @@
import type { Import } from 'unimport'
import type { ESLintPluginOptions as ViteCheckerOptions } from 'vite-plugin-eslint2'
import type { Options as WebpackCheckerOptions } from 'eslint-webpack-plugin'
import { NuxtESLintFeaturesOptions } from '@nuxt/eslint-config/flat'
import type { NuxtESLintFeaturesOptions } from '@nuxt/eslint-config/flat'

declare module '@nuxt/schema' {
interface NuxtHooks {
Expand Down

0 comments on commit 6a61b37

Please sign in to comment.