Skip to content

Commit

Permalink
refa: only export from index
Browse files Browse the repository at this point in the history
  • Loading branch information
MaikoTan committed Aug 3, 2024
1 parent b285c41 commit fcca22f
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 105 deletions.
21 changes: 0 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,6 @@
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
"./index": {
"types": {
"import": "./dist/index.d.ts"
},
"import": "./dist/index.js",
"require": "./dist/index.cjs"
},
"./node": {
"types": {
"import": "./dist/node.d.ts"
},
"import": "./dist/node.js",
"require": "./dist/node.cjs"
},
"./typescript": {
"types": {
"import": "./dist/typescript.d.ts"
},
"import": "./dist/typescript.js",
"require": "./dist/typescript.cjs"
},
"./package.json": "./package.json"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import typescript from '@rollup/plugin-typescript'
import { defineConfig } from 'rollup'

export default defineConfig({
input: ['src/index.ts', 'src/node.ts', 'src/typescript.ts'],
input: ['src/index.ts'],
output: [
{
dir: 'dist',
Expand All @@ -23,6 +23,7 @@ export default defineConfig({
],
external: [
'@eslint/eslintrc',
'@eslint/js',
'eslint',
'eslint-plugin-import',
'eslint-plugin-mocha',
Expand Down
82 changes: 82 additions & 0 deletions src/base.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
import { FlatCompat } from '@eslint/eslintrc'
import js from '@eslint/js'
import { Linter } from 'eslint'
import mochaPlugin from 'eslint-plugin-mocha'

const compat = new FlatCompat()

const config: Linter.FlatConfig[] = [
js.configs.recommended,
...compat.extends('plugin:import-x/recommended'),
mochaPlugin.configs.flat.recommended,
{
ignores: [
'**/.git/**',
'**/.yarn/**',
'**/node_modules/**',
'**/.pnp.*',
],
},
{
languageOptions: {
ecmaVersion: 2024,
},
settings: {
'import-x/resolver': {
node: true,
},
},
rules: {
'comma-dangle': ['error', 'always-multiline'],
'dot-notation': 'off',
'generator-star-spacing': ['error', 'after'],
'max-len': ['warn', 120],
'multiline-ternary': 'off',
'no-callback-literal': 'off',
'no-mixed-operators': 'off',
'no-use-before-define': 'off',
'no-return-assign': 'off',
'no-sequences': 'off',
'no-useless-escape': 'off',
'one-var': 'off',
'operator-linebreak': [
'error',
'after',
{
overrides: {
'?': 'before',
':': 'before',
},
},
],
'quotes': [
'error',
'single',
{
avoidEscape: true,
allowTemplateLiterals: true,
},
],
'quote-props': ['error', 'consistent-as-needed'],
'valid-typeof': 'off',
'yield-star-spacing': ['error', 'after'],
'space-before-function-paren': 'off',
// Import plugin
'import-x/export': 'off',
'import-x/no-unresolved': 'error',
'import-x/order': [
'error',
{
'groups': ['builtin', 'external', 'internal', 'unknown', 'parent', 'sibling', 'index', 'object', 'type'],
'newlines-between': 'always',
'alphabetize': {
order: 'asc',
caseInsensitive: false,
},
},
],
},
},
]

export default config
89 changes: 8 additions & 81 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,82 +1,9 @@
import { FlatCompat } from '@eslint/eslintrc'
import js from '@eslint/js'
import { Linter } from 'eslint'
import mochaPlugin from 'eslint-plugin-mocha'
import base from './base'
import node from './node'
import typescript from './typescript'

const compat = new FlatCompat()

const config: Linter.FlatConfig[] = [
js.configs.recommended,
...compat.extends('plugin:import-x/recommended'),
mochaPlugin.configs.flat.recommended,
{
ignores: [
'**/.git/**',
'**/.yarn/**',
'**/node_modules/**',
'**/.pnp.*',
],
},
{
languageOptions: {
ecmaVersion: 2024,
},
settings: {
'import-x/resolver': {
node: true,
},
},
rules: {
'comma-dangle': ['error', 'always-multiline'],
'dot-notation': 'off',
'generator-star-spacing': ['error', 'after'],
'max-len': ['warn', 120],
'multiline-ternary': 'off',
'no-callback-literal': 'off',
'no-mixed-operators': 'off',
'no-use-before-define': 'off',
'no-return-assign': 'off',
'no-sequences': 'off',
'no-useless-escape': 'off',
'one-var': 'off',
'operator-linebreak': [
'error',
'after',
{
overrides: {
'?': 'before',
':': 'before',
},
},
],
'quotes': [
'error',
'single',
{
avoidEscape: true,
allowTemplateLiterals: true,
},
],
'quote-props': ['error', 'consistent-as-needed'],
'valid-typeof': 'off',
'yield-star-spacing': ['error', 'after'],
'space-before-function-paren': 'off',
// Import plugin
'import-x/export': 'off',
'import-x/no-unresolved': 'error',
'import-x/order': [
'error',
{
'groups': ['builtin', 'external', 'internal', 'unknown', 'parent', 'sibling', 'index', 'object', 'type'],
'newlines-between': 'always',
'alphabetize': {
order: 'asc',
caseInsensitive: false,
},
},
],
},
},
]

export default config
export const configs = {
base,
node,
typescript,
}
2 changes: 1 addition & 1 deletion src/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FlatCompat } from '@eslint/eslintrc'
import { Linter } from 'eslint'
import globals from 'globals'

import baseConfig from './index'
import baseConfig from './base'

const compat = new FlatCompat()
const config: Linter.FlatConfig[] = [
Expand Down
2 changes: 1 addition & 1 deletion src/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FlatCompat } from '@eslint/eslintrc'
import { Linter } from 'eslint'
import { configs as tseslint } from 'typescript-eslint'

import baseConfig from './index'
import baseConfig from './base'

const compat = new FlatCompat()
const config = [
Expand Down

0 comments on commit fcca22f

Please sign in to comment.