only create new artifact, when module should be moved to root of zip

Author: bweigel

lib/inject.js

@@ -50,25 +50,15 @@ function injectRequirements(requirementsPath, packagePath, options) {
  * @param {string} module module to keep
  * @return {Promise} the JSZip object written out.
  */
-function injectSourceCode(source, target, module, options) {
+function injectSourceCode(source, target, module) {
   const targetZip = new JSZip();
 
   return fse
     .readFileAsync(source)
     .then(buffer => JSZip.loadAsync(buffer))
     .then(sourceZip => sourceZip.filter(() => true))
     .map(srcZipObj => {
-      let targetName;
-
-      if (
-        options.IndividuallyMoveUpModules === true ||
-        options.IndividuallyMoveUpModules == 'true'
-      ) {
-        targetName = srcZipObj.name.replace(module + '/', '');
-      } else {
-        targetName = srcZipObj.name;
-      }
-
+      let targetName = srcZipObj.name.replace(module + '/', '');
       return zipFile(targetZip, targetName, srcZipObj.async('nodebuffer'));
     })
     .then(() => writeZip(targetZip, target));
@@ -95,19 +85,19 @@ function injectAllRequirements(funcArtifact) {
         return func;
       })
       .map(func => {
-        if (func.module !== '.') {
+        if (
+          this.options.IndividuallyMoveUpModules === true ||
+          this.options.IndividuallyMoveUpModules === 'true'
+        ) {
           const artifact = func.package ? func.package.artifact : funcArtifact;
           const newArtifact = path.join(
             '.serverless',
             `${func.module}-${func.name}.zip`
           );
           func.package.artifact = newArtifact;
-          return injectSourceCode(
-            artifact,
-            newArtifact,
-            func.module,
-            this.options
-          ).then(() => func);
+          return injectSourceCode(artifact, newArtifact, func.module).then(
+            () => func
+          );
         } else {
           return func;
         }
@@ -116,10 +106,10 @@ function injectAllRequirements(funcArtifact) {
         return this.options.zip
           ? func
           : injectRequirements(
-              path.join('.serverless', func.module, 'requirements'),
-              func.package.artifact,
-              this.options
-            );
+            path.join('.serverless', func.module, 'requirements'),
+            func.package.artifact,
+            this.options
+          );
       });
   } else if (!this.options.zip) {
     return injectRequirements(