From ad1901f8a01e45431b5017a37aaf405cebbaa458 Mon Sep 17 00:00:00 2001
From: Candid Dauth <cdauth@cdauth.eu>
Date: Sun, 24 Dec 2023 12:36:29 +0100
Subject: [PATCH] Fix build

---
 .dockerignore          |  1 +
 frontend/build.d.ts    | 14 ++++++++++++++
 frontend/build.js      | 24 ++++++++++++++++++++++++
 frontend/build.ts      | 24 ------------------------
 frontend/package.json  |  2 +-
 server/src/frontend.ts |  2 +-
 server/vite.config.ts  |  2 +-
 7 files changed, 42 insertions(+), 27 deletions(-)
 create mode 100644 frontend/build.d.ts
 create mode 100644 frontend/build.js
 delete mode 100644 frontend/build.ts

diff --git a/.dockerignore b/.dockerignore
index 5bd2efa5..054799a3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,7 @@ node_modules
 */node_modules
 */dist
 */out
+*/out.node
 docs
 .github
 Dockerfile
\ No newline at end of file
diff --git a/frontend/build.d.ts b/frontend/build.d.ts
new file mode 100644
index 00000000..b9fe8bcf
--- /dev/null
+++ b/frontend/build.d.ts
@@ -0,0 +1,14 @@
+import { InlineConfig, ViteDevServer } from "vite";
+
+export const paths: {
+    root: string;
+    dist: string;
+    base: string;
+    mapEntry: string;
+    mapEjs: string;
+    tableEntry: string;
+    tableEjs: string;
+    manifest: string;
+};
+
+export function serve(inlineConfig?: InlineConfig): Promise<ViteDevServer>;
diff --git a/frontend/build.js b/frontend/build.js
new file mode 100644
index 00000000..c7e444b6
--- /dev/null
+++ b/frontend/build.js
@@ -0,0 +1,24 @@
+import { createServer } from "vite";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+
+const root = dirname(fileURLToPath(import.meta.url));
+const dist = `${root}/dist/app`;
+
+export const paths = {
+    root,
+    dist,
+    base: '/_app/',
+    mapEntry: "src/map/map.ts",
+    mapEjs: `${root}/src/map/map.ejs`,
+    tableEntry: "src/table/table.ts",
+    tableEjs: `${root}/src/table/table.ejs`,
+    manifest: `${dist}/manifest.json`,
+};
+
+export async function serve(inlineConfig = {}) {
+    return await createServer({
+        root,
+        ...inlineConfig
+    });
+}
\ No newline at end of file
diff --git a/frontend/build.ts b/frontend/build.ts
deleted file mode 100644
index a15b12db..00000000
--- a/frontend/build.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createServer, type InlineConfig, type ViteDevServer } from "vite";
-import { dirname } from "path";
-import { fileURLToPath } from "url";
-
-const root = dirname(fileURLToPath(import.meta.url));
-const dist = `${root}/dist/app`;
-
-export const paths = {
-	root,
-	dist,
-	base: '/_app/',
-	mapEntry: "src/map/map.ts",
-	mapEjs: `${root}/src/map/map.ejs`,
-	tableEntry: "src/table/table.ts",
-	tableEjs: `${root}/src/table/table.ejs`,
-	manifest: `${dist}/manifest.json`,
-};
-
-export async function serve(inlineConfig: InlineConfig = {}): Promise<ViteDevServer> {
-	return await createServer({
-		root,
-		...inlineConfig
-	});
-}
\ No newline at end of file
diff --git a/frontend/package.json b/frontend/package.json
index 1e238363..9fc275cf 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,7 +18,7 @@
   },
   "type": "module",
   "main": "./dist/lib/facilmap-frontend.mjs",
-  "typings": "./dist/lib/facilmap-frontend.d.ts",
+  "types": "./dist/lib/facilmap-frontend.d.ts",
   "files": [
     "dist",
     "src",
diff --git a/server/src/frontend.ts b/server/src/frontend.ts
index 123a2429..68b90845 100644
--- a/server/src/frontend.ts
+++ b/server/src/frontend.ts
@@ -1,5 +1,5 @@
 import type { Manifest } from "vite";
-import { paths, serve } from "facilmap-frontend/build";
+import { paths, serve } from "facilmap-frontend/build.js";
 import { readFile } from "node:fs/promises";
 import type { ID, Line, Marker, PadData, Type } from "facilmap-types";
 import * as ejs from "ejs";
diff --git a/server/vite.config.ts b/server/vite.config.ts
index 1e132b48..7c0ca189 100644
--- a/server/vite.config.ts
+++ b/server/vite.config.ts
@@ -22,7 +22,7 @@ export default defineConfig({
 				!id.startsWith("./")
 				&& !id.startsWith("../")
 				&& /* resolved internal modules */ !id.startsWith("/")
-				&& !id.startsWith("facilmap-")
+				&& !["facilmap-types", "facilmap-utils"].includes(id)
 			)
 		}
 	}