From 27bdde6dc78850ff7087bf3695e56dfeb277d8c7 Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Sat, 28 Nov 2020 02:49:37 +0100 Subject: [PATCH 1/3] improve makefile to not remove tsconfigs already in git --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 530398a9365a..3fbff0a3c051 100644 --- a/Makefile +++ b/Makefile @@ -149,6 +149,10 @@ clean-tsconfig: rm -f packages/*/tsconfig.{tsbuildinfo,json} rm -f codemods/*/tsconfig.{tsbuildinfo,json} rm -f eslint/*/tsconfig.{tsbuildinfo,json} + # revert files in git + git checkout HEAD -- packages/*/tsconfig.json + git checkout HEAD -- codemods/*/tsconfig.json + git checkout HEAD -- eslint/*/tsconfig.json test-clean: $(foreach source, $(SOURCES), \ From 97b28b3619da203b2424fb9588e2cf2c1289bdf5 Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Sat, 28 Nov 2020 16:17:04 +0100 Subject: [PATCH 2/3] update tsconfig generation script to include packages in eslint and codemods folders --- scripts/generators/tsconfig.js | 38 ++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/scripts/generators/tsconfig.js b/scripts/generators/tsconfig.js index 968f36f0ae01..1409cac9ac45 100644 --- a/scripts/generators/tsconfig.js +++ b/scripts/generators/tsconfig.js @@ -5,21 +5,29 @@ const fs = require("fs"); const root = path.resolve(__dirname, "../../"); -const tsPkgs = fs - .readdirSync(path.join(root, "packages")) - .filter(name => name.startsWith("babel-")) - .map(name => ({ - name: name.replace(/^babel-/, "@babel/"), - dir: path.resolve(root, "packages", name), - })) - .filter(({ dir }) => { - try { - fs.statSync(path.join(dir, "src", "index.ts")); - return true; - } catch { - return false; - } - }); +function getTsPkgs(subRoot) { + return fs + .readdirSync(path.join(root, subRoot)) + .filter(name => name.startsWith("babel-")) + .map(name => ({ + name: name.replace(/^babel-/, "@babel/"), + dir: path.resolve(root, subRoot, name), + })) + .filter(({ dir }) => { + try { + fs.statSync(path.join(dir, "src", "index.ts")); + return true; + } catch { + return false; + } + }); +} + +const tsPkgs = [ + ...getTsPkgs("packages"), + ...getTsPkgs("eslint"), + ...getTsPkgs("codemods"), +]; for (const { dir } of tsPkgs) { const pkg = require(`${dir}/package.json`); From 77dfc4794365a5e470db017303d539326d00bdab Mon Sep 17 00:00:00 2001 From: Bogdan Savluk Date: Fri, 4 Dec 2020 19:50:09 +0100 Subject: [PATCH 3/3] use git clean --- Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3fbff0a3c051..114387c86255 100644 --- a/Makefile +++ b/Makefile @@ -146,13 +146,10 @@ clean: test-clean clean-tsconfig: rm -f tsconfig.json - rm -f packages/*/tsconfig.{tsbuildinfo,json} - rm -f codemods/*/tsconfig.{tsbuildinfo,json} - rm -f eslint/*/tsconfig.{tsbuildinfo,json} - # revert files in git - git checkout HEAD -- packages/*/tsconfig.json - git checkout HEAD -- codemods/*/tsconfig.json - git checkout HEAD -- eslint/*/tsconfig.json + git clean packages/*/tsconfig.json -xfq + git clean codemods/*/tsconfig.json -xfq + git clean eslint/*/tsconfig.json -xfq + rm -f */*/tsconfig.tsbuildinfo test-clean: $(foreach source, $(SOURCES), \