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

reverted Nested executables #1210 to fix #1823 #1867

Merged
merged 1 commit into from
Nov 15, 2016
Merged

reverted Nested executables #1210 to fix #1823 #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion __tests__/commands/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,8 @@ test.concurrent(
},
);

test.concurrent('install should hoist nested bin scripts', (): Promise<void> => {
// disabled to resolve https://github.com/yarnpkg/yarn/pull/1210
test.skip('install should hoist nested bin scripts', (): Promise<void> => {
return runInstall({binLinks: true}, 'install-nested-bin', async (config) => {
const binScripts = await fs.walk(path.join(config.cwd, 'node_modules', '.bin'));
// need to double the amount as windows makes 2 entries for each dependency
Expand Down
2 changes: 1 addition & 1 deletion src/package-linker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export default class PackageLinker {
if (this.config.binLinks) {
const tickBin = this.reporter.progress(flatTree.length);
await promise.queue(flatTree, async ([dest, {pkg}]) => {
const binLoc = path.join(this.config.cwd, this.config.getFolder(pkg));
const binLoc = path.join(dest, this.config.getFolder(pkg));
await this.linkBinDependencies(pkg, binLoc);
tickBin(dest);
}, 4);
Expand Down