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: add @vitest/eslint-plugin when using vitest #559

Merged
merged 3 commits into from
Aug 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
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ jobs:
flag-for-pinia: '--pinia'
flag-for-vitest: '--vitest'
flag-for-e2e: '--cypress'
flag-for-eslint: '--eslint'
flag-for-devtools: '--devtools'

- node-version: 18
Expand All @@ -76,6 +77,7 @@ jobs:
flag-for-pinia: '--pinia'
flag-for-vitest: '--vitest'
flag-for-e2e: '--cypress'
flag-for-eslint: '--eslint'
flag-for-devtools: '--devtools'

- node-version: 20
Expand All @@ -86,6 +88,7 @@ jobs:
flag-for-pinia: '--pinia'
flag-for-vitest: '--vitest'
flag-for-e2e: '--cypress'
flag-for-eslint: '--eslint'
flag-for-devtools: '--devtools'

- node-version: 22
Expand All @@ -96,11 +99,12 @@ jobs:
flag-for-pinia: '--pinia'
flag-for-vitest: '--vitest'
flag-for-e2e: '--cypress'
flag-for-eslint: '--eslint'
flag-for-devtools: '--devtools'
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.os == 'windows-latest' }}
env:
FEATURE_FLAGS: ${{ matrix.flag-for-ts }} ${{ matrix.flag-for-jsx }} ${{ matrix.flag-for-router }} ${{ matrix.flag-for-pinia }} ${{ matrix.flag-for-vitest }} ${{ matrix.flag-for-e2e }} ${{matrix.flag-for-devtools}}
FEATURE_FLAGS: ${{ matrix.flag-for-ts }} ${{ matrix.flag-for-jsx }} ${{ matrix.flag-for-router }} ${{ matrix.flag-for-pinia }} ${{ matrix.flag-for-vitest }} ${{ matrix.flag-for-e2e }} ${{matrix.flag-for-eslint}} ${{matrix.flag-for-devtools}}
# Sometimes the Linux runner can't verify Cypress in 30s
CYPRESS_VERIFY_TIMEOUT: 60000
steps:
Expand Down Expand Up @@ -189,3 +193,8 @@ jobs:
name: Run e2e test script
working-directory: ../sample-project
run: pnpm test:e2e

- if: ${{ contains(matrix.flag-for-eslint, '--') }}
name: Run lint script
working-directory: ../sample-project
run: pnpm lint --no-fix --max-warnings=0
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ pnpm-lock.yaml
# https://github.com/prettier/prettier/issues/7884
**/*.spec.js
**/*.spec.ts
# but let's format our unit tests
!__test__/**/*.spec.ts
**/dist
# https://github.com/prettier/prettier/issues/5246
**/*.html
Expand Down
12 changes: 6 additions & 6 deletions __test__/locale.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ import en from '../locales/en-US.json'
function getKeys(obj: any, path = '', result: string[] = []) {
for (let key in obj) {
if (typeof obj[key] === 'object') {
getKeys(obj[key], path ? `${path}.${key}` : key, result);
getKeys(obj[key], path ? `${path}.${key}` : key, result)
} else {
result.push(path ? `${path}.${key}` : key);
result.push(path ? `${path}.${key}` : key)
}
}
return result;
return result
}

const localesOtherThanEnglish = readdirSync(resolve(__dirname, '../locales')).filter((file) => {
return file.endsWith('.json') && !file.startsWith('en-US')
})
const defaultKeys = getKeys(en);
const defaultKeys = getKeys(en)

describe("locale files should include all keys", () => {
describe('locale files should include all keys', () => {
localesOtherThanEnglish.forEach((locale) => {
it(`for ${locale}`, () => {
expect(getKeys(require(`../locales/${locale}`))).toEqual(defaultKeys)
})
})
})
})
76 changes: 76 additions & 0 deletions __test__/renderEslint.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import { it, describe, expect } from 'vitest'
import { getAdditionalConfigAndDependencies } from '../utils/renderEslint'

describe('renderEslint', () => {
it('should get additional dependencies and config with no test flags', () => {
const { additionalConfig, additionalDependencies } = getAdditionalConfigAndDependencies({
needsVitest: false,
needsCypress: false,
needsCypressCT: false,
needsPlaywright: false
})
expect(additionalConfig).toStrictEqual({})
expect(additionalDependencies).toStrictEqual({})
})

it('should get additional dependencies and config with for vitest', () => {
const { additionalConfig, additionalDependencies } = getAdditionalConfigAndDependencies({
needsVitest: true,
needsCypress: false,
needsCypressCT: false,
needsPlaywright: false
})
expect(additionalConfig.overrides[0].files).toStrictEqual([
'src/**/*.{test,spec}.{js,ts,jsx,tsx}'
])
expect(additionalConfig.overrides[0].extends).toStrictEqual([
'plugin:@vitest/legacy-recommended'
])
expect(additionalDependencies['@vitest/eslint-plugin']).not.toBeUndefined()
})

it('should get additional dependencies and config with for cypress', () => {
const { additionalConfig, additionalDependencies } = getAdditionalConfigAndDependencies({
needsVitest: false,
needsCypress: true,
needsCypressCT: false,
needsPlaywright: false
})
expect(additionalConfig.overrides[0].files).toStrictEqual([
'cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/support/**/*.{js,ts,jsx,tsx}'
])
expect(additionalConfig.overrides[0].extends).toStrictEqual(['plugin:cypress/recommended'])
expect(additionalDependencies['eslint-plugin-cypress']).not.toBeUndefined()
})

it('should get additional dependencies and config with for cypress with component testing', () => {
const { additionalConfig, additionalDependencies } = getAdditionalConfigAndDependencies({
needsVitest: false,
needsCypress: true,
needsCypressCT: true,
needsPlaywright: false
})
expect(additionalConfig.overrides[0].files).toStrictEqual([
'**/__tests__/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/support/**/*.{js,ts,jsx,tsx}'
])
expect(additionalConfig.overrides[0].extends).toStrictEqual(['plugin:cypress/recommended'])
expect(additionalDependencies['eslint-plugin-cypress']).not.toBeUndefined()
})

it('should get additional dependencies and config with for playwright', () => {
const { additionalConfig, additionalDependencies } = getAdditionalConfigAndDependencies({
needsVitest: false,
needsCypress: false,
needsCypressCT: false,
needsPlaywright: true
})
expect(additionalConfig.overrides[0].files).toStrictEqual([
'e2e/**/*.{test,spec}.{js,ts,jsx,tsx}'
])
expect(additionalConfig.overrides[0].extends).toStrictEqual(['plugin:playwright/recommended'])
expect(additionalDependencies['eslint-plugin-playwright']).not.toBeUndefined()
})
})
1 change: 1 addition & 0 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@ async function init() {
if (needsEslint) {
renderEslint(root, {
needsTypeScript,
needsVitest,
needsCypress,
needsCypressCT,
needsPrettier,
Expand Down
7 changes: 6 additions & 1 deletion scripts/snapshot.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ function fullCombination(arr) {
}

let flagCombinations = fullCombination(featureFlags)
flagCombinations.push(['default'], ['devtools', 'router', 'pinia'], ['eslint'], ['eslint-with-prettier'])
flagCombinations.push(
['default'],
['devtools', 'router', 'pinia'],
['eslint'],
['eslint-with-prettier']
)

// `--with-tests` are equivalent of `--vitest --cypress`
// Previously it means `--cypress` without `--vitest`.
Expand Down
1 change: 1 addition & 0 deletions template/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"devDependencies": {
"@vitest/eslint-plugin": "1.0.2",
"eslint-plugin-cypress": "^3.4.0",
"eslint-plugin-playwright": "^1.6.2"
}
Expand Down
89 changes: 58 additions & 31 deletions utils/renderEslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,14 @@ const eslintDeps = eslintTemplatePackage.devDependencies

export default function renderEslint(
rootDir,
{ needsTypeScript, needsCypress, needsCypressCT, needsPrettier, needsPlaywright }
{ needsTypeScript, needsVitest, needsCypress, needsCypressCT, needsPrettier, needsPlaywright }
) {
const additionalConfig: Linter.Config = {}
const additionalDependencies = {}

if (needsCypress) {
additionalConfig.overrides = [
{
files: needsCypressCT
? [
'**/__tests__/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/support/**/*.{js,ts,jsx,tsx}'
]
: ['cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}', 'cypress/support/**/*.{js,ts,jsx,tsx}'],
extends: ['plugin:cypress/recommended']
}
]

additionalDependencies['eslint-plugin-cypress'] = eslintDeps['eslint-plugin-cypress']
}

if (needsPlaywright) {
additionalConfig.overrides = [
{
files: ['e2e/**/*.{test,spec}.{js,ts,jsx,tsx}'],
extends: ['plugin:playwright/recommended']
}
]

additionalDependencies['eslint-plugin-playwright'] = eslintDeps['eslint-plugin-playwright']
}
const { additionalConfig, additionalDependencies } = getAdditionalConfigAndDependencies({
needsVitest,
needsCypress,
needsCypressCT,
needsPlaywright
})

const { pkg, files } = createESLintConfig({
vueVersion: '3.x',
Expand Down Expand Up @@ -86,3 +62,54 @@ export default function renderEslint(
fs.writeFileSync(fullPath, content as string, 'utf-8')
}
}

// visible for testing
export function getAdditionalConfigAndDependencies({
needsVitest,
needsCypress,
needsCypressCT,
needsPlaywright
}) {
const additionalConfig: Linter.Config = {}
const additionalDependencies = {}

if (needsVitest) {
additionalConfig.overrides = [
{
files: ['src/**/*.{test,spec}.{js,ts,jsx,tsx}'],
extends: ['plugin:@vitest/legacy-recommended']
}
]

additionalDependencies['@vitest/eslint-plugin'] = eslintDeps['@vitest/eslint-plugin']
}

if (needsCypress) {
additionalConfig.overrides = [
{
files: needsCypressCT
? [
'**/__tests__/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}',
'cypress/support/**/*.{js,ts,jsx,tsx}'
]
: ['cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}', 'cypress/support/**/*.{js,ts,jsx,tsx}'],
extends: ['plugin:cypress/recommended']
}
]

additionalDependencies['eslint-plugin-cypress'] = eslintDeps['eslint-plugin-cypress']
}

if (needsPlaywright) {
additionalConfig.overrides = [
{
files: ['e2e/**/*.{test,spec}.{js,ts,jsx,tsx}'],
extends: ['plugin:playwright/recommended']
}
]

additionalDependencies['eslint-plugin-playwright'] = eslintDeps['eslint-plugin-playwright']
}
return { additionalConfig, additionalDependencies }
}