Skip to content

Replace wrench with node-fs-extra #34

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 4 commits into from
Apr 6, 2016
Merged

Replace wrench with node-fs-extra #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae28b95
remove wrench
Apr 6, 2016
59dd733
remove wrench add fs-extra
Apr 6, 2016
72b1bc4
airbnb formatting
Apr 6, 2016
9af3b89
version bump
Apr 6, 2016
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
16 changes: 5 additions & 11 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ module.exports = function(S) {

const path = require('path'),
_ = require('lodash'),
fs = require('fs'),
fs = require('fs-extra'),
browserify = require('browserify'),
UglifyJS = require('uglify-js'),
wrench = require('wrench'),
BbPromise = require('bluebird');

/**
Expand Down Expand Up @@ -270,16 +269,11 @@ module.exports = function(S) {
let destPath = path.join(_this.optimizedDistPath, p);

if (fs.lstatSync(p).isDirectory()) {
wrench.mkdirSyncRecursive(destPath, '0777');
wrench.copyDirSyncRecursive(
path.join(_this.evt.options.pathDist, p),
destPath, {
forceDelete: true
}
);
fs.mkdirsSync(destPath, '0777');
fs.copySync(path.join(_this.evt.options.pathDist, p), destPath, {clobber: true, dereference: true});
} else {
wrench.mkdirSyncRecursive(path.dirname(destPath), '0777');
S.utils.writeFileSync(destPath, S.utils.readFileSync(p));
fs.mkdirsSync(path.dirname(destPath), '0777');
fs.copySync(p, destPath, {clobber: true, dereference: true});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the link I posted in the other task, the dereference option is only supported for the fs-extra.copy and not the fs-extra.copySync. I would suggest to use the asynchronous variant here, maybe wrapped by a Promise.fromCallback() to have a promisified implementation.
See also here: jprichardson/node-fs-extra#210

}
});
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "serverless-optimizer-plugin",
"version": "2.1.0",
"version": "2.1.1",
"engines": {
"node": ">=4.0"
},
Expand Down Expand Up @@ -41,6 +41,6 @@
"browserify": "^13.0.0",
"lodash": "^4.0.0",
"uglify-js": "^2.6.1",
"wrench": "^1.5.8"
"fs-extra": "~0.26.7"
}
}