When init, search for first level subdirectory (#1269)
Summary: When running `flipper-pkg init path/plugin`, this allows to skip the `Do you wanna add this path to watching in Flipper config?`, if the path is direct first level subdirectory of any added path from Flipper `pluginPaths: []` ## Changelog - Improve matching for watched pluginPaths when initialising new plugin Pull Request resolved: https://github.com/facebook/flipper/pull/1269 Test Plan: 1. Create folder: `~/flipper-plugins` 2. Add this folder to Flipper config `pluginPaths: ['~/flipper-plugins']` 3. Create new subfolder `test-plugin` 4. Run `flipper-pkg init test-plugin` 5. It should not ask to add this folder to pluginPaths To verify it only works for first level subdirectory, create another folder: `/deep/test-plugin2` and re-run steps with it. This should also keep working if we specify exactly the path for the plugin itself. Reviewed By: mweststrate Differential Revision: D22065630 Pulled By: jknoxville fbshipit-source-id: 9ef8d364e3815033b63579e37a6f2d19515ca902
This commit is contained in:
committed by
Facebook GitHub Bot
parent
4a52af358e
commit
f2996b7e7c
@@ -130,9 +130,14 @@ async function verifyFlipperSearchPath(pluginDirectory: string) {
|
|||||||
} else {
|
} else {
|
||||||
const config = JSON.parse(fs.readFileSync(flipperConfigPath, 'utf8'));
|
const config = JSON.parse(fs.readFileSync(flipperConfigPath, 'utf8'));
|
||||||
const pluginPaths: string[] = config.pluginPaths ?? [];
|
const pluginPaths: string[] = config.pluginPaths ?? [];
|
||||||
const isInSearchPath = pluginPaths.some(
|
const isInSearchPath = pluginPaths.some((p) => {
|
||||||
(p) => pluginDirectory === path.resolve(p.replace(/^~/, homedir())),
|
// Match: exact path and first level subdirectory
|
||||||
);
|
const relativePath = path.relative(
|
||||||
|
path.resolve(p.replace(/^~/, homedir())),
|
||||||
|
pluginDirectory,
|
||||||
|
);
|
||||||
|
return relativePath.split('/').length === 1;
|
||||||
|
});
|
||||||
if (!isInSearchPath) {
|
if (!isInSearchPath) {
|
||||||
if (
|
if (
|
||||||
(
|
(
|
||||||
|
|||||||
Reference in New Issue
Block a user