Skip to content

Commit eea20dd

Browse files
committed
backout typescript :disappointed_relieved
1 parent b6a7360 commit eea20dd

17 files changed

+5851
-5760
lines changed

.eslintrc

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{
2-
"parser": "@typescript-eslint/parser",
2+
"parser": "babel-eslint",
33
"extends": [
44
"standard",
55
"standard-react",
6-
"plugin:prettier/recommended",
7-
"prettier/standard",
8-
"prettier/react",
9-
"plugin:@typescript-eslint/eslint-recommended"
6+
"plugin:prettier/recommended"
7+
# "prettier/standard",
8+
# "prettier/react"
109
],
1110
"env": {
1211
"node": true
@@ -20,7 +19,7 @@
2019
},
2120
"settings": {
2221
"react": {
23-
"version": "16"
22+
"version": "17"
2423
}
2524
},
2625
"rules": {

example/package.json

+3-10
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,13 @@
77
"start": "node ../node_modules/react-scripts/bin/react-scripts.js start",
88
"build": "node ../node_modules/react-scripts/bin/react-scripts.js build",
99
"test": "node ../node_modules/react-scripts/bin/react-scripts.js test",
10-
"eject": "node ../node_modules/react-scripts/bin/react-scripts.js eject"
10+
"eject": "node ../node_modules/react-scripts/bin/react-scripts.js eject",
11+
"lint": "eslint ."
1112
},
1213
"dependencies": {
13-
"@testing-library/jest-dom": "link:../node_modules/@testing-library/jest-dom",
14-
"@testing-library/react": "link:../node_modules/@testing-library/react",
15-
"@testing-library/user-event": "link:../node_modules/@testing-library/user-event",
16-
"@types/jest": "link:../node_modules/@types/jest",
17-
"@types/node": "link:../node_modules/@types/node",
18-
"@types/react": "link:../node_modules/@types/react",
19-
"@types/react-dom": "link:../node_modules/@types/react-dom",
2014
"react": "link:../node_modules/react",
21-
"react-dom": "link:../node_modules/react-dom",
15+
"react-dom": "^17.0.2",
2216
"react-scripts": "link:../node_modules/react-scripts",
23-
"typescript": "link:../node_modules/typescript",
2417
"react-set-state": "link:.."
2518
},
2619
"devDependencies": {
File renamed without changes.

example/src/App.tsx

-10
This file was deleted.
File renamed without changes.

example/src/react-app-env.d.ts

-1
This file was deleted.

example/src/setupTests.ts

-5
This file was deleted.

example/tsconfig.json

-22
This file was deleted.

example/yarn.lock

+3,004-2,612
Large diffs are not rendered by default.

package.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"repository": "myckhel/react-set-state",
88
"main": "dist/index.js",
99
"module": "dist/index.modern.js",
10-
"source": "src/index.tsx",
10+
"source": "src/index.js",
1111
"engines": {
1212
"node": ">=10"
1313
},
@@ -18,44 +18,44 @@
1818
"test": "run-s test:unit test:lint test:build",
1919
"test:build": "run-s build",
2020
"test:lint": "eslint .",
21-
"test:unit": "cross-env CI=1 react-scripts test --env=jsdom",
22-
"test:watch": "react-scripts test --env=jsdom",
21+
"test:unit": "cross-env CI=1 react-scripts test --env=node",
22+
"test:watch": "react-scripts test --env=node",
2323
"predeploy": "cd example && yarn install && yarn run build",
24-
"deploy": "gh-pages -d example/build"
24+
"deploy": "gh-pages -d example/build",
25+
"lint": "eslint .",
26+
"lint:fix": "eslint . --fix"
2527
},
2628
"peerDependencies": {
2729
"react": "^16.0.0"
2830
},
31+
"peerDependenciesMeta": {
32+
"react-dom": {
33+
"optional": true
34+
},
35+
"react-native": {
36+
"optional": true
37+
}
38+
},
2939
"devDependencies": {
30-
"@testing-library/jest-dom": "^4.2.4",
31-
"@testing-library/react": "^9.5.0",
32-
"@testing-library/user-event": "^7.2.1",
33-
"@types/jest": "^25.1.4",
34-
"@types/node": "^12.12.38",
35-
"@types/react": "^16.9.27",
36-
"@types/react-dom": "^16.9.7",
37-
"@typescript-eslint/eslint-plugin": "^2.26.0",
38-
"@typescript-eslint/parser": "^2.26.0",
39-
"microbundle-crl": "^0.13.10",
40-
"babel-eslint": "^10.0.3",
40+
"babel-eslint": "^10.1.0",
4141
"cross-env": "^7.0.2",
42-
"eslint": "^6.8.0",
43-
"eslint-config-prettier": "^6.7.0",
44-
"eslint-config-standard": "^14.1.0",
45-
"eslint-config-standard-react": "^9.2.0",
46-
"eslint-plugin-import": "^2.18.2",
47-
"eslint-plugin-node": "^11.0.0",
48-
"eslint-plugin-prettier": "^3.1.1",
49-
"eslint-plugin-promise": "^4.2.1",
50-
"eslint-plugin-react": "^7.17.0",
51-
"eslint-plugin-standard": "^4.0.1",
52-
"gh-pages": "^2.2.0",
42+
"eslint": "^7.25.0",
43+
"eslint-config-prettier": "^8.3.0",
44+
"eslint-config-standard": "^16.0.2",
45+
"eslint-config-standard-react": "^11.0.1",
46+
"eslint-plugin-import": "^2.22.1",
47+
"eslint-plugin-node": "^11.1.0",
48+
"eslint-plugin-prettier": "^3.4.0",
49+
"eslint-plugin-promise": "^5.1.0",
50+
"eslint-plugin-react": "^7.23.2",
51+
"eslint-plugin-standard": "^5.0.0",
52+
"gh-pages": "^3.2.0",
53+
"immer": "^9.0.2",
54+
"microbundle-crl": "^0.13.10",
5355
"npm-run-all": "^4.1.5",
5456
"prettier": "^2.0.4",
55-
"react": "^16.13.1",
56-
"react-dom": "^16.13.1",
57-
"react-scripts": "^3.4.1",
58-
"typescript": "^3.7.5"
57+
"react": "^17.0.2",
58+
"react-scripts": "^4.0.3"
5959
},
6060
"files": [
6161
"dist"

src/index.test.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import useMergeState from '.'
2+
3+
describe('useMergeState', () => {
4+
it('is truthy', () => {
5+
expect(useMergeState).toBeTruthy()
6+
})
7+
})

src/index.test.tsx

-7
This file was deleted.

src/index.tsx

-10
This file was deleted.

src/typings.d.ts

-17
This file was deleted.

tsconfig.json

-22
This file was deleted.

tsconfig.test.json

-6
This file was deleted.

0 commit comments

Comments
 (0)