From 8884d0ad16de65889ed3191ec7af6d44fc7632a4 Mon Sep 17 00:00:00 2001
From: Gal Schlezinger <gal@spitfire.co.il>
Date: Thu, 24 Feb 2022 11:33:35 +0200
Subject: [PATCH] fix stuff

---
 .../build/webpack/loaders/next-middleware-wasm-loader.ts    | 2 +-
 .../next/build/webpack/plugins/functions-manifest-plugin.ts | 6 +++---
 packages/next/build/webpack/plugins/middleware-plugin.ts    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/next/build/webpack/loaders/next-middleware-wasm-loader.ts b/packages/next/build/webpack/loaders/next-middleware-wasm-loader.ts
index 2897781cbe51..b01f80ce97e0 100644
--- a/packages/next/build/webpack/loaders/next-middleware-wasm-loader.ts
+++ b/packages/next/build/webpack/loaders/next-middleware-wasm-loader.ts
@@ -11,7 +11,7 @@ const MiddlewareWasmLoader: webpack.loader.Loader = function (
   _sourceMap
 ) {
   const name = `wasm_${sha1(source)}`
-  const filePath = `middleware-chunks/${name}.wasm`
+  const filePath = `server/middleware-chunks/${name}.wasm`
   const binding: WasmBinding = { filePath, name }
   this._module.buildInfo.nextWasmMiddlewareBinding = binding
   this.emitFile(`/${filePath}`, source, null)
diff --git a/packages/next/build/webpack/plugins/functions-manifest-plugin.ts b/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
index 4a5cf366e147..c8a04a2f34b9 100644
--- a/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
+++ b/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
@@ -3,7 +3,7 @@ import { sources, webpack5 } from 'next/dist/compiled/webpack/webpack'
 import { normalizePagePath } from '../../../server/normalize-page-path'
 import { FUNCTIONS_MANIFEST } from '../../../shared/lib/constants'
 import { getPageFromPath } from '../../entries'
-import { collectAssets, getEntrypointInfo } from './middleware-plugin'
+import { collectAssets, getEntrypointInfo, PerRoute } from './middleware-plugin'
 
 const PLUGIN_NAME = 'FunctionsManifestPlugin'
 export interface FunctionsManifest {
@@ -52,7 +52,7 @@ export default class FunctionsManifestPlugin {
   createAssets(
     compilation: webpack5.Compilation,
     assets: any,
-    envPerRoute: Map<string, string[]>,
+    perRoute: PerRoute,
     isEdgeRuntime: boolean
   ) {
     const functionsManifest: FunctionsManifest = {
@@ -60,7 +60,7 @@ export default class FunctionsManifestPlugin {
       pages: {},
     }
 
-    const infos = getEntrypointInfo(compilation, envPerRoute, isEdgeRuntime)
+    const infos = getEntrypointInfo(compilation, perRoute, isEdgeRuntime)
     infos.forEach((info) => {
       const { page } = info
       // TODO: use global default runtime instead of 'web'
diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index 503a7a3bb5a8..54195245aebe 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -51,7 +51,7 @@ function getPageFromEntrypointName(pagePath: string) {
   return page
 }
 
-type PerRoute = {
+export type PerRoute = {
   envPerRoute: Map<string, string[]>
   wasmPerRoute: Map<string, WasmBinding[]>
 }