From 8a2a0d80138c1155609443fe15ba5ea8207ed774 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Mon, 24 Jun 2019 13:40:37 +0200
Subject: [PATCH] ts es2015 modules, path resolution fixes

---
 app/webpack.config.js                              |  2 +-
 app/webpack.main.config.js                         |  2 +-
 terminus-community-color-schemes/webpack.config.js |  2 +-
 terminus-core/webpack.config.js                    |  2 +-
 terminus-plugin-manager/webpack.config.js          |  2 +-
 terminus-settings/webpack.config.js                |  2 +-
 terminus-ssh/tsconfig0.typings.json                | 14 --------------
 terminus-ssh/webpack.config.js                     |  4 ++--
 terminus-terminal/webpack.config.js                |  2 +-
 tsconfig.json                                      |  3 ++-
 10 files changed, 11 insertions(+), 24 deletions(-)
 delete mode 100644 terminus-ssh/tsconfig0.typings.json

diff --git a/app/webpack.config.js b/app/webpack.config.js
index ead80a99..e3fa00e2 100644
--- a/app/webpack.config.js
+++ b/app/webpack.config.js
@@ -14,7 +14,7 @@ module.exports = {
      minimize: false,
   },
   context: __dirname,
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,
diff --git a/app/webpack.main.config.js b/app/webpack.main.config.js
index f2aa9be6..fab72b87 100644
--- a/app/webpack.main.config.js
+++ b/app/webpack.main.config.js
@@ -9,7 +9,7 @@ module.exports = {
   },
   mode: process.env.TERMINUS_DEV ? 'development' : 'production',
   context: __dirname,
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   output: {
     path: path.join(__dirname, 'dist'),
     pathinfo: true,
diff --git a/terminus-community-color-schemes/webpack.config.js b/terminus-community-color-schemes/webpack.config.js
index b33336aa..b407a9fb 100644
--- a/terminus-community-color-schemes/webpack.config.js
+++ b/terminus-community-color-schemes/webpack.config.js
@@ -4,7 +4,7 @@ const webpack = require('webpack')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   context: __dirname,
   output: {
     path: path.resolve(__dirname, 'dist'),
diff --git a/terminus-core/webpack.config.js b/terminus-core/webpack.config.js
index 2efe50a8..294ac4e1 100644
--- a/terminus-core/webpack.config.js
+++ b/terminus-core/webpack.config.js
@@ -4,7 +4,7 @@ const webpack = require('webpack')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   context: __dirname,
   mode: 'development',
   output: {
diff --git a/terminus-plugin-manager/webpack.config.js b/terminus-plugin-manager/webpack.config.js
index 561e2331..a15b8010 100644
--- a/terminus-plugin-manager/webpack.config.js
+++ b/terminus-plugin-manager/webpack.config.js
@@ -4,7 +4,7 @@ const webpack = require('webpack')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   context: __dirname,
   output: {
     path: path.resolve(__dirname, 'dist'),
diff --git a/terminus-settings/webpack.config.js b/terminus-settings/webpack.config.js
index 35d71c51..e53cda9b 100644
--- a/terminus-settings/webpack.config.js
+++ b/terminus-settings/webpack.config.js
@@ -4,7 +4,7 @@ const webpack = require('webpack')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   context: __dirname,
   mode: 'development',
   output: {
diff --git a/terminus-ssh/tsconfig0.typings.json b/terminus-ssh/tsconfig0.typings.json
deleted file mode 100644
index c0d2273c..00000000
--- a/terminus-ssh/tsconfig0.typings.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig.json",
-  "exclude": ["node_modules", "dist", "typings"],
-  "compilerOptions": {
-    "baseUrl": "src",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationDir": "./typings",
-    "paths": {
-      "terminus-*": ["../../terminus-*"],
-      "*": ["../../app/node_modules/*"]
-    }
-  }
-}
diff --git a/terminus-ssh/webpack.config.js b/terminus-ssh/webpack.config.js
index 047cf10b..bf5efa9a 100644
--- a/terminus-ssh/webpack.config.js
+++ b/terminus-ssh/webpack.config.js
@@ -3,7 +3,7 @@ const path = require('path')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   context: __dirname,
   output: {
     path: path.resolve(__dirname, 'dist'),
@@ -18,7 +18,7 @@ module.exports = {
   },
   resolve: {
     modules: ['.', 'src', 'node_modules', '../app/node_modules'].map(x => path.join(__dirname, x)),
-    extensions: ['.ts', '.js'],
+    extensions: ['.ts', '.js']
   },
   module: {
     rules: [
diff --git a/terminus-terminal/webpack.config.js b/terminus-terminal/webpack.config.js
index 5eae9711..e2fd2181 100644
--- a/terminus-terminal/webpack.config.js
+++ b/terminus-terminal/webpack.config.js
@@ -4,7 +4,7 @@ const webpack = require('webpack')
 module.exports = {
   target: 'node',
   entry: 'src/index.ts',
-  devtool: 'eval-source-map',
+  devtool: 'source-map',
   context: __dirname,
   output: {
     path: path.resolve(__dirname, 'dist'),
diff --git a/tsconfig.json b/tsconfig.json
index 52236958..4bb34072 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "module": "commonjs",
+    "module": "es2015",
     "target": "es2016",
+    "moduleResolution": "node",
     "noImplicitAny": false,
     "removeComments": false,
     "emitDeclarationOnly": false,