Clean the tmp dir during _archivePrebuilt to match _buildAndArchive behavior (#518)

Author: jsepia

lib/main.js

@@ -657,9 +657,13 @@ Emulate only the body of the API Gateway event.
   _archivePrebuilt (program) {
     const codeDirectory = this._codeDirectory()
 
-    return this._fileCopy(program, program.prebuiltDirectory, codeDirectory, false).then(() => {
-      console.log('=> Zipping deployment package')
-      return this._zip(program, codeDirectory)
+    return Promise.resolve().then(() => {
+      return this._cleanDirectory(codeDirectory, program.keepNodeModules)
+    }).then(() => {
+      return this._fileCopy(program, program.prebuiltDirectory, codeDirectory, false).then(() => {
+        console.log('=> Zipping deployment package')
+        return this._zip(program, codeDirectory)
+      })
     })
   }
 

test/main.js

@@ -865,6 +865,24 @@ describe('lib/main', function () {
         })
       })
     })
+
+    it('cleans the temporary directory before running `_archivePrebuilt`', function () {
+      _timeout({ this: this, sec: 30 }) // give it time to zip
+      const buildDir = '.build_' + Date.now()
+      const codeDir = lambda._codeDirectory()
+      const tmpFile = path.join(codeDir, 'deleteme')
+      after(() => fs.removeSync(buildDir))
+
+      fs.mkdirSync(codeDir, { recursive: true })
+      fs.writeFileSync(tmpFile, '...')
+      fs.mkdirSync(buildDir)
+      fs.writeFileSync(path.join(buildDir, 'test'), '...')
+
+      program.prebuiltDirectory = buildDir
+      return lambda._archive(program).then((_data) => {
+        assert.isNotTrue(fs.existsSync(tmpFile))
+      })
+    })
   })
 
   describe('_readArchive', () => {