Skip to content
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
27 changes: 18 additions & 9 deletions __tests__/categories/js/eslint/eslint.entrypoint.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ describe('eslint', () => {
const config = createConfig({ eslintConfig: { ignores: ['__test__'] } });
configMocked.getConfig.mockReturnValueOnce(config);

const configFile = `export default [
const configFile = `import { defineConfig } from 'eslint/config';

export default defineConfig(
{ignores: ["__test__"]},
];`;
);`;

await eslint();

Expand All @@ -79,8 +81,10 @@ describe('eslint', () => {
const config = createConfig({ eslintConfig: {} });
configMocked.getConfig.mockReturnValueOnce(config);

const configFile = `export default [
];`;
const configFile = `import { defineConfig } from 'eslint/config';

export default defineConfig(
);`;

await eslint();

Expand All @@ -98,9 +102,11 @@ describe('eslint', () => {
});
configMocked.getConfig.mockReturnValueOnce(config);

const configFile = `export default [
const configFile = `import { defineConfig } from 'eslint/config';

export default defineConfig(
{languageOptions: {}}
];`;
);`;

await eslint();

Expand All @@ -114,10 +120,12 @@ describe('eslint', () => {
});
configMocked.getConfig.mockReturnValueOnce(config);

const configFile = `export default [
const configFile = `import { defineConfig } from 'eslint/config';

export default defineConfig(
__test1__,
__test2__,
];`;
);`;

await eslint();

Expand Down Expand Up @@ -150,8 +158,9 @@ __test2__,

const configFile = `// @ts-check
import globals from "globals";
import { defineConfig } from 'eslint/config';

export default tseslint.config(
export default defineConfig(
{ignores: ["node_modules"]},
{files: ["src/**/*.ts"],languageOptions: {globals: {...globals.window},parserOptions: {"ecmaVersion":2020}},plugins: {'@typescript-eslint': eslintPluginTs},rules: {"no-console":"warn"}}
);`;
Expand Down
3 changes: 2 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import beautifulSort from 'eslint-plugin-beautiful-sort';
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
import { defineConfig } from 'eslint/config';

export default tseslint.config(
export default defineConfig(
eslint.configs.recommended,
...tseslint.configs.recommended,
eslintPluginPrettierRecommended,
Expand Down
Loading
Loading