Move api.ts to avoid rewriting other files in same directory on gen

icpc · Mar 16, 2024 · 525f4a4 · 525f4a4
1 parent a320ab2
commit 525f4a4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/frontend/common/api.ts → src/frontend/generated/api.ts b/src/frontend/common/api.ts → src/frontend/generated/api.ts
@@ -40,7 +40,7 @@ export enum PenaltyRoundingMode {
 
 export interface AwardsSettings {
   championTitle?: string | null;
-  groupsChampionTitles?: { [key: string]: string };
+  groupsChampionTitles?: { [key: GroupId]: string };
   rankAwardsMaxRank?: number;
   medals?: MedalSettings[];
   medalGroups?: MedalSettings[][];

diff --git a/src/frontend/overlay/tsconfig.json b/src/frontend/overlay/tsconfig.json
@@ -20,7 +20,7 @@
     "rootDir": "../", // Yes, this is ugly. Will be fixed once the admin is typescript too.
     "baseUrl": ".",
     "paths": {
-      "@shared/*": ["../common/*"],
+      "@shared/*": ["../common/*", "../generated/*"],
       "@/*": ["src/*"]
     },
   },

diff --git a/src/schema-generator/build.gradle.kts b/src/schema-generator/build.gradle.kts
@@ -7,7 +7,7 @@ val schemasExportLocation = rootProject.layout.projectDirectory.dir("schemas")
 val schemasGenerationLocation = tmpLocation.map { it.dir("schemas") }
 val schemasGatherLocation = layout.buildDirectory.dir("schemas")
 
-val tsExportLocation = rootProject.layout.projectDirectory.dir("src").dir("frontend").dir("common")
+val tsExportLocation = rootProject.layout.projectDirectory.dir("src").dir("frontend").dir("generated")
 val tsGenerationLocation = tmpLocation.map { it.dir("ts") }
 val tsGatherLocation = layout.buildDirectory.dir("ts")