Merge pull request #834 from CorentinDoue/chore/use-processed-options

chore: use processedOptions

Author: j0k3r

index.js

@@ -90,6 +90,12 @@ class ServerlessWebpack {
     };
 
     this.hooks = {
+      initialize: () => {
+        // serverless.processedInput does not exist in serverless@<2.0.0. This ensure the retrocompatibility with serverless v1
+        if (this.serverless.processedInput && this.serverless.processedInput.options) {
+          this.options = this.serverless.processedInput.options;
+        }
+      },
       'before:package:createDeploymentArtifacts': () =>
         BbPromise.bind(this)
           .then(() => this.serverless.pluginManager.spawn('webpack:validate'))

index.test.js

@@ -134,10 +134,20 @@ describe('ServerlessWebpack', () => {
   );
 
   describe('hooks', () => {
+    const functionName = 'myFunction';
+    const rawOptions = {
+      f: functionName
+    };
+    const processedOptions = {
+      function: functionName
+    };
     let slsw;
 
     before(() => {
-      slsw = new ServerlessWebpack(serverless, {});
+      slsw = new ServerlessWebpack(serverless, rawOptions);
+      if(serverless.processedInput) { // serverless.processedInput does not exist in serverless@<2.0.0
+        serverless.processedInput.options = processedOptions;
+      }
       sandbox.stub(slsw, 'cleanup').returns(BbPromise.resolve());
       sandbox.stub(slsw, 'watch').returns(BbPromise.resolve());
       sandbox.stub(slsw, 'wpwatch').returns(BbPromise.resolve());
@@ -461,6 +471,21 @@ describe('ServerlessWebpack', () => {
               });
             });
           }
+        },
+        {
+          name: 'initialize',
+          test: () => {
+            it('should override the raw options with the processed ones', () => {
+              slsw.hooks.initialize();
+              if(serverless.processedInput) {
+                expect(slsw.options).to.equal(processedOptions);
+              } else {
+                // serverless.processedInput does not exist in serverless@<2.0.0
+                // The options should not be changed
+                expect(slsw.options).to.equal(rawOptions);
+              }
+            });
+          }
         }
       ],
       hook => {