Skip to content

Commit

Permalink
Merge pull request #67 from thdk/chore/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade peer dependencies
  • Loading branch information
infctr authored Aug 30, 2023
2 parents e99e668 + f9b14f0 commit eabbad5
Show file tree
Hide file tree
Showing 6 changed files with 1,887 additions and 1,276 deletions.
58 changes: 32 additions & 26 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,52 @@ module.exports = {
'eslint:recommended',
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'plugin:@typescript-eslint/recommended',
'plugin:eslint-plugin/all',
'plugin:prettier/recommended',
],
parserOptions: {
ecmaVersion: 10,
project: ['./tsconfig.json', './tests/tsconfig.json'],
sourceType: 'module',
},
rules: {
'no-console': 'warn',

'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
overrides: [
{
files: ['tests/**'],
env: {
jest: true,
},
files: ['*.ts', '*.tsx'],
extends: ['plugin:import/typescript', 'plugin:@typescript-eslint/recommended'],

rules: {
'jest/no-disabled-tests': 'warn',
'jest/no-focused-tests': 'error',
'jest/no-alias-methods': 'error',
'jest/no-identical-title': 'error',
'jest/no-jasmine-globals': 'error',
'jest/no-jest-import': 'error',
'jest/no-test-prefixes': 'error',
'jest/no-test-callback': 'error',
'jest/no-test-return-statement': 'error',
'jest/prefer-to-have-length': 'warn',
'jest/prefer-spy-on': 'error',
'jest/valid-expect': 'error',
'jest/no-test-callback': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},

parserOptions: {
project: ['./tsconfig.json', './tests/tsconfig.json'],
},
overrides: [
{
files: ['tests/**'],
env: {
jest: true,
},
rules: {
'jest/no-disabled-tests': 'warn',
'jest/no-focused-tests': 'error',
'jest/no-alias-methods': 'error',
'jest/no-identical-title': 'error',
'jest/no-jasmine-globals': 'error',
'jest/no-test-prefixes': 'error',
'jest/no-test-return-statement': 'error',
'jest/prefer-to-have-length': 'warn',
'jest/prefer-spy-on': 'error',
'jest/valid-expect': 'error',
'jest/no-test-callback': 'off',
},
},
],
},
],
settings: {
Expand All @@ -58,5 +65,4 @@ module.exports = {
},
},
},
ignorePatterns: ['.eslintrc.js'],
}
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 18
- run: yarn
- run: yarn verify

Expand All @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 18
registry-url: https://registry.npmjs.org/
- run: yarn
- run: npm publish
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [12.x, 14.x, 16.x]
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v2
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,42 +55,42 @@
"@rollup/plugin-commonjs": "~12.0.0",
"@rollup/plugin-json": "~4.0.3",
"@rollup/plugin-node-resolve": "~8.0.0",
"@rollup/plugin-typescript": "~4.1.2",
"@rollup/plugin-typescript": "~11.1.2",
"@types/babel__core": "~7.1.7",
"@types/babel__preset-env": "~7.9.0",
"@types/eslint": "~7.28.1",
"@types/jest": "~27.0.2",
"@types/natural-compare-lite": "~1.4.0",
"@types/rimraf": "~3.0.1",
"@types/tmp": "~0.2.1",
"@typescript-eslint/eslint-plugin": "~5.0.0",
"@typescript-eslint/parser": "~5.0.0",
"@typescript-eslint/eslint-plugin": "~6.4.0",
"@typescript-eslint/parser": "~6.4.0",
"babel-jest": "~26.6.3",
"babel-plugin-module-resolver": "~4.1.0",
"eslint": "~8.0.1",
"eslint-config-prettier": "~8.3.0",
"eslint-plugin-eslint-plugin": "~3.6.1",
"eslint-plugin-import": "~2.25.2",
"eslint-plugin-jest": "~25.0.6",
"eslint-plugin-prettier": "~4.0.0",
"eslint-config-prettier": "~9.0.0",
"eslint-plugin-eslint-plugin": "~5.1.1",
"eslint-plugin-import": "~2.28.0",
"eslint-plugin-jest": "~27.2.3",
"eslint-plugin-prettier": "~5.0.0",
"http-server": "~13.0.0",
"husky": "~4.2.5",
"jest": "~27.2.5",
"jest": "~29.6.2",
"lint-staged": "~10.5.4",
"prettier": "~2.3.2",
"prettier": "3.0.1",
"rimraf": "~3.0.2",
"rollup": "~2.10.5",
"tmp": "~0.2.1",
"tsconfig": "~7.0.0",
"typescript": "~4.3.5"
"typescript": "5.1.6"
},
"peerDependencies": {
"@typescript-eslint/parser": "^1 || ^2 || ^3 || ^4 || ^5",
"eslint": "^5 || ^6 || ^7 || ^8",
"@typescript-eslint/parser": "^6",
"eslint": "^7 || ^8",
"typescript": "^3 || ^4 || ^5"
},
"engines": {
"node": "12 || >= 13.9"
"node": ">= 16"
},
"license": "ISC"
}
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true /* Generates corresponding '.d.ts' file. */,
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
"sourceMap": true /* Generates corresponding '.map' file. */,
"sourceMap": false /* Generates corresponding '.map' file. */,
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "lib" /* Redirect output structure to the directory. */,
// "rootDir": "src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
Expand Down
Loading

0 comments on commit eabbad5

Please sign in to comment.