chore: extract edge-app-route loader template

vercel · Oct 4, 2023 · ad8601d · ad8601d
1 parent f8308c9
commit ad8601d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/packages/next/src/build/entries.ts b/packages/next/src/build/entries.ts
@@ -356,6 +356,7 @@ export function getEdgeServerEntry(opts: {
       layer: WEBPACK_LAYERS.reactServerComponents,
     }
   }
+
   if (isMiddlewareFile(opts.page)) {
     const loaderParams: MiddlewareLoaderOptions = {
       absolutePagePath: opts.absolutePagePath,

diff --git a/packages/next/src/build/load-entrypoint.ts b/packages/next/src/build/load-entrypoint.ts
@@ -19,12 +19,18 @@ const TEMPLATES_ESM_FOLDER = path.normalize(
  * handle replacement values that are related to imports.
  *
  * @param entrypoint the entrypoint to load
- * @param replacements the replacements to perform
+ * @param replacements string replacements to perform
+ * @param injections code injections to perform
  * @returns the loaded file with the replacements
  */
 
 export async function loadEntrypoint(
-  entrypoint: 'pages' | 'pages-api' | 'app-page' | 'app-route',
+  entrypoint:
+    | 'pages'
+    | 'pages-api'
+    | 'app-page'
+    | 'app-route'
+    | 'edge-app-route',
   replacements: Record<`VAR_${string}`, string>,
   injections?: Record<string, string>
 ): Promise<string> {

diff --git a/packages/next/src/build/templates/edge-app-route.ts b/packages/next/src/build/templates/edge-app-route.ts
@@ -0,0 +1,9 @@
+import { EdgeRouteModuleWrapper } from '../../server/web/edge-route-module-wrapper'
+
+// Import the userland code.
+// @ts-expect-error - replaced by webpack/turbopack loader
+import * as module from 'VAR_USERLAND'
+
+export const ComponentMod = module
+
+export default EdgeRouteModuleWrapper.wrap(module.routeModule)
diff --git a/packages/next/src/build/webpack/loaders/next-edge-app-route-loader/index.ts b/packages/next/src/build/webpack/loaders/next-edge-app-route-loader/index.ts
@@ -4,6 +4,7 @@ import { NextConfig } from '../../../../server/config-shared'
 import { webpack } from 'next/dist/compiled/webpack/webpack'
 import { WEBPACK_RESOURCE_QUERIES } from '../../../../lib/constants'
 import { MiddlewareConfig } from '../../../analysis/get-page-static-info'
+import { loadEntrypoint } from '../../../load-entrypoint'
 
 export type EdgeAppRouteLoaderQuery = {
   absolutePagePath: string
@@ -15,7 +16,7 @@ export type EdgeAppRouteLoaderQuery = {
 }
 
 const EdgeAppRouteLoader: webpack.LoaderDefinitionFunction<EdgeAppRouteLoaderQuery> =
-  function (this) {
+  async function (this) {
     const {
       page,
       absolutePagePath,
@@ -52,13 +53,9 @@ const EdgeAppRouteLoader: webpack.LoaderDefinitionFunction<EdgeAppRouteLoaderQue
       stringifiedPagePath.length - 1
     )}?${WEBPACK_RESOURCE_QUERIES.edgeSSREntry}`
 
-    return `
-    import { EdgeRouteModuleWrapper } from 'next/dist/esm/server/web/edge-route-module-wrapper'
-    import * as module from ${JSON.stringify(modulePath)}
-
-    export const ComponentMod = module
-
-    export default EdgeRouteModuleWrapper.wrap(module.routeModule)`
+    return await loadEntrypoint('edge-app-route', {
+      VAR_USERLAND: modulePath,
+    })
   }
 
 export default EdgeAppRouteLoader