✨ Update configuration fallbacks

carloscuesta · Sep 26, 2022 · ae84aa6 · ae84aa6
1 parent 8d2c88c
commit ae84aa6
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/utils/configurationVault/getConfiguration.js b/src/utils/configurationVault/getConfiguration.js
@@ -1,5 +1,5 @@
 import Conf from 'conf'
-import { cwd } from 'process'
+import { config, cwd } from 'process'
 import pathExists from 'path-exists'
 
 import { CONFIG, EMOJI_COMMIT_FORMATS } from '@constants/configuration'
@@ -30,12 +30,12 @@ const getConfiguration = (): { get: Function, set: Function } => {
     const packageJson = `${cwd()}/package.json`
     const configurationFile = `${cwd()}/.gitmojirc.json`
 
-    if (pathExists.sync(packageJson)) {
-      return require(packageJson).gitmoji || LOCAL_CONFIGURATION.store
+    if (pathExists.sync(packageJson) && require(packageJson)?.gitmoji) {
+      return require(packageJson).gitmoji
     }
 
-    if (pathExists.sync(configurationFile)) {
-      return require(configurationFile) || LOCAL_CONFIGURATION.store
+    if (pathExists.sync(configurationFile) && require(configurationFile)) {
+      return require(configurationFile)
     }
 
     return LOCAL_CONFIGURATION.store