7 files changed, 103 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
index b09745150..a10427aad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -349,4 +349,3 @@ server*.log
 /src/internal-server/public/privacy.html
 
 /src/internal-server/user_data/
-.tstmp/
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 08cc34b63..1f3c42a3d 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -14,6 +14,7 @@ import sassVariables from 'gulp-sass-variables';
 import { removeSync, outputJson } from 'fs-extra';
 import kebabCase from 'kebab-case';
 import hexRgb from 'hex-rgb';
+import ts from 'gulp-typescript';
 
 import * as buildInfo from 'preval-build-info';
 import config from './package.json';
@@ -29,6 +30,8 @@ const isDevBuild = process.env.NODE_ENV === 'development';
 
 const getTargetEnv = isDevBuild ? 'development' : 'production';
 
+const tsProject = ts.createProject('tsconfig.json');
+
 const styleConfig = Object.keys(rawStyleConfig).map(key => {
   const isHex = /^#[0-9A-F]{6}$/i.test(rawStyleConfig[key]);
   return {
@@ -67,7 +70,7 @@ const paths = {
     src: 'src/styles/vertical.scss',
     dest: 'build/styles',
   },
-  scripts: {
+  javascripts: {
     src: 'src/**/*.js',
     dest: 'build/',
     watch: [
@@ -75,6 +78,14 @@ const paths = {
       'src/**/*.js',
     ],
   },
+  typescripts: {
+    src: 'src/**/*.ts',
+    dest: 'build/',
+    watch: [
+      // 'packages/**/*.ts',
+      'src/**/*.ts',
+    ],
+  },
   packages: {
     watch: 'packages/**/*',
     // dest: 'build/',
@@ -121,9 +132,11 @@ export function mvSrc() {
       [
         `${paths.src}/*`,
         `${paths.src}/*/**`,
-        `!${paths.scripts.watch[1]}`,
+        `!${paths.javascripts.watch[1]}`,
+        `!${paths.typescripts.watch[1]}`,
         `!${paths.src}/styles/**`,
         `!${paths.src}/**/*.js`,
+        `!${paths.src}/**/*.ts`,
       ],
       { since: gulp.lastRun(mvSrc) },
     )
@@ -226,16 +239,39 @@ export function verticalStyle() {
     .pipe(connect.reload());
 }
 
-export function scripts() {
+export function processJavascripts() {
   return gulp
-    .src(paths.scripts.src, { since: gulp.lastRun(scripts) })
+    .src(
+      [
+        paths.javascripts.src,
+      ],
+      { since: gulp.lastRun(processJavascripts) })
+    .pipe(
+      babel({
+        comments: false,
+      }),
+    )
+    .pipe(gulpIf(!isDevBuild, uglify())) // Only uglify in production to speed up dev builds
+    .pipe(gulp.dest(paths.javascripts.dest))
+    .pipe(connect.reload());
+}
+
+export function processTypescripts() {
+  return gulp
+    .src(
+      [
+        paths.typescripts.src,
+      ],
+      { since: gulp.lastRun(processTypescripts) })
+    .pipe(tsProject())
+    .js
     .pipe(
       babel({
         comments: false,
       }),
     )
     .pipe(gulpIf(!isDevBuild, uglify())) // Only uglify in production to speed up dev builds
-    .pipe(gulp.dest(paths.scripts.dest))
+    .pipe(gulp.dest(paths.typescripts.dest))
     .pipe(connect.reload());
 }
 
@@ -244,9 +280,10 @@ export function watch() {
   gulp.watch(paths.styles.watch, styles);
   gulp.watch(paths.verticalStyle.src, verticalStyle);
 
-  gulp.watch([paths.src, `${paths.scripts.src}`, `${paths.styles.src}`], mvSrc);
+  gulp.watch([paths.src, `${paths.javascripts.src}`, `${paths.styles.src}`], mvSrc);
 
-  gulp.watch(paths.scripts.watch, scripts);
+  gulp.watch(paths.javascripts.watch, processJavascripts);
+  gulp.watch(paths.typescripts.watch, processTypescripts);
 }
 
 export function webserver() {
@@ -270,7 +307,7 @@ export function recipeInfo() {
 const build = gulp.series(
   clean,
   gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages, exportBuildInfo),
-  gulp.parallel(html, scripts, styles, verticalStyle, recipes, recipeInfo),
+  gulp.parallel(html, processJavascripts, processTypescripts, styles, verticalStyle, recipes, recipeInfo),
 );
 export { build };
 
diff --git a/package-lock.json b/package-lock.json
index 2f6528b27..41afd1f19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9315,7 +9315,8 @@
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "buffer-indexof": {
       "version": "1.1.1",
@@ -16523,6 +16524,44 @@
         "through2": "^2.0.1"
       }
     },
+    "gulp-typescript": {
+      "version": "6.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-6.0.0-alpha.1.tgz",
+      "integrity": "sha512-KoT0TTfjfT7w3JItHkgFH1T/zK4oXWC+a8xxKfniRfVcA0Fa1bKrIhztYelYmb+95RB80OLMBreknYkdwzdi2Q==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1",
+        "plugin-error": "^1.0.1",
+        "source-map": "^0.7.3",
+        "through2": "^3.0.1",
+        "vinyl": "^2.2.0",
+        "vinyl-fs": "^3.0.3"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
+        },
+        "through2": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+          "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.4",
+            "readable-stream": "2 || 3"
+          }
+        }
+      }
+    },
     "gulp-uglify": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
@@ -27286,6 +27325,7 @@
       "version": "0.5.19",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
       "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -27294,7 +27334,8 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
@@ -28259,6 +28300,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz",
       "integrity": "sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==",
+      "dev": true,
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -28268,7 +28310,8 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
diff --git a/package.json b/package.json
index 71b65c6ff..ce13d3c1e 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,6 @@
     "sqlite3": "5.0.0",
     "tar": "4.4.15",
     "targz": "1.0.1",
-    "terser": "4.4.0",
     "tslib": "2.3.0",
     "useragent-generator": "1.1.1-amkt-22079-finish.0",
     "uuid": "3.3.3",
@@ -186,11 +185,12 @@
     "gulp-babel": "8.0.0",
     "gulp-cli": "2.3.0",
     "gulp-connect": "5.7.0",
-    "gulp-sass": "5.0.0",
-    "gulp-sass-variables": "1.2.0",
     "gulp-csso": "4.0.1",
     "gulp-htmlmin": "5.0.1",
     "gulp-if": "3.0.0",
+    "gulp-sass": "5.0.0",
+    "gulp-sass-variables": "1.2.0",
+    "gulp-typescript": "6.0.0-alpha.1",
     "gulp-uglify": "3.0.2",
     "hex-rgb": "3.0.0",
     "html-webpack-plugin": "4.5.2",
@@ -206,6 +206,7 @@
     "react-intl-translations-manager": "5.0.3",
     "sass": "1.37.5",
     "simple-git": "2.42.0",
+    "terser": "4.4.0",
     "ts-loader": "5.4.5",
     "typescript": "3.9.10",
     "webpack": "4.46.0",
diff --git a/src/helpers/url-helpers.js b/src/helpers/url-helpers.ts
index b0dc9afbb..23e8fab29 100644
--- a/src/helpers/url-helpers.js
+++ b/src/helpers/url-helpers.ts
@@ -8,8 +8,8 @@ import { ALLOWED_PROTOCOLS } from '../config';
 
 const debug = require('debug')('Ferdi:Helpers:url');
 
-export function isValidExternalURL(url) {
-  let parsedUrl;
+export function isValidExternalURL(url: string) {
+  let parsedUrl: URL;
   try {
     parsedUrl = new URL(url);
   } catch (_) {
@@ -23,13 +23,13 @@ export function isValidExternalURL(url) {
   return isAllowed;
 }
 
-export async function openPath(folderName) {
+export async function openPath(folderName: string) {
   ensureDirSync(folderName);
   shell.openPath(folderName);
 }
 
 // TODO: Need to verify and fix/remove the skipping logic. Ideally, we should never skip this check
-export function openExternalUrl(url, skipValidityCheck = false) {
+export function openExternalUrl(url: string, skipValidityCheck: boolean = false) {
   if (skipValidityCheck || isValidExternalURL(url)) {
     shell.openExternal(url);
   }
diff --git a/tsconfig.json b/tsconfig.json
index 46e0e6cfa..2676f392d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.settings.json",
   "compilerOptions": {
-    "outDir": ".tstmp",
+    "outDir": ".tmp",
     "rootDir": "./"
-  },
+  }
 }
diff --git a/tsconfig.settings.json b/tsconfig.settings.json
index 67153089e..59e520710 100644
--- a/tsconfig.settings.json
+++ b/tsconfig.settings.json
@@ -6,6 +6,8 @@
     "lib": ["es2015", "es2017", "dom"],
     "jsx": "react",
     "typeRoots": ["node_modules/@types"],
+    "moduleResolution": "node",
+    "types": ["node"],
     "sourceMap": true,
     "noImplicitAny": false,   // TODO: Need to switch
     "allowSyntheticDefaultImports": true,
@@ -21,9 +23,5 @@
     "noImplicitReturns": true,
     "noImplicitThis": true,
     "preserveConstEnums": true,
-    // "exclude": [
-    //   "node_modules",
-    //   "**/*.spec.ts"
-    // ]
   }
 }