Skip to content

Commit eccf653

Browse files
author
Jason Kuhrt
authored
feat: upgrade to TypeScript 3.9 (#859)
1 parent e037db4 commit eccf653

File tree

4 files changed

+68
-32
lines changed

4 files changed

+68
-32
lines changed

DEVELOPMENT.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ yarn test e2e/kitchen
110110

111111
- Live under `/test/e2e`
112112

113-
- `E2E_NEXUS_VERSION` – which version of Nexus to install during app creation
113+
- `E2E_NEXUS_VERSION` – which version of Nexus to install during app creation
114+
115+
- The `create-prisma` e2e test always uses the `next` version of `nexus-plugin-prisma`. This is so that pre-releases can be made to fix Nexus PRs ([example](https://github.com/graphql-nexus/nexus/pull/859)).
114116

115117
- E2E tests run in CI against every commit _after the package has been published_. These are preview and pr releases so its acceptable, and doing it this way provides a true smoke test of if the _real_ user journey works end to end.
116118

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
"rxjs": "^6.5.4",
5454
"simple-git": "^2.0.0",
5555
"strip-ansi": "^6.0.0",
56-
"ts-morph": "^7.0.0",
57-
"ts-node": "^8.9.0",
58-
"tslib": "^1",
59-
"type-fest": "^0.14.0",
60-
"typescript": "3.8.x"
56+
"ts-morph": "^7.1.0",
57+
"ts-node": "^8.10.1",
58+
"tslib": "^2.0.0",
59+
"typescript": "3.9.x",
60+
"type-fest": "^0.14.0"
6161
},
6262
"devDependencies": {
6363
"@prisma-labs/prettier-config": "0.1.0",

src/lib/utils/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,10 @@ export type SerializedError = {
357357

358358
export function serializeError(e: Error): SerializedError {
359359
return {
360+
...e,
360361
name: e.name,
361362
message: e.message,
362363
stack: e.stack,
363-
...e,
364364
}
365365
}
366366

yarn.lock

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -729,17 +729,17 @@
729729
traverse "^0.6.6"
730730
unified "^6.1.6"
731731

732-
"@ts-morph/common@~0.4.0":
733-
version "0.4.0"
734-
resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.4.0.tgz#c8fdb870692b16a80ca0722af7d12d6bb7c78ed7"
735-
integrity sha512-VV5/F8k/9RnSZnNpnaOarKb7LOzYhITjHB9JIcpl1l+zlt99H1HeZH/yI2Xs6BtAV4WjPX+SjjRVybdEm6IOEQ==
732+
"@ts-morph/common@~0.5.0":
733+
version "0.5.0"
734+
resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.5.0.tgz#d6ba5d162a8d6bf5c0870ffe2083a1f513d2193d"
735+
integrity sha512-/nIPpBgAJULjFnPlreL3gm4XJK9wiE3TGkBh02qXe80naG+AvegvCZX34abU3MArJRPeTfQL8vJxcx8HBMVBiQ==
736736
dependencies:
737737
"@dsherret/to-absolute-glob" "^2.0.2"
738-
fast-glob "^3.1.1"
739-
fs-extra "^8.1.0"
738+
fast-glob "^3.2.2"
739+
fs-extra "^9.0.0"
740740
is-negated-glob "^1.0.0"
741741
multimatch "^4.0.0"
742-
typescript "~3.8.2"
742+
typescript "~3.9.2"
743743

744744
745745
version "1.3.1"
@@ -1262,6 +1262,11 @@ asynckit@^0.4.0:
12621262
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
12631263
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
12641264

1265+
at-least-node@^1.0.0:
1266+
version "1.0.0"
1267+
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
1268+
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
1269+
12651270
atob@^2.1.2:
12661271
version "2.1.2"
12671272
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -2515,7 +2520,7 @@ fast-deep-equal@^3.1.1:
25152520
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
25162521
integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
25172522

2518-
fast-glob@^3.0.3, fast-glob@^3.1.1:
2523+
fast-glob@^3.0.3, fast-glob@^3.2.2:
25192524
version "3.2.2"
25202525
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
25212526
integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
@@ -2691,6 +2696,16 @@ fs-extra@^8.1.0:
26912696
jsonfile "^4.0.0"
26922697
universalify "^0.1.0"
26932698

2699+
fs-extra@^9.0.0:
2700+
version "9.0.0"
2701+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
2702+
integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
2703+
dependencies:
2704+
at-least-node "^1.0.0"
2705+
graceful-fs "^4.2.0"
2706+
jsonfile "^6.0.1"
2707+
universalify "^1.0.0"
2708+
26942709
fs-jetpack@^2.2.3:
26952710
version "2.2.3"
26962711
resolved "https://registry.yarnpkg.com/fs-jetpack/-/fs-jetpack-2.2.3.tgz#75113dcf1e4a9c7c7275732f2b7305656df114c8"
@@ -3979,6 +3994,15 @@ jsonfile@^4.0.0:
39793994
optionalDependencies:
39803995
graceful-fs "^4.1.6"
39813996

3997+
jsonfile@^6.0.1:
3998+
version "6.0.1"
3999+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
4000+
integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
4001+
dependencies:
4002+
universalify "^1.0.0"
4003+
optionalDependencies:
4004+
graceful-fs "^4.1.6"
4005+
39824006
jsprim@^1.2.2:
39834007
version "1.4.1"
39844008
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -4324,9 +4348,9 @@ mixin-deep@^1.2.0:
43244348
is-extendable "^1.0.1"
43254349

43264350
4327-
version "1.0.3"
4328-
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.3.tgz#4cf2e30ad45959dddea53ad97d518b6c8205e1ea"
4329-
integrity sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==
4351+
version "1.0.4"
4352+
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
4353+
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
43304354

43314355
mkdirp@^0.5.0, mkdirp@^0.5.1:
43324356
version "0.5.5"
@@ -5968,31 +5992,36 @@ [email protected]:
59685992
semver "7.x"
59695993
yargs-parser "18.x"
59705994

5971-
ts-morph@^7.0.0:
5972-
version "7.0.1"
5973-
resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-7.0.1.tgz#50ea7b48bf278ac8a9755038fc95de9754d66030"
5974-
integrity sha512-/HghaxCDqBKHWPI+n9/ueT4k5NKTxSsEfJMMUMLybTn7zvi9gcZ8ynnGYrQt5cfl2oapFe/X5VHjLcS1ugV4lg==
5995+
ts-morph@^7.1.0:
5996+
version "7.1.0"
5997+
resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-7.1.0.tgz#cba07079a2dd92a7db2830d66f486764bc32a2ae"
5998+
integrity sha512-BXlOdqTnCH5xQQRBHXfrE69/XTdVVEOoQZwZKdUpvbCrTMInilbUZjv9J8TdhekV/gloq2NqMgeQhIzdPZCiDA==
59755999
dependencies:
59766000
"@dsherret/to-absolute-glob" "^2.0.2"
5977-
"@ts-morph/common" "~0.4.0"
6001+
"@ts-morph/common" "~0.5.0"
59786002
code-block-writer "^10.1.0"
59796003

5980-
ts-node@^8.9.0:
5981-
version "8.9.0"
5982-
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.9.0.tgz#d7bf7272dcbecd3a2aa18bd0b96c7d2f270c15d4"
5983-
integrity sha512-rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w==
6004+
ts-node@^8.10.1:
6005+
version "8.10.1"
6006+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.1.tgz#77da0366ff8afbe733596361d2df9a60fc9c9bd3"
6007+
integrity sha512-bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw==
59846008
dependencies:
59856009
arg "^4.1.0"
59866010
diff "^4.0.1"
59876011
make-error "^1.1.1"
59886012
source-map-support "^0.5.17"
59896013
yn "3.1.1"
59906014

5991-
tslib@^1, tslib@^1.9.0, tslib@^1.9.3:
6015+
tslib@^1.9.0, tslib@^1.9.3:
59926016
version "1.11.1"
59936017
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
59946018
integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
59956019

6020+
tslib@^2.0.0:
6021+
version "2.0.0"
6022+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
6023+
integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
6024+
59966025
tunnel-agent@^0.6.0:
59976026
version "0.6.0"
59986027
resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -6062,10 +6091,10 @@ typedarray-to-buffer@^3.1.5:
60626091
dependencies:
60636092
is-typedarray "^1.0.0"
60646093

6065-
typescript@3.8.x, typescript@~3.8.2:
6066-
version "3.8.3"
6067-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
6068-
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
6094+
typescript@3.9.x, typescript@~3.9.2:
6095+
version "3.9.3"
6096+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
6097+
integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
60696098

60706099
unc-path-regex@^0.1.2:
60716100
version "0.1.2"
@@ -6164,6 +6193,11 @@ universalify@^0.1.0:
61646193
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
61656194
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
61666195

6196+
universalify@^1.0.0:
6197+
version "1.0.0"
6198+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
6199+
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
6200+
61676201
[email protected], unpipe@~1.0.0:
61686202
version "1.0.0"
61696203
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

0 commit comments

Comments
 (0)