Merge pull request #432 from Thorium-Sim/develop

Fix some broken stuff when building for production.
Thorium-Sim · Oct 11, 2022 · 61e57d9 · 61e57d9
2 parents 5f22edf + 8da356b
commit 61e57d9
Show file tree

Hide file tree

Showing 5 changed files with 847 additions and 654 deletions.
diff --git a/client/package.json b/client/package.json
@@ -75,6 +75,7 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "@types/three": "^0.143.0",
+    "@vitejs/plugin-react": "^2.1.0",
     "@vitejs/plugin-react-refresh": "^1.3.6",
     "autoprefixer": "^10.4.8",
     "daisyui": "^2.22.0",

diff --git a/client/src/context/ThoriumAccountContext.tsx b/client/src/context/ThoriumAccountContext.tsx
@@ -6,7 +6,6 @@ import {
   useMemo,
   useState,
 } from "react";
-import * as React from "react";
 import {useLocalStorage} from "../hooks/useLocalStorage";
 
 type ThoriumAccountContextProps = {

diff --git a/client/vite.config.ts b/client/vite.config.ts
@@ -1,17 +1,15 @@
 import {defineConfig} from "vite";
-import reactRefresh from "@vitejs/plugin-react-refresh";
 import tsconfigPaths from "vite-tsconfig-paths";
-import reactJsx from "vite-react-jsx";
+import react from "@vitejs/plugin-react";
 import releasesPlugin from "./vite-plugins/releases";
 import mdPlugin, {Mode} from "vite-plugin-markdown";
 
 // https://vitejs.dev/config/
 export default defineConfig(async () => {
   return {
     plugins: [
-      reactRefresh(),
       tsconfigPaths(),
-      reactJsx(),
+      react(),
       releasesPlugin(),
       mdPlugin({mode: [Mode.HTML, Mode.TOC]}),
     ],
@@ -20,7 +18,9 @@ export default defineConfig(async () => {
       emptyOutDir: false,
       commonjsOptions: {include: []},
     },
-    optimizeDeps: {disabled: false},
+    optimizeDeps: {
+      disabled: false,
+    },
     define: {
       "process.env.THORIUMSIM_CLIENT_ID": `"01FM3JNPNP3GFAXYR22Y7F9XAJ"`,
       "process.env.THORIUMSIM_URL": `"https://thoriumsim.com"`,