@@ -255,28 +255,27 @@ export const findMainModule = (
255255 entry : string = 'index.js' ,
256256 template ?: TemplateType
257257) => {
258- try {
259- // first attempt: try loading the entry file if it exists
260- const module = resolveModule ( entry , modules , directories ) ;
261- return module ;
262- } catch ( e ) {
263- try {
264- // second attempt: try loading the first file that exists from
265- // the list of possible defaults in the template defination
266- const templateDefinition = getTemplateDefinition ( template ) ;
258+ const resolve = resolveModuleWrapped ( { modules, directories } ) ;
267259
268- const defaultOpenedFiles = templateDefinition . getDefaultOpenedFiles ( { } ) ;
260+ // first attempt: try loading the entry file if it exists
269261
270- const defaultOpenModule = defaultOpenedFiles
271- . map ( path => resolveModuleWrapped ( { modules, directories } ) ( path ) )
272- . find ( module => module ) ;
262+ const entryModule = resolve ( entry ) ;
263+ if ( entryModule ) return entryModule ;
273264
274- return defaultOpenModule ;
275- } catch ( nestedError ) {
276- // third attempt: give up and load the first file in the list
277- return modules [ 0 ] ;
278- }
279- }
265+ // second attempt: try loading the first file that exists from
266+ // the list of possible defaults in the template defination
267+ const templateDefinition = getTemplateDefinition ( template ) ;
268+
269+ const defaultOpenedFiles = templateDefinition . getDefaultOpenedFiles ( { } ) ;
270+
271+ const defaultOpenModule = defaultOpenedFiles
272+ . map ( path => resolve ( path ) )
273+ . find ( module => module ) ;
274+
275+ if ( defaultOpenModule ) return defaultOpenModule ;
276+
277+ // third attempt: give up and load the first file in the list
278+ return modules [ 0 ] ;
280279} ;
281280
282281export const findCurrentModule = (
0 commit comments