Fix to include only package.json in the source directory
#274
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abetomo
commented
May 10, 2017
| @@ -210,6 +210,7 @@ describe('node-lambda', function () { | |||
| fs.mkdirsSync(path.join('__unittest', 'hoge')); | |||
| fs.mkdirsSync(path.join('__unittest', 'fuga')); | |||
| fs.writeFileSync(path.join('__unittest', 'hoge', 'piyo')); | |||
| fs.writeFileSync(path.join('__unittest', 'hoge', 'package.json')); | |||
There was a problem hiding this comment.
The setting to exclude __unittest/hoge/* is https://github.com/motdotla/node-lambda/pull/274/files#diff-e5b8495db5b34b144973178386ba5ceeR247.
DeviaVir
reviewed
May 10, 2017
lib/main.js
Outdated
| @@ -229,7 +229,7 @@ Lambda.prototype._fileCopy = function (program, src, dest, excludeNodeModules, c | |||
| const options = { | |||
| dereference: true, // same meaning as `-L` of `rsync` command | |||
| filter: function (src, dest) { | |||
| if (!program.prebuiltDirectory && path.basename(src) == 'package.json') { | |||
| if (!program.prebuiltDirectory && src == path.join(srcAbsolutePath, 'package.json')) { | |||
| @@ -272,7 +272,7 @@ Lambda.prototype._rsync = function (program, src, dest, excludeNodeModules, call | |||
| } | |||
|
|
|||
| // include package.json unless prebuiltDirectory is set | |||
| var includeArgs = program.prebuiltDirectory ? '' : '--include package.json '; | |||
| var includeArgs = program.prebuiltDirectory ? '' : '--include /package.json '; | |||
There was a problem hiding this comment.
not sure, but the / would make the path invalid, or no?
There was a problem hiding this comment.
The include and exclude options of rsync are complicated, so I can not explain the exact behavior, but the result was as follows.
src directory
% pwd
/tmp/test
% find /tmp/test -type f
/tmp/test/package.json
/tmp/test/foo/package.json
exclude='foo/*'
include='package.json'
% rm -rf /tmp/bar; rsync -rL --include='package.json' --exclude='foo/*' /tmp/test /tmp/bar
% find /tmp/bar -type f
/tmp/bar/test/package.json
/tmp/bar/test/foo/package.json
include='/package.json'
% rm -rf /tmp/bar; rsync -rL --include='/package.json' --exclude='foo/*' /tmp/test /tmp/bar
% find /tmp/bar -type f
/tmp/bar/test/package.json
exclude='foo'
include='package.json'
% rm -rf /tmp/bar; rsync -rL --include='package.json' --exclude='foo' /tmp/test /tmp/bar
% find /tmp/bar -type f
/tmp/bar/test/package.json
include='/package.json'
% rm -rf /tmp/bar; rsync -rL --include='/package.json' --exclude='foo' /tmp/test /tmp/bar
% find /tmp/bar -type f
/tmp/bar/test/package.json
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#272
I restricted
package.json, but is there any adverse effect you are concerned about?