refactor: uses the appropriate webpack hooks

vercel · Aug 23, 2022 · 73be5ce · 73be5ce
1 parent 6adc2f8
commit 73be5ce
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 118 deletions.
diff --git a/packages/next/build/webpack/loaders/get-module-build-info.ts b/packages/next/build/webpack/loaders/get-module-build-info.ts
@@ -1,5 +1,4 @@
 import { webpack } from 'next/dist/compiled/webpack/webpack'
-import type { MiddlewareConfig } from '../../analysis/get-page-static-info'
 
 /**
  * A getter for module build info that casts to the type it should have.
@@ -16,7 +15,6 @@ export function getModuleBuildInfo(webpackModule: webpack.Module) {
     usingIndirectEval?: boolean | Set<string>
     route?: RouteMeta
     importLocByPath?: Map<string, any>
-    edgeFunctionConfig?: Partial<MiddlewareConfig>
     rootDir?: string
   }
 }

diff --git a/packages/next/build/webpack/loaders/next-edge-function-loader.ts b/packages/next/build/webpack/loaders/next-edge-function-loader.ts
@@ -1,25 +1,20 @@
 import { getModuleBuildInfo } from './get-module-build-info'
 import { stringifyRequest } from '../stringify-request'
-import { loadEdgeFunctionConfigFromFile } from './utils'
 
 export type EdgeFunctionLoaderOptions = {
   absolutePagePath: string
   page: string
   rootDir: string
 }
 
-export default async function middlewareLoader(this: any) {
+export default function middlewareLoader(this: any) {
   const { absolutePagePath, page, rootDir }: EdgeFunctionLoaderOptions =
     this.getOptions()
   const stringifiedPagePath = stringifyRequest(this, absolutePagePath)
   const buildInfo = getModuleBuildInfo(this._module)
   buildInfo.nextEdgeApiFunction = {
     page: page || '/',
   }
-  buildInfo.edgeFunctionConfig = await loadEdgeFunctionConfigFromFile(
-    absolutePagePath,
-    this.getResolve()
-  )
   buildInfo.rootDir = rootDir
 
   return `

diff --git a/packages/next/build/webpack/loaders/next-middleware-loader.ts b/packages/next/build/webpack/loaders/next-middleware-loader.ts
@@ -1,7 +1,6 @@
 import { getModuleBuildInfo } from './get-module-build-info'
 import { stringifyRequest } from '../stringify-request'
 import { MIDDLEWARE_LOCATION_REGEXP } from '../../../lib/constants'
-import { loadEdgeFunctionConfigFromFile } from './utils'
 
 export type MiddlewareLoaderOptions = {
   absolutePagePath: string
@@ -10,7 +9,7 @@ export type MiddlewareLoaderOptions = {
   rootDir: string
 }
 
-export default async function middlewareLoader(this: any) {
+export default function middlewareLoader(this: any) {
   const {
     absolutePagePath,
     page,
@@ -28,10 +27,6 @@ export default async function middlewareLoader(this: any) {
     page:
       page.replace(new RegExp(`/${MIDDLEWARE_LOCATION_REGEXP}$`), '') || '/',
   }
-  buildInfo.edgeFunctionConfig = await loadEdgeFunctionConfigFromFile(
-    absolutePagePath,
-    this.getResolve()
-  )
   buildInfo.rootDir = rootDir
 
   return `