Skip to content

chore: convert findSymlinkedModules to TS #693

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

Merged
merged 3 commits into from
Sep 10, 2019
Merged

chore: convert findSymlinkedModules to TS #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47b6a01
convert findSymlinkedModules to ts
pveyes Sep 10, 2019
9aef8ed
lint --fix
pveyes Sep 10, 2019
f180121
remove @flow strict and @format
pveyes Sep 10, 2019
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
66 changes: 36 additions & 30 deletions ...ges/cli/src/tools/findSymlinkedModules.js → ...ges/cli/src/tools/findSymlinkedModules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
* @flow strict
*/

import path from 'path';
Expand All @@ -32,7 +29,7 @@ import fs from 'fs';
*/
export default function findSymlinkedModules(
projectRoot: string,
ignoredRoots?: Array<string> = [],
ignoredRoots: Array<string> = [],
) {
const nodeModuleRoot = path.join(projectRoot, 'node_modules');
const resolvedSymlinks = findModuleSymlinks(nodeModuleRoot, [
Expand All @@ -52,19 +49,22 @@ function findModuleSymlinks(

// Find module symlinks
const moduleFolders = fs.readdirSync(modulesPath);
const symlinks = moduleFolders.reduce((links, folderName) => {
const folderPath = path.join(modulesPath, folderName);
const maybeSymlinkPaths = [];
if (folderName.startsWith('@')) {
const scopedModuleFolders = fs.readdirSync(folderPath);
maybeSymlinkPaths.push(
...scopedModuleFolders.map(name => path.join(folderPath, name)),
);
} else {
maybeSymlinkPaths.push(folderPath);
}
return links.concat(resolveSymlinkPaths(maybeSymlinkPaths, ignoredPaths));
}, []);
const symlinks = moduleFolders.reduce(
(links, folderName) => {
const folderPath = path.join(modulesPath, folderName);
const maybeSymlinkPaths = [];
if (folderName.startsWith('@')) {
const scopedModuleFolders = fs.readdirSync(folderPath);
maybeSymlinkPaths.push(
...scopedModuleFolders.map(name => path.join(folderPath, name)),
);
} else {
maybeSymlinkPaths.push(folderPath);
}
return links.concat(resolveSymlinkPaths(maybeSymlinkPaths, ignoredPaths));
},
[] as string[],
);

// For any symlinks found, look in _that_ modules node_modules directory
// and find any symlinked modules
Expand All @@ -78,23 +78,29 @@ function findModuleSymlinks(
...symlinks,
]),
),
[],
[] as string[],
);

return [...new Set([...symlinks, ...nestedSymlinks])];
}

function resolveSymlinkPaths(maybeSymlinkPaths, ignoredPaths) {
return maybeSymlinkPaths.reduce((links, maybeSymlinkPath) => {
if (fs.lstatSync(maybeSymlinkPath).isSymbolicLink()) {
const resolved = path.resolve(
path.dirname(maybeSymlinkPath),
fs.readlinkSync(maybeSymlinkPath),
);
if (ignoredPaths.indexOf(resolved) === -1 && fs.existsSync(resolved)) {
links.push(resolved);
function resolveSymlinkPaths(
maybeSymlinkPaths: string[],
ignoredPaths: string[],
) {
return maybeSymlinkPaths.reduce(
(links, maybeSymlinkPath) => {
if (fs.lstatSync(maybeSymlinkPath).isSymbolicLink()) {
const resolved = path.resolve(
path.dirname(maybeSymlinkPath),
fs.readlinkSync(maybeSymlinkPath),
);
if (ignoredPaths.indexOf(resolved) === -1 && fs.existsSync(resolved)) {
links.push(resolved);
}
}
}
return links;
}, []);
return links;
},
[] as string[],
);
}
1 change: 1 addition & 0 deletions packages/cli/src/tools/loadMetroConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {createBlacklist} from 'metro';
import {loadConfig} from 'metro-config';
import {existsSync} from 'fs';
import {type ConfigT} from 'types';
// $FlowFixMe - converted to TS
import findSymlinkedModules from './findSymlinkedModules';

const resolveSymlinksForRoots = roots =>
Expand Down