From f6b06556f68adba53512d33d062dde381f7ea14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20J=C3=A4derberg?=
 <joakim.jaderberg@scandichotels.com>
Date: Thu, 13 Nov 2025 09:28:07 +0000
Subject: [PATCH] Merged in chore/typegen-nextjs-routes (pull request #3147)

Make check-types dependent on next typegen

* add typegen as a prestep


Approved-by: Anton Gunnarsson
---
 apps/partner-sas/package.json                            | 1 +
 apps/partner-sas/turbo.json                              | 2 ++
 .../app/[lang]/(live)/(public)/(contentTypes)/layout.tsx | 9 ++++++---
 apps/scandic-web/app/[lang]/(no-layout)/layout.tsx       | 6 +++---
 apps/scandic-web/package.json                            | 1 +
 apps/scandic-web/turbo.json                              | 2 ++
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/partner-sas/package.json b/apps/partner-sas/package.json
index 9cc542344..b992aafd6 100644
--- a/apps/partner-sas/package.json
+++ b/apps/partner-sas/package.json
@@ -10,6 +10,7 @@
     "lint": "next lint --max-warnings 0 && tsgo --noEmit",
     "lint:fix": "next lint --fix && tsgo --noEmit",
     "check-types": "tsgo --noEmit",
+    "typegen": "next typegen",
     "clean": "rm -rf .next",
     "test": "vitest run --passWithNoTests",
     "test:watch": "vitest",
diff --git a/apps/partner-sas/turbo.json b/apps/partner-sas/turbo.json
index e6af9d59c..9e9d23c4a 100644
--- a/apps/partner-sas/turbo.json
+++ b/apps/partner-sas/turbo.json
@@ -15,6 +15,8 @@
     "clean": {
       "cache": false
     },
+    "typegen": { "dependsOn": [] },
+    "check-types": { "dependsOn": ["typegen"] },
     "include:shared": {
       "outputs": ["public/_static/shared/**"]
     }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/layout.tsx
index c7bdd6990..304d210c3 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/layout.tsx
@@ -1,8 +1,11 @@
 import styles from "./layout.module.css"
 
-import type { LayoutProps } from "@/.next/types/app/[lang]/(live)/(public)/(contentTypes)/layout"
-
-export default function ContentTypeLayout(props: LayoutProps) {
+// Unable to use LayoutProps directly, probably due to parallel routes and/or page groups
+type Props = Pick<
+  LayoutProps<"/[lang]">,
+  "children" | "preview" | "breadcrumbs"
+>
+export default function ContentTypeLayout(props: Props) {
   return (
     <section className={styles.layout}>
       {props.preview}
diff --git a/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx b/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx
index 58d2da1c2..3e97721d6 100644
--- a/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx
@@ -25,9 +25,9 @@ import { getMessages } from "@/i18n"
 import ClientIntlProvider from "@/i18n/Provider"
 import { setLang } from "@/i18n/serverContext"
 
-import type { LayoutProps } from "@/.next/types/app/[lang]/(no-layout)/layout"
-
-export default async function RootLayout(props: LayoutProps) {
+// Unable to use LayoutProps directly, probably due to parallel routes
+type Props = Pick<LayoutProps<"/[lang]">, "children" | "params">
+export default async function RootLayout(props: Props) {
   const params = await props.params
 
   const { children } = props
diff --git a/apps/scandic-web/package.json b/apps/scandic-web/package.json
index 76def266b..41b910458 100644
--- a/apps/scandic-web/package.json
+++ b/apps/scandic-web/package.json
@@ -16,6 +16,7 @@
     "ci:build": "yarn lint && yarn test && yarn build",
     "clean": "rm -rf .next",
     "check-types": "tsgo --noEmit",
+    "typegen": "next typegen",
     "include:shared": "jiti ../../scripts/copyFiles.ts ../../shared public/_static/shared",
     "format": "prettier --write ."
   },
diff --git a/apps/scandic-web/turbo.json b/apps/scandic-web/turbo.json
index cfc0f21c1..3cf51e872 100644
--- a/apps/scandic-web/turbo.json
+++ b/apps/scandic-web/turbo.json
@@ -15,6 +15,8 @@
     "include:shared": {
       "outputs": ["public/_static/shared/**"]
     },
+    "typegen": { "dependsOn": [] },
+    "check-types": { "dependsOn": ["typegen"] },
     "clean": {
       "cache": false
     }