Skip to content

Commit eabbad5

Browse files
authored
Merge pull request #67 from thdk/chore/upgrade-dependencies
Upgrade peer dependencies
2 parents e99e668 + f9b14f0 commit eabbad5

File tree

6 files changed

+1887
-1276
lines changed

6 files changed

+1887
-1276
lines changed

.eslintrc.js

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,52 @@ module.exports = {
1010
'eslint:recommended',
1111
'plugin:import/errors',
1212
'plugin:import/warnings',
13-
'plugin:import/typescript',
14-
'plugin:@typescript-eslint/recommended',
1513
'plugin:eslint-plugin/all',
1614
'plugin:prettier/recommended',
1715
],
1816
parserOptions: {
1917
ecmaVersion: 10,
20-
project: ['./tsconfig.json', './tests/tsconfig.json'],
2118
sourceType: 'module',
2219
},
2320
rules: {
2421
'no-console': 'warn',
25-
26-
'@typescript-eslint/explicit-function-return-type': 'off',
27-
'@typescript-eslint/explicit-module-boundary-types': 'off',
28-
'@typescript-eslint/ban-ts-ignore': 'off',
29-
'@typescript-eslint/no-explicit-any': 'off',
3022
},
3123
overrides: [
3224
{
33-
files: ['tests/**'],
34-
env: {
35-
jest: true,
36-
},
25+
files: ['*.ts', '*.tsx'],
26+
extends: ['plugin:import/typescript', 'plugin:@typescript-eslint/recommended'],
27+
3728
rules: {
38-
'jest/no-disabled-tests': 'warn',
39-
'jest/no-focused-tests': 'error',
40-
'jest/no-alias-methods': 'error',
41-
'jest/no-identical-title': 'error',
42-
'jest/no-jasmine-globals': 'error',
43-
'jest/no-jest-import': 'error',
44-
'jest/no-test-prefixes': 'error',
45-
'jest/no-test-callback': 'error',
46-
'jest/no-test-return-statement': 'error',
47-
'jest/prefer-to-have-length': 'warn',
48-
'jest/prefer-spy-on': 'error',
49-
'jest/valid-expect': 'error',
50-
'jest/no-test-callback': 'off',
29+
'@typescript-eslint/explicit-function-return-type': 'off',
30+
'@typescript-eslint/explicit-module-boundary-types': 'off',
31+
'@typescript-eslint/ban-ts-ignore': 'off',
32+
'@typescript-eslint/no-explicit-any': 'off',
33+
},
34+
35+
parserOptions: {
36+
project: ['./tsconfig.json', './tests/tsconfig.json'],
5137
},
38+
overrides: [
39+
{
40+
files: ['tests/**'],
41+
env: {
42+
jest: true,
43+
},
44+
rules: {
45+
'jest/no-disabled-tests': 'warn',
46+
'jest/no-focused-tests': 'error',
47+
'jest/no-alias-methods': 'error',
48+
'jest/no-identical-title': 'error',
49+
'jest/no-jasmine-globals': 'error',
50+
'jest/no-test-prefixes': 'error',
51+
'jest/no-test-return-statement': 'error',
52+
'jest/prefer-to-have-length': 'warn',
53+
'jest/prefer-spy-on': 'error',
54+
'jest/valid-expect': 'error',
55+
'jest/no-test-callback': 'off',
56+
},
57+
},
58+
],
5259
},
5360
],
5461
settings: {
@@ -58,5 +65,4 @@ module.exports = {
5865
},
5966
},
6067
},
61-
ignorePatterns: ['.eslintrc.js'],
6268
}

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: actions/setup-node@v1
1616
with:
17-
node-version: 12
17+
node-version: 18
1818
- run: yarn
1919
- run: yarn verify
2020

@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v2
2626
- uses: actions/setup-node@v1
2727
with:
28-
node-version: 12
28+
node-version: 18
2929
registry-url: https://registry.npmjs.org/
3030
- run: yarn
3131
- run: npm publish

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

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

2020
steps:
2121
- uses: actions/checkout@v2

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,42 +55,42 @@
5555
"@rollup/plugin-commonjs": "~12.0.0",
5656
"@rollup/plugin-json": "~4.0.3",
5757
"@rollup/plugin-node-resolve": "~8.0.0",
58-
"@rollup/plugin-typescript": "~4.1.2",
58+
"@rollup/plugin-typescript": "~11.1.2",
5959
"@types/babel__core": "~7.1.7",
6060
"@types/babel__preset-env": "~7.9.0",
6161
"@types/eslint": "~7.28.1",
6262
"@types/jest": "~27.0.2",
6363
"@types/natural-compare-lite": "~1.4.0",
6464
"@types/rimraf": "~3.0.1",
6565
"@types/tmp": "~0.2.1",
66-
"@typescript-eslint/eslint-plugin": "~5.0.0",
67-
"@typescript-eslint/parser": "~5.0.0",
66+
"@typescript-eslint/eslint-plugin": "~6.4.0",
67+
"@typescript-eslint/parser": "~6.4.0",
6868
"babel-jest": "~26.6.3",
6969
"babel-plugin-module-resolver": "~4.1.0",
7070
"eslint": "~8.0.1",
71-
"eslint-config-prettier": "~8.3.0",
72-
"eslint-plugin-eslint-plugin": "~3.6.1",
73-
"eslint-plugin-import": "~2.25.2",
74-
"eslint-plugin-jest": "~25.0.6",
75-
"eslint-plugin-prettier": "~4.0.0",
71+
"eslint-config-prettier": "~9.0.0",
72+
"eslint-plugin-eslint-plugin": "~5.1.1",
73+
"eslint-plugin-import": "~2.28.0",
74+
"eslint-plugin-jest": "~27.2.3",
75+
"eslint-plugin-prettier": "~5.0.0",
7676
"http-server": "~13.0.0",
7777
"husky": "~4.2.5",
78-
"jest": "~27.2.5",
78+
"jest": "~29.6.2",
7979
"lint-staged": "~10.5.4",
80-
"prettier": "~2.3.2",
80+
"prettier": "3.0.1",
8181
"rimraf": "~3.0.2",
8282
"rollup": "~2.10.5",
8383
"tmp": "~0.2.1",
8484
"tsconfig": "~7.0.0",
85-
"typescript": "~4.3.5"
85+
"typescript": "5.1.6"
8686
},
8787
"peerDependencies": {
88-
"@typescript-eslint/parser": "^1 || ^2 || ^3 || ^4 || ^5",
89-
"eslint": "^5 || ^6 || ^7 || ^8",
88+
"@typescript-eslint/parser": "^6",
89+
"eslint": "^7 || ^8",
9090
"typescript": "^3 || ^4 || ^5"
9191
},
9292
"engines": {
93-
"node": "12 || >= 13.9"
93+
"node": ">= 16"
9494
},
9595
"license": "ISC"
9696
}

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
1111
// "declaration": true /* Generates corresponding '.d.ts' file. */,
1212
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
13-
"sourceMap": true /* Generates corresponding '.map' file. */,
13+
"sourceMap": false /* Generates corresponding '.map' file. */,
1414
// "outFile": "./", /* Concatenate and emit output to single file. */
1515
"outDir": "lib" /* Redirect output structure to the directory. */,
1616
// "rootDir": "src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,

0 commit comments

Comments
 (0)