From c2ecc3f602325922f80ac9733018f18e8f4013e2 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Wed, 7 Aug 2019 00:47:13 +0100
Subject: [PATCH] Auto-types for lab manager

When `types` is not defined in tsconfig, all types from `@types` will be autodetected by Typescript.
---
 examples/web3/package.json                |  2 +-
 examples/web3/tsconfig.json               |  1 -
 packages/html-manager/package.json        |  2 +-
 packages/html-manager/tsconfig.json       |  3 +--
 packages/jupyterlab-manager/package.json  |  1 +
 packages/jupyterlab-manager/tsconfig.json |  1 -
 tsconfigbase.json                         |  3 +--
 yarn.lock                                 | 10 +++++-----
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/examples/web3/package.json b/examples/web3/package.json
index f470caf24e..3105fdf542 100644
--- a/examples/web3/package.json
+++ b/examples/web3/package.json
@@ -25,7 +25,7 @@
   },
   "devDependencies": {
     "@types/codemirror": "^0.0.74",
-    "@types/requirejs": "^2.1.31",
+    "@types/node": "^12.7.0",
     "css-loader": "^3.4.0",
     "file-loader": "^5.0.2",
     "fs-extra": "^8.0.1",
diff --git a/examples/web3/tsconfig.json b/examples/web3/tsconfig.json
index 8489175c09..a1e4ba13c4 100644
--- a/examples/web3/tsconfig.json
+++ b/examples/web3/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfigbase",
   "compilerOptions": {
-    "types": ["requirejs"],
     "outDir": "lib",
     "rootDir": "src"
   },
diff --git a/packages/html-manager/package.json b/packages/html-manager/package.json
index 98d3220386..65cdb3a6ac 100644
--- a/packages/html-manager/package.json
+++ b/packages/html-manager/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@types/mocha": "^5.2.7",
-    "@types/requirejs": "^2.1.31",
+    "@types/node": "^12.7.0",
     "chai": "^4.0.0",
     "css-loader": "^3.4.0",
     "file-loader": "^5.0.2",
diff --git a/packages/html-manager/tsconfig.json b/packages/html-manager/tsconfig.json
index cda8dbbde7..595ecec080 100644
--- a/packages/html-manager/tsconfig.json
+++ b/packages/html-manager/tsconfig.json
@@ -2,8 +2,7 @@
   "extends": "../../tsconfigbase",
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src",
-    "types": ["requirejs"]
+    "rootDir": "src"
   },
   "include": ["src/*"],
   "references": [
diff --git a/packages/jupyterlab-manager/package.json b/packages/jupyterlab-manager/package.json
index 1ea0110424..05ca3f498c 100644
--- a/packages/jupyterlab-manager/package.json
+++ b/packages/jupyterlab-manager/package.json
@@ -61,6 +61,7 @@
   },
   "devDependencies": {
     "@jupyterlab/cells": "^2.0.0-beta.2",
+    "@types/node": "^12.7.0",
     "@types/semver": "^6.0.1",
     "rimraf": "^2.6.1",
     "typedoc": "^0.15.6",
diff --git a/packages/jupyterlab-manager/tsconfig.json b/packages/jupyterlab-manager/tsconfig.json
index e17b2729c6..b452205fa4 100644
--- a/packages/jupyterlab-manager/tsconfig.json
+++ b/packages/jupyterlab-manager/tsconfig.json
@@ -3,7 +3,6 @@
   "compilerOptions": {
     "outDir": "lib",
     "rootDir": "src",
-    "types": ["node"]
   },
   "include": ["src/**/*"],
   "references": [
diff --git a/tsconfigbase.json b/tsconfigbase.json
index 6af4fa5456..2af02be7c2 100644
--- a/tsconfigbase.json
+++ b/tsconfigbase.json
@@ -15,7 +15,6 @@
     "preserveWatchOutput": true,
     "resolveJsonModule": true,
     "strictNullChecks": true,
-    "target": "es2017",
-    "types": []
+    "target": "es2017"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5f4f06cf2e..104f53d0b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1609,6 +1609,11 @@
   resolved "https://registry.npmjs.org/@types/node/-/node-12.12.22.tgz#b8d9eae3328b96910a373cf06ac8d3c5abe9c200"
   integrity sha512-r5i93jqbPWGXYXxianGATOxTelkp6ih/U0WVnvaqAvTqM+0U6J3kw6Xk6uq/dWNRkEVw/0SLcO5ORXbVNz4FMQ==
 
+"@types/node@^12.7.0":
+  version "12.7.0"
+  resolved "https://registry.npmjs.org/@types/node/-/node-12.7.0.tgz#545dde2a1a5c27d281cfb8308d6736e0708f5d6c"
+  integrity sha512-vqcj1MVm2Sla4PpMfYKh1MyDN4D2f/mPIZD7RdAGqEsbE+JxfeqQHHVbRDQ0Nqn8i73gJa1HQ1Pu3+nH4Q0Yiw==
+
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -1622,11 +1627,6 @@
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
-"@types/requirejs@^2.1.31":
-  version "2.1.31"
-  resolved "https://registry.npmjs.org/@types/requirejs/-/requirejs-2.1.31.tgz#a24eaa0ee4f6b84feb8f521ca6550d48490b2bc6"
-  integrity sha512-b2soeyuU76rMbcRJ4e0hEl0tbMhFwZeTC0VZnfuWlfGlk6BwWNsev6kFu/twKABPX29wkX84wU2o+cEJoXsiTw==
-
 "@types/semver@^6.0.1":
   version "6.2.0"
   resolved "https://registry.npmjs.org/@types/semver/-/semver-6.2.0.tgz#d688d574400d96c5b0114968705366f431831e1a"