Fix mpa routing in build and dev

eyeregens · Mar 5, 2023 · 27f474a · 27f474a
1 parent 1ec7c31
commit 27f474a
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 267 deletions.
diff --git a/src/pages/index.html → index.html b/src/pages/index.html → index.html
diff --git a/src/pages/logviewer.html → logviewer/index.html b/src/pages/logviewer.html → logviewer/index.html
@@ -210,7 +210,7 @@
     </nav>
     <main></main>
     <aside></aside>
-    <script type="module" src="../logviewer/main.js"></script>
+    <script type="module" src="./src/main.js"></script>
 </body>
 
 </html>
diff --git a/src/logviewer/README.md → logviewer/src/README.md b/src/logviewer/README.md → logviewer/src/README.md
diff --git a/src/logviewer/file.js → logviewer/src/file.js b/src/logviewer/file.js → logviewer/src/file.js
diff --git a/src/logviewer/html.js → logviewer/src/html.js b/src/logviewer/html.js → logviewer/src/html.js
diff --git a/src/logviewer/main.js → logviewer/src/main.js b/src/logviewer/main.js → logviewer/src/main.js
diff --git a/netlify.toml b/netlify.toml
@@ -8,7 +8,7 @@
 
 [[redirects]]
   from = "/logviewer"
-  to = "/logviewer.html"
+  to = "/logviewer/index.html"
   status = 200
 
 [[redirects]]

diff --git a/package.json b/package.json
@@ -13,8 +13,6 @@
     "build": "tsc && vite build",
     "build:scripting-runtime": "./src/engine/scripting/emscripten/build.sh",
     "build:examples": "./examples/build.sh",
-    "preview": "vite-node ./preview-server.ts",
-    "preview:testnet": "VITE_USE_TESTNET=true yarn preview",
     "typecheck": "tsc --noEmit",
     "lint": "npm run lint:js && npm run lint:css",
     "lint:js": "eslint ./src",
@@ -97,7 +95,6 @@
     "@vitejs/plugin-react": "^3.1.0",
     "@vitest/ui": "^0.29.2",
     "c8": "^7.11.0",
-    "chokidar": "^3.5.3",
     "connect-history-api-fallback": "^2.0.0",
     "eslint": "^8.12.0",
     "eslint-config-google": "^0.14.0",
@@ -109,7 +106,6 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.4.0",
     "eslint-plugin-unicorn": "^46.0.0",
-    "glob": "^9.2.1",
     "husky": "^8.0.3",
     "jsdom": "^21.1.0",
     "postcss": "^8.4.12",

diff --git a/preview-server.ts b/preview-server.ts
diff --git a/src/live-reload.ts b/src/live-reload.ts
diff --git a/src/main.tsx b/src/main.tsx
@@ -1,4 +1,3 @@
-import "./live-reload";
 import React from "react";
 import ReactDOM from "react-dom";
 import { BrowserRouter, useLocation, useNavigationType, createRoutesFromChildren, matchRoutes } from "react-router-dom";

diff --git a/src/vite/mpa-router.ts b/src/vite/mpa-router.ts
@@ -1,53 +1,24 @@
 import { Connect, PluginOption } from "vite";
-import { glob } from "glob";
-import path from "path";
-import history, { Rewrite } from "connect-history-api-fallback";
+import history from "connect-history-api-fallback";
 
 export function mpaRouter(): PluginOption {
   return {
     name: "vite-plugin-mpa-router",
-    enforce: "pre",
-    async config(config) {
-      const pages = await glob("../pages/**/*.html", { cwd: __dirname });
-
-      const input: { [key: string]: string } = {};
-
-      for (const pagePath of pages) {
-        const name = path.basename(pagePath, ".html");
-        input[name] = path.resolve(__dirname, pagePath);
-      }
-
-      config.build = config.build || {};
-      config.build.rollupOptions = config.build.rollupOptions || {};
-      config.build.rollupOptions.input = input;
-    },
     async configureServer(server) {
-      const pages = await glob("../pages/**/*.html", { cwd: __dirname });
-
-      const rewrites: Rewrite[] = [];
-
-      for (const pagePath of pages) {
-        const name = path.basename(pagePath, ".html");
-        const to = `./src/pages/${name}.html`;
-
-        if (name === "index") {
-          rewrites.push({
-            from: /^\/$/,
-            to,
-          });
-        }
-
-        rewrites.push({
-          from: new RegExp(`^/${name}$`),
-          to,
-        });
-      }
-
       server.middlewares.use(
         history({
           htmlAcceptHeaders: ["text/html", "application/xhtml+xml"],
-          index: "./src/pages/index.html",
-          rewrites,
+          index: "./index.html",
+          rewrites: [
+            {
+              from: /^\/logviewer$/,
+              to: "./logviewer/index.html",
+            },
+            {
+              from: /^\/$/,
+              to: "./index.html",
+            },
+          ],
         }) as Connect.NextHandleFunction
       );
     },

diff --git a/src/testnet.ts → src/vite/testnet.ts b/src/testnet.ts → src/vite/testnet.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -16,13 +16,5 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": [
-    "./src",
-    "deps.d.ts",
-    "./test",
-    "./preview-server.ts",
-    "./vite.config.ts",
-    "types/WebSG.d.ts",
-    "docs/examples/light/light.js"
-  ]
+  "include": ["./src", "./deps.d.ts", "./test", "./vite.config.ts", "./logviewer/src"]
 }
diff --git a/types/WebSG.d.ts b/types/WebSG.d.ts
diff --git a/vite.config.ts b/vite.config.ts
@@ -6,11 +6,12 @@ import { serviceWorkerPlugin } from "@gautemo/vite-plugin-service-worker";
 import { viteStaticCopy } from "vite-plugin-static-copy";
 import path from "path";
 
-import testnetServerPlugin from "./src/testnet";
 import { mpaRouter } from "./src/vite/mpa-router";
+import testnetServerPlugin from "./src/vite/testnet";
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  appType: "mpa",
   base: "/",
   server: {
     port: 3000,
@@ -55,6 +56,12 @@ export default defineConfig({
   },
   build: {
     sourcemap: true,
+    rollupOptions: {
+      input: {
+        main: path.resolve(__dirname, "index.html"),
+        logviewer: path.resolve(__dirname, "logviewer/index.html"),
+      },
+    },
   },
   test: {
     globals: true,