From 3b133a13dfdf193d83367307ce8d412ab7e7ffb9 Mon Sep 17 00:00:00 2001
From: Thomas <PerfectPixel@users.noreply.github.com>
Date: Thu, 5 Dec 2019 21:01:47 +0100
Subject: [PATCH 1/2] Eagerly correct artifact paths

---
 src/index.ts | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index a249ce58..b7bd587b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -223,33 +223,33 @@ export class TypeScriptPlugin {
       path.join(this.originalServicePath, SERVERLESS_FOLDER)
     )
 
-    if (this.options.function) {
-      const fn = service.functions[this.options.function]
-      fn.package.artifact = path.join(
+    const functionNames = service.getAllFunctions()
+    functionNames.forEach(name => {
+      const fnPackage = service.functions[name].package
+      if (fnPackage.artifact) {
+        fnPackage.artifact = path.join(
+          this.originalServicePath,
+          SERVERLESS_FOLDER,
+          path.basename(fnPackage.artifact)
+        )
+      }
+    })
+
+    if (service.artifact) {
+      service.artifact = path.join(
         this.originalServicePath,
         SERVERLESS_FOLDER,
-        path.basename(fn.package.artifact)
+        path.basename(service.artifact)
       )
-      return
     }
 
-    if (service.package.individually) {
-      const functionNames = service.getAllFunctions()
-      functionNames.forEach(name => {
-        service.functions[name].package.artifact = path.join(
-          this.originalServicePath,
-          SERVERLESS_FOLDER,
-          path.basename(service.functions[name].package.artifact)
-        )
-      })
-      return
+    if (service.package.artifact) {
+      service.package.artifact = path.join(
+        this.originalServicePath,
+        SERVERLESS_FOLDER,
+        path.basename(service.package.artifact)
+      )
     }
-
-    service.package.artifact = path.join(
-      this.originalServicePath,
-      SERVERLESS_FOLDER,
-      path.basename(service.package.artifact)
-    )
   }
 
   async cleanup(): Promise<void> {

From 490681300dc0b770747210830cfc762a628ec357 Mon Sep 17 00:00:00 2001
From: Thomas <PerfectPixel@users.noreply.github.com>
Date: Thu, 5 Dec 2019 21:03:00 +0100
Subject: [PATCH 2/2] Update Serverless.d.ts

---
 src/Serverless.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Serverless.d.ts b/src/Serverless.d.ts
index ec7d7049..edfce25f 100644
--- a/src/Serverless.d.ts
+++ b/src/Serverless.d.ts
@@ -9,6 +9,7 @@ declare namespace Serverless {
     }
 
     service: {
+      artifact: string
       provider: {
         name: string
       }
@@ -43,4 +44,4 @@ declare namespace Serverless {
   interface PluginManager {
     spawn(command: string): Promise<void>
   }
-}
\ No newline at end of file
+}