File tree 1 file changed +4
-23
lines changed
packages/api/core/src/util
1 file changed +4
-23
lines changed Original file line number Diff line number Diff line change @@ -124,31 +124,12 @@ export default async (dir: string): Promise<ResolvedForgeConfig> => {
124
124
forgeConfig = packageJSON . config && packageJSON . config . forge ? packageJSON . config . forge : null ;
125
125
}
126
126
127
- if ( ! forgeConfig || typeof forgeConfig === 'string' ) {
128
- const iterator = ( ( ) => {
129
- const file = typeof forgeConfig === 'string' ? forgeConfig : false ;
130
- const extensions = [ '.js' , ...Object . keys ( interpret . extensions ) ] ;
131
- let index = - 1 ;
132
- return {
133
- [ Symbol . iterator ] : ( ) => ( {
134
- next ( ) {
135
- if ( index >= extensions . length ) return { done : true , value : '' } ;
136
- let value : string | false ;
137
- if ( index < 0 ) {
138
- index = 0 ;
139
- value = file ;
140
- }
141
- value ||= `forge.config${ extensions [ index ++ ] } ` ;
142
- return { value } ;
143
- } ,
144
- } ) ,
145
- } ;
146
- } ) ( ) ;
147
- for ( const file of iterator ) {
148
- const pathToConfig = path . resolve ( dir , file ) ;
127
+ if ( ! forgeConfig || ! [ 'object' , 'string' ] . includes ( typeof forgeConfig ) ) {
128
+ for ( const extension of [ '.js' , ...Object . keys ( interpret . extensions ) ] ) {
129
+ const pathToConfig = path . resolve ( dir , `forge.config${ extension } ` ) ;
149
130
if ( await fs . pathExists ( pathToConfig ) ) {
150
131
rechoir . prepare ( interpret . extensions , pathToConfig , dir ) ;
151
- forgeConfig = file ;
132
+ forgeConfig = `forge.config ${ extension } ` ;
152
133
break ;
153
134
}
154
135
}
You can’t perform that action at this time.
0 commit comments