public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grafana/toolkit: Resolve modules correctly (#21216)

Browse Source
This commit is contained in:
Dominik Prokop
2019-12-20 16:16:55 +01:00
committed by GitHub
parent 392819c5d0
commit d98fa28287
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-toolkit/src/config/webpack.plugin.config.ts
+13 -11
View File
@@ -29,18 +29,20 @@ export const findModuleFiles = async (base: string, files?: string[], result?: s
result = result || [];
if (files) {
files.forEach(async file => {
const newbase = path.join(base, file);
if (fs.statSync(newbase).isDirectory()) {
result = await findModuleFiles(newbase, await readdirPromise(newbase), result);
} else {
const filename = path.basename(file);
if (/^module.(t|j)sx?$/.exec(filename)) {
// @ts-ignore
result.push(newbase);
await Promise.all(
files.map(async file => {
const newbase = path.join(base, file);
if (fs.statSync(newbase).isDirectory()) {
result = await findModuleFiles(newbase, await readdirPromise(newbase), result);
} else {
const filename = path.basename(file);
if (/^module.(t|j)sx?$/.exec(filename)) {
// @ts-ignore
result.push(newbase);
}
}
}
});
})
);
}
return result;
};