Implemented configDir for outDir

CHANGELOG.md

@@ -29,6 +29,7 @@ Many thanks to the following for contributing to this release:
 
 - Fixed IPC errors reporting undefined when no stack trace was present [#624](https://github.com/clusterio/clusterio/pull/624).
 - Fixed loopback routing for instances reporting the wrong error message [#625](https://github.com/clusterio/clusterio/pull/625).
+- Bumped Typescript version to 5.5 and implemented `${configDir}` in base configs for "outDir" [#648](https://github.com/clusterio/clusterio/pull/648).
 
 ### Breaking Changes
 

package.json

@@ -36,8 +36,8 @@
 		"@clusterio/controller": "workspace:*",
 		"@clusterio/ctl": "workspace:*",
 		"@clusterio/host": "workspace:*",
-		"@clusterio/web_ui": "workspace:*",
 		"@clusterio/lib": "workspace:*",
+		"@clusterio/web_ui": "workspace:*",
 		"@swc/core": "^1.4.0",
 		"@typescript-eslint/eslint-plugin": "^6.4.1",
 		"@typescript-eslint/parser": "^6.4.1",
@@ -51,8 +51,8 @@
 		"mocha": "^10.2.0",
 		"nyc": "^15.1.0",
 		"phin": "^3.7.0",
-		"typedoc": "^0.24.8",
+		"typedoc": "^0.26.3",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"yargs": "^17.7.2"
 	}
 }

packages/controller/package.json

@@ -51,7 +51,7 @@
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-router-dom": "^6.4.14",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-dev-middleware": "^6.1.1",
 		"webpack-merge": "^5.9.0"

packages/controller/tsconfig.browser.json

@@ -7,6 +7,5 @@
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "package.json" ],
 	"compilerOptions": {
 		"rootDir": "..",
-		"outDir": "dist/browser",
 	}
 }

packages/controller/tsconfig.node.json

@@ -4,7 +4,4 @@
 		{ "path": "../lib/tsconfig.node.json" },
 	],
 	"include": ["index.ts", "controller.ts", "package.json", "src/**/*.ts"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

packages/create/templates/plugin-ts/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

packages/create/templates/plugin-ts/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

packages/ctl/package.json

@@ -35,6 +35,6 @@
 		"@types/node": "^20.4.5",
 		"@types/set-blocking": "^2.0.0",
 		"@types/yargs": "^17.0.24",
-		"typescript": "^5.1.6"
+		"typescript": "^5.5.3"
 	}
 }

packages/ctl/tsconfig.node.json

@@ -4,7 +4,4 @@
 		{ "path": "../lib/tsconfig.node.json" },
 	],
 	"include": ["index.ts", "package.json", "ctl.ts", "src/**/*.ts"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

packages/host/package.json

@@ -43,6 +43,6 @@
 		"@types/semver": "^7.5.0",
 		"@types/set-blocking": "^2.0.0",
 		"@types/yargs": "^17.0.24",
-		"typescript": "^5.1.6"
+		"typescript": "^5.5.3"
 	}
 }

packages/host/tsconfig.node.json

@@ -4,7 +4,4 @@
 		{ "path": "../lib/tsconfig.node.json" },
 	],
 	"include": ["index.ts", "host.ts", "package.json", "src/**/*.ts", "src/**/*.js"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

packages/lib/package.json

@@ -41,6 +41,6 @@
 		"@types/triple-beam": "^1.3.2",
 		"@types/ws": "^8.5.5",
 		"@types/yargs": "^17.0.24",
-		"typescript": "^5.1.6"
+		"typescript": "^5.5.3"
 	}
 }

packages/lib/tsconfig.browser.json

@@ -26,6 +26,5 @@
 	],
 	"compilerOptions": {
 		"rootDir": ".",
-		"outDir": "dist/browser",
 	}
 }

packages/lib/tsconfig.node.json

@@ -2,7 +2,6 @@
 	"extends": "../../tsconfig.node.json",
 	"include": ["index.ts", "browser.ts", "build_mod.js", "src/**/*.ts", "src/**/*.js"],
 	"compilerOptions": {
-		"outDir": "dist/node",
 		"allowJs": true,
 	},
 }

packages/web_ui/package.json

@@ -40,7 +40,7 @@
 		"style-loader": "^3.3.3",
 		"swc-loader": "^0.2.6",
 		"terser-webpack-plugin": "^5.3.9",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"util": "^0.12.5",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",

packages/web_ui/tsconfig.browser.json

@@ -4,7 +4,4 @@
 		{ "path": "../lib/tsconfig.browser.json" },
 	],
 	"include": [ "src/**/*.tsx", "src/**/*.ts", "package.json", "global.d.ts" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/global_chat/package.json

@@ -25,7 +25,7 @@
 		"@clusterio/web_ui": "workspace:*",
 		"@types/node": "^20.4.5",
 		"@types/react": "^18.2.21",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-merge": "^5.9.0"

plugins/global_chat/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/global_chat/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

plugins/inventory_sync/package.json

@@ -33,7 +33,7 @@
 		"antd": "^5.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-merge": "^5.9.0"

plugins/inventory_sync/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/inventory_sync/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

plugins/player_auth/package.json

@@ -36,7 +36,7 @@
 		"phin": "^3.7.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-merge": "^5.9.0"

plugins/player_auth/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/player_auth/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

plugins/research_sync/package.json

@@ -30,7 +30,7 @@
 		"@types/fs-extra": "^11.0.1",
 		"@types/node": "^20.4.5",
 		"@types/react": "^18.2.21",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-merge": "^5.9.0"

plugins/research_sync/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/research_sync/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

plugins/statistics_exporter/package.json

@@ -25,7 +25,7 @@
 		"@clusterio/web_ui": "workspace:*",
 		"@types/node": "^20.4.5",
 		"@types/react": "^18.2.21",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-merge": "^5.9.0"

plugins/statistics_exporter/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/statistics_exporter/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

plugins/subspace_storage/package.json

@@ -34,7 +34,7 @@
 		"antd": "^5.13.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
-		"typescript": "^5.1.6",
+		"typescript": "^5.5.3",
 		"webpack": "^5.88.2",
 		"webpack-cli": "^5.1.4",
 		"webpack-merge": "^5.9.0"

plugins/subspace_storage/tsconfig.browser.json

@@ -5,7 +5,4 @@
 		{ "path": "../../packages/web_ui/tsconfig.browser.json" },
 	],
 	"include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ],
-	"compilerOptions": {
-		"outDir": "dist/browser",
-	}
 }

plugins/subspace_storage/tsconfig.node.json

@@ -5,7 +5,4 @@
 	],
 	"include": ["./**/*.ts"],
 	"exclude": ["test/*", "./dist/*"],
-	"compilerOptions": {
-		"outDir": "dist/node",
-	},
 }

tsconfig.browser.json

@@ -7,5 +7,6 @@
 		"target": "es2022",
 		"jsx": "react-jsx",
 		"noEmitOnError": true,
+		"outDir": "${configDir}/dist/browser",
 	},
 }

tsconfig.node.json

@@ -6,5 +6,6 @@
 		"moduleResolution": "node16",
 		"target": "es2022",
 		"forceConsistentCasingInFileNames": true,
+		"outDir": "${configDir}/dist/node",
 	},
 }