Merge pull request #179 from franciscocpg/examples-minor-improvements

Examples minor improvements
serverless-heaven · Aug 3, 2017 · cf51110 · cf51110
2 parents 1a116f4 + a7045b2
commit cf51110
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/examples/babel-dynamically-entries/serverless.yml b/examples/babel-dynamically-entries/serverless.yml
@@ -6,7 +6,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
 
 functions:
   first:

diff --git a/examples/babel-multiple-statically-entries/serverless.yml b/examples/babel-multiple-statically-entries/serverless.yml
@@ -6,7 +6,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
 
 functions:
   first:

diff --git a/examples/babel/serverless.yml b/examples/babel/serverless.yml
@@ -6,7 +6,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
 
 functions:
   hello:

diff --git a/examples/include-external-npm-packages/serverless.yml b/examples/include-external-npm-packages/serverless.yml
@@ -6,7 +6,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
 
 custom:
   webpackIncludeModules: true # enable auto including modules

diff --git a/examples/multiple-statically-entries/serverless.yml b/examples/multiple-statically-entries/serverless.yml
@@ -6,7 +6,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
 
 functions:
   first:

diff --git a/examples/typescript/serverless.yml b/examples/typescript/serverless.yml
@@ -6,7 +6,7 @@ plugins:
 
 provider:
   name: aws
-  runtime: nodejs4.3
+  runtime: nodejs6.10
 
 functions:
   hello:

diff --git a/examples/typescript/webpack.config.js b/examples/typescript/webpack.config.js
@@ -1,11 +1,12 @@
 var path = require('path');
+const slsw = require('serverless-webpack');
 
 module.exports = {
-  entry: './handler.ts',
+  entry: slsw.lib.entries,
   output: {
     libraryTarget: 'commonjs',
     path: path.join(__dirname, '.webpack'),
-    filename: 'handler.js'
+    filename: '[name].js'
   },
   target: 'node',
   module: {

diff --git a/examples/typescript/yarn.lock b/examples/typescript/yarn.lock
@@ -906,7 +906,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob@^7.0.5:
+glob@^7.0.5, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
@@ -1801,12 +1801,13 @@ [email protected]:
     send "0.15.3"
 
 "serverless-webpack@file:../../":
-  version "2.0.0"
+  version "2.2.0"
   dependencies:
     bluebird "^3.4.0"
     body-parser "^1.15.2"
     express "^4.14.0"
     fs-extra "^0.26.7"
+    glob "^7.1.2"
     lodash "^4.17.4"
     npm-programmatic "0.0.5"
     ts-node "^3.2.0"