Revert "Merge pull request #450 from stevemao/patch-1"

This reverts commit 9f4500e, reversing
changes made to 557170b.
Fixes #505

Author: Frank Schmid

README.md

@@ -230,7 +230,7 @@ const path = require('path');
 module.exports = {
   // ...
   output: {
-    libraryTarget: 'commonjs2',
+    libraryTarget: 'commonjs',
     path: path.resolve(__dirname, '.webpack'),
     filename: '[name].js',
   },
@@ -305,17 +305,17 @@ custom:
 #### Runtime dependencies
 
 If a runtime dependency is detected that is found in the `devDependencies` section and
-so would not be packaged, the plugin will error until you explicitly exclude it (see `forceExclude` below)
+so would not be packaged, the plugin will error until you explicitly exclude it (see `forceExclude` below) 
 or move it to the `dependencies` section.
 
 #### AWS-SDK
 
 An exception for the runtime dependency error is the AWS-SDK. All projects using the AWS-SDK normally
-have it listed in `devDependencies` because AWS provides it already in their Lambda environment. In this case
+have it listed in `devDependencies` because AWS provides it already in their Lambda environment. In this case 
 the aws-sdk is automatically excluded and only an informational message is printed (in `--verbose` mode).
 
 The main reason for the warning is, that silently ignoring anything contradicts the declarative nature
-of Serverless' service definition. So the correct way to define the handling for the aws-sdk is, as
+of Serverless' service definition. So the correct way to define the handling for the aws-sdk is, as 
 you would do for all other excluded modules (see `forceExclude` below).
 
 ```yaml
@@ -342,7 +342,7 @@ custom:
 ```
 
 You should select the packager, that you use to develop your projects, because only
-then locked versions will be handled correctly, i.e. the plugin uses the generated
+then locked versions will be handled correctly, i.e. the plugin uses the generated 
 (and usually committed) package lock file that is created by your favorite packager.
 
 Each packager might support specific options that can be set in the `packagerOptions`
@@ -375,7 +375,7 @@ You can specify custom scripts that are executed after the installation of the f
 has been finished. These are standard packager scripts as they can be used in any `package.json`.
 
 Warning: The use cases for them are very rare and specific and you should investigate first,
-if your use case can be covered with webpack plugins first. They should never access files
+if your use case can be covered with webpack plugins first. They should never access files 
 outside of their current working directory which is the compiled function folder, if any.
 A valid use case would be to start anything available as binary from `node_modules`.
 

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

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

examples/babel/webpack.config.js

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

examples/typescript/webpack.config.js

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

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: 'commonjs2',
+          libraryTarget: 'commonjs',
           path: outputPath,
           filename: '[name].js',
         };

tests/validate.test.js

@@ -183,7 +183,7 @@ describe('validate', () => {
       return module
         .validate()
         .then(() => expect(module.webpackConfig.output).to.eql({
-          libraryTarget: 'commonjs2',
+          libraryTarget: 'commonjs',
           path: path.join(testServicePath, '.webpack', 'service'),
           filename: '[name].js',
         }));
@@ -200,7 +200,7 @@ describe('validate', () => {
       return module
         .validate()
         .then(() => expect(module.webpackConfig.output).to.eql({
-          libraryTarget: 'commonjs2',
+          libraryTarget: 'commonjs',
           path: path.join(testServicePath, '.webpack', 'service'),
           filename: '[name].js',
         }));
@@ -214,7 +214,7 @@ describe('validate', () => {
       return module
         .validate()
         .then(() => expect(module.webpackConfig.output).to.eql({
-          libraryTarget: 'commonjs2',
+          libraryTarget: 'commonjs',
           path: path.join(testServicePath, '.webpack', 'service'),
           filename: '[name].js',
         }));
@@ -658,7 +658,7 @@ describe('validate', () => {
             devtool: 'source-map',
             context: 'some context',
             output: {
-              libraryTarget: 'commonjs2'
+              libraryTarget: 'commonjs'
             }
           }));
           module.serverless.service.functions = testFunctionsConfig;
@@ -674,10 +674,10 @@ describe('validate', () => {
             expect(module.webpackConfig[1].context).to.equal('some context');
             expect(module.webpackConfig[2].context).to.equal('some context');
             expect(module.webpackConfig[3].context).to.equal('some context');
-            expect(module.webpackConfig[0].output.libraryTarget).to.equal('commonjs2');
-            expect(module.webpackConfig[1].output.libraryTarget).to.equal('commonjs2');
-            expect(module.webpackConfig[2].output.libraryTarget).to.equal('commonjs2');
-            expect(module.webpackConfig[3].output.libraryTarget).to.equal('commonjs2');
+            expect(module.webpackConfig[0].output.libraryTarget).to.equal('commonjs');
+            expect(module.webpackConfig[1].output.libraryTarget).to.equal('commonjs');
+            expect(module.webpackConfig[2].output.libraryTarget).to.equal('commonjs');
+            expect(module.webpackConfig[3].output.libraryTarget).to.equal('commonjs');
             return null;
           });
         });