Skip to content

Commit

Permalink
#339: Reworking of the config system
Browse files Browse the repository at this point in the history
Signed-off-by: Reece Dunham <[email protected]>
  • Loading branch information
RDIL committed Nov 5, 2023
1 parent 282a7c0 commit 199f974
Show file tree
Hide file tree
Showing 46 changed files with 581 additions and 1,576 deletions.
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.0-rc.53.cjs

This file was deleted.

6 changes: 2 additions & 4 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ initScope: peacockproject
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v2"

yarnPath: .yarn/releases/yarn-4.0.0-rc.53.cjs
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v2"
2 changes: 1 addition & 1 deletion components/2016/legacyContractHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion components/2016/legacyMenuData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion components/2016/legacyProfileRouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions components/candle/challengeService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion components/candle/masteryService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading

0 comments on commit 199f974

Please sign in to comment.