Skip to content

Commit

Permalink
Merge branch 'develop' into depfu/batch_dev/npm/2024-06-30
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
sebbo2002 committed Aug 3, 2024
2 parents 4749945 + 8a3672b commit d96baa9
Show file tree
Hide file tree
Showing 13 changed files with 2,235 additions and 2,652 deletions.
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

53 changes: 0 additions & 53 deletions .eslintrc

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/stale-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ jobs:
days-before-close: 14
stale-issue-label: stale
stale-pr-label: stale
exempt-issue-labels: do-not-close
exempt-pr-labels: do-not-close
51 changes: 51 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import eslint from '@eslint/js';
import eslintPluginJsonc from 'eslint-plugin-jsonc';
import globals from 'globals';
import tseslint from 'typescript-eslint';

export default [
eslint.configs.recommended,
...tseslint.configs.recommended,
...eslintPluginJsonc.configs['flat/recommended-with-jsonc'],
{
files: [
'test/**/*.ts'
],
rules: {
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/ban-ts-comment': 'off'
}
},
{
rules: {
semi: 'error',
quotes: [
'error',
'single'
],
indent: [
'error',
4
],
'jsonc/sort-keys': 'error'
},
languageOptions: {
ecmaVersion: 2022,
sourceType: 'module',
globals: {
...globals.node,
...globals.es6,
...globals.mocha
}
}
},
{
ignores: [
'node_modules/**',
'dist/**',
'docs/**',
'package-lock.json',
'.nyc_output/**'
]
}
];
Loading

0 comments on commit d96baa9

Please sign in to comment.