refactor: get rid of unneded new helper

Author: pieh

packages/runtime/src/helpers/analysis.ts

@@ -2,8 +2,8 @@ import fs, { existsSync } from 'fs'
 
 import { relative } from 'pathe'
 
-import { getNextModulePath } from './files'
 import { ApiRouteType } from './types'
+import { findModuleFromBase } from './utils'
 
 export interface ApiStandardConfig {
   type?: never
@@ -92,11 +92,17 @@ export const extractConfigFromFile = async (apiFilePath: string, appDir: string)
   try {
     if (!extractConstValue) {
       // eslint-disable-next-line import/no-dynamic-require
-      extractConstValue = require(getNextModulePath(appDir, ['next/dist/build/analysis/extract-const-value']))
+      extractConstValue = require(findModuleFromBase({
+        paths: [appDir],
+        candidates: ['next/dist/build/analysis/extract-const-value'],
+      }))
     }
     if (!parseModule) {
       // eslint-disable-next-line prefer-destructuring, @typescript-eslint/no-var-requires, import/no-dynamic-require
-      parseModule = require(getNextModulePath(appDir, ['next/dist/build/analysis/parse-module'])).parseModule
+      parseModule = require(findModuleFromBase({
+        paths: [appDir],
+        candidates: ['next/dist/build/analysis/parse-module'],
+      })).parseModule
     }
   } catch (error) {
     if (error.code === 'MODULE_NOT_FOUND') {

packages/runtime/src/helpers/files.ts

@@ -338,21 +338,7 @@ export const getServerFile = (root: string, includeBase = true) => {
     candidates.unshift('next/dist/server/base-server')
   }
 
-  return getNextModulePath(root, candidates)
-}
-
-export const getNextModulePath = (root: string, candidates: Array<string>): string | null => {
-  const module = findModuleFromBase({ candidates, paths: [root] })
-  if (module) {
-    return module
-  }
-
-  for (const candidate of candidates) {
-    try {
-      return require.resolve(candidate)
-    } catch {}
-  }
-  return null
+  return findModuleFromBase({ candidates, paths: [root] })
 }
 
 /**

packages/runtime/src/helpers/utils.ts

@@ -267,6 +267,17 @@ export const findModuleFromBase = ({ paths, candidates }): string | null => {
       // Ignore the error
     }
   }
+  // if we couldn't find a module from paths, let's try to resolve from here
+  for (const candidate of candidates) {
+    try {
+      const modulePath = require.resolve(candidate)
+      if (modulePath) {
+        return modulePath
+      }
+    } catch {
+      // Ignore the error
+    }
+  }
   return null
 }