From 6e30a232ca30e02743d9634d8b9855a9be827d52 Mon Sep 17 00:00:00 2001 From: Michael Kauzmann Date: Tue, 22 Oct 2024 13:08:21 -0600 Subject: [PATCH] chipper and perennial to use config from chipper, https://github.com/phetsims/perennial/issues/364 Signed-off-by: Michael Kauzmann --- package.json | 8 ++++++++ tsconfig-chipper.json | 2 +- tsconfig.json | 2 +- tsconfig/buildtools/tsconfig.json | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index eacbea14..9a8c585e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,15 @@ "@octokit/rest": "~16.33.1", "@types/grunt": "~0.4.31", "@types/lodash": "~4.17.9", + "@types/jquery": "~3.5.13", + "@types/p2": "~0.7.39", + "@types/pako": "~2.0.0", + "@types/qunit": "~2.19.6", + "@types/react": "~18.0.12", + "@types/react-dom": "~18.0.5", + "@types/three": "~0.137.0", "@types/nopt": "~3.0.32", + "@webgpu/types": "~0.1.34", "async": "~0.9.2", "async-mutex": "~0.4.0", "async-q": "~0.3.1", diff --git a/tsconfig-chipper.json b/tsconfig-chipper.json index fc179d82..7cf442fa 100644 --- a/tsconfig-chipper.json +++ b/tsconfig-chipper.json @@ -1,5 +1,5 @@ { - "extends": "../chipper/tsconfig/shared/tsconfig-node.json", + "extends": "./tsconfig/shared/tsconfig-node.json", // Entry points for checked out resources that may not be on main, but need to version together. These must be usable // by chipper "include": [ diff --git a/tsconfig.json b/tsconfig.json index 1acb6852..b02bb4ea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ // TODO: Remove devDependencies from chipper and use many of them from perennial-alias, https://github.com/phetsims/perennial/issues/364 // TODO: If you want to use optionize() in perennial, we need to move it from phet-core to perennial-alias. Or JO HELP, https://github.com/phetsims/perennial/issues/371 // TODO: Doesn't shared/tsconfig-node and core need to be in perennial-alias? https://github.com/phetsims/perennial/issues/364 - "extends": "../chipper/tsconfig/shared/tsconfig-node.json", + "extends": "./tsconfig/shared/tsconfig-node.json", "include": [ "js/**/*", "test/**/*" diff --git a/tsconfig/buildtools/tsconfig.json b/tsconfig/buildtools/tsconfig.json index bd6b84db..de81da86 100644 --- a/tsconfig/buildtools/tsconfig.json +++ b/tsconfig/buildtools/tsconfig.json @@ -5,7 +5,8 @@ }, "references": [ { - "path": "../../tsconfig-chipper-node.json" + // TODO:fix this so it doesn't hard code importing from chipper, https://github.com/phetsims/perennial/issues/364 + "path": "../../../chipper/tsconfig-chipper-node.json" } ] } \ No newline at end of file