Skip to content

Commit

Permalink
Support symlinks-to-symlinks
Browse files Browse the repository at this point in the history
Summary:
In response to [this comment](#9009 (comment)).

I could be wrong here, but I think Watchman can't handle symlinks, so we need to make sure symlinks-to-symlinks are handled up front.
Closes #9792

Differential Revision: D3858349

Pulled By: bestander

fbshipit-source-id: f3a34dae90ed9a7004a03158288db5e1932bfc69
  • Loading branch information
aleclarson authored and Facebook Github Bot 5 committed Sep 15, 2016
1 parent 00e7d46 commit fa6191f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 19 deletions.
54 changes: 38 additions & 16 deletions local-cli/server/findSymlinksPaths.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,50 @@
const path = require('path');
const fs = require('fs');

function isSubPathOfPath(parentPath, subPath) {
return !path.relative(parentPath, subPath).startsWith('..' + path.sep);
}

function isSubPathOfPaths(parentPaths, subPath) {
return parentPaths.some(parentPath => isSubPathOfPath(parentPath, subPath));
}

/**
* Find and resolve symlinks in `lookupFolder`, filtering out any
* paths that are subpaths of `existingSearchPaths`.
* Find and resolve symlinks in `lookupFolder`.
* Ignore any descendants of the paths in `ignoredRoots`.
*/
module.exports = function findSymlinksPaths(lookupFolder, existingSearchPaths) {
module.exports = function findSymlinksPaths(lookupFolder, ignoredRoots) {
const timeStart = Date.now();
const folders = fs.readdirSync(lookupFolder);
const resolvedSymlinks = folders.map(folder => path.resolve(lookupFolder, folder))
.filter(folderPath => fs.lstatSync(folderPath).isSymbolicLink())
.map(symlink => path.resolve(process.cwd(), fs.readlinkSync(symlink)))
.filter(symlinkPath => !isSubPathOfPaths(existingSearchPaths, symlinkPath));
const timeEnd = Date.now();

const resolvedSymlinks = [];
folders.forEach(folder => {
const visited = [];

let symlink = path.resolve(lookupFolder, folder);
while (fs.lstatSync(symlink).isSymbolicLink()) {
const index = visited.indexOf(symlink);
if (index !== -1) {
throw Error(
`Infinite symlink recursion detected:\n ` +
visited.slice(index).join(`\n `)
);
}

visited.push(symlink);
symlink = path.resolve(
path.dirname(symlink),
fs.readlinkSync(symlink)
);
}

if (visited.length && !rootExists(ignoredRoots, symlink)) {
resolvedSymlinks.push(symlink);
}
});

const timeEnd = Date.now();
console.log(`Scanning ${folders.length} folders for symlinks in ${lookupFolder} (${timeEnd - timeStart}ms)`);

return resolvedSymlinks;
};

function rootExists(roots, child) {
return roots.some(root => isDescendant(root, child));
}

function isDescendant(root, child) {
return root === child || child.startsWith(root + path.sep);
}
6 changes: 3 additions & 3 deletions local-cli/server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ const NODE_MODULES = path.resolve(__dirname, '..', '..', '..');
* Starts the React Native Packager Server.
*/
function server(argv, config, args) {
args.projectRoots = args.projectRoots.concat(
args.root,
findSymlinksPaths(NODE_MODULES, args.projectRoots)
const roots = args.projectRoots.concat(args.root);
args.projectRoots = roots.concat(
findSymlinksPaths(NODE_MODULES, roots)
);

console.log(formatBanner(
Expand Down

0 comments on commit fa6191f

Please sign in to comment.