Fix build errors for serverless > 1.17.0 (#36)

* Fix function artifact now under package property
* Fix single function deployment by cleaning .webpack folder later in the deploy hooks

Note: this drops support for serverless < 1.18.0

Closes #37

Author: cardoni

src/index.js

@@ -23,8 +23,10 @@ class ServerlessPluginWebpack {
     this.hooks = {
       'before:package:createDeploymentArtifacts': () => this.webpackBundle('service'),
       'after:package:createDeploymentArtifacts': () => this.restoreAndCopy('service'),
+      'after:package:finalize': () => this.clean(),
       'before:deploy:function:packageFunction': () => this.webpackBundle('function'),
       'after:deploy:function:packageFunction': () => this.restoreAndCopy('function'),
+      'after:deploy:function:deploy': () => this.clean(),
     };
   }
 
@@ -69,7 +71,7 @@ class ServerlessPluginWebpack {
     // Restore service path
     this.serverless.config.servicePath = this.originalServicePath;
 
-    // Copy .webpack/.serverless to .serverless and remove .webpack
+    // Copy .webpack/.serverless to .serverless and set artifacts
     const src = path.join(this.originalServicePath, webpackFolder, serverlessFolder);
     const dest = path.join(this.originalServicePath, serverlessFolder);
     return fs.copy(src, dest)
@@ -80,9 +82,13 @@ class ServerlessPluginWebpack {
             this.serverless.service.functions
           );
         }
-        return fs.remove(path.join(this.originalServicePath, webpackFolder));
+        return Promise.resolve();
       });
   }
+
+  clean() {
+    return fs.remove(path.join(this.originalServicePath, webpackFolder));
+  }
 }
 
 module.exports = ServerlessPluginWebpack;

src/lib/service.js

@@ -26,7 +26,7 @@ const setFnsPackage = R.map(
 
 const setFnsArtifacts = (serverlessPath, fns) => R.map(
   R.over(
-    R.lensProp('artifact'),
+    R.lensPath(['package', 'artifact']),
     artifact => path.join(serverlessPath, path.basename(artifact))
   ),
   fns

test/service.test.js

@@ -77,15 +77,15 @@ test('setFnsPackage', () => {
 
 test('setArtifacts', () => {
   const artifactFns = {
-    firstGet: { artifact: '/.serverless/.webpack/service-dev-firstGet.zip' },
-    secondGet: { artifact: '/.serverless/.webpack/service-dev-secondGet.zip' },
-    post: { artifact: '/.serverless/.webpack/service-dev-post.zip' },
+    firstGet: { package: { artifact: '/.serverless/.webpack/service-dev-firstGet.zip' } },
+    secondGet: { package: { artifact: '/.serverless/.webpack/service-dev-secondGet.zip' } },
+    post: { package: { artifact: '/.serverless/.webpack/service-dev-post.zip' } },
   };
 
   const modifiedArtifactFns = {
-    firstGet: { artifact: path.join('/.serverless', 'service-dev-firstGet.zip') },
-    secondGet: { artifact: path.join('/.serverless', 'service-dev-secondGet.zip') },
-    post: { artifact: path.join('/.serverless', 'service-dev-post.zip') },
+    firstGet: { package: { artifact: path.join('/.serverless', 'service-dev-firstGet.zip') } },
+    secondGet: { package: { artifact: path.join('/.serverless', 'service-dev-secondGet.zip') } },
+    post: { package: { artifact: path.join('/.serverless', 'service-dev-post.zip') } },
   };
   expect(service.setFnsArtifacts('/.serverless', artifactFns)).toEqual(modifiedArtifactFns);
 });