Fix config file loading

gjsify · Feb 2, 2022 · 52a07c4 · 52a07c4
1 parent ad50ef9
commit 52a07c4
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -212,9 +212,16 @@ export class Config {
                 '.js': async (filepath) => {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                     const file = await import(filepath)
-                    if (file.default) {
+
+                    // Files with `exports.default = { ... }`
+                    if (file?.default?.default) {
+                        return file.default.default as Partial<UserConfig>
+                    }
+                    // Files with `export default { ... }`
+                    if (file?.default) {
                         return file.default as Partial<UserConfig>
                     }
+                    // Files with `export { ... }`
                     return file as Partial<UserConfig>
                 },
             },
@@ -293,11 +300,11 @@ export class Config {
                 config.environments = configFile.config.environments
             }
             // buildType
-            if (configFile.config.buildType) {
+            if (config.buildType === Config.options.buildType.default && configFile.config.buildType) {
                 config.buildType = configFile.config.buildType
             }
             // moduleType
-            if (configFile.config.moduleType) {
+            if (config.moduleType === Config.options.moduleType.default && configFile.config.moduleType) {
                 config.moduleType = configFile.config.moduleType
             }
             // verbose