refactor: don't rely on MODULE_NOT_FOUND for lack of advanced API routes warning

Author: pieh

packages/runtime/src/helpers/analysis.ts

@@ -88,31 +88,32 @@ export const extractConfigFromFile = async (apiFilePath: string, appDir: string)
     return {}
   }
 
-  try {
-    if (!extractConstValue) {
-      // eslint-disable-next-line import/no-dynamic-require
-      extractConstValue = require(findModuleFromBase({
-        paths: [appDir],
-        candidates: ['next/dist/build/analysis/extract-const-value'],
-      }) ?? '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(findModuleFromBase({
-        paths: [appDir],
-        candidates: ['next/dist/build/analysis/parse-module'],
-      }) ?? 'next/dist/build/analysis/parse-module').parseModule
-    }
-  } catch (error) {
-    if (error.code === 'MODULE_NOT_FOUND') {
-      if (!hasWarnedAboutNextVersion) {
-        console.log("This version of Next.js doesn't support advanced API routes. Skipping...")
-        hasWarnedAboutNextVersion = true
-      }
-      // Old Next.js version
-      return {}
+  const extractConstValueModulePath = findModuleFromBase({
+    paths: [appDir],
+    candidates: ['next/dist/build/analysis/extract-const-value'],
+  })
+
+  const parseModulePath = findModuleFromBase({
+    paths: [appDir],
+    candidates: ['next/dist/build/analysis/parse-module'],
+  })
+
+  if (!extractConstValueModulePath || !parseModulePath) {
+    if (!hasWarnedAboutNextVersion) {
+      console.log("This version of Next.js doesn't support advanced API routes. Skipping...")
+      hasWarnedAboutNextVersion = true
     }
-    throw error
+    // Old Next.js version
+    return {}
+  }
+
+  if (!extractConstValue && extractConstValueModulePath) {
+    // eslint-disable-next-line import/no-dynamic-require
+    extractConstValue = require(extractConstValueModulePath)
+  }
+  if (!parseModule && parseModulePath) {
+    // eslint-disable-next-line prefer-destructuring, @typescript-eslint/no-var-requires, import/no-dynamic-require
+    parseModule = require(parseModulePath).parseModule
   }
 
   const { extractExportedConstValue, UnsupportedValueError } = extractConstValue

test/helpers/analysis.spec.ts

@@ -11,70 +11,70 @@ describe('static source analysis', () => {
     ;(console.error as jest.Mock).mockRestore()
   })
   it('should extract config values from a source file', async () => {
-    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background.js'))
+    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background.js'), process.cwd())
     expect(config).toEqual({
       type: 'experimental-background',
     })
   })
   it('should extract config values from a TypeScript source file', async () => {
-    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background.ts'))
+    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background.ts'), process.cwd())
     expect(config).toEqual({
       type: 'experimental-background',
     })
   })
   it('should return an empty config if not defined', async () => {
-    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/missing.ts'))
+    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/missing.ts'), process.cwd())
     expect(config).toEqual({})
   })
 
   it('should return an empty config if config is invalid', async () => {
-    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/invalid.ts'))
+    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/invalid.ts'), process.cwd())
     expect(config).toEqual({})
   })
 
   it('should extract schedule values from a source file', async () => {
-    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/scheduled.ts'))
+    const config = await extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/scheduled.ts'), process.cwd())
     expect(config).toEqual({
       type: 'experimental-scheduled',
       schedule: '@daily',
     })
   })
   it('should throw if schedule is provided when type is background', async () => {
-    await expect(extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background-schedule.ts'))).rejects.toThrow(
-      'Unsupported config value in test/fixtures/analysis/background-schedule.ts',
-    )
+    await expect(
+      extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background-schedule.ts'), process.cwd()),
+    ).rejects.toThrow('Unsupported config value in test/fixtures/analysis/background-schedule.ts')
     expect(console.error).toHaveBeenCalledWith(
       `Invalid config value in test/fixtures/analysis/background-schedule.ts: schedule is not allowed unless type is "experimental-scheduled"`,
     )
   })
   it('should throw if schedule is provided when type is default', async () => {
-    await expect(extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/default-schedule.ts'))).rejects.toThrow(
-      'Unsupported config value in test/fixtures/analysis/default-schedule.ts',
-    )
+    await expect(
+      extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/default-schedule.ts'), process.cwd()),
+    ).rejects.toThrow('Unsupported config value in test/fixtures/analysis/default-schedule.ts')
     expect(console.error).toHaveBeenCalledWith(
       `Invalid config value in test/fixtures/analysis/default-schedule.ts: schedule is not allowed unless type is "experimental-scheduled"`,
     )
   })
   it('should throw if schedule is not provided when type is scheduled', async () => {
-    await expect(extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/missing-schedule.ts'))).rejects.toThrow(
-      'Unsupported config value in test/fixtures/analysis/missing-schedule.ts',
-    )
+    await expect(
+      extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/missing-schedule.ts'), process.cwd()),
+    ).rejects.toThrow('Unsupported config value in test/fixtures/analysis/missing-schedule.ts')
     expect(console.error).toHaveBeenCalledWith(
       `Invalid config value in test/fixtures/analysis/missing-schedule.ts: schedule is required when type is "experimental-scheduled"`,
     )
   })
   it('should throw if edge runtime is specified for scheduled functions', async () => {
-    await expect(extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/scheduled-edge.ts'))).rejects.toThrow(
-      'Unsupported config value in test/fixtures/analysis/scheduled-edge.ts',
-    )
+    await expect(
+      extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/scheduled-edge.ts'), process.cwd()),
+    ).rejects.toThrow('Unsupported config value in test/fixtures/analysis/scheduled-edge.ts')
     expect(console.error).toHaveBeenCalledWith(
       `Invalid config value in test/fixtures/analysis/scheduled-edge.ts: edge runtime is not supported for scheduled functions`,
     )
   })
   it('should throw if edge runtime is specified for background functions', async () => {
-    await expect(extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background-edge.ts'))).rejects.toThrow(
-      'Unsupported config value in test/fixtures/analysis/background-edge.ts',
-    )
+    await expect(
+      extractConfigFromFile(resolve(__dirname, '../fixtures/analysis/background-edge.ts'), process.cwd()),
+    ).rejects.toThrow('Unsupported config value in test/fixtures/analysis/background-edge.ts')
     expect(console.error).toHaveBeenCalledWith(
       `Invalid config value in test/fixtures/analysis/background-edge.ts: edge runtime is not supported for background functions`,
     )