Better active directory selection #4246
Merged
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
arcanis
commented
Aug 24, 2017
__tests__/index.js
Outdated
| @@ -243,7 +243,7 @@ if (process.platform !== 'win32') { | |||
| } | |||
|
|
|||
| test.concurrent('should run bin command', async () => { | |||
| const stdout = await execCommand('bin', [], '', false); | |||
| const stdout = await execCommand('bin', [], '', true); | |||
There was a problem hiding this comment.
If not run in a temp directory, the new behavior makes us go to the repository root. Other tests don't seem to break.
BYK
approved these changes
Aug 24, 2017
__tests__/integration.js
Outdated
| const cwd = await makeTemp(); | ||
| const cacheFolder = path.join(cwd, '.cache'); | ||
|
|
||
| const subdir = path.join(cwd, 'a/b/c/d/e/f/g/h/i'); |
There was a problem hiding this comment.
Since you're using path.join I'd recommend writing this as path.join(cwd, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i') for cross-platform compatibility. You can even do path.join(cwd, ...Array.from('abcdefghi')) if you wanna look cool :P
src/cli/index.js
Outdated
| @@ -21,6 +21,22 @@ const net = require('net'); | |||
| const onDeath = require('death'); | |||
| const path = require('path'); | |||
|
|
|||
| function findActiveDirectory(base): string { | |||
src/cli/index.js
Outdated
| let prev = null; | ||
| let dir = base; | ||
|
|
||
| do { |
There was a problem hiding this comment.
Can be simplified as:
while (prevDir !== currentDir && !fs.existsSync(path.join(currentDir, constants.NODE_PACKAGE_JSON))) {
prevDir = currentDir;
currentDir= path.dirname(currentDir);
}
return currentDir;
joaolucasl
pushed a commit
to joaolucasl/yarn
that referenced
this pull request
Oct 27, 2017
* Automatically backtrack to the closest package.json directory * Add a test * Prettier * Fixes linting * Executes a test in a temp directory to not get affected by the change * Removes now useless await * Feedbacks * Update index.js * Update index.js
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.
Summary
Fix #2709 - Yarn will now try to move to the closest ancestor directory that contains a
package.jsonfile if it can. If none is to be found, the current directory will be used as usual. Note that the same behavior if applied to the--cwdoption, so--cwd foo/barwill go tofooiffoo/package.jsonexists but notfoo/bar/package.json.I thought about doing this in the same pass than the rc file selection, but it wouldn't change anything because we're not stat'ing the same files, so we could not factorize the checks.
Test plan
Added a test case, and the old one should still pass as expected.