From 607a3ae6a83decb7ca2d8f7912841ec3979ef184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Negr=C3=A3o=20G=20Zica?= Date: Sat, 12 Oct 2024 18:22:40 -0300 Subject: [PATCH] fix(revert): preserve mtime when zipping with the node zipper (#539) (#558) This reverts commit 162d9bc7f0e87d63cd93adb0f4756d01769da79d. --- src/tests/util.test.ts | 40 ++++++++-------------------------------- src/utils.ts | 2 +- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/src/tests/util.test.ts b/src/tests/util.test.ts index 8b92052..9d89c83 100644 --- a/src/tests/util.test.ts +++ b/src/tests/util.test.ts @@ -18,29 +18,15 @@ describe('utils/findProjectRoot', () => { }); describe('utils/zip', () => { - const mtime = new Date(2024, 0, 1, 0, 0, 0, 0); - beforeEach(() => { mockFs({ - '/src': mockFs.directory({ - mtime, - items: { - 'test.txt': mockFs.file({ - mtime, - content: 'lorem ipsum', - }), - modules: mockFs.directory({ - mtime, - items: { - 'module.txt': mockFs.file({ - mtime, - content: 'lorem ipsum 2', - }), - }, - }), + '/src': { + 'test.txt': 'lorem ipsum', + modules: { + 'module.txt': 'lorem ipsum 2', }, - }), - '/dist': mockFs.directory({ mtime }), + }, + '/dist': {}, }); }); @@ -79,17 +65,7 @@ describe('utils/zip', () => { }, ]; - // Check the mtimes are set correctly - const sourceStat = fs.statSync(source); - expect(sourceStat.mtime).toEqual(mtime); - - const testStat = fs.statSync('/src/test.txt'); - expect(testStat.mtime).toEqual(mtime); - - const moduleStat = fs.statSync('/src/modules/module.txt'); - expect(moduleStat.mtime).toEqual(mtime); - - await expect(zip(zipPath, filesPathList, useNativeZip)).resolves.toBeUndefined(); + await zip(zipPath, filesPathList, useNativeZip); expect(fs.existsSync(zipPath)).toEqual(true); @@ -103,7 +79,7 @@ describe('utils/zip', () => { if (!useNativeZip) { const data = fs.readFileSync(zipPath); const fileHash = crypto.createHash('sha256').update(data).digest('base64'); - expect(fileHash).toEqual('PHu2gv7OIMv+lAOCXYPNd30X8/7EKYTuV7KYJjw3Qd4='); + expect(fileHash).toEqual('iCZdyHJ7ON2LLwBIE6gQmRvBTzXBogSqJTMvHSenzGk='); } } ); diff --git a/src/utils.ts b/src/utils.ts index cebf3bb..6b3738b 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -112,7 +112,7 @@ function nodeZip(zipPath: string, filesPathList: IFiles): Promise { zipArchive.append(fs.readFileSync(file.rootPath), { name: file.localPath, mode: stats.mode, - date: new Date(stats.mtime), + date: new Date(0), // necessary to get the same hash when zipping the same content }); });