fix node refs in tsconfig

gulpfile.js

@@ -24,18 +24,12 @@ function webfonts() {
         .pipe(gulp.dest(paths.cssDir));
 };
 
-function cleanupNodeTypes() {
-    return del(['./jslib/node_modules/@types/node/']);
-}
-
 function version() {
     fs.writeFileSync(paths.build + 'version.json', '{"version":"' + package.version + '"}');
 }
 
 gulp.task('clean', clean);
 gulp.task('webfonts', ['clean'], webfonts);
-gulp.task('cleanupNodeTypes', cleanupNodeTypes);
 gulp.task('prebuild', ['webfonts']);
-gulp.task('prebuild:prod', ['prebuild', 'cleanupNodeTypes']);
 gulp.task('version', version);
 gulp.task('postdist', ['version']);

package-lock.json

@@ -3910,7 +3910,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3931,12 +3932,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3951,17 +3954,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4078,7 +4084,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4090,6 +4097,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4104,6 +4112,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4111,12 +4120,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4135,6 +4146,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4215,7 +4227,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4227,6 +4240,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4312,7 +4326,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4348,6 +4363,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4367,6 +4383,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4410,12 +4427,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

package.json

@@ -8,12 +8,12 @@
     "postinstall": "npm run sub:init",
     "build": "gulp prebuild && webpack --config webpack.config.js",
     "build:watch": "gulp prebuild && webpack-serve --config webpack.config.js",
-    "build:prod": "gulp prebuild:prod && cross-env NODE_ENV=production webpack --config webpack.config.js",
-    "build:prod:watch": "gulp prebuild:prod && cross-env NODE_ENV=production webpack-serve --config webpack.config.js",
+    "build:prod": "gulp prebuild && cross-env NODE_ENV=production webpack --config webpack.config.js",
+    "build:prod:watch": "gulp prebuild && cross-env NODE_ENV=production webpack-serve --config webpack.config.js",
     "build:selfhost": "gulp prebuild && cross-env SELF_HOST=true webpack-serve --config webpack.config.js",
     "build:selfhost:watch": "gulp prebuild && cross-env SELF_HOST=true webpack-serve --config webpack.config.js",
-    "build:selfhost:prod": "gulp prebuild:prod && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
-    "build:selfhost:prod:watch": "gulp prebuild:prod && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
+    "build:selfhost:prod": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
+    "build:selfhost:prod:watch": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
     "clean:l10n": "git push origin --delete l10n_master",
     "dist": "npm run build:prod && gulp postdist",
     "dist:selfhost": "npm run build:selfhost:prod && gulp postdist",
@@ -26,7 +26,6 @@
     "@ngtools/webpack": "^6.2.1",
     "@types/jquery": "^3.3.6",
     "@types/lunr": "^2.1.6",
-    "@types/node": "8.0.19",
     "@types/node-forge": "^0.7.5",
     "@types/papaparse": "^4.5.3",
     "@types/webcrypto": "^0.0.28",

tsconfig.json

@@ -15,7 +15,8 @@
       "jslib/*": [ "jslib/src/*" ],
       "@angular/*": [ "node_modules/@angular/*" ],
       "angular2-toaster": [ "node_modules/angular2-toaster" ],
-      "angulartics2": [ "node_modules/angulartics2" ]
+      "angulartics2": [ "node_modules/angulartics2" ],
+      "node": [ "node_modules/@types/node" ],
     }
   },
   "exclude": [