Fix duplicate packaging issue

lib/plugins/package/lib/packageService.js

@@ -225,6 +225,7 @@ module.exports = {
     params.include.forEach((pattern) => {
       patterns.push(pattern);
     });
+
     // NOTE: please keep this order of concatenating the include params
     // rather than doing it the other way round!
     // see https://github.com/serverless/serverless/pull/5825 for more information

lib/plugins/package/lib/packageService.test.js

@@ -12,7 +12,7 @@ const serverlessConfigFileUtils = require('../../../../lib/utils/getServerlessCo
 // Configure chai
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
-const expect = require('chai').expect;
+const { expect } = require('chai');
 
 describe('#packageService()', () => {
   let serverless;
@@ -516,6 +516,7 @@ describe('#packageService()', () => {
       ]));
     });
   });
+
   describe('#packageLayer()', () => {
     const exclude = ['test-exclude'];
     const include = ['test-include'];

lib/plugins/package/lib/zipService.js

@@ -82,27 +82,29 @@ module.exports = {
       output.on('error', (err) => reject(err));
       zip.on('error', (err) => reject(err));
 
-
       output.on('open', () => {
         zip.pipe(output);
 
-        BbPromise.all(files.map(this.getFileContentAndStat.bind(this))).then((contents) => {
-          _.forEach(_.sortBy(contents, ['filePath']), (file) => {
-            const name = file.filePath.slice(prefix ? `${prefix}${path.sep}`.length : 0);
-            let mode = file.stat.mode;
-            if (filesToChmodPlusX && _.includes(filesToChmodPlusX, name)
-                && file.stat.mode % 2 === 0) {
-              mode += 1;
-            }
-            zip.append(file.data, {
-              name,
-              mode,
-              date: new Date(0), // necessary to get the same hash when zipping the same content
+        const normalizedFiles = _.uniq(files.map(file => path.normalize(file)));
+
+        return BbPromise.all(normalizedFiles.map(this.getFileContentAndStat.bind(this)))
+          .then((contents) => {
+            _.forEach(_.sortBy(contents, ['filePath']), (file) => {
+              const name = file.filePath.slice(prefix ? `${prefix}${path.sep}`.length : 0);
+              let mode = file.stat.mode;
+              if (filesToChmodPlusX && _.includes(filesToChmodPlusX, name)
+                  && file.stat.mode % 2 === 0) {
+                mode += 1;
+              }
+              zip.append(file.data, {
+                name,
+                mode,
+                date: new Date(0), // necessary to get the same hash when zipping the same content
+              });
             });
-          });
 
-          zip.finalize();
-        }).catch(reject);
+            zip.finalize();
+          }).catch(reject);
       });
     });
   },

lib/plugins/package/lib/zipService.test.js

@@ -1036,6 +1036,30 @@ describe('zipService', () => {
         });
     });
 
+    it('should include files only once', () => {
+      params.zipFileName = getTestArtifactFileName('include-outside-working-dir');
+      serverless.config.servicePath = path.join(serverless.config.servicePath, 'lib');
+      params.exclude = [
+        './**',
+      ];
+      params.include = [
+        '.././bin/**',
+      ];
+
+      return expect(packagePlugin.zip(params)).to.eventually.be
+        .equal(path.join(serverless.config.servicePath, '.serverless', params.zipFileName))
+        .then(artifact => {
+          const data = fs.readFileSync(artifact);
+          return expect(zip.loadAsync(data)).to.be.fulfilled;
+        }).then(unzippedData => {
+          const unzippedFileData = unzippedData.files;
+          expect(Object.keys(unzippedFileData).sort()).to.deep.equal([
+            'bin/binary-444',
+            'bin/binary-777',
+          ]);
+        });
+    });
+
     it('should throw an error if no files are matched', () => {
       params.exclude = ['**/**'];
       params.include = [];

tests/utils/fs/index.js

@@ -19,6 +19,12 @@ function getTmpFilePath(fileName) {
   return path.join(getTmpDirPath(), fileName);
 }
 
+function createTmpDir() {
+  const dirPath = getTmpDirPath();
+  fse.ensureDirSync(dirPath);
+  return dirPath;
+}
+
 function createTmpFile(name) {
   const filePath = getTmpFilePath(name);
   fse.ensureFileSync(filePath);
@@ -50,6 +56,7 @@ module.exports = {
   tmpDirCommonPath,
   getTmpDirPath,
   getTmpFilePath,
+  createTmpDir,
   createTmpFile,
   replaceTextInFile,
   readYamlFile,