From 089a9ba056663f6aed7ab8bd731967bae475ce7b Mon Sep 17 00:00:00 2001 From: Tom Mrazauskas Date: Sat, 23 Apr 2022 16:28:41 +0300 Subject: [PATCH 1/2] chore: tweak bundleTs script --- scripts/bundleTs.mjs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/bundleTs.mjs b/scripts/bundleTs.mjs index 7d87a062e8cd..64aa5bb5394f 100644 --- a/scripts/bundleTs.mjs +++ b/scripts/bundleTs.mjs @@ -36,23 +36,20 @@ const copyrightSnippet = ` */ `.trim(); +const typesNodeReferenceDirective = '/// '; + (async () => { const packages = getPackages(); const isTsPackage = p => fs.existsSync(path.resolve(p.packageDir, 'tsconfig.json')); - const hasMoreThanOneDefinitionFile = p => - fs - .readdirSync(path.resolve(p.packageDir, 'build')) - .filter(f => f.endsWith('.d.ts')).length > 1; + const excludedPackages = ['@jest/globals']; const packagesToBundle = packages.filter( - p => isTsPackage(p) && hasMoreThanOneDefinitionFile(p), + p => isTsPackage(p) && !excludedPackages.includes(p.pkg.name), ); - const typesNodeReferenceDirective = '/// '; - console.log(chalk.inverse(' Extracting TypeScript definition files ')); const sharedExtractorConfig = { From 710ec565b02bd84048da8e67d061a30b5e97c6bf Mon Sep 17 00:00:00 2001 From: Tom Mrazauskas Date: Sun, 24 Apr 2022 07:11:43 +0300 Subject: [PATCH 2/2] refactor: use Set --- scripts/bundleTs.mjs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bundleTs.mjs b/scripts/bundleTs.mjs index 64aa5bb5394f..4961d41ad2c6 100644 --- a/scripts/bundleTs.mjs +++ b/scripts/bundleTs.mjs @@ -38,16 +38,16 @@ const copyrightSnippet = ` const typesNodeReferenceDirective = '/// '; +const excludedPackages = new Set(['@jest/globals']); + (async () => { const packages = getPackages(); const isTsPackage = p => fs.existsSync(path.resolve(p.packageDir, 'tsconfig.json')); - const excludedPackages = ['@jest/globals']; - const packagesToBundle = packages.filter( - p => isTsPackage(p) && !excludedPackages.includes(p.pkg.name), + p => isTsPackage(p) && !excludedPackages.has(p.pkg.name), ); console.log(chalk.inverse(' Extracting TypeScript definition files '));