Merge branch 'master' into remove-warning

README.md

@@ -99,7 +99,7 @@ A basic Webpack promise configuration might look like this:
 const webpack = require('webpack')
 const slsw = require('serverless-webpack');
 
-module.exports = async () => {
+module.exports = (async () => {
   const accountId = await slsw.lib.serverless.providers.aws.getAccountId();
   return {
     entry: './handler.js',
@@ -113,7 +113,7 @@ module.exports = async () => {
       loaders: [ ... ]
     }
   };
-}();
+})();
 ```
 ```js
 // Version with promises
@@ -184,6 +184,8 @@ module.exports = {
 The lib export also provides the `serverless` and `options` properties, through
 which you can access the Serverless instance and the options given on the command-line.
 
+The current stage e.g is accessible through `slsw.lib.options.stage`
+
 This enables you to have a fully customized dynamic configuration, that can evaluate
 anything available in the Serverless framework. There are really no limits.
 
@@ -228,7 +230,7 @@ const path = require('path');
 module.exports = {
   // ...
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.resolve(__dirname, '.webpack'),
     filename: '[name].js',
   },
@@ -450,6 +452,23 @@ custom:
 
 This is also useful for projects that use TypeScript.
 
+#### Keep output directory after packaging
+
+You can keep the output directory (defaults to `.webpack`) from being removed
+after build.
+
+Just add `keepOutputDirectory: true`
+
+```yaml
+# serverless.yml
+custom:
+  webpack:
+    keepOutputDirectory: true
+```
+
+This can be useful, in case you want to upload the source maps to your Error
+reporting system, or just have it available for some post processing.
+
 #### Examples
 
 You can find an example setups in the [`examples`][link-examples] folder.

examples/babel-multiple-statically-entries/webpack.config.js

@@ -21,7 +21,7 @@ module.exports = {
     ]
   },
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.join(__dirname, '.webpack'),
     filename: '[name].js'
   }

examples/babel/serverless.yml

@@ -1,4 +1,4 @@
-service: babel-dynamically-entries-example
+service: babel-example
 
 # Add the serverless-webpack plugin
 plugins:

examples/babel/webpack.config.js

@@ -18,7 +18,7 @@ module.exports = {
     ]
   },
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.join(__dirname, '.webpack'),
     filename: '[name].js'
   }

examples/multiple-statically-entries/webpack.config.js

@@ -16,7 +16,7 @@ module.exports = {
   },
   target: 'node',
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.join(__dirname, '.webpack'),
     filename: '[name].js'
   },

examples/serverless-offline/webpack.config.js

@@ -7,7 +7,7 @@ module.exports = {
   target: 'node',
   externals: [nodeExternals()],
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.join(__dirname, '.webpack'),
     filename: '[name].js'
   },

examples/typescript/webpack.config.js

@@ -12,7 +12,7 @@ module.exports = {
     ]
   },
   output: {
-    libraryTarget: 'commonjs',
+    libraryTarget: 'commonjs2',
     path: path.join(__dirname, '.webpack'),
     filename: '[name].js'
   },

lib/Configuration.js

@@ -13,6 +13,7 @@ const DefaultConfig = {
   includeModules: false,
   packager: 'npm',
   packagerOptions: {},
+  keepOutputDirectory: false,
   config: null
 };
 
@@ -70,6 +71,10 @@ class Configuration {
     return this._hasLegacyConfig;
   }
 
+  get keepOutputDirectory() {
+    return this._config.keepOutputDirectory;
+  }
+
   toJSON() {
     return _.omitBy(this._config, _.isNil);
   }

lib/Configuration.test.js

@@ -18,6 +18,7 @@ describe('Configuration', () => {
         includeModules: false,
         packager: 'npm',
         packagerOptions: {},
+        keepOutputDirectory: false,
         config: null
       };
     });
@@ -66,6 +67,7 @@ describe('Configuration', () => {
         includeModules: { forceInclude: ['mod1'] },
         packager: 'npm',
         packagerOptions: {},
+        keepOutputDirectory: false,
         config: null
       });
     });
@@ -85,6 +87,7 @@ describe('Configuration', () => {
         includeModules: { forceInclude: ['mod1'] },
         packager: 'npm',
         packagerOptions: {},
+        keepOutputDirectory: false,
         config: null
       });
     });
@@ -103,6 +106,7 @@ describe('Configuration', () => {
         includeModules: { forceInclude: ['mod1'] },
         packager: 'npm',
         packagerOptions: {},
+        keepOutputDirectory: false,
         config: null
       });
     });

lib/cleanup.js

@@ -7,10 +7,14 @@ module.exports = {
   cleanup() {
     const webpackOutputPath = this.webpackOutputPath;
 
-    this.options.verbose && this.serverless.cli.log(`Remove ${webpackOutputPath}`);
-
-    if (this.serverless.utils.dirExistsSync(webpackOutputPath)) {
-      fse.removeSync(webpackOutputPath);
+    const keepOutputDirectory = this.configuration.keepOutputDirectory;
+    if (!keepOutputDirectory) {
+      this.options.verbose && this.serverless.cli.log(`Remove ${webpackOutputPath}`);
+      if (this.serverless.utils.dirExistsSync(webpackOutputPath)) {
+        fse.removeSync(webpackOutputPath);
+      }
+    } else {
+      this.options.verbose && this.serverless.cli.log(`Keeping ${webpackOutputPath}`);
     }
 
     return BbPromise.resolve();

lib/validate.js

@@ -136,7 +136,7 @@ module.exports = {
       if (!this.webpackConfig.output || _.isEmpty(this.webpackConfig.output)) {
         const outputPath = path.join(this.serverless.config.servicePath, '.webpack');
         this.webpackConfig.output = {
-          libraryTarget: 'commonjs',
+          libraryTarget: 'commonjs2',
           path: outputPath,
           filename: '[name].js',
         };