diff --git a/lib/manager/pip_setup/util.ts b/lib/manager/pip_setup/util.ts index 84b020c0df26ad80da8688258a148657b3068c2a..dae67ed378c21d647ca10511130956d24cb41ae4 100644 --- a/lib/manager/pip_setup/util.ts +++ b/lib/manager/pip_setup/util.ts @@ -16,7 +16,7 @@ export async function getExtractFile(): Promise<string> { const cacheDir = await ensureCacheDir('./others/pip_setup'); extractPy = join(cacheDir, EXTRACT); - await outputFile(extractPy, dataFiles.get('data/extract.py')); + await outputFile(extractPy, dataFiles.get('extract.py')); return extractPy; } diff --git a/lib/versioning/node/schedule.ts b/lib/versioning/node/schedule.ts index 094c235d12a4dc3273bcb4092491998873d03a31..dfd5df3096dfce2a03b256e457706bc46117a35e 100644 --- a/lib/versioning/node/schedule.ts +++ b/lib/versioning/node/schedule.ts @@ -11,7 +11,7 @@ interface NodeJsSchedule { export type NodeJsData = Record<string, NodeJsSchedule>; export const nodeSchedule: NodeJsData = JSON.parse( - dataFiles.get('data/node-js-schedule.json') + dataFiles.get('node-js-schedule.json') ); export interface NodeJsPolicies { diff --git a/tools/generate-imports.ts b/tools/generate-imports.ts index b4a19adc37d1f477f6f7b60bae72c4ab02ad048f..90c2b2009bfa73b957738e06e33be897a42dca92 100644 --- a/tools/generate-imports.ts +++ b/tools/generate-imports.ts @@ -1,4 +1,3 @@ -import path from 'path'; import fs from 'fs-extra'; import shell from 'shelljs'; @@ -23,35 +22,12 @@ async function updateFile(file: string, code: string): Promise<void> { newFiles.add(file); } -const dataPaths = ['data']; - -function expandPaths(paths: string[]): string[] { - return paths - .map((pathName) => { - const stat = fs.statSync(pathName); - - if (stat.isFile()) { - return [pathName]; - } - - if (stat.isDirectory()) { - const dirPaths = fs - .readdirSync(pathName, { withFileTypes: true }) - .filter( - (dirent) => - !(dirent.isFile() && ['.DS_Store'].includes(dirent.name)) - ) - .map((dirent) => path.join(pathName, dirent.name)); - return expandPaths(dirPaths); - } - - return []; - }) - .reduce((x, y) => x.concat(y)); -} - async function generateData(): Promise<void> { - const files = expandPaths(dataPaths).sort(); + const files = fs + .readdirSync('data', { withFileTypes: true }) + .filter((dirent) => dirent.isFile()) + .map((dirent) => dirent.name) + .sort(); const importDataFileType = files.map((x) => ` | '${x}'`).join('\n'); @@ -59,8 +35,8 @@ async function generateData(): Promise<void> { const contentMapAssignments: string[] = []; for (const file of files) { - shell.echo(`> ${file}`); - const rawFileContent = await fs.readFile(file, 'utf8'); + shell.echo(`> data/${file}`); + const rawFileContent = await fs.readFile(`data/${file}`, 'utf8'); contentMapAssignments.push( `data.set('${file}', ${JSON.stringify(rawFileContent)});` );