Skip to content

Commit 2822b1f

Browse files
committed
upgrade dependencies - react, typescriipt, eslint, babel
1 parent bf90799 commit 2822b1f

File tree

9 files changed

+4704
-1364
lines changed

9 files changed

+4704
-1364
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.eslintrc.js

.eslintrc.js

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
module.exports = {
2+
env: {
3+
browser: true,
4+
es6: true,
5+
node: true,
6+
},
7+
extends: [
8+
"plugin:@shopify/typescript",
9+
"plugin:@shopify/jest",
10+
"plugin:@shopify/react",
11+
"plugin:@shopify/prettier",
12+
],
13+
parser: "@typescript-eslint/parser",
14+
parserOptions: {
15+
project: "tsconfig.json",
16+
sourceType: "module",
17+
ecmaVersion: 2020
18+
},
19+
plugins: ["@typescript-eslint"],
20+
rules: {
21+
"babel/object-curly-spacing": "off",
22+
"no-undefined": "off",
23+
"no-param-reassign": "off",
24+
"react/no-unused-prop-types": "off",
25+
"react/jsx-filename-extension": [1, { extensions: [".tsx"] }],
26+
"typescript/member-ordering": "off",
27+
"jest/consistent-test-it": [
28+
"error",
29+
{
30+
fn: "it",
31+
},
32+
],
33+
"prettier/prettier": ["error", { "singleQuote": true }],
34+
"no-use-before-define": "off",
35+
"@typescript-eslint/no-use-before-define": ["error"],
36+
"@shopify/react-prefer-private-members": "off",
37+
"@typescript-eslint/member-ordering": "off"
38+
},
39+
settings: {
40+
"import/ignore": ["node_modules", "\\.s?css"],
41+
},
42+
};

.eslintrc.json

-21
This file was deleted.

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
/types
66
npm-debug.log*
77
.DS_Store
8+
.idea

config/jest/config.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
"collectCoverage": true,
44
"rootDir": "../..",
55
"roots": [
6-
"<rootDir>/src",
76
"<rootDir>/tests"
87
],
98
"moduleFileExtensions": [
109
"ts",
1110
"tsx",
1211
"js"
1312
],
14-
"testRegex": "[\\w+]\\.test\\.(tsx?|js)$",
1513
"transform": {
1614
"\\.tsx?$": "<rootDir>/config/jest/transformers/typescript.js"
17-
}
15+
},
16+
"testMatch": [
17+
"**/?(*.)+(spec|test).+(ts|tsx|js)"
18+
]
1819
}

package.json

+22-18
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,44 @@
2323
"prop-types": "^15.5.7"
2424
},
2525
"peerDependencies": {
26-
"react": "15.x || 16.x"
26+
"react": "15.x || 16.x || 17.x"
2727
},
2828
"devDependencies": {
29+
"@shopify/eslint-plugin": "^39.0.4",
2930
"@types/jest": "^20.0.8",
30-
"@types/prop-types": "^15.5.1",
31-
"@types/react": "^15.0.38",
32-
"@types/react-dom": "^15.5.4",
31+
"@types/prop-types": "^15.7.3",
32+
"@types/react": "^17.0.0",
33+
"@types/react-dom": "^17.0.0",
34+
"@typescript-eslint/eslint-plugin": "^4.13.0",
35+
"@typescript-eslint/parser": "^4.13.0",
3336
"awesome-typescript-loader": "^3.2.1",
3437
"babel-cli": "^6.26.0",
35-
"babel-eslint": "7.0.0",
38+
"babel-eslint": "^10.1.0",
3639
"babel-jest": "^19.0.0",
37-
"babel-preset-es2015": "^6.22.0",
38-
"babel-preset-react": "^6.23.0",
40+
"babel-preset-es2015": "^6.24.1",
41+
"babel-preset-react": "^6.24.1",
3942
"babel-preset-typescript": "^7.0.0-alpha.19",
4043
"codecov": "^1.0.1",
41-
"eslint": "^4.10.0",
42-
"eslint-plugin-shopify": "^22.1.0",
44+
"eslint": "^7.18.0",
45+
"eslint-plugin-jest": "^24.1.3",
46+
"eslint-plugin-prettier": "^3.3.1",
4347
"fs-extra": "^4.0.1",
44-
"jest": "^19.0.2",
48+
"jest": "^26.6.3",
4549
"nwb": "0.15.x",
46-
"react": "^15.4.2",
47-
"react-addons-test-utils": "^15.4.2",
48-
"react-dom": "^15.4.2",
49-
"react-test-renderer": "^15.4.2",
50+
"prettier": "^2.2.1",
51+
"react": "^17.0.1",
52+
"react-addons-test-utils": "^15.6.2",
53+
"react-dom": "^17.0.1",
54+
"react-test-renderer": "^17.0.1",
5055
"rimraf": "^2.6.1",
51-
"rollup": "^0.49.2",
56+
"rollup": "0.50",
5257
"rollup-plugin-babel": "^3.0.2",
5358
"rollup-plugin-commonjs": "^8.2.0",
5459
"rollup-plugin-node-resolve": "^3.0.0",
5560
"rollup-plugin-typescript2": "^0.15.0",
5661
"rollup-plugin-uglify": "^2.0.1",
57-
"tslint": "^5.10.0",
58-
"tslint-config-shopify": "^3.0.2",
59-
"typescript": "2.8.3"
62+
"tslib": "^2.1.0",
63+
"typescript": "^4.1.3"
6064
},
6165
"author": {
6266
"name": "Clauderic Demers",

0 commit comments

Comments
 (0)