From a8fd1b3285d0ebf83b218dd6b3b23d98c4125bd3 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 21 Jan 2024 16:39:48 -0600
Subject: [PATCH 1/3] Update vike version

---
 package.json |   2 +-
 yarn.lock    | 387 +++++++++++++++++++++++++++++----------------------
 2 files changed, 222 insertions(+), 167 deletions(-)

diff --git a/package.json b/package.json
index 99331b47..10f7e986 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "use-debounce": "^9.0.4",
     "use-react-router-breadcrumbs": "^3.2.1",
     "use-resize-observer": "^9.1.0",
-    "vike": "0.4.150-commit-63b1c32",
+    "vike": "^0.4.159",
     "vite": "^4.4.9",
     "vite-plugin-cesium": "^1.2.22"
   },
diff --git a/yarn.lock b/yarn.lock
index 778b3255..8d9bac27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1828,7 +1828,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@brillout/import@npm:0.2.3, @brillout/import@npm:^0.2.3":
+"@brillout/import@npm:^0.2.3":
   version: 0.2.3
   resolution: "@brillout/import@npm:0.2.3"
   checksum: 90a0f39148ded078ac9298d93bb968ede51f28ef24112e0bac11a6fee14e3df0b13c67a49c86a588bcaefea325b7d5369d7952b0bcb64102d371378c4fde491e
@@ -1856,12 +1856,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@brillout/vite-plugin-import-build@npm:0.2.22-commit-7f1bb0a":
-  version: 0.2.22-commit-7f1bb0a
-  resolution: "@brillout/vite-plugin-import-build@npm:0.2.22-commit-7f1bb0a"
+"@brillout/vite-plugin-server-entry@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@brillout/vite-plugin-server-entry@npm:0.4.3"
   dependencies:
     "@brillout/import": ^0.2.3
-  checksum: e3a31e3a9254597076acce298b24bef938d00f34ef2ee5550631f866d13a9899738571fcd4ed0119351d25acc09bb43205519d52fe141f76c90779e1cb39683c
+  checksum: 8972400794a100536b4badad274d439d29ed32ee9f1f3852f6f36a316ba7ac05f46355d58c049ffed05d79fa1cfa22e2c2b13c1343f8c23ece09302787e3d568
   languageName: node
   linkType: hard
 
@@ -2389,10 +2389,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-arm64@npm:0.17.19"
-  conditions: os=android & cpu=arm64
+"@esbuild/aix-ppc64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/aix-ppc64@npm:0.19.11"
+  conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
 
@@ -2403,10 +2403,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-arm@npm:0.17.19"
-  conditions: os=android & cpu=arm
+"@esbuild/android-arm64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/android-arm64@npm:0.19.11"
+  conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -2417,10 +2417,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-x64@npm:0.17.19"
-  conditions: os=android & cpu=x64
+"@esbuild/android-arm@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/android-arm@npm:0.19.11"
+  conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
@@ -2431,10 +2431,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/darwin-arm64@npm:0.17.19"
-  conditions: os=darwin & cpu=arm64
+"@esbuild/android-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/android-x64@npm:0.19.11"
+  conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2445,10 +2445,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/darwin-x64@npm:0.17.19"
-  conditions: os=darwin & cpu=x64
+"@esbuild/darwin-arm64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/darwin-arm64@npm:0.19.11"
+  conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -2459,10 +2459,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/freebsd-arm64@npm:0.17.19"
-  conditions: os=freebsd & cpu=arm64
+"@esbuild/darwin-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/darwin-x64@npm:0.19.11"
+  conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2473,10 +2473,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/freebsd-x64@npm:0.17.19"
-  conditions: os=freebsd & cpu=x64
+"@esbuild/freebsd-arm64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/freebsd-arm64@npm:0.19.11"
+  conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -2487,10 +2487,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-arm64@npm:0.17.19"
-  conditions: os=linux & cpu=arm64
+"@esbuild/freebsd-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/freebsd-x64@npm:0.19.11"
+  conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2501,10 +2501,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-arm@npm:0.17.19"
-  conditions: os=linux & cpu=arm
+"@esbuild/linux-arm64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-arm64@npm:0.19.11"
+  conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -2515,10 +2515,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-ia32@npm:0.17.19"
-  conditions: os=linux & cpu=ia32
+"@esbuild/linux-arm@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-arm@npm:0.19.11"
+  conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
@@ -2529,10 +2529,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-loong64@npm:0.17.19"
-  conditions: os=linux & cpu=loong64
+"@esbuild/linux-ia32@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-ia32@npm:0.19.11"
+  conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
@@ -2543,10 +2543,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-mips64el@npm:0.17.19"
-  conditions: os=linux & cpu=mips64el
+"@esbuild/linux-loong64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-loong64@npm:0.19.11"
+  conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
@@ -2557,10 +2557,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-ppc64@npm:0.17.19"
-  conditions: os=linux & cpu=ppc64
+"@esbuild/linux-mips64el@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-mips64el@npm:0.19.11"
+  conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
@@ -2571,10 +2571,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-riscv64@npm:0.17.19"
-  conditions: os=linux & cpu=riscv64
+"@esbuild/linux-ppc64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-ppc64@npm:0.19.11"
+  conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
@@ -2585,10 +2585,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-s390x@npm:0.17.19"
-  conditions: os=linux & cpu=s390x
+"@esbuild/linux-riscv64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-riscv64@npm:0.19.11"
+  conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
@@ -2599,10 +2599,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-x64@npm:0.17.19"
-  conditions: os=linux & cpu=x64
+"@esbuild/linux-s390x@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-s390x@npm:0.19.11"
+  conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
@@ -2613,10 +2613,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/netbsd-x64@npm:0.17.19"
-  conditions: os=netbsd & cpu=x64
+"@esbuild/linux-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/linux-x64@npm:0.19.11"
+  conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2627,10 +2627,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/openbsd-x64@npm:0.17.19"
-  conditions: os=openbsd & cpu=x64
+"@esbuild/netbsd-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/netbsd-x64@npm:0.19.11"
+  conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2641,10 +2641,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/sunos-x64@npm:0.17.19"
-  conditions: os=sunos & cpu=x64
+"@esbuild/openbsd-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/openbsd-x64@npm:0.19.11"
+  conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2655,10 +2655,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-arm64@npm:0.17.19"
-  conditions: os=win32 & cpu=arm64
+"@esbuild/sunos-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/sunos-x64@npm:0.19.11"
+  conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
@@ -2669,10 +2669,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-ia32@npm:0.17.19"
-  conditions: os=win32 & cpu=ia32
+"@esbuild/win32-arm64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/win32-arm64@npm:0.19.11"
+  conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
@@ -2683,10 +2683,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-x64@npm:0.17.19"
-  conditions: os=win32 & cpu=x64
+"@esbuild/win32-ia32@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/win32-ia32@npm:0.19.11"
+  conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
@@ -2697,6 +2697,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/win32-x64@npm:0.19.11":
+  version: 0.19.11
+  resolution: "@esbuild/win32-x64@npm:0.19.11"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@eslint-community/eslint-utils@npm:^4.4.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
@@ -3803,7 +3810,7 @@ __metadata:
     use-debounce: ^9.0.4
     use-react-router-breadcrumbs: ^3.2.1
     use-resize-observer: ^9.1.0
-    vike: 0.4.150-commit-63b1c32
+    vike: ^0.4.159
     vite: ^4.4.9
     vite-plugin-cesium: ^1.2.22
     vite-plugin-rewrite-all: ^1.0.1
@@ -5136,6 +5143,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@polka/url@npm:^1.0.0-next.24":
+  version: 1.0.0-next.24
+  resolution: "@polka/url@npm:1.0.0-next.24"
+  checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
+  languageName: node
+  linkType: hard
+
 "@popperjs/core@npm:^2.11.7, @popperjs/core@npm:^2.9.3":
   version: 2.11.8
   resolution: "@popperjs/core@npm:2.11.8"
@@ -9400,7 +9414,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.7.14":
+"cac@npm:^6.0.0":
   version: 6.7.14
   resolution: "cac@npm:6.7.14"
   checksum: 45a2496a9443abbe7f52a49b22fbe51b1905eff46e03fd5e6c98e3f85077be3f8949685a1849b1a9cd2bc3e5567dfebcf64f01ce01847baf918f1b37c839791a
@@ -12812,7 +12826,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^1.2.1, es-module-lexer@npm:^1.3.0":
+"es-module-lexer@npm:^1.0.0":
+  version: 1.4.1
+  resolution: "es-module-lexer@npm:1.4.1"
+  checksum: a11b5a256d4e8e9c7d94c2fd87415ccd1591617b6edd847e064503f8eaece2d25e2e9078a02c5ce3ed5e83bb748f5b4820efbe78072c8beb07ac619c2edec35d
+  languageName: node
+  linkType: hard
+
+"es-module-lexer@npm:^1.2.1":
   version: 1.3.1
   resolution: "es-module-lexer@npm:1.3.1"
   checksum: 3beafa7e171eb1e8cc45695edf8d51638488dddf65294d7911f8d6a96249da6a9838c87529262cc6ea53988d8272cec0f4bff93f476ed031a54ba3afb51a0ed3
@@ -12857,32 +12878,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.17.18":
-  version: 0.17.19
-  resolution: "esbuild@npm:0.17.19"
-  dependencies:
-    "@esbuild/android-arm": 0.17.19
-    "@esbuild/android-arm64": 0.17.19
-    "@esbuild/android-x64": 0.17.19
-    "@esbuild/darwin-arm64": 0.17.19
-    "@esbuild/darwin-x64": 0.17.19
-    "@esbuild/freebsd-arm64": 0.17.19
-    "@esbuild/freebsd-x64": 0.17.19
-    "@esbuild/linux-arm": 0.17.19
-    "@esbuild/linux-arm64": 0.17.19
-    "@esbuild/linux-ia32": 0.17.19
-    "@esbuild/linux-loong64": 0.17.19
-    "@esbuild/linux-mips64el": 0.17.19
-    "@esbuild/linux-ppc64": 0.17.19
-    "@esbuild/linux-riscv64": 0.17.19
-    "@esbuild/linux-s390x": 0.17.19
-    "@esbuild/linux-x64": 0.17.19
-    "@esbuild/netbsd-x64": 0.17.19
-    "@esbuild/openbsd-x64": 0.17.19
-    "@esbuild/sunos-x64": 0.17.19
-    "@esbuild/win32-arm64": 0.17.19
-    "@esbuild/win32-ia32": 0.17.19
-    "@esbuild/win32-x64": 0.17.19
+"esbuild@npm:^0.18.10":
+  version: 0.18.20
+  resolution: "esbuild@npm:0.18.20"
+  dependencies:
+    "@esbuild/android-arm": 0.18.20
+    "@esbuild/android-arm64": 0.18.20
+    "@esbuild/android-x64": 0.18.20
+    "@esbuild/darwin-arm64": 0.18.20
+    "@esbuild/darwin-x64": 0.18.20
+    "@esbuild/freebsd-arm64": 0.18.20
+    "@esbuild/freebsd-x64": 0.18.20
+    "@esbuild/linux-arm": 0.18.20
+    "@esbuild/linux-arm64": 0.18.20
+    "@esbuild/linux-ia32": 0.18.20
+    "@esbuild/linux-loong64": 0.18.20
+    "@esbuild/linux-mips64el": 0.18.20
+    "@esbuild/linux-ppc64": 0.18.20
+    "@esbuild/linux-riscv64": 0.18.20
+    "@esbuild/linux-s390x": 0.18.20
+    "@esbuild/linux-x64": 0.18.20
+    "@esbuild/netbsd-x64": 0.18.20
+    "@esbuild/openbsd-x64": 0.18.20
+    "@esbuild/sunos-x64": 0.18.20
+    "@esbuild/win32-arm64": 0.18.20
+    "@esbuild/win32-ia32": 0.18.20
+    "@esbuild/win32-x64": 0.18.20
   dependenciesMeta:
     "@esbuild/android-arm":
       optional: true
@@ -12930,37 +12951,40 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: ac11b1a5a6008e4e37ccffbd6c2c054746fc58d0ed4a2f9ee643bd030cfcea9a33a235087bc777def8420f2eaafb3486e76adb7bdb7241a9143b43a69a10afd8
+  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.18.10":
-  version: 0.18.20
-  resolution: "esbuild@npm:0.18.20"
-  dependencies:
-    "@esbuild/android-arm": 0.18.20
-    "@esbuild/android-arm64": 0.18.20
-    "@esbuild/android-x64": 0.18.20
-    "@esbuild/darwin-arm64": 0.18.20
-    "@esbuild/darwin-x64": 0.18.20
-    "@esbuild/freebsd-arm64": 0.18.20
-    "@esbuild/freebsd-x64": 0.18.20
-    "@esbuild/linux-arm": 0.18.20
-    "@esbuild/linux-arm64": 0.18.20
-    "@esbuild/linux-ia32": 0.18.20
-    "@esbuild/linux-loong64": 0.18.20
-    "@esbuild/linux-mips64el": 0.18.20
-    "@esbuild/linux-ppc64": 0.18.20
-    "@esbuild/linux-riscv64": 0.18.20
-    "@esbuild/linux-s390x": 0.18.20
-    "@esbuild/linux-x64": 0.18.20
-    "@esbuild/netbsd-x64": 0.18.20
-    "@esbuild/openbsd-x64": 0.18.20
-    "@esbuild/sunos-x64": 0.18.20
-    "@esbuild/win32-arm64": 0.18.20
-    "@esbuild/win32-ia32": 0.18.20
-    "@esbuild/win32-x64": 0.18.20
+"esbuild@npm:^0.19.0":
+  version: 0.19.11
+  resolution: "esbuild@npm:0.19.11"
+  dependencies:
+    "@esbuild/aix-ppc64": 0.19.11
+    "@esbuild/android-arm": 0.19.11
+    "@esbuild/android-arm64": 0.19.11
+    "@esbuild/android-x64": 0.19.11
+    "@esbuild/darwin-arm64": 0.19.11
+    "@esbuild/darwin-x64": 0.19.11
+    "@esbuild/freebsd-arm64": 0.19.11
+    "@esbuild/freebsd-x64": 0.19.11
+    "@esbuild/linux-arm": 0.19.11
+    "@esbuild/linux-arm64": 0.19.11
+    "@esbuild/linux-ia32": 0.19.11
+    "@esbuild/linux-loong64": 0.19.11
+    "@esbuild/linux-mips64el": 0.19.11
+    "@esbuild/linux-ppc64": 0.19.11
+    "@esbuild/linux-riscv64": 0.19.11
+    "@esbuild/linux-s390x": 0.19.11
+    "@esbuild/linux-x64": 0.19.11
+    "@esbuild/netbsd-x64": 0.19.11
+    "@esbuild/openbsd-x64": 0.19.11
+    "@esbuild/sunos-x64": 0.19.11
+    "@esbuild/win32-arm64": 0.19.11
+    "@esbuild/win32-ia32": 0.19.11
+    "@esbuild/win32-x64": 0.19.11
   dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
     "@esbuild/android-arm":
       optional: true
     "@esbuild/android-arm64":
@@ -13007,7 +13031,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 5d253614e50cdb6ec22095afd0c414f15688e7278a7eb4f3720a6dd1306b0909cf431e7b9437a90d065a31b1c57be60130f63fe3e8d0083b588571f31ee6ec7b
+  checksum: ae949a796d1d06b55275ae7491ce137857468f69a93d8cc9c0943d2a701ac54e14dbb250a2ba56f2ad98283669578f1ec3bd85a4681910a5ff29a2470c3bd62c
   languageName: node
   linkType: hard
 
@@ -13573,7 +13597,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
+"fast-glob@npm:^3.0.0":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
+  dependencies:
+    "@nodelib/fs.stat": ^2.0.2
+    "@nodelib/fs.walk": ^1.2.3
+    glob-parent: ^5.1.2
+    merge2: ^1.3.0
+    micromatch: ^4.0.4
+  checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1
+  languageName: node
+  linkType: hard
+
+"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0":
   version: 3.3.1
   resolution: "fast-glob@npm:3.3.1"
   dependencies:
@@ -20945,6 +20982,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mrmime@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "mrmime@npm:2.0.0"
+  checksum: f6fe11ec667c3d96f1ce5fd41184ed491d5f0a5f4045e82446a471ccda5f84c7f7610dff61d378b73d964f73a320bd7f89788f9e6b9403e32cc4be28ba99f569
+  languageName: node
+  linkType: hard
+
 "ms@npm:2.0.0":
   version: 2.0.0
   resolution: "ms@npm:2.0.0"
@@ -26619,7 +26663,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sirv@npm:^2.0.2, sirv@npm:^2.0.3":
+"sirv@npm:^2.0.0":
+  version: 2.0.4
+  resolution: "sirv@npm:2.0.4"
+  dependencies:
+    "@polka/url": ^1.0.0-next.24
+    mrmime: ^2.0.0
+    totalist: ^3.0.0
+  checksum: 6853384a51d6ee9377dd657e2b257e0e98b29abbfbfa6333e105197f0f100c8c56a4520b47028b04ab1833cf2312526206f38fcd4f891c6df453f40da1a15a57
+  languageName: node
+  linkType: hard
+
+"sirv@npm:^2.0.3":
   version: 2.0.3
   resolution: "sirv@npm:2.0.3"
   dependencies:
@@ -26840,7 +26895,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.21, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20":
+"source-map-support@npm:^0.5.0, source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20":
   version: 0.5.21
   resolution: "source-map-support@npm:0.5.21"
   dependencies:
@@ -29571,22 +29626,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vike@npm:0.4.150-commit-63b1c32":
-  version: 0.4.150-commit-63b1c32
-  resolution: "vike@npm:0.4.150-commit-63b1c32"
+"vike@npm:^0.4.159":
+  version: 0.4.159
+  resolution: "vike@npm:0.4.159"
   dependencies:
-    "@brillout/import": 0.2.3
+    "@brillout/import": ^0.2.3
     "@brillout/json-serializer": ^0.5.8
     "@brillout/picocolors": ^1.0.10
     "@brillout/require-shim": ^0.1.2
-    "@brillout/vite-plugin-import-build": 0.2.22-commit-7f1bb0a
-    acorn: ^8.8.2
-    cac: ^6.7.14
-    es-module-lexer: ^1.3.0
-    esbuild: ^0.17.18
-    fast-glob: ^3.2.12
-    sirv: ^2.0.2
-    source-map-support: ^0.5.21
+    "@brillout/vite-plugin-server-entry": ^0.4.3
+    acorn: ^8.0.0
+    cac: ^6.0.0
+    es-module-lexer: ^1.0.0
+    esbuild: ^0.19.0
+    fast-glob: ^3.0.0
+    sirv: ^2.0.0
+    source-map-support: ^0.5.0
   peerDependencies:
     react-streaming: ">=0.3.5"
     vite: ">=3.1.0"
@@ -29595,7 +29650,7 @@ __metadata:
       optional: true
   bin:
     vike: node/cli/bin-entry.js
-  checksum: 6e0b8e9aec401083bd05182ca63b212ad72260086e3464e32858d5369a28d2373030f24ae0deed93d71e91f1bfe91a5d02e5235613e14203d3c1bdf37181f04a
+  checksum: 5da0423812db17b23684b58a4809ee89213315872921eed53def6cfe837e4c9df4692afabd29467b9af5efc8b1ae78b75ab1b5764eb25eae336f0ca6e912803c
   languageName: node
   linkType: hard
 

From a38ad7a710387e134270b65e1c413c1d76c9f93b Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 21 Jan 2024 17:09:04 -0600
Subject: [PATCH 2/3] Switched to vike v1 design

- Seems to work pretty well
- Might need some added adjustment and testing

See migration guide at https://vike.dev/migration/v1-design
---
 src/pages/{index.page.tsx => +Page.tsx}                      | 0
 src/{renderer/_error.page.tsx => pages/_error/+Page.tsx}     | 0
 src/pages/about/{index.page.tsx => +Page.tsx}                | 0
 src/pages/column/{@id.page.ts => @id/+Page.ts}               | 0
 .../column/{@id.page.server.ts => @id/+onBeforeRender.ts}    | 0
 src/pages/dev/{index.page.ts => +Page.ts}                    | 0
 src/pages/dev/globe/{index.page.ts => +Page.ts}              | 0
 src/pages/dev/paleo/{index.page.ts => +Page.ts}              | 0
 src/pages/dev/security/{index.page.ts => +Page.ts}           | 0
 src/pages/dev/security/{index.page.route.ts => +guard.ts}    | 0
 src/pages/dev/security/endpoint/{index.page.ts => +Page.ts}  | 0
 src/pages/dev/ui-tests/{index.page.ts => +Page.ts}           | 0
 .../dev/ui-tests/{data-sheet.page.ts => data-sheet/+Page.ts} | 4 ++--
 src/pages/map/{index.page.ts => +Page.ts}                    | 0
 src/pages/map/{index.page.route.ts => +route.ts}             | 0
 src/pages/maps/{index.page.ts => +Page.ts}                   | 0
 src/pages/maps/{index.page.server.ts => +onBeforeRender.ts}  | 0
 src/pages/maps/@id/{index.page.ts => +Page.ts}               | 0
 src/pages/maps/@id/edit/{index.page.ts => +Page.ts}          | 0
 src/pages/maps/@id/edit/{index.page.route.ts => +route.ts}   | 0
 src/renderer/+config.h.ts                                    | 5 +++++
 .../{_default.page.client.tsx => +onRenderClient.tsx}        | 4 ++--
 src/renderer/{_default.page.server.tsx => +onRenderHtml.tsx} | 5 ++---
 23 files changed, 11 insertions(+), 7 deletions(-)
 rename src/pages/{index.page.tsx => +Page.tsx} (100%)
 rename src/{renderer/_error.page.tsx => pages/_error/+Page.tsx} (100%)
 rename src/pages/about/{index.page.tsx => +Page.tsx} (100%)
 rename src/pages/column/{@id.page.ts => @id/+Page.ts} (100%)
 rename src/pages/column/{@id.page.server.ts => @id/+onBeforeRender.ts} (100%)
 rename src/pages/dev/{index.page.ts => +Page.ts} (100%)
 rename src/pages/dev/globe/{index.page.ts => +Page.ts} (100%)
 rename src/pages/dev/paleo/{index.page.ts => +Page.ts} (100%)
 rename src/pages/dev/security/{index.page.ts => +Page.ts} (100%)
 rename src/pages/dev/security/{index.page.route.ts => +guard.ts} (100%)
 rename src/pages/dev/security/endpoint/{index.page.ts => +Page.ts} (100%)
 rename src/pages/dev/ui-tests/{index.page.ts => +Page.ts} (100%)
 rename src/pages/dev/ui-tests/{data-sheet.page.ts => data-sheet/+Page.ts} (96%)
 rename src/pages/map/{index.page.ts => +Page.ts} (100%)
 rename src/pages/map/{index.page.route.ts => +route.ts} (100%)
 rename src/pages/maps/{index.page.ts => +Page.ts} (100%)
 rename src/pages/maps/{index.page.server.ts => +onBeforeRender.ts} (100%)
 rename src/pages/maps/@id/{index.page.ts => +Page.ts} (100%)
 rename src/pages/maps/@id/edit/{index.page.ts => +Page.ts} (100%)
 rename src/pages/maps/@id/edit/{index.page.route.ts => +route.ts} (100%)
 create mode 100644 src/renderer/+config.h.ts
 rename src/renderer/{_default.page.client.tsx => +onRenderClient.tsx} (96%)
 rename src/renderer/{_default.page.server.tsx => +onRenderHtml.tsx} (93%)

diff --git a/src/pages/index.page.tsx b/src/pages/+Page.tsx
similarity index 100%
rename from src/pages/index.page.tsx
rename to src/pages/+Page.tsx
diff --git a/src/renderer/_error.page.tsx b/src/pages/_error/+Page.tsx
similarity index 100%
rename from src/renderer/_error.page.tsx
rename to src/pages/_error/+Page.tsx
diff --git a/src/pages/about/index.page.tsx b/src/pages/about/+Page.tsx
similarity index 100%
rename from src/pages/about/index.page.tsx
rename to src/pages/about/+Page.tsx
diff --git a/src/pages/column/@id.page.ts b/src/pages/column/@id/+Page.ts
similarity index 100%
rename from src/pages/column/@id.page.ts
rename to src/pages/column/@id/+Page.ts
diff --git a/src/pages/column/@id.page.server.ts b/src/pages/column/@id/+onBeforeRender.ts
similarity index 100%
rename from src/pages/column/@id.page.server.ts
rename to src/pages/column/@id/+onBeforeRender.ts
diff --git a/src/pages/dev/index.page.ts b/src/pages/dev/+Page.ts
similarity index 100%
rename from src/pages/dev/index.page.ts
rename to src/pages/dev/+Page.ts
diff --git a/src/pages/dev/globe/index.page.ts b/src/pages/dev/globe/+Page.ts
similarity index 100%
rename from src/pages/dev/globe/index.page.ts
rename to src/pages/dev/globe/+Page.ts
diff --git a/src/pages/dev/paleo/index.page.ts b/src/pages/dev/paleo/+Page.ts
similarity index 100%
rename from src/pages/dev/paleo/index.page.ts
rename to src/pages/dev/paleo/+Page.ts
diff --git a/src/pages/dev/security/index.page.ts b/src/pages/dev/security/+Page.ts
similarity index 100%
rename from src/pages/dev/security/index.page.ts
rename to src/pages/dev/security/+Page.ts
diff --git a/src/pages/dev/security/index.page.route.ts b/src/pages/dev/security/+guard.ts
similarity index 100%
rename from src/pages/dev/security/index.page.route.ts
rename to src/pages/dev/security/+guard.ts
diff --git a/src/pages/dev/security/endpoint/index.page.ts b/src/pages/dev/security/endpoint/+Page.ts
similarity index 100%
rename from src/pages/dev/security/endpoint/index.page.ts
rename to src/pages/dev/security/endpoint/+Page.ts
diff --git a/src/pages/dev/ui-tests/index.page.ts b/src/pages/dev/ui-tests/+Page.ts
similarity index 100%
rename from src/pages/dev/ui-tests/index.page.ts
rename to src/pages/dev/ui-tests/+Page.ts
diff --git a/src/pages/dev/ui-tests/data-sheet.page.ts b/src/pages/dev/ui-tests/data-sheet/+Page.ts
similarity index 96%
rename from src/pages/dev/ui-tests/data-sheet.page.ts
rename to src/pages/dev/ui-tests/data-sheet/+Page.ts
index eb7db396..39cef894 100644
--- a/src/pages/dev/ui-tests/data-sheet.page.ts
+++ b/src/pages/dev/ui-tests/data-sheet/+Page.ts
@@ -1,7 +1,7 @@
-import hyper from "@macrostrat/hyper";
 import { Breadcrumbs, HotkeysProvider } from "@blueprintjs/core";
+import hyper from "@macrostrat/hyper";
 import { ClientOnly } from "~/renderer/client-only";
-import style from "./main.module.sass";
+import style from "../main.module.sass";
 
 const h = hyper.styled(style);
 
diff --git a/src/pages/map/index.page.ts b/src/pages/map/+Page.ts
similarity index 100%
rename from src/pages/map/index.page.ts
rename to src/pages/map/+Page.ts
diff --git a/src/pages/map/index.page.route.ts b/src/pages/map/+route.ts
similarity index 100%
rename from src/pages/map/index.page.route.ts
rename to src/pages/map/+route.ts
diff --git a/src/pages/maps/index.page.ts b/src/pages/maps/+Page.ts
similarity index 100%
rename from src/pages/maps/index.page.ts
rename to src/pages/maps/+Page.ts
diff --git a/src/pages/maps/index.page.server.ts b/src/pages/maps/+onBeforeRender.ts
similarity index 100%
rename from src/pages/maps/index.page.server.ts
rename to src/pages/maps/+onBeforeRender.ts
diff --git a/src/pages/maps/@id/index.page.ts b/src/pages/maps/@id/+Page.ts
similarity index 100%
rename from src/pages/maps/@id/index.page.ts
rename to src/pages/maps/@id/+Page.ts
diff --git a/src/pages/maps/@id/edit/index.page.ts b/src/pages/maps/@id/edit/+Page.ts
similarity index 100%
rename from src/pages/maps/@id/edit/index.page.ts
rename to src/pages/maps/@id/edit/+Page.ts
diff --git a/src/pages/maps/@id/edit/index.page.route.ts b/src/pages/maps/@id/edit/+route.ts
similarity index 100%
rename from src/pages/maps/@id/edit/index.page.route.ts
rename to src/pages/maps/@id/edit/+route.ts
diff --git a/src/renderer/+config.h.ts b/src/renderer/+config.h.ts
new file mode 100644
index 00000000..252bcc0b
--- /dev/null
+++ b/src/renderer/+config.h.ts
@@ -0,0 +1,5 @@
+import { Config } from "vike/types";
+
+export default {
+  passToClient: ["pageProps", "urlPathname"],
+} satisfies Config;
diff --git a/src/renderer/_default.page.client.tsx b/src/renderer/+onRenderClient.tsx
similarity index 96%
rename from src/renderer/_default.page.client.tsx
rename to src/renderer/+onRenderClient.tsx
index a59af55b..d1019168 100644
--- a/src/renderer/_default.page.client.tsx
+++ b/src/renderer/+onRenderClient.tsx
@@ -1,9 +1,9 @@
-export { render };
+export { render as onRenderClient };
 
+import { FocusStyleManager } from "@blueprintjs/core";
 import { hydrateRoot } from "react-dom/client";
 import { PageShell } from "./page-shell";
 import type { PageContextClient } from "./types";
-import { FocusStyleManager } from "@blueprintjs/core";
 
 // This render() hook only supports SSR, see https://vike.dev/render-modes for how to modify render() to support SPA
 async function render(pageContext: PageContextClient) {
diff --git a/src/renderer/_default.page.server.tsx b/src/renderer/+onRenderHtml.tsx
similarity index 93%
rename from src/renderer/_default.page.server.tsx
rename to src/renderer/+onRenderHtml.tsx
index 5c8ebca9..e00cec93 100644
--- a/src/renderer/_default.page.server.tsx
+++ b/src/renderer/+onRenderHtml.tsx
@@ -1,10 +1,9 @@
-export { render };
+export { render as onRenderHtml };
 // See https://vike.dev/data-fetching
-export const passToClient = ["pageProps", "urlPathname"];
 
 import ReactDOMServer from "react-dom/server";
+import { dangerouslySkipEscape, escapeInject } from "vike/server";
 import { PageShell } from "./page-shell";
-import { escapeInject, dangerouslySkipEscape } from "vike/server";
 import type { PageContextServer } from "./types";
 
 async function render(pageContext: PageContextServer) {

From 19af62d0169968aa131af71acd2f7bd2dffb05a5 Mon Sep 17 00:00:00 2001
From: Daven Quinn <code@davenquinn.com>
Date: Sun, 21 Jan 2024 17:17:13 -0600
Subject: [PATCH 3/3] Convert most TSX pages to Typescript

---
 src/pages/+Page.ts                            | 13 ++++++++++++
 src/pages/+Page.tsx                           | 20 -------------------
 src/pages/_error/+Page.ts                     | 14 +++++++++++++
 src/pages/_error/+Page.tsx                    | 19 ------------------
 src/pages/about/+Page.tsx                     | 14 -------------
 src/pages/about/code.css                      |  6 ------
 ...+onRenderClient.tsx => +onRenderClient.ts} |  8 ++------
 .../{+onRenderHtml.tsx => +onRenderHtml.ts}   |  5 ++---
 src/renderer/{Link.tsx => Link.ts}            |  3 ++-
 9 files changed, 33 insertions(+), 69 deletions(-)
 create mode 100644 src/pages/+Page.ts
 delete mode 100644 src/pages/+Page.tsx
 create mode 100644 src/pages/_error/+Page.ts
 delete mode 100644 src/pages/_error/+Page.tsx
 delete mode 100644 src/pages/about/+Page.tsx
 delete mode 100644 src/pages/about/code.css
 rename src/renderer/{+onRenderClient.tsx => +onRenderClient.ts} (88%)
 rename src/renderer/{+onRenderHtml.tsx => +onRenderHtml.ts} (95%)
 rename src/renderer/{Link.tsx => Link.ts} (81%)

diff --git a/src/pages/+Page.ts b/src/pages/+Page.ts
new file mode 100644
index 00000000..74be692e
--- /dev/null
+++ b/src/pages/+Page.ts
@@ -0,0 +1,13 @@
+import h from "@macrostrat/hyper";
+import { Link } from "~/renderer/Link";
+
+export function Page() {
+  return h([
+    h("h1", "Macrostrat dev"),
+    h("ul", [
+      h("li", h(Link, { href: "map" }, "Map")),
+      h("li", h(Link, { href: "maps" }, "Map index")),
+      h("li", h(Link, { href: "dev" }, "Dev layers")),
+    ]),
+  ]);
+}
diff --git a/src/pages/+Page.tsx b/src/pages/+Page.tsx
deleted file mode 100644
index 01337b3b..00000000
--- a/src/pages/+Page.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Link } from "~/renderer/Link";
-
-export function Page() {
-  return (
-    <>
-      <h1>Macrostrat dev</h1>
-      <ul>
-        <li>
-          <Link href="map">Map</Link>
-        </li>
-        <li>
-          <Link href="maps">Map index</Link>
-        </li>
-        <li>
-          <Link href="dev">Dev layers</Link>
-        </li>
-      </ul>
-    </>
-  );
-}
diff --git a/src/pages/_error/+Page.ts b/src/pages/_error/+Page.ts
new file mode 100644
index 00000000..91457e2d
--- /dev/null
+++ b/src/pages/_error/+Page.ts
@@ -0,0 +1,14 @@
+export { Page };
+
+import h from "@macrostrat/hyper";
+
+function Page({ is404 }: { is404: boolean }) {
+  if (is404) {
+    return h([
+      h("h1", "404 Page Not Found"),
+      h("p", "This page could not be found."),
+    ]);
+  } else {
+    return h([h("h1", "500 Internal Error"), h("p", "Something went wrong.")]);
+  }
+}
diff --git a/src/pages/_error/+Page.tsx b/src/pages/_error/+Page.tsx
deleted file mode 100644
index 92ceb508..00000000
--- a/src/pages/_error/+Page.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-export { Page }
-
-function Page({ is404 }: { is404: boolean }) {
-  if (is404) {
-    return (
-      <>
-        <h1>404 Page Not Found</h1>
-        <p>This page could not be found.</p>
-      </>
-    )
-  } else {
-    return (
-      <>
-        <h1>500 Internal Error</h1>
-        <p>Something went wrong.</p>
-      </>
-    )
-  }
-}
diff --git a/src/pages/about/+Page.tsx b/src/pages/about/+Page.tsx
deleted file mode 100644
index 3120478e..00000000
--- a/src/pages/about/+Page.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import "./code.css";
-
-export { Page };
-
-function Page() {
-  return (
-    <>
-      <h1>About</h1>
-      <p>
-        Example of using <code>vike</code>.
-      </p>
-    </>
-  );
-}
diff --git a/src/pages/about/code.css b/src/pages/about/code.css
deleted file mode 100644
index 1e5a0221..00000000
--- a/src/pages/about/code.css
+++ /dev/null
@@ -1,6 +0,0 @@
-code {
-  font-family: monospace;
-  background-color: #eaeaea;
-  padding: 3px 5px;
-  border-radius: 4px;
-}
diff --git a/src/renderer/+onRenderClient.tsx b/src/renderer/+onRenderClient.ts
similarity index 88%
rename from src/renderer/+onRenderClient.tsx
rename to src/renderer/+onRenderClient.ts
index d1019168..84393d7d 100644
--- a/src/renderer/+onRenderClient.tsx
+++ b/src/renderer/+onRenderClient.ts
@@ -1,6 +1,7 @@
 export { render as onRenderClient };
 
 import { FocusStyleManager } from "@blueprintjs/core";
+import h from "@macrostrat/hyper";
 import { hydrateRoot } from "react-dom/client";
 import { PageShell } from "./page-shell";
 import type { PageContextClient } from "./types";
@@ -18,12 +19,7 @@ async function render(pageContext: PageContextClient) {
   console.log("Rendering on client");
   const root = document.getElementById("app-container");
   if (!root) throw new Error("DOM element #react-root not found");
-  hydrateRoot(
-    root,
-    <PageShell pageContext={pageContext}>
-      <Page {...pageProps} />
-    </PageShell>
-  );
+  hydrateRoot(root, h(PageShell, { pageContext }, h(Page, pageProps)));
 }
 
 /* To enable Client-side Routing:
diff --git a/src/renderer/+onRenderHtml.tsx b/src/renderer/+onRenderHtml.ts
similarity index 95%
rename from src/renderer/+onRenderHtml.tsx
rename to src/renderer/+onRenderHtml.ts
index e00cec93..4f549629 100644
--- a/src/renderer/+onRenderHtml.tsx
+++ b/src/renderer/+onRenderHtml.ts
@@ -1,6 +1,7 @@
 export { render as onRenderHtml };
 // See https://vike.dev/data-fetching
 
+import h from "@macrostrat/hyper";
 import ReactDOMServer from "react-dom/server";
 import { dangerouslySkipEscape, escapeInject } from "vike/server";
 import { PageShell } from "./page-shell";
@@ -12,9 +13,7 @@ async function render(pageContext: PageContextServer) {
   if (!Page)
     throw new Error("render() hook expects pageContext.Page to be defined");
   const pageHtml = ReactDOMServer.renderToString(
-    <PageShell pageContext={pageContext}>
-      <Page {...pageProps} />
-    </PageShell>
+    h(PageShell, { pageContext }, h(Page, pageProps))
   );
 
   // See https://vike.dev/head
diff --git a/src/renderer/Link.tsx b/src/renderer/Link.ts
similarity index 81%
rename from src/renderer/Link.tsx
rename to src/renderer/Link.ts
index a84e86bc..3c40b5a8 100644
--- a/src/renderer/Link.tsx
+++ b/src/renderer/Link.ts
@@ -1,3 +1,4 @@
+import h from "@macrostrat/hyper";
 import { usePageContext } from "./page-context";
 
 export function Link(props: {
@@ -12,5 +13,5 @@ export function Link(props: {
   ]
     .filter(Boolean)
     .join(" ");
-  return <a {...props} className={className} />;
+  return h("a", { ...props, className });
 }