Merge branch 'master' into feature/ignore-test-in-lambda-folder

Author: swyxio

README.md

@@ -6,15 +6,15 @@ The goal is to make it easy to write Lambda's with transpiled JS/TypeScript feat
 
 ## Installation
 
-**We recommend installing locally** rather than globally: 
+**We recommend installing locally** rather than globally:
 
 ```bash
 yarn add -D netlify-lambda
 ```
 
 This will ensure your build scripts don't assume a global install which is better for your CI/CD (for example with Netlify's buildbot).
 
-If you don't have a [`netlify.toml`](https://www.netlify.com/docs/netlify-toml-reference/) file, you'll need one ([example](https://github.com/netlify/create-react-app-lambda/blob/master/netlify.toml)). Define the `functions` field where the functions will be built to and served from, e.g. 
+If you don't have a [`netlify.toml`](https://www.netlify.com/docs/netlify-toml-reference/) file, you'll need one ([example](https://github.com/netlify/create-react-app-lambda/blob/master/netlify.toml)). Define the `functions` field where the functions will be built to and served from, e.g.
 
 ```toml
 # example netlify.toml
@@ -45,13 +45,21 @@ folder/hello.js -> http://localhost:9000/.netlify/functions/hello
 
 It also watches your files and restarts the dev server on change. Note: if you add a new file you should kill and restart the process to pick up the new file.
 
-**IMPORTANT**: 
+**IMPORTANT**:
 
 - You need a [`netlify.toml`](https://www.netlify.com/docs/netlify-toml-reference/) file with a `functions` field.
 - Every function needs to be a top-level js/ts/mjs file. You can have subfolders inside the `netlify-lambda` folder, but those are only for supporting files to be imported by your top level function.
 - Function signatures follow the [AWS event handler](https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html) syntax but must be named `handler`. [We use Node v8](https://www.netlify.com/blog/2018/04/03/node.js-8.10-now-available-in-netlify-functions/) so `async` functions **are** supported ([beware common mistakes](https://serverless.com/blog/common-node8-mistakes-in-lambda/)!). Read [Netlify Functions docs](https://www.netlify.com/docs/functions/#javascript-lambda-functions) for more info.
 
 <details>
+<summary><b>Environment variables in build and branch contextx</b>
+
+Read Netlify's [documentation on environment variables](https://www.netlify.com/docs/continuous-deployment/#build-environment-variables).
+`netlify-lambda` should respect the env variables you supply in `netlify.toml` accordingly (except for deploy previews, which make no sense to locally emulate).
+
+However, this is a [relatively new feature](https://github.com/netlify/netlify-lambda/issues/59), so if you encounter issues, file one.
+
+</details>
   <summary>
     <b>Lambda function examples</b>
   </summary>
@@ -106,7 +114,7 @@ When your function is deployed on Netlify, it will be available at `/.netlify/fu
 
 Say you are running `webpack-serve` on port 8080 and `netlify-lambda serve` on port 9000. Mounting `localhost:9000` to `/.netlify/functions/` on your `webpack-serve` server (`localhost:8080/.netlify/functions/`) will closely replicate what the final production environment will look like during development, and will allow you to assume the same function url path in development and in production.
 
-- If you are using with `create-react-app`, see [netlify/create-react-app-lambda](https://github.com/netlify/create-react-app-lambda/blob/f0e94f1d5a42992a2b894bfeae5b8c039a177dd9/src/setupProxy.js) for an example of how to do this with `create-react-app`. [setupProxy is partially documented in the CRA docs](https://facebook.github.io/create-react-app/docs/proxying-api-requests-in-development#configuring-the-proxy-manually). You can also learn how to do this from scratch in a video: https://www.youtube.com/watch?v=3ldSM98nCHI 
+- If you are using with `create-react-app`, see [netlify/create-react-app-lambda](https://github.com/netlify/create-react-app-lambda/blob/f0e94f1d5a42992a2b894bfeae5b8c039a177dd9/src/setupProxy.js) for an example of how to do this with `create-react-app`. [setupProxy is partially documented in the CRA docs](https://facebook.github.io/create-react-app/docs/proxying-api-requests-in-development#configuring-the-proxy-manually). You can also learn how to do this from scratch in a video: https://www.youtube.com/watch?v=3ldSM98nCHI
 - If you are using Gatsby, see [their Advanced Proxying docs](https://www.gatsbyjs.org/docs/api-proxy/#advanced-proxying). This is implemented in the [JAMstack Hackathon Starter](https://github.com/sw-yx/jamstack-hackathon-starter), and here is an accompanying blogpost: [Turning the Static Dynamic: Gatsby + Netlify Functions + Netlify Identity](https://www.gatsbyjs.org/blog/2018-12-17-turning-the-static-dynamic/).
 - If you are using Next.js, see [this issue for how to proxy](https://github.com/netlify/netlify-lambda/pull/28#issuecomment-439675503).
 - If you are using Vue CLI, you may just use https://github.com/netlify/vue-cli-plugin-netlify-lambda/.
@@ -116,12 +124,12 @@ Say you are running `webpack-serve` on port 8080 and `netlify-lambda serve` on p
 
 ```js
 module.exports = {
-  mode: "development",
+  mode: 'development',
   devServer: {
     proxy: {
-      "/.netlify": {
-        target: "http://localhost:9000",
-        pathRewrite: { "^/.netlify/functions": "" }
+      '/.netlify': {
+        target: 'http://localhost:9000',
+        pathRewrite: { '^/.netlify/functions': '' }
       }
     }
   }
@@ -138,7 +146,7 @@ CORS issues when trying to use netlify-lambdas locally with angular? you need to
 Firstly make sure you are using relative paths in your app to ensure that your app will work locally and on Netlify, example below...
 
 ```js
-  this.http.get('/.netlify/functions/jokeTypescript')
+this.http.get('/.netlify/functions/jokeTypescript');
 ```
 
 Then place a `proxy.config.json` file in the root of your project, the contents should look something like...
@@ -175,6 +183,7 @@ To make your life easier you can add these to your `scripts` in `package.json`
 ```
 
 Obviously you need to run up `netlify-lambda` & `angular` at the same time.
+
 </details>
 
 ## Webpack Configuration
@@ -236,6 +245,10 @@ There are additional CLI options:
 -s --static
 ```
 
+### --config option
+
+If you need to use additional webpack modules or loaders, you can specify an additional webpack config with the `-c`/`--config` option when running either `serve` or `build`.
+
 ### --port option
 
 The serving port can be changed with the `-p`/`--port` option.
@@ -244,24 +257,24 @@ The serving port can be changed with the `-p`/`--port` option.
 
 If you need an escape hatch and are building your lambda in some way that is incompatible with our build process, you can skip the build with the `-s` or `--static` flag. [More info here](https://github.com/netlify/netlify-lambda/pull/62).
 
-## Debugging
+## Netlify Identity
 
-To debug lambdas, prepend the `serve` command with [npm's package runner npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) `npx --node-arg=--inspect netlify-lambda serve ...`. Additionally:
+Make sure to [read the docs](https://www.netlify.com/docs/functions/#identity-and-functions) on how Netlify Functions and Netlify Identity work together. Basically you have to make your request with an `authorization` header and a `Bearer` token with your Netlify Identity JWT supplied. You can get this JWT from any of our Identity solutions from [gotrue-js](https://github.com/netlify/gotrue-js) to [netlify-identity-widget](https://github.com/netlify/netlify-identity-widget).
 
-1. make sure that sourcemaps are built along the way (e.g. in the webpack configuration and the `tsconfig.json` if typescript is used) 
-2. webpack's uglification is turned off with `optimization: { minimize: false }`. If using VSCode,  it is likely that the `sourceMapPathOverrides` have to be adapted for breakpoints to work.
+Since for practical purposes we cannot fully emulate Netlify Identity locally, we provide [simple JWT decoding inside the `context` of your function](https://github.com/netlify/netlify-lambda/pull/57). This will give you back the `user` info you need to work with.
 
-Netlify Functions [run in Node v8.10](https://www.netlify.com/blog/2018/04/03/node.js-8.10-now-available-in-netlify-functions/) and you may need to run the same version to mirror the environment locally. Also make sure to check that you aren't [committing one of these common Node 8 mistakes in Lambda!](https://serverless.com/blog/common-node8-mistakes-in-lambda/)
+Minor note: For the `identity` field, since we are not fully emulating Netlify Identity, we can't give you details on the Identity instance, so we give you [unambiguous strings](https://github.com/netlify/netlify-lambda/blob/master/lib/serve.js#L87) so you know not to rely on it locally: `NETLIFY_LAMBDA_LOCALLY_EMULATED_IDENTITY_URL` and `NETLIFY_LAMBDA_LOCALLY_EMULATED_IDENTITY_TOKEN`. In production, of course, Netlify Functions will give you the correct `identity.url` and `identity.token` fields. We find we dont use this info often in our functions so it is not that big of a deal in our judgment.
 
-Don't forget to search our issues in case someone has run into a similar problem you have!
+## Debugging
 
-## Netlify Identity
+To debug lambdas, prepend the `serve` command with [npm's package runner npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) `npx --node-arg=--inspect netlify-lambda serve ...`. Additionally:
 
-Make sure to [read the docs](https://www.netlify.com/docs/functions/#identity-and-functions) on how Netlify Functions and Netlify Identity work together. Basically you have to make your request with an `authorization` header and a `Bearer` token with your Netlify Identity JWT supplied. You can get this JWT from any of our Identity solutions from [gotrue-js](https://github.com/netlify/gotrue-js) to [netlify-identity-widget](https://github.com/netlify/netlify-identity-widget).
+1. make sure that sourcemaps are built along the way (e.g. in the webpack configuration and the `tsconfig.json` if typescript is used)
+2. webpack's uglification is turned off with `optimization: { minimize: false }`. If using VSCode, it is likely that the `sourceMapPathOverrides` have to be adapted for breakpoints to work.
 
-Since for practical purposes we cannot fully emulate Netlify Identity locally, we provide [simple JWT decoding inside the `context` of your function](https://github.com/netlify/netlify-lambda/pull/57). This will give you back the `user` info you need to work with.
+Netlify Functions [run in Node v8.10](https://www.netlify.com/blog/2018/04/03/node.js-8.10-now-available-in-netlify-functions/) and you may need to run the same version to mirror the environment locally. Also make sure to check that you aren't [committing one of these common Node 8 mistakes in Lambda!](https://serverless.com/blog/common-node8-mistakes-in-lambda/)
 
-Minor note: For the `identity` field, since we are not fully emulating Netlify Identity, we can't give you details on the Identity instance, so we give you [unambiguous strings](https://github.com/netlify/netlify-lambda/blob/master/lib/serve.js#L87) so you know not to rely on it locally: `NETLIFY_LAMBDA_LOCALLY_EMULATED_IDENTITY_URL` and `NETLIFY_LAMBDA_LOCALLY_EMULATED_IDENTITY_TOKEN`. In production, of course, Netlify Functions will give you the correct `identity.url` and `identity.token` fields. We find we dont use this info often in our functions so it is not that big of a deal in our judgment.
+Don't forget to search our issues in case someone has run into a similar problem you have!
 
 ## Example functions and Tutorials
 

lib/build.js

@@ -1,32 +1,32 @@
-var fs = require("fs");
-var path = require("path");
-var conf = require("./config");
-var webpack = require("webpack");
-var merge = require("webpack-merge");
+var fs = require('fs');
+var path = require('path');
+var conf = require('./config');
+var webpack = require('webpack');
+var merge = require('webpack-merge');
 
 const testFilePattern = "\\.(test|spec)\\.?";
 
 // custom babel target for each node version
 function getBabelTarget(envConfig) {
-  var key = "AWS_LAMBDA_JS_RUNTIME";
-  var runtimes = ["nodejs8.10", "nodejs4.3.2", "nodejs6.10.3"];
-  var current = envConfig[key] || process.env[key] || "nodejs6.10.3";
+  var key = 'AWS_LAMBDA_JS_RUNTIME';
+  var runtimes = ['nodejs8.15.0', 'nodejs6.10.3'];
+  var current = envConfig[key] || process.env[key] || 'nodejs8.15.0';
   var unknown = runtimes.indexOf(current) === -1;
-  return unknown ? "6.10" : current.replace(/^nodejs/, "");
+  return unknown ? '8.15.0' : current.replace(/^nodejs/, '');
 }
 
 function haveBabelrc(functionsDir) {
   const cwd = process.cwd();
 
   return (
-    fs.existsSync(path.join(cwd, ".babelrc")) ||
-    functionsDir.split("/").reduce((foundBabelrc, dir) => {
+    fs.existsSync(path.join(cwd, '.babelrc')) ||
+    functionsDir.split('/').reduce((foundBabelrc, dir) => {
       if (foundBabelrc) return foundBabelrc;
 
       const indexOf = functionsDir.indexOf(dir);
       const dirToSearch = functionsDir.substr(0, indexOf);
 
-      return fs.existsSync(path.join(cwd, dirToSearch, ".babelrc"));
+      return fs.existsSync(path.join(cwd, dirToSearch, '.babelrc'));
     }, false)
   );
 }
@@ -37,13 +37,13 @@ function webpackConfig(dir, additionalConfig) {
   var babelOpts = { cacheDirectory: true };
   if (!haveBabelrc(dir)) {
     babelOpts.presets = [
-      ["@babel/preset-env", { targets: { node: getBabelTarget(envConfig) } }]
+      ['@babel/preset-env', { targets: { node: getBabelTarget(envConfig) } }]
     ];
 
     babelOpts.plugins = [
-      "@babel/plugin-proposal-class-properties",
-      "@babel/plugin-transform-object-assign",
-      "@babel/plugin-proposal-object-rest-spread"
+      '@babel/plugin-proposal-class-properties',
+      '@babel/plugin-transform-object-assign',
+      '@babel/plugin-proposal-object-rest-spread'
     ];
   }
 
@@ -53,20 +53,25 @@ function webpackConfig(dir, additionalConfig) {
 
   if (dirPath === functionsPath) {
     throw new Error(
-      "Function source and publish folder should be in different locations"
+      `
+      netlify-lambda Error: Function source folder (specified in netlify-lambda serve/build command) 
+      and publish folder (specified in netlify.toml)
+      should be different. 
+      For more info, check https://github.com/netlify/netlify-lambda#usage
+      `
     );
   }
 
   // Include environment variables from config if available
   var defineEnv = {};
   Object.keys(envConfig).forEach(key => {
-    defineEnv["process.env." + key] = JSON.stringify(envConfig[key]);
+    defineEnv['process.env.' + key] = JSON.stringify(envConfig[key]);
   });
 
   var webpackConfig = {
-    mode: "production",
+    mode: 'production',
     resolve: {
-      extensions: [".wasm", ".mjs", ".js", ".json", ".ts"]
+      extensions: ['.wasm', '.mjs', '.js', '.json', '.ts']
     },
     module: {
       rules: [
@@ -76,23 +81,23 @@ function webpackConfig(dir, additionalConfig) {
             `(node_modules|bower_components|${testFilePattern})`
           ),
           use: {
-            loader: "babel-loader",
+            loader: 'babel-loader',
             options: babelOpts
           }
         }
       ]
     },
     context: dirPath,
     entry: {},
-    target: "node",
+    target: 'node',
     plugins: [
       new webpack.IgnorePlugin(/vertx/),
       new webpack.DefinePlugin(defineEnv)
     ],
     output: {
       path: functionsPath,
-      filename: "[name].js",
-      libraryTarget: "commonjs"
+      filename: '[name].js',
+      libraryTarget: 'commonjs'
     },
     devtool: false
   };

lib/config.js

@@ -1,12 +1,12 @@
-var toml = require("toml");
-var fs = require("fs");
-var path = require("path");
+var toml = require('toml');
+var fs = require('fs');
+var path = require('path');
 
 exports.load = function() {
-  var configPath = path.join(process.cwd(), "netlify.toml");
+  var configPath = path.join(process.cwd(), 'netlify.toml');
   if (!fs.existsSync(configPath)) {
     console.error(
-      "No netlify.toml found. This is needed to configure the function settings"
+      'No netlify.toml found. This is needed to configure the function settings. For more info: https://github.com/netlify/netlify-lambda#installation'
     );
     process.exit(1);
   }
@@ -16,16 +16,16 @@ exports.load = function() {
 
 exports.loadContext = function(config) {
   var buildConfig = config.build;
-  var contextConfig = (
-    process.env.CONTEXT &&
-    config.context &&
-    config.context[process.env.CONTEXT]
-  ) || {};
-  var branchConfig = (
-    process.env.BRANCH &&
-    config.context &&
-    config.context[process.env.BRANCH]
-  ) || {};
+  var contextConfig =
+    (process.env.CONTEXT &&
+      config.context &&
+      config.context[process.env.CONTEXT]) ||
+    {};
+  var branchConfig =
+    (process.env.BRANCH &&
+      config.context &&
+      config.context[process.env.BRANCH]) ||
+    {};
   var buildEnv = buildConfig.environment || buildConfig.Environment || {};
   var contextEnv = contextConfig.environment || contextConfig.Environment || {};
   var branchEnv = branchConfig.environment || branchConfig.Environment || {};
@@ -36,7 +36,7 @@ exports.loadContext = function(config) {
     environment: {
       ...buildEnv,
       ...contextEnv,
-      ...branchEnv,
+      ...branchEnv
     }
   };
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify-lambda",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "description": "Build and serve lambda function with webpack compilation",
   "homepage": "https://github.com/netlify/netlify-lambda#readme",
   "main": "bin/cmd.js",