From c8b42bee9db55f3311cf06dfd12d8b3dd581f8b8 Mon Sep 17 00:00:00 2001
From: Mickael Lecoq <m.blacksad@gmail.com>
Date: Tue, 17 Apr 2018 15:20:18 +0200
Subject: [PATCH 1/4] upgrade typescript, types, node and webpack

---
 .../templates/aws-nodejs-typescript/package.json    | 13 +++++++------
 .../templates/aws-nodejs-typescript/serverless.yml  |  2 +-
 .../aws-nodejs-typescript/webpack.config.js         |  6 ++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 525a1e997..f61752221 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -10,13 +10,14 @@
     "source-map-support": "^0.5.0"
   },
   "devDependencies": {
-    "@types/aws-lambda": "0.0.22",
+    "@types/aws-lambda": "8.10.1",
     "@types/node": "^8.0.57",
-    "serverless-webpack": "^4.0.0",
-    "ts-loader": "^2.3.7",
-    "typescript": "^2.5.2",
-    "webpack": "^3.6.0"
+    "serverless-webpack": "^5.1.1",
+    "ts-loader": "^4.2.0",
+    "typescript": "^2.8.1",
+    "webpack": "^4.5.0"
   },
-  "author": "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)",
+  "author":
+    "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)",
   "license": "MIT"
 }
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml
index bb8a2f566..ef04a44b7 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.yml
@@ -7,7 +7,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs6.10
+  runtime: nodejs8.10
 
 functions:
   hello:
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
index 46a0b7e61..f8d4deb08 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
@@ -8,6 +8,7 @@ Object.keys(slsw.lib.entries).forEach(key => (
 ));
 
 module.exports = {
+  mode: 'production',
   entry: entries,
   devtool: 'source-map',
   resolve: {
@@ -26,8 +27,9 @@ module.exports = {
   },
   target: 'node',
   module: {
-    loaders: [
-      { test: /\.ts(x?)$/, loader: 'ts-loader' },
+    rules: [
+      // all files with a `.ts` or `.tsx` extension will be handled by `ts-loader`
+      { test: /\.tsx?$/, loader: 'ts-loader' },
     ],
   },
 };

From 375f72e65755d74756b29edfd87f7ea68f9e1fae Mon Sep 17 00:00:00 2001
From: Mickael Lecoq <m.blacksad@gmail.com>
Date: Tue, 17 Apr 2018 15:42:19 +0200
Subject: [PATCH 2/4] set dev mode for local developments

---
 .../aws-nodejs-typescript/webpack.config.js      | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
index f8d4deb08..482b98431 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
@@ -3,22 +3,16 @@ const slsw = require('serverless-webpack');
 
 const entries = {};
 
-Object.keys(slsw.lib.entries).forEach(key => (
-  entries[key] = ['./source-map-install.js', slsw.lib.entries[key]]
-));
+Object.keys(slsw.lib.entries).forEach(
+  key => (entries[key] = ['./source-map-install.js', slsw.lib.entries[key]])
+);
 
 module.exports = {
-  mode: 'production',
+  mode: slsw.lib.webpack.isLocal ? 'development' : 'production',
   entry: entries,
   devtool: 'source-map',
   resolve: {
-    extensions: [
-      '.js',
-      '.jsx',
-      '.json',
-      '.ts',
-      '.tsx'
-    ]
+    extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'],
   },
   output: {
     libraryTarget: 'commonjs',

From 07cde95deda6d1e5e8cf381eb30cf7ea97171fb2 Mon Sep 17 00:00:00 2001
From: Mickael Lecoq <m.blacksad@gmail.com>
Date: Thu, 10 May 2018 14:42:55 +0200
Subject: [PATCH 3/4] node 8 - compile to es6

---
 .../create/templates/aws-nodejs-typescript/tsconfig.json       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json
index cb07c78d8..a29f8767b 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json
@@ -2,8 +2,7 @@
   "compilerOptions": {
     "sourceMap": true,
     "lib": [
-      "es5",
-      "es2015.promise"
+      "es6"
     ]
   },
   "exclude": [

From 089279478b297b885aef7103ab9477bb33759526 Mon Sep 17 00:00:00 2001
From: Mickael Lecoq <m.blacksad@gmail.com>
Date: Fri, 11 May 2018 11:29:44 +0200
Subject: [PATCH 4/4] fix tsconfig

---
 .../create/templates/aws-nodejs-typescript/tsconfig.json    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json
index a29f8767b..20be6a1c6 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/tsconfig.json
@@ -1,9 +1,11 @@
 {
   "compilerOptions": {
     "sourceMap": true,
+    "target": "es6",
     "lib": [
-      "es6"
-    ]
+      "esnext"
+    ],
+    "moduleResolution": "node"
   },
   "exclude": [
     "node_modules"