Merge remote-tracking branch 'origin/master' into nialexsan/ts-conver…

…sion-fixed-merge-conflicts

.changeset/pre.json

@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "typescript",
   "initialVersions": {
     "@onflow/config": "1.1.2",

packages/util-encode-key/src/index.ts

@@ -15,7 +15,6 @@ const VALID_HASHINGS = new Set([SHA2_256, SHA3_256])
 
 /**
  * Encodes a key into a hex string
- * 
  * @param key - The key to encode (DER Hex)
  * @param curve - The curve Flow needs to use with your key [ECDSA_P256|ECDSA_secp256k1]
  * @param hash - The hashing algorythm Flow needs to use with your key [SHA2_256|SHA3_256]

packages/util-logger/src/util-logger.ts

@@ -1,5 +1,11 @@
+interface IConfig {
+  get: <T>(key: string) => T;
+}
+
+type Config = IConfig & (() => IConfig) | null
+
 // Config dependency injected into logger to break circular dependency
-let config: any = null
+let config: Config = null
 export const setConfig = (_config: any) => {
   config = _config
 }
@@ -61,7 +67,7 @@ export const log = async (options: {
   always?: boolean
 }) => {
   const {title, message, level, always} = options
-  const configLoggerLevel = await config.get("logger.level", LEVELS.warn)
+  const configLoggerLevel = (await config?.()?.get<number>("logger.level")) ?? LEVELS.warn
 
   // If config level is below message level then don't show it
   if (!always && configLoggerLevel < level) return