From 8e5d581b9bd126b80753e86871c4132de24dc56d Mon Sep 17 00:00:00 2001 From: Hornwitser Date: Wed, 7 Feb 2024 17:25:42 +0100 Subject: [PATCH] Move tsconfig.web.json to tsconfig.browser.json Rename the config files for the browser build of modules to better communicate that it's purpose is to compile code for a browser environment rather than the Web UI in particular. This also aligns with the "browser" option in package.json, the existing browser.ts entrypoint in lib, and how the browser environment is typically referred to. --- ...tsconfig.web.json => tsconfig.browser.json} | 6 +++--- ...tsconfig.web.json => tsconfig.browser.json} | 2 +- ...tsconfig.web.json => tsconfig.browser.json} | 4 ++-- packages/web_ui/webpack.common.js | 2 +- plugins/global_chat/tsconfig.browser.json | 11 +++++++++++ plugins/global_chat/tsconfig.web.json | 11 ----------- plugins/inventory_sync/tsconfig.browser.json | 11 +++++++++++ plugins/inventory_sync/tsconfig.web.json | 11 ----------- plugins/player_auth/tsconfig.browser.json | 11 +++++++++++ plugins/player_auth/tsconfig.web.json | 11 ----------- plugins/research_sync/tsconfig.browser.json | 11 +++++++++++ plugins/research_sync/tsconfig.web.json | 11 ----------- .../statistics_exporter/tsconfig.browser.json | 11 +++++++++++ plugins/statistics_exporter/tsconfig.web.json | 11 ----------- plugins/subspace_storage/tsconfig.browser.json | 11 +++++++++++ plugins/subspace_storage/tsconfig.web.json | 11 ----------- tsconfig.web.json => tsconfig.browser.json | 0 tsconfig.json | 18 +++++++++--------- 18 files changed, 82 insertions(+), 82 deletions(-) rename packages/controller/{tsconfig.web.json => tsconfig.browser.json} (54%) rename packages/lib/{tsconfig.web.json => tsconfig.browser.json} (93%) rename packages/web_ui/{tsconfig.web.json => tsconfig.browser.json} (62%) create mode 100644 plugins/global_chat/tsconfig.browser.json delete mode 100644 plugins/global_chat/tsconfig.web.json create mode 100644 plugins/inventory_sync/tsconfig.browser.json delete mode 100644 plugins/inventory_sync/tsconfig.web.json create mode 100644 plugins/player_auth/tsconfig.browser.json delete mode 100644 plugins/player_auth/tsconfig.web.json create mode 100644 plugins/research_sync/tsconfig.browser.json delete mode 100644 plugins/research_sync/tsconfig.web.json create mode 100644 plugins/statistics_exporter/tsconfig.browser.json delete mode 100644 plugins/statistics_exporter/tsconfig.web.json create mode 100644 plugins/subspace_storage/tsconfig.browser.json delete mode 100644 plugins/subspace_storage/tsconfig.web.json rename tsconfig.web.json => tsconfig.browser.json (100%) diff --git a/packages/controller/tsconfig.web.json b/packages/controller/tsconfig.browser.json similarity index 54% rename from packages/controller/tsconfig.web.json rename to packages/controller/tsconfig.browser.json index 6685a163..3fff0691 100644 --- a/packages/controller/tsconfig.web.json +++ b/packages/controller/tsconfig.browser.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.web.json", + "extends": "../../tsconfig.browser.json", "references": [ - { "path": "../lib/tsconfig.web.json" }, - { "path": "../web_ui/tsconfig.web.json" }, + { "path": "../lib/tsconfig.browser.json" }, + { "path": "../web_ui/tsconfig.browser.json" }, ], "include": [ "web/**/*.tsx", "web/**/*.ts", "package.json" ], "compilerOptions": { diff --git a/packages/lib/tsconfig.web.json b/packages/lib/tsconfig.browser.json similarity index 93% rename from packages/lib/tsconfig.web.json rename to packages/lib/tsconfig.browser.json index a4349659..36ebfbd9 100644 --- a/packages/lib/tsconfig.web.json +++ b/packages/lib/tsconfig.browser.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.web.json", + "extends": "../../tsconfig.browser.json", "include": [ "browser.ts", "package.json", diff --git a/packages/web_ui/tsconfig.web.json b/packages/web_ui/tsconfig.browser.json similarity index 62% rename from packages/web_ui/tsconfig.web.json rename to packages/web_ui/tsconfig.browser.json index 65754630..8d0236e7 100644 --- a/packages/web_ui/tsconfig.web.json +++ b/packages/web_ui/tsconfig.browser.json @@ -1,7 +1,7 @@ { - "extends": "../../tsconfig.web.json", + "extends": "../../tsconfig.browser.json", "references": [ - { "path": "../lib/tsconfig.web.json" }, + { "path": "../lib/tsconfig.browser.json" }, ], "include": [ "src/**/*.tsx", "src/**/*.ts", "package.json", "global.d.ts" ], "compilerOptions": { diff --git a/packages/web_ui/webpack.common.js b/packages/web_ui/webpack.common.js index e8a5d8b7..99825c4b 100644 --- a/packages/web_ui/webpack.common.js +++ b/packages/web_ui/webpack.common.js @@ -79,7 +79,7 @@ module.exports = (env = {}) => ({ use: { loader: require.resolve("ts-loader"), options: { - configFile: "tsconfig.web.json", + configFile: "tsconfig.browser.json", projectReferences: true, }, }, diff --git a/plugins/global_chat/tsconfig.browser.json b/plugins/global_chat/tsconfig.browser.json new file mode 100644 index 00000000..a3109220 --- /dev/null +++ b/plugins/global_chat/tsconfig.browser.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.browser.json", + "references": [ + { "path": "../../packages/lib/tsconfig.browser.json" }, + { "path": "../../packages/web_ui/tsconfig.browser.json" }, + ], + "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], + "compilerOptions": { + "outDir": "dist/web/build", + } +} diff --git a/plugins/global_chat/tsconfig.web.json b/plugins/global_chat/tsconfig.web.json deleted file mode 100644 index c37f9141..00000000 --- a/plugins/global_chat/tsconfig.web.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.web.json", - "references": [ - { "path": "../../packages/lib/tsconfig.web.json" }, - { "path": "../../packages/web_ui/tsconfig.web.json" }, - ], - "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], - "compilerOptions": { - "outDir": "dist/web/build", - } -} diff --git a/plugins/inventory_sync/tsconfig.browser.json b/plugins/inventory_sync/tsconfig.browser.json new file mode 100644 index 00000000..a3109220 --- /dev/null +++ b/plugins/inventory_sync/tsconfig.browser.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.browser.json", + "references": [ + { "path": "../../packages/lib/tsconfig.browser.json" }, + { "path": "../../packages/web_ui/tsconfig.browser.json" }, + ], + "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], + "compilerOptions": { + "outDir": "dist/web/build", + } +} diff --git a/plugins/inventory_sync/tsconfig.web.json b/plugins/inventory_sync/tsconfig.web.json deleted file mode 100644 index c37f9141..00000000 --- a/plugins/inventory_sync/tsconfig.web.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.web.json", - "references": [ - { "path": "../../packages/lib/tsconfig.web.json" }, - { "path": "../../packages/web_ui/tsconfig.web.json" }, - ], - "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], - "compilerOptions": { - "outDir": "dist/web/build", - } -} diff --git a/plugins/player_auth/tsconfig.browser.json b/plugins/player_auth/tsconfig.browser.json new file mode 100644 index 00000000..a3109220 --- /dev/null +++ b/plugins/player_auth/tsconfig.browser.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.browser.json", + "references": [ + { "path": "../../packages/lib/tsconfig.browser.json" }, + { "path": "../../packages/web_ui/tsconfig.browser.json" }, + ], + "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], + "compilerOptions": { + "outDir": "dist/web/build", + } +} diff --git a/plugins/player_auth/tsconfig.web.json b/plugins/player_auth/tsconfig.web.json deleted file mode 100644 index c37f9141..00000000 --- a/plugins/player_auth/tsconfig.web.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.web.json", - "references": [ - { "path": "../../packages/lib/tsconfig.web.json" }, - { "path": "../../packages/web_ui/tsconfig.web.json" }, - ], - "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], - "compilerOptions": { - "outDir": "dist/web/build", - } -} diff --git a/plugins/research_sync/tsconfig.browser.json b/plugins/research_sync/tsconfig.browser.json new file mode 100644 index 00000000..a3109220 --- /dev/null +++ b/plugins/research_sync/tsconfig.browser.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.browser.json", + "references": [ + { "path": "../../packages/lib/tsconfig.browser.json" }, + { "path": "../../packages/web_ui/tsconfig.browser.json" }, + ], + "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], + "compilerOptions": { + "outDir": "dist/web/build", + } +} diff --git a/plugins/research_sync/tsconfig.web.json b/plugins/research_sync/tsconfig.web.json deleted file mode 100644 index c37f9141..00000000 --- a/plugins/research_sync/tsconfig.web.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.web.json", - "references": [ - { "path": "../../packages/lib/tsconfig.web.json" }, - { "path": "../../packages/web_ui/tsconfig.web.json" }, - ], - "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], - "compilerOptions": { - "outDir": "dist/web/build", - } -} diff --git a/plugins/statistics_exporter/tsconfig.browser.json b/plugins/statistics_exporter/tsconfig.browser.json new file mode 100644 index 00000000..0454f6c4 --- /dev/null +++ b/plugins/statistics_exporter/tsconfig.browser.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.browser.json", + "references": [ + { "path": "../../packages/lib/tsconfig.browser.json" }, + { "path": "../../packages/web_ui/tsconfig.browser.json" }, + ], + "include": [ "web/**/*.tsx", "web/**/*.ts", "package.json" ], + "compilerOptions": { + "outDir": "dist/web/build", + } +} diff --git a/plugins/statistics_exporter/tsconfig.web.json b/plugins/statistics_exporter/tsconfig.web.json deleted file mode 100644 index decec50c..00000000 --- a/plugins/statistics_exporter/tsconfig.web.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.web.json", - "references": [ - { "path": "../../packages/lib/tsconfig.web.json" }, - { "path": "../../packages/web_ui/tsconfig.web.json" }, - ], - "include": [ "web/**/*.tsx", "web/**/*.ts", "package.json" ], - "compilerOptions": { - "outDir": "dist/web/build", - } -} diff --git a/plugins/subspace_storage/tsconfig.browser.json b/plugins/subspace_storage/tsconfig.browser.json new file mode 100644 index 00000000..a3109220 --- /dev/null +++ b/plugins/subspace_storage/tsconfig.browser.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.browser.json", + "references": [ + { "path": "../../packages/lib/tsconfig.browser.json" }, + { "path": "../../packages/web_ui/tsconfig.browser.json" }, + ], + "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], + "compilerOptions": { + "outDir": "dist/web/build", + } +} diff --git a/plugins/subspace_storage/tsconfig.web.json b/plugins/subspace_storage/tsconfig.web.json deleted file mode 100644 index c37f9141..00000000 --- a/plugins/subspace_storage/tsconfig.web.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.web.json", - "references": [ - { "path": "../../packages/lib/tsconfig.web.json" }, - { "path": "../../packages/web_ui/tsconfig.web.json" }, - ], - "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], - "compilerOptions": { - "outDir": "dist/web/build", - } -} diff --git a/tsconfig.web.json b/tsconfig.browser.json similarity index 100% rename from tsconfig.web.json rename to tsconfig.browser.json diff --git a/tsconfig.json b/tsconfig.json index c9f896d7..fbb6a7ec 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,23 +2,23 @@ "files": [], "references": [ { "path": "./packages/lib" }, - { "path": "./packages/lib/tsconfig.web.json" }, { "path": "./packages/controller" }, - { "path": "./packages/controller/tsconfig.web.json" }, { "path": "./packages/host" }, { "path": "./packages/ctl" }, - { "path": "./packages/web_ui/tsconfig.web.json" }, { "path": "./plugins/global_chat" }, - { "path": "./plugins/global_chat/tsconfig.web.json" }, { "path": "./plugins/inventory_sync" }, - { "path": "./plugins/inventory_sync/tsconfig.web.json" }, { "path": "./plugins/player_auth" }, - { "path": "./plugins/player_auth/tsconfig.web.json" }, { "path": "./plugins/research_sync" }, - { "path": "./plugins/research_sync/tsconfig.web.json" }, { "path": "./plugins/statistics_exporter" }, - { "path": "./plugins/statistics_exporter/tsconfig.web.json" }, { "path": "./plugins/subspace_storage" }, - { "path": "./plugins/subspace_storage/tsconfig.web.json" }, + { "path": "./packages/lib/tsconfig.browser.json" }, + { "path": "./packages/controller/tsconfig.browser.json" }, + { "path": "./packages/web_ui/tsconfig.browser.json" }, + { "path": "./plugins/global_chat/tsconfig.browser.json" }, + { "path": "./plugins/inventory_sync/tsconfig.browser.json" }, + { "path": "./plugins/player_auth/tsconfig.browser.json" }, + { "path": "./plugins/research_sync/tsconfig.browser.json" }, + { "path": "./plugins/statistics_exporter/tsconfig.browser.json" }, + { "path": "./plugins/subspace_storage/tsconfig.browser.json" }, ], }