Skip to content

Commit

Permalink
Fixed deprecated typescript config conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
SimplyBoo committed May 26, 2020
1 parent f4ecfe1 commit bbf5132
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"prettier": "^1.18.2",
"ts-node": "^8.5.4",
"tslib": "^1.10.0",
"typescript": "^3.5.3",
"typescript": "3.8.2",
"typescript-json-schema": "^0.39.0"
}
}
3 changes: 2 additions & 1 deletion server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"rootDir": "src",
"outDir": "dist",
"target": "es2018",
"importHelpers": false
"importHelpers": false,
"incremental": false
},
"include": ["src/**/*.ts", "types/*.ts"]
}
7 changes: 6 additions & 1 deletion server/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2728,7 +2728,12 @@ typescript-json-schema@^0.39.0:
typescript "^3.5.1"
yargs "^13.2.4"

typescript@^3.5.1, typescript@^3.5.3:
[email protected]:
version "3.8.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz#91d6868aaead7da74f493c553aeff76c0c0b1d5a"
integrity sha512-EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==

typescript@^3.5.1:
version "3.9.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a"
integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==
Expand Down

0 comments on commit bbf5132

Please sign in to comment.