mirror of
https://github.com/iconify/iconify.git
synced 2024-12-13 14:13:06 +00:00
Merge remote-tracking branch 'KermanX/feat/multiple-cwd' into next
This commit is contained in:
commit
c2a76b13ac
@ -15,19 +15,24 @@ export const loadNodeIcon: UniversalIconLoader = async (
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
const iconSet = await loadCollectionFromFS(
|
const cwds = Array.isArray(options?.cwd) ? options.cwd : [options?.cwd];
|
||||||
collection,
|
|
||||||
options?.autoInstall,
|
for (const cwd of cwds) {
|
||||||
undefined,
|
const iconSet = await loadCollectionFromFS(
|
||||||
options?.cwd
|
|
||||||
);
|
|
||||||
if (iconSet) {
|
|
||||||
result = await searchForIcon(
|
|
||||||
iconSet,
|
|
||||||
collection,
|
collection,
|
||||||
getPossibleIconNames(icon),
|
options?.autoInstall,
|
||||||
options
|
undefined,
|
||||||
|
cwd
|
||||||
);
|
);
|
||||||
|
if (iconSet) {
|
||||||
|
result = await searchForIcon(
|
||||||
|
iconSet,
|
||||||
|
collection,
|
||||||
|
getPossibleIconNames(icon),
|
||||||
|
options
|
||||||
|
);
|
||||||
|
if (result) break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!result && options?.warn) {
|
if (!result && options?.warn) {
|
||||||
|
@ -183,8 +183,11 @@ export type IconifyLoaderOptions = {
|
|||||||
/**
|
/**
|
||||||
* Current working directory, used to resolve the @iconify-json package.
|
* Current working directory, used to resolve the @iconify-json package.
|
||||||
*
|
*
|
||||||
|
* Can be a string or an array of strings, the first existing path will be used.
|
||||||
|
*
|
||||||
* Only used on `node` environment.
|
* Only used on `node` environment.
|
||||||
|
*
|
||||||
* @default process.cwd()
|
* @default process.cwd()
|
||||||
*/
|
*/
|
||||||
cwd?: string;
|
cwd?: string | string[];
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user