Reworking of the config system (squashed!)

thepeacockproject · Nov 22, 2023 · a22da55 · a22da55
1 parent 2d83a4c
commit a22da55
Show file tree

Hide file tree

Showing 43 changed files with 599 additions and 690 deletions.
diff --git a/.idea/Peacock.iml b/.idea/Peacock.iml
diff --git a/components/2016/legacyContractHandler.ts b/components/2016/legacyContractHandler.ts
@@ -22,7 +22,7 @@ import { json as jsonMiddleware } from "body-parser"
 import { enqueueEvent, newSession } from "../eventHandler"
 import { _legacyBull, _theLastYardbirdScpc, controller } from "../controller"
 import { log, LogLevel } from "../loggingInterop"
-import { getConfig } from "../configSwizzleManager"
+import { getConfig } from "../configManager"
 import type { GameChanger, RequestWithJwt } from "../types/types"
 import { randomUUID } from "crypto"
 import { getFlag } from "../flags"

diff --git a/components/2016/legacyMenuData.ts b/components/2016/legacyMenuData.ts
@@ -18,7 +18,7 @@
 
 import { Router } from "express"
 import { RequestWithJwt } from "../types/types"
-import { getConfig } from "../configSwizzleManager"
+import { getConfig } from "../configManager"
 import { getDefaultSuitFor, uuidRegex } from "../utils"
 import { json as jsonMiddleware } from "body-parser"
 import { controller } from "../controller"

diff --git a/components/2016/legacyProfileRouter.ts b/components/2016/legacyProfileRouter.ts
@@ -22,7 +22,7 @@ import type {
     RequestWithJwt,
 } from "../types/types"
 import { log, LogLevel } from "../loggingInterop"
-import { getConfig } from "../configSwizzleManager"
+import { getConfig } from "../configManager"
 
 import { Router } from "express"
 import { controller } from "../controller"

diff --git a/components/candle/challengeService.ts b/components/candle/challengeService.ts
@@ -58,11 +58,11 @@ import {
     mergeSavedChallengeGroups,
 } from "./challengeHelpers"
 import assert from "assert"
-import { getVersionedConfig } from "../configSwizzleManager"
-import { SyncHook } from "../hooksImpl"
+import { getVersionedConfig } from "../configManager"
 import { getUserEscalationProgress } from "../contracts/escalations/escalationService"
 
 import { getUnlockableById } from "../inventory"
+import { SyncHook } from "tapable"
 
 type ChallengeDefinitionLike = {
     Context?: Record<string, unknown>

diff --git a/components/candle/masteryService.ts b/components/candle/masteryService.ts
@@ -21,7 +21,7 @@ import {
     getSubLocationByName,
 } from "../contracts/dataGen"
 import { log, LogLevel } from "../loggingInterop"
-import { getConfig, getVersionedConfig } from "../configSwizzleManager"
+import { getConfig, getVersionedConfig } from "../configManager"
 import { getUserData } from "../databaseHandler"
 import {
     MasteryData,