Skip to content

Commit

Permalink
chipper and perennial to use config from chipper, #364
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Kauzmann <[email protected]>
  • Loading branch information
zepumph committed Oct 22, 2024
1 parent 2f8b3c3 commit 6e30a23
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tsconfig-chipper.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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/**/*"
Expand Down
3 changes: 2 additions & 1 deletion tsconfig/buildtools/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}

0 comments on commit 6e30a23

Please sign in to comment.