Merge remote-tracking branch 'upstream/master'

.eslintrc

@@ -48,3 +48,4 @@ rules:
   lodash/preferred-alias: off
   lodash/prop-shorthand: off
   lodash/prefer-lodash-method: [ error, { ignoreObjects: [ BbPromise, path ] } ]
+  max-len: [ error, { code: 120, ignoreStrings: true, ignoreComments: true, ignoreTemplateLiterals: true } ]

.lintstagedrc.yml

@@ -1,5 +1,4 @@
-linters:
-  "*.js":
-    - "prettier-eslint --write"             # Run Prettier
-    - "eslint"                              # Run TSLint
-    - "git add"
+"*.js":
+  - "prettier-eslint --write"             # Run Prettier
+  - "eslint"                              # Run TSLint
+  - "git add"

examples/typescript/.babelrc

@@ -0,0 +1,13 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "current"
+        }
+      }
+    ],
+    ["@babel/preset-typescript"]
+  ]
+}

examples/typescript/.gitignore

@@ -0,0 +1,3 @@
+node_modules
+.webpack
+.webpackCache

examples/typescript/package.json

@@ -9,10 +9,16 @@
   "author": "Nicola Peduzzi <thenikso@gmail.com> (http://nikso.net)",
   "license": "MIT",
   "devDependencies": {
-    "serverless": "^1.23.0",
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/preset-typescript": "^7.3.3",
+    "babel-loader": "^8.0.6",
+    "cache-loader": "^4.1.0",
+    "fork-ts-checker-webpack-plugin": "^1.4.3",
+    "serverless": "^1.49.0",
     "serverless-webpack": "file:../../",
-    "ts-loader": "^2.3.7",
-    "typescript": "^2.5.3",
-    "webpack": "^3.8.1"
+    "typescript": "^3.5.3",
+    "webpack": "^4.38.0",
+    "webpack-node-externals": "^1.7.2"
   }
 }

examples/typescript/serverless.yml

@@ -1,18 +1,31 @@
 service: serverless-webpack-typescript-example
-
+package:
+  individually: true
 # Add the serverless-webpack plugin
 plugins:
   - serverless-webpack
 
 provider:
   name: aws
-  runtime: nodejs6.10
+  runtime: nodejs10.x
 
 functions:
   hello:
-    handler: handler.hello
+    handler: src/handler.hello
     events:
       - http:
           method: get
           path: hello
           integration: lambda
+  goodbye:
+    handler: src/handler2.goodbye
+    events:
+      - http:
+          method: get
+          path: goodbye
+          integration: lambda
+custom:
+  webpack:
+    webpackConfig: 'webpack.config.js'
+    packager: 'yarn'
+    includeModules: true

examples/typescript/src/handler2.ts

@@ -0,0 +1,3 @@
+export const goodbye = (event, context, cb) => cb(null,
+  { message: 'Goodbye Serverless Webpack (Typescript) v1.0! Your function executed successfully!', event }
+);

examples/typescript/tsconfig.json

@@ -1,12 +1,17 @@
 {
   "compilerOptions": {
-    "sourceMap": true,
-    "lib": [
-      "es5",
-      "es6",
-      "dom",
-      "es2015",
-      "esnext.asynciterable"
-    ]
+    "preserveConstEnums": true,
+    "strictNullChecks": true,
+    "inlineSources": true,
+    "inlineSourceMap": true,
+    "sourceRoot": "/",
+    "target": "es2017",
+    "outDir": ".build",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "lib": ["es2017"],
+    "rootDir": "./src",
+    "resolveJsonModule": true
   }
 }

examples/typescript/webpack.config.js

@@ -1,32 +1,42 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
+const nodeExternals = require('webpack-node-externals');
 const slsw = require('serverless-webpack');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+
+const isLocal = slsw.lib.webpack.isLocal;
 
 module.exports = {
+  mode: isLocal ? 'development' : 'production',
   entry: slsw.lib.entries,
+  externals: [nodeExternals()],
+  devtool: 'source-map',
   resolve: {
-    extensions: [
-      '.js',
-      '.json',
-      '.ts',
-      '.tsx'
-    ]
+    extensions: [ '.js', '.jsx', '.json', '.ts', '.tsx' ]
   },
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.join(__dirname, '.webpack'),
     filename: '[name].js'
   },
   target: 'node',
   module: {
     rules: [
       {
-        test: /\.ts(x?)$/,
+        // Include ts, tsx, js, and jsx files.
+        test: /\.(ts|js)x?$/,
+        exclude: /node_modules/,
         use: [
           {
-            loader: 'ts-loader'
-          }
-        ],
+            loader: 'cache-loader',
+            options: {
+              cacheDirectory: path.resolve('.webpackCache')
+            }
+          },
+          'babel-loader'
+        ]
       }
     ]
-  }
+  },
+  plugins: [new ForkTsCheckerWebpackPlugin()]
 };