Merge branch 'master' into feat/sw-929-release-preps

app/[lang]/(live)/(public)/[contentType]/[uid]/@preview/loading.tsx

@@ -0,0 +1,11 @@
+import { env } from "@/env/server"
+
+import CurrentLoadingSpinner from "@/components/Current/LoadingSpinner"
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  if (env.HIDE_FOR_NEXT_RELEASE) {
+    return <CurrentLoadingSpinner />
+  }
+  return <LoadingSpinner />
+}

app/[lang]/(live)/(public)/[contentType]/[uid]/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  return <LoadingSpinner fullPage />
+}

app/[lang]/(live)/(public)/hotelreservation/(confirmation)/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  return <LoadingSpinner fullPage />
+}

app/[lang]/(live)/(public)/hotelreservation/(standard)/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function Loading() {
+  return <LoadingSpinner fullPage />
+}

app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/@modal/(.)map/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function LoadingModal() {
+  return <LoadingSpinner />
+}

app/[lang]/(live)/(public)/hotelreservation/(standard)/step/@summary/loading.tsx

@@ -0,0 +1,5 @@
+import LoadingSpinner from "@/components/LoadingSpinner"
+
+export default function LoadingSummaryHeader() {
+  return <LoadingSpinner />
+}

app/[lang]/(live)/@bookingwidget/[contentType]/[uid]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@bookingwidget/default.tsx

@@ -1 +0,0 @@
-export { default } from "./page"

app/[lang]/(live)/@bookingwidget/my-pages/[...path]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@footer/[...paths]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../page"

app/[lang]/(live)/@footer/[contentType]/[uid]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@footer/default.tsx

@@ -1 +0,0 @@
-export { default } from "./page"

app/[lang]/(live)/@footer/my-pages/[...path]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@header/[...paths]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../page"

app/[lang]/(live)/@header/[contentType]/[uid]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@header/default.tsx

@@ -1 +0,0 @@
-export { default } from "./page"

app/[lang]/(live)/@header/my-pages/[...path]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@sitewidealert/[...paths]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../page"

app/[lang]/(live)/@sitewidealert/[contentType]/[uid]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@sitewidealert/default.tsx

@@ -1 +0,0 @@
-export { default } from "./page"

app/[lang]/(live)/@sitewidealert/my-pages/[...path]/page.tsx

@@ -1 +0,0 @@
-export { default } from "../../page"

app/[lang]/(live)/@sitewidealert/page.tsx

@@ -13,7 +13,7 @@ export default function SitewideAlertPage({ params }: PageArgs<LangParams>) {
   }
 
   setLang(params.lang)
-  preload()
+  void preload()
 
   return (
     <Suspense>