From 50f36665eb0f01a01b4e94f7c1c160851f44ba68 Mon Sep 17 00:00:00 2001 From: RSamaium Date: Fri, 26 Jan 2024 13:50:59 +0100 Subject: [PATCH] fix react import --- packages/client/package-lock.json | 40 +++++++++++++++++++- packages/client/package.json | 1 + packages/client/src/Gui/Gui.ts | 1 - packages/compiler/src/build/client-config.ts | 4 +- 4 files changed, 41 insertions(+), 5 deletions(-) diff --git a/packages/client/package-lock.json b/packages/client/package-lock.json index 52169748..48bdd194 100644 --- a/packages/client/package-lock.json +++ b/packages/client/package-lock.json @@ -20,6 +20,7 @@ "lodash.merge": "4.6.2", "pixi-viewport": "^5.0.2", "pixi.js": "7.2.4", + "react-dom": "^18.2.0", "rxjs": "7.8.0", "simple-room-client": "^3.0.0", "vue": "^3.2.47" @@ -5331,7 +5332,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "peer": true, "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -6022,6 +6022,18 @@ "node": ">=0.10.0" } }, + "node_modules/react-dom": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "dependencies": { + "loose-envify": "^1.1.0", + "scheduler": "^0.23.0" + }, + "peerDependencies": { + "react": "^18.2.0" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -6392,6 +6404,14 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "node_modules/scheduler": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "dependencies": { + "loose-envify": "^1.1.0" + } + }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -12303,7 +12323,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "peer": true, "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } @@ -12812,6 +12831,15 @@ "loose-envify": "^1.1.0" } }, + "react-dom": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "requires": { + "loose-envify": "^1.1.0", + "scheduler": "^0.23.0" + } + }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -13092,6 +13120,14 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "scheduler": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "requires": { + "loose-envify": "^1.1.0" + } + }, "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", diff --git a/packages/client/package.json b/packages/client/package.json index a23b7163..6b524ef6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -38,6 +38,7 @@ "lodash.merge": "4.6.2", "pixi-viewport": "^5.0.2", "pixi.js": "7.2.4", + "react-dom": "^18.2.0", "rxjs": "7.8.0", "simple-room-client": "^3.0.0", "vue": "^3.2.47" diff --git a/packages/client/src/Gui/Gui.ts b/packages/client/src/Gui/Gui.ts index 61b9bb4a..3cc10602 100644 --- a/packages/client/src/Gui/Gui.ts +++ b/packages/client/src/Gui/Gui.ts @@ -58,7 +58,6 @@ export class Gui { } if (this.clientEngine.envs?.['VITE_REACT']) { - console.warn('[RPGJS] React GUI is experimental feature. So, its use may change over time. Not yet in production') COMPONENT_LIBRARIES.push(await import('./React').then(m => m.ReactGui)) } diff --git a/packages/compiler/src/build/client-config.ts b/packages/compiler/src/build/client-config.ts index ed457851..6f7fd263 100644 --- a/packages/compiler/src/build/client-config.ts +++ b/packages/compiler/src/build/client-config.ts @@ -59,7 +59,7 @@ export async function clientBuildConfig(dirname: string, options: ClientBuildCon throw new Error('Invalid type. Choice between rpg or mmorpg') } - const buildOptions = config.compilerOptions.build + const buildOptions = config.compilerOptions?.build // found react packages in node_modules const hasPkg = pkg => _fs.existsSync(join(cwd(), 'node_modules', pkg)) @@ -75,7 +75,7 @@ export async function clientBuildConfig(dirname: string, options: ClientBuildCon let serverUrl = '' if (isBuild) { - serverUrl = env.VITE_SERVER_URL = process.env.VITE_SERVER_URL ?? buildOptions.serverUrl ?? '' + serverUrl = env.VITE_SERVER_URL = process.env.VITE_SERVER_URL ?? buildOptions?.serverUrl ?? '' } else { serverUrl = 'http://' + env.VITE_SERVER_URL