Skip to content
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

Jump to bottom

Fix: handle empty bin strings #6515

Merged
merged 4 commits into from Oct 9, 2018
Merged

Fix: handle empty bin strings #6515

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88759f1
Fix: handle empty bin strings
rhburrows Oct 7, 2018
610daba
Add an entry to the changelog
rhburrows Oct 8, 2018
3571127
Add a test to make sure empty binlinks aren't created
rhburrows Oct 8, 2018
ad9420f
Fix empty bin string test on Windows
rhburrows Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions __tests__/__snapshots__/normalize-manifest.js.snap
View file
Open in desktop
Expand Up @@ -90,6 +90,12 @@ Array [
]
`;

exports[`empty bin string: empty bin string 1`] = `
Array [
"foo: No license field",
]
`;

exports[`engines array: engines array 1`] = `
Array [
"No license field",
Expand Down
4 changes: 4 additions & 0 deletions __tests__/fixtures/normalize-manifest/empty bin string/actual.json
View file
Open in desktop
@@ -0,0 +1,4 @@
{
"name": "foo",
"bin": ""
}
5 changes: 5 additions & 0 deletions __tests__/fixtures/normalize-manifest/empty bin string/expected.json
View file
Open in desktop
@@ -0,0 +1,5 @@
{
"name": "foo",
"version": "",
"bin": ""
}
2 changes: 1 addition & 1 deletion src/util/normalize-manifest/fix.js
View file
Open in desktop
Expand Up @@ -153,7 +153,7 @@ export default (async function(
// if the `bin` field is as string then expand it to an object with a single property
// based on the original `bin` field and `name field`
// { name: "foo", bin: "cli.js" } -> { name: "foo", bin: { foo: "cli.js" } }
if (typeof info.name === 'string' && typeof info.bin === 'string') {
if (typeof info.name === 'string' && typeof info.bin === 'string' && info.bin.length > 0) {
// Remove scoped package name for consistency with NPM's bin field fixing behaviour
const name = info.name.replace(/^@[^\/]+\//, '');
info.bin = {[name]: info.bin};
Expand Down