Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit f51444f

Browse files
committed
Update typescript
1 parent 65a0b2a commit f51444f

File tree

3 files changed

+56
-29
lines changed

3 files changed

+56
-29
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"glob": "^7.1.2",
4848
"lodash": "^4.17.10",
4949
"prettier": "^1.18.2",
50-
"typescript": "2.8.3"
50+
"typescript": "3.6.3"
5151
},
5252
"devDependencies": {
5353
"@types/chalk": "^2.2.0",
@@ -56,15 +56,15 @@
5656
"@types/glob": "^5.0.35",
5757
"@types/jest": "^22.2.3",
5858
"@types/lodash": "^4.14.109",
59-
"@types/node": "^10.1.2",
59+
"@types/node": "^12.7.5",
6060
"@types/prettier": "^1.18.2",
6161
"@types/react": "^16.3.14",
6262
"dedent": "^0.7.0",
6363
"husky": "^3.0.5",
6464
"jest": "^22.4.4",
6565
"lint-staged": "^7.1.1",
6666
"ts-jest": "^22.4.6",
67-
"ts-node": "^6.0.3",
67+
"ts-node": "^8.3.0",
6868
"tslint": "^5.10.0"
6969
}
7070
}

src/transforms/react-js-make-props-and-state-transform.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,10 @@ function getInitialStateFromClassDeclaration(
191191

192192
if (initialStateMember && ts.isPropertyDeclaration(initialStateMember) && initialStateMember.initializer) {
193193
const type = typeChecker.getTypeAtLocation(initialStateMember.initializer)!;
194-
195-
return typeChecker.typeToTypeNode(type);
194+
const typeNode = typeChecker.typeToTypeNode(type);
195+
if (typeNode) {
196+
return typeNode;
197+
}
196198
}
197199

198200
// Initial state in constructor
@@ -207,7 +209,10 @@ function getInitialStateFromClassDeclaration(
207209
ts.isBinaryExpression(statement.expression) &&
208210
statement.expression.left.getText() === 'this.state'
209211
) {
210-
return typeChecker.typeToTypeNode(typeChecker.getTypeAtLocation(statement.expression.right));
212+
const typeNode = typeChecker.typeToTypeNode(typeChecker.getTypeAtLocation(statement.expression.right));
213+
if (typeNode) {
214+
return typeNode;
215+
}
211216
}
212217
}
213218
}
@@ -242,7 +247,10 @@ function getStateLookingForSetStateCalls(
242247
node.expression.expression.getText().match(/setState/)
243248
) {
244249
const type = typeChecker.getTypeAtLocation(node.expression.arguments[0]);
245-
typeNodes.push(typeChecker.typeToTypeNode(type));
250+
const typeNode = typeChecker.typeToTypeNode(type);
251+
if (typeNode) {
252+
typeNodes.push(typeNode);
253+
}
246254
}
247255
}
248256
}

yarn.lock

Lines changed: 41 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@
7676
version "9.3.0"
7777
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.3.0.tgz#3a129cda7c4e5df2409702626892cb4b96546dd5"
7878

79-
"@types/node@^10.1.2":
80-
version "10.1.2"
81-
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.2.tgz#1b928a0baa408fc8ae3ac012cc81375addc147c6"
79+
"@types/node@^12.7.5":
80+
version "12.7.5"
81+
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.5.tgz#e19436e7f8e9b4601005d73673b6dc4784ffcc2f"
82+
integrity sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w==
8283

8384
"@types/normalize-package-data@^2.4.0":
8485
version "2.4.0"
@@ -206,6 +207,11 @@ are-we-there-yet@~1.1.2:
206207
delegates "^1.0.0"
207208
readable-stream "^2.0.6"
208209

210+
arg@^4.1.0:
211+
version "4.1.1"
212+
resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.1.tgz#485f8e7c390ce4c5f78257dbea80d4be11feda4c"
213+
integrity sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==
214+
209215
argparse@^1.0.7:
210216
version "1.0.9"
211217
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
@@ -254,7 +260,7 @@ array-unique@^0.3.2:
254260
version "0.3.2"
255261
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
256262

257-
arrify@^1.0.0, arrify@^1.0.1:
263+
arrify@^1.0.1:
258264
version "1.0.1"
259265
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
260266

@@ -1000,10 +1006,15 @@ detect-newline@^2.1.0:
10001006
version "2.1.0"
10011007
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
10021008

1003-
diff@^3.1.0, diff@^3.2.0:
1009+
diff@^3.2.0:
10041010
version "3.4.0"
10051011
resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
10061012

1013+
diff@^4.0.1:
1014+
version "4.0.1"
1015+
resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
1016+
integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
1017+
10071018
domexception@^1.0.0:
10081019
version "1.0.1"
10091020
resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -3562,13 +3573,21 @@ source-map-support@^0.4.15:
35623573
dependencies:
35633574
source-map "^0.5.6"
35643575

3565-
source-map-support@^0.5.0, source-map-support@^0.5.3, source-map-support@^0.5.5:
3576+
source-map-support@^0.5.0, source-map-support@^0.5.5:
35663577
version "0.5.6"
35673578
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
35683579
dependencies:
35693580
buffer-from "^1.0.0"
35703581
source-map "^0.6.0"
35713582

3583+
source-map-support@^0.5.6:
3584+
version "0.5.13"
3585+
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
3586+
integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
3587+
dependencies:
3588+
buffer-from "^1.0.0"
3589+
source-map "^0.6.0"
3590+
35723591
source-map-url@^0.4.0:
35733592
version "0.4.0"
35743593
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -3854,18 +3873,16 @@ ts-jest@^22.4.6:
38543873
source-map-support "^0.5.5"
38553874
yargs "^11.0.0"
38563875

3857-
ts-node@^6.0.3:
3858-
version "6.0.3"
3859-
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-6.0.3.tgz#28bf74bcad134fad17f7469dad04638ece03f0f4"
3876+
ts-node@^8.3.0:
3877+
version "8.3.0"
3878+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.3.0.tgz#e4059618411371924a1fb5f3b125915f324efb57"
3879+
integrity sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==
38603880
dependencies:
3861-
arrify "^1.0.0"
3862-
chalk "^2.3.0"
3863-
diff "^3.1.0"
3881+
arg "^4.1.0"
3882+
diff "^4.0.1"
38643883
make-error "^1.1.1"
3865-
minimist "^1.2.0"
3866-
mkdirp "^0.5.1"
3867-
source-map-support "^0.5.3"
3868-
yn "^2.0.0"
3884+
source-map-support "^0.5.6"
3885+
yn "^3.0.0"
38693886

38703887
tslib@^1.8.0, tslib@^1.8.1:
38713888
version "1.9.0"
@@ -3915,9 +3932,10 @@ type-fest@^0.6.0:
39153932
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
39163933
integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
39173934

3918-
typescript@2.8.3:
3919-
version "2.8.3"
3920-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
3935+
typescript@3.6.3:
3936+
version "3.6.3"
3937+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.3.tgz#fea942fabb20f7e1ca7164ff626f1a9f3f70b4da"
3938+
integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==
39213939

39223940
uglify-js@^2.6:
39233941
version "2.8.29"
@@ -4162,6 +4180,7 @@ yargs@~3.10.0:
41624180
decamelize "^1.0.0"
41634181
window-size "0.1.0"
41644182

4165-
yn@^2.0.0:
4166-
version "2.0.0"
4167-
resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
4183+
yn@^3.0.0:
4184+
version "3.1.1"
4185+
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
4186+
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==

0 commit comments

Comments
 (0)