Skip to content

Convert packageModules to use bestzip instead of archiver #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 20, 2020
Merged

Convert packageModules to use bestzip instead of archiver #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5988436
Add some logging for testing zip performance.
Jun 25, 2020
8201546
Better formatting on file durations logging.
liron-strattic Jun 25, 2020
eb43b7d
Attempt better logging for zip writing performance.
liron-strattic Jun 25, 2020
9b3c725
Remove bad code.
liron-strattic Jun 25, 2020
de20ff5
Attempt to use bestzip instead of archiver. Unit tests not passing.
liron-strattic Jun 25, 2020
f99645e
Fix bug in previous attempt. Also attempt to add bestzip mock, which …
liron-strattic Jun 25, 2020
48c49cf
Get unit tests to pass and attempt to fix zip file paths.
liron-strattic Jun 25, 2020
0bcecf8
Some code cleanup.
liron-strattic Jun 25, 2020
e3641fb
Attempt to adjust the cwd to use the full directory and not the paren…
liron-strattic Jun 25, 2020
7ca2836
Remove unneeded logs.
liron-strattic Jun 25, 2020
d077fba
Revert one logging change to remove the timestamp.
liron-strattic Jun 28, 2020
a184678
Fix missing require after merge.
liron-strattic Jul 22, 2020
dc9c136
Cleanup archiver
j0k3r Jul 29, 2020
2aef3a9
Keep using `.webpack` instead of switching to `.serverless` folder
j0k3r Jul 29, 2020
0136d7e
Update bestzip
j0k3r Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 23 additions & 31 deletions lib/packageModules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
const BbPromise = require('bluebird');
const _ = require('lodash');
const path = require('path');
const archiver = require('archiver');
const fs = require('fs');
const bestzip = require('bestzip');
const glob = require('glob');
const semver = require('semver');
const fs = require('fs');

function setArtifactPath(funcName, func, artifactPath) {
const version = this.serverless.getVersion();
Expand All @@ -26,14 +26,7 @@ function setArtifactPath(funcName, func, artifactPath) {
}

function zip(directory, name) {
const zip = archiver.create('zip');
// Create artifact in temp path and move it to the package path (if any) later
// This allows us to persist the webpackOutputPath and re-use the compiled output
const artifactFilePath = path.join(this.webpackOutputPath, name);
this.serverless.utils.writeFileDir(artifactFilePath);

const output = fs.createWriteStream(artifactFilePath);

// Check that files exist to be zipped
let files = glob.sync('**', {
cwd: directory,
dot: true,
Expand All @@ -50,29 +43,28 @@ function zip(directory, name) {
return BbPromise.reject(error);
}

output.on('open', () => {
zip.pipe(output);

_.forEach(files, filePath => {
const fullPath = path.resolve(directory, filePath);

const stats = fs.statSync(fullPath);

if (!stats.isDirectory(fullPath)) {
zip.append(fs.readFileSync(fullPath), {
name: filePath,
mode: stats.mode,
date: new Date(0) // necessary to get the same hash when zipping the same content
});
}
});

zip.finalize();
});
// Create artifact in temp path and move it to the package path (if any) later
// This allows us to persist the webpackOutputPath and re-use the compiled output
const artifactFilePath = path.join(this.webpackOutputPath, name);
this.serverless.utils.writeFileDir(artifactFilePath);

const cwd = directory;
const source = '*';
const destination = path.relative(cwd, artifactFilePath);
const zipArgs = {
source,
cwd,
destination
};
return new BbPromise((resolve, reject) => {
output.on('close', () => resolve(artifactFilePath));
zip.on('error', err => reject(err));
bestzip(zipArgs)
.then(() => {
resolve(artifactFilePath);
return null;
})
.catch(err => {
reject(err);
});
});
}

Expand Down
8 changes: 4 additions & 4 deletions lib/packagers/yarn.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ describe('yarn', () => {
it('should transform yarn trees to npm dependencies', () => {
const testYarnResult =
'{"type":"activityStart","data":{"id":0}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"archiver@^2.1.1"}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"bestzip@^2.1.5"}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"bluebird@^3.5.1"}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"fs-extra@^4.0.3"}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"mkdirp@^0.5.1"}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"minimist@^0.0.8"}}\n' +
'{"type":"activityTick","data":{"id":0,"name":"@sls/webpack@^1.0.0"}}\n' +
'{"type":"tree","data":{"type":"list","trees":[' +
'{"name":"archiver@2.1.1","children":[],"hint":null,"color":"bold",' +
'{"name":"bestzip@2.1.5","children":[],"hint":null,"color":"bold",' +
'"depth":0},{"name":"[email protected]","children":[],"hint":null,"color":' +
'"bold","depth":0},{"name":"[email protected]","children":[],"hint":null,' +
'"color":"bold","depth":0},{"name":"[email protected]","children":[{"name":' +
Expand All @@ -80,8 +80,8 @@ describe('yarn', () => {
const expectedResult = {
problems: [],
dependencies: {
archiver: {
version: '2.1.1',
bestzip: {
version: '2.1.5',
dependencies: {}
},
bluebird: {
Expand Down
Loading