diff --git a/Makefile b/Makefile index dc1f3e5a31..69c7681fa5 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ analyze-go: test-js: export NODE_PATH = ./frontend test-js: - _mocha --compilers js:babel-core/register,tsx:typescript-require \ + _mocha --compilers js:babel-core/register \ --recursive "frontend/**/*.tests.js*" \ --require ignore-styles \ --require "frontend/.test.setup.js" \ diff --git a/package.json b/package.json index ca1e41b9bc..cbcbdfdf23 100644 --- a/package.json +++ b/package.json @@ -108,8 +108,7 @@ "tslint": "5.10.0", "tslint-eslint-rules": "^5.4.0", "tslint-react": "3.6.0", - "typescript": "^3.5.3", - "typescript-require": "0.2.10", + "typescript": "^3.9.6", "url-loader": "^2.1.0", "webpack": "^4.37.0", "webpack-cli": "^3.3.6", diff --git a/yarn.lock b/yarn.lock index 5f07da1751..88f5075395 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8340,22 +8340,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript-require@0.2.10: - version "0.2.10" - resolved "https://registry.yarnpkg.com/typescript-require/-/typescript-require-0.2.10.tgz#8c8ee2aa75f3530b560b849c2927cd3697eba68e" - integrity sha1-jI7iqnXzUwtWC4ScKSfNNpfrpo4= - dependencies: - typescript "^1.5.3" - -typescript@^1.5.3: - version "1.8.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-1.8.10.tgz#b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e" - integrity sha1-tHXW4N/wv1DyluXKbvn7tccyDx4= - -typescript@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977" - integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g== +typescript@^3.9.6: + version "3.9.6" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a" + integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw== ua-parser-js@^0.7.18: version "0.7.20"