From 8221fd42337e0df98a6b128896cd4b0281edc1bb Mon Sep 17 00:00:00 2001
From: Franz Unger <franz.unger@vivid-planet.com>
Date: Wed, 27 Nov 2024 17:02:52 +0100
Subject: [PATCH 1/2] Make project starting when site is remove via create-app
 with remove-site

---
 admin/src/config.tsx                            |  4 +++-
 api/src/config/config.ts                        |  2 +-
 api/src/config/environment-variables.ts         |  1 +
 create-app/site-configs.d.ts                    | 17 +++++++++++++++++
 .../src/scripts/remove-site/removeSite.ts       |  6 +++++-
 5 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 create-app/site-configs.d.ts

diff --git a/admin/src/config.tsx b/admin/src/config.tsx
index 476264e95..b6e5dac95 100644
--- a/admin/src/config.tsx
+++ b/admin/src/config.tsx
@@ -22,7 +22,9 @@ export function createConfig() {
         apiUrl: environmentVariables.API_URL,
         adminUrl: environmentVariables.ADMIN_URL,
         previewUrl: environmentVariables.PREVIEW_URL,
-        sitesConfig: JSON.parse(environmentVariables.PUBLIC_SITE_CONFIGS) as PublicSiteConfig[],
+        sitesConfig: (environmentVariables.PUBLIC_SITE_CONFIGS
+            ? JSON.parse(environmentVariables.PUBLIC_SITE_CONFIGS)
+            : [{ scope: { domain: "main", languages: ["en"] } }]) as PublicSiteConfig[],
         buildDate: environmentVariables.BUILD_DATE,
         buildNumber: environmentVariables.BUILD_NUMBER,
         commitSha: environmentVariables.COMMIT_SHA,
diff --git a/api/src/config/config.ts b/api/src/config/config.ts
index a08d45880..c836f8e48 100644
--- a/api/src/config/config.ts
+++ b/api/src/config/config.ts
@@ -63,7 +63,7 @@ export function createConfig(processEnv: NodeJS.ProcessEnv) {
         cdn: {
             originCheckSecret: envVars.CDN_ORIGIN_CHECK_SECRET,
         },
-        siteConfigs: envVars.PRIVATE_SITE_CONFIGS,
+        siteConfigs: envVars.PRIVATE_SITE_CONFIGS || [{ scope: { domain: "main", languages: ["en"] } }],
         sitePreviewSecret: envVars.SITE_PREVIEW_SECRET,
     };
 }
diff --git a/api/src/config/environment-variables.ts b/api/src/config/environment-variables.ts
index 81f886977..3aebf6132 100644
--- a/api/src/config/environment-variables.ts
+++ b/api/src/config/environment-variables.ts
@@ -123,6 +123,7 @@ export class EnvironmentVariables {
 
     @IsArray()
     @Transform(({ value }) => JSON.parse(value))
+    @IsOptional()
     PRIVATE_SITE_CONFIGS: PrivateSiteConfig[];
 
     @IsArray()
diff --git a/create-app/site-configs.d.ts b/create-app/site-configs.d.ts
new file mode 100644
index 000000000..cbdd69330
--- /dev/null
+++ b/create-app/site-configs.d.ts
@@ -0,0 +1,17 @@
+// This file meant to be deleted in the process of creating a data-driven application
+
+export type ContentScope = {
+    domain: string;
+    language: string;
+};
+
+export type PublicSiteConfig = {
+    url: "";
+    preloginEnabled: false;
+    scope: {
+        domain: string;
+        languages: string[];
+    };
+};
+
+export type PrivateSiteConfig = PublicSiteConfig;
diff --git a/create-app/src/scripts/remove-site/removeSite.ts b/create-app/src/scripts/remove-site/removeSite.ts
index 16e14d626..c91a9110d 100644
--- a/create-app/src/scripts/remove-site/removeSite.ts
+++ b/create-app/src/scripts/remove-site/removeSite.ts
@@ -1,3 +1,5 @@
+import * as fs from "fs";
+
 import { deleteFilesAndFolders } from "../../util/deleteFilesAndFolders";
 import { removeReferenceInFile } from "../../util/removeReferenceInFile";
 import { runEslintFix } from "../../util/runEslintFix";
@@ -16,7 +18,9 @@ function removeSiteReferences(verbose: boolean) {
 }
 
 export function removeSite(verbose: boolean) {
-    deleteFilesAndFolders(["site"], verbose);
+    deleteFilesAndFolders(["site", "site-configs", ".env.site-configs.tpl"], verbose);
+    fs.copyFile("./create-app/site-configs.d.ts", "./admin/src/site-configs.d.ts", (err) => console.log);
+    fs.copyFile("./create-app/site-configs.d.ts", "./api/src/site-configs.d.ts", (err) => console.log);
     removeSiteReferences(verbose);
     runEslintFix(verbose);
 }

From a82f84f430491cd9ca67dee3f3df03e4574e1cb9 Mon Sep 17 00:00:00 2001
From: Thomas Dax <thomas.dax@vivid-planet.com>
Date: Tue, 3 Dec 2024 15:49:18 +0100
Subject: [PATCH 2/2] Fix typo

---
 create-app/site-configs.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/create-app/site-configs.d.ts b/create-app/site-configs.d.ts
index cbdd69330..8ea5d7358 100644
--- a/create-app/site-configs.d.ts
+++ b/create-app/site-configs.d.ts
@@ -1,4 +1,4 @@
-// This file meant to be deleted in the process of creating a data-driven application
+// This file is meant to be deleted in the process of creating a data-driven application
 
 export type ContentScope = {
     domain: string;