consistent naming of artifacts, when moving modules up

Author: bweigel

lib/inject.js

@@ -90,10 +90,17 @@ function injectAllRequirements(funcArtifact) {
           this.options.IndividuallyMoveUpModules === 'true'
         ) {
           const artifact = func.package ? func.package.artifact : funcArtifact;
-          const newArtifact = path.join(
-            '.serverless',
-            `${func.module}-${func.name}.zip`
-          );
+
+          let newArtifact;
+          if (func.module === '.') {
+            newArtifact = path.join('.serverless', `root-${func.name}.zip`);
+          } else {
+            newArtifact = path.join(
+              '.serverless',
+              `${func.module}-${func.name}.zip`
+            );
+          }
+
           func.package.artifact = newArtifact;
           return injectSourceCode(artifact, newArtifact, func.module).then(
             () => func

test.js

@@ -414,7 +414,9 @@ test('can package individually, moving modules to root of zip-File with Individu
   npm(['i', path]);
   sls(['--individually=true', '--moveup=true', 'package']);
 
-  const zipfiles_hello = listZipFiles('.serverless/hello.zip');
+  const zipfiles_hello = listZipFiles(
+    '.serverless/root-sls-py-req-test-dev-hello.zip'
+  );
   t.false(
     zipfiles_hello.includes(`fn2${sep}__init__.py`),
     'fn2 is not packaged in function hello'