Fix scoped bin paths (#2163)

* Add failing tests for bin path normalisation from scoped package name * Add fix for bin normalisation for scoped packages
yarnpkg · Dec 7, 2016 · 8a12b1b · 8a12b1b
1 parent 0664103
commit 8a12b1b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/__tests__/fixtures/normalize-manifest/scoped bin string/actual.json b/__tests__/fixtures/normalize-manifest/scoped bin string/actual.json
@@ -0,0 +1,4 @@
+{
+  "name": "@scope/foo",
+  "bin": "bar"
+}
diff --git a/__tests__/fixtures/normalize-manifest/scoped bin string/expected.json b/__tests__/fixtures/normalize-manifest/scoped bin string/expected.json
@@ -0,0 +1,7 @@
+{
+  "name": "@scope/foo",
+  "version": "",
+  "bin": {
+    "foo": "bar"
+  }
+}
diff --git a/__tests__/fixtures/normalize-manifest/scoped bin string/warnings.json b/__tests__/fixtures/normalize-manifest/scoped bin string/warnings.json
@@ -0,0 +1 @@
+["@scope/foo: No license field"]
diff --git a/src/util/normalize-manifest/fix.js b/src/util/normalize-manifest/fix.js
@@ -153,7 +153,9 @@ export default async function (
   // 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') {
-    info.bin = {[info.name]: info.bin};
+    // Remove scoped package name for consistency with NPM's bin field fixing behaviour
+    const name = info.name.replace(/^@[^\/]+\//, '');
+    info.bin = {[name]: info.bin};
   }
 
   // bundleDependencies is an alias for bundledDependencies