chore: improves validation message

vercel · Sep 12, 2022 · db81016 · db81016
1 parent eb2c584
commit db81016
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/packages/next/build/analysis/get-page-static-info.ts b/packages/next/build/analysis/get-page-static-info.ts
@@ -12,6 +12,7 @@ import * as Log from '../output/log'
 import { SERVER_RUNTIME } from '../../lib/constants'
 import { ServerRuntime } from 'next/types'
 import { checkCustomRoutes } from '../../lib/load-custom-routes'
+import { matcher } from 'next/dist/compiled/micromatch'
 
 export interface MiddlewareConfig {
   matchers: MiddlewareMatcher[]
@@ -177,9 +178,11 @@ function getMiddlewareConfig(
       ? config.allowDynamic
       : [config.allowDynamic]
     for (const glob of result.allowDynamicGlobs ?? []) {
-      if (typeof glob !== 'string') {
+      try {
+        matcher(glob)
+      } catch (err) {
         throw new Error(
-          `A middleware/edge exported 'config.allowDynamic' must be a string or an array of strings`
+          `A middleware/edge exported 'config.allowDynamic' is not a valid pattern: ${err.message}`
         )
       }
     }

diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -255,12 +255,7 @@ function isDynamicCodeEvaluationAllowed(
   rootDir?: string
 ) {
   const name = fileName.replace(rootDir ?? '', '')
-  for (const glob of edgeFunctionConfig?.allowDynamicGlobs ?? []) {
-    if (isMatch(name, glob)) {
-      return true
-    }
-  }
-  return false
+  return isMatch(name, edgeFunctionConfig?.allowDynamicGlobs ?? [])
 }
 
 function buildUnsupportedApiError({

diff --git a/test/production/edge-config-validations/index.test.ts b/test/production/edge-config-validations/index.test.ts
@@ -29,7 +29,7 @@ describe('Edge config validations', () => {
     })
     await expect(next.start()).rejects.toThrow('next build failed')
     expect(next.cliOutput).toMatch(
-      `exported 'config.allowDynamic' must be a string or an array of strings`
+      `exported 'config.allowDynamic' is not a valid pattern: Expected pattern to be a non-empty string`
     )
   })
 })