From f20c94b884f7ab76936b059b712274a35fcc6318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me> Date: Thu, 6 Jul 2023 09:48:05 +0200 Subject: [PATCH] Singletons => Change method to make singleton class --- config/SharedConfig.ts | 14 ++------------ helpers/Toolbox.ts | 14 +------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/config/SharedConfig.ts b/config/SharedConfig.ts index ee2a196..29c55a2 100644 --- a/config/SharedConfig.ts +++ b/config/SharedConfig.ts @@ -1,25 +1,15 @@ class SharedConfig { - private static _instance: SharedConfig; - public readonly production: boolean; public readonly logsFolder: string; - private constructor() { + constructor() { this.production = process.env.NODE_ENV === 'production'; this.logsFolder = process.env.LOGS_FOLDER || ''; } - - public static get instance(): SharedConfig { - if ( !SharedConfig._instance ) { - SharedConfig._instance = new SharedConfig(); - } - - return SharedConfig._instance; - } } -export default SharedConfig.instance; +export default new SharedConfig(); diff --git a/helpers/Toolbox.ts b/helpers/Toolbox.ts index bea427e..1a51f23 100644 --- a/helpers/Toolbox.ts +++ b/helpers/Toolbox.ts @@ -1,20 +1,8 @@ class Toolbox { - private static _instance: Toolbox; - - private constructor() { } - - public static get instance(): Toolbox { - if ( !Toolbox._instance ) { - Toolbox._instance = new Toolbox(); - } - - return Toolbox._instance; - } - public urlToPath(url: string): string { return url.replace(/^([a-z]{3,5}:\/{2})?[a-z.@]+(:[0-9]{1,5})?.(.*)/, '$3').replace('.git', ''); } } -export default Toolbox.instance; +export default new Toolbox(); -- GitLab