From c2c390ea47d8f9a24fe3bd4bcb310c610ac114de Mon Sep 17 00:00:00 2001 From: Michael Kauzmann Date: Tue, 8 Oct 2024 13:07:56 -0600 Subject: [PATCH] buildtools/tsconfig is better as a single reference to chipper/tsconfig-node.json https://github.com/phetsims/chipper/issues/1463 --- tsconfig/buildjson/tsconfig.json | 1 - tsconfig/buildtools/tsconfig.json | 20 ++------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/tsconfig/buildjson/tsconfig.json b/tsconfig/buildjson/tsconfig.json index e6583bd0..7b7c5817 100644 --- a/tsconfig/buildjson/tsconfig.json +++ b/tsconfig/buildjson/tsconfig.json @@ -26,7 +26,6 @@ "../../../joist/images/**/*", "../../../joist/js/**/*", "../../../joist/sounds/**/*", - // TODO: kite/js/grunt/ is node code. Oh boy, let's talk about this https://github.com/phetsims/chipper/issues/1469 "../../../kite/js/**/*", "../../../phet-core/js/**/*", // It's OK to list private repo phet-io files here, even though open source clients cannot check them out. diff --git a/tsconfig/buildtools/tsconfig.json b/tsconfig/buildtools/tsconfig.json index 191af079..840ff591 100644 --- a/tsconfig/buildtools/tsconfig.json +++ b/tsconfig/buildtools/tsconfig.json @@ -1,24 +1,8 @@ - -// TODO: Ideally, the contents here would be an extends, but typescript really doesn't want me to do that. https://github.com/phetsims/chipper/issues/1463 -//{ -// // Chipper and its node dependencies is what we call "buildtools" -// "extends": "../../../chipper/tsconfig-node.json" -//} { - "extends": "../../tsconfig/shared/tsconfig-node.json", - "include": [ - "../../js/common/**/*", - "../../js/grunt/**/*", - "../../js/phet-io/**/*", - "../../js/scripts/**/*", - "../../test/**/*", - "../../eslint/**/*", - // Gruntfile and eslint.config.mjs - "../../*" - ], + // Chipper and its node dependencies is what we call "buildtools" "references": [ { - "path": "../../../perennial-alias/tsconfig-chipper.json" + "path": "../../tsconfig-node.json" } ] } \ No newline at end of file