update loader

vercel · Jun 5, 2023 · af39410 · af39410
1 parent 17c32c5
commit af39410
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -1100,6 +1100,8 @@ export default async function getBaseWebpackConfig(
 
             // TODO: This is a temp fix, investigate the module not found for zod
             zod: path.dirname(require.resolve('zod/package.json')),
+            'styled-jsx': require.resolve('styled-jsx/package.json'),
+            'styled-jsx/style': require.resolve('styled-jsx/style'),
           }
         : undefined),
 

diff --git a/packages/next/src/build/webpack/loaders/next-edge-function-loader.ts b/packages/next/src/build/webpack/loaders/next-edge-function-loader.ts
@@ -35,9 +35,7 @@ const nextEdgeFunctionLoader: webpack.LoaderDefinitionFunction<EdgeFunctionLoade
 
         enhanceGlobals()
 
-        import * as _mod from ${stringifiedPagePath}
-        const mod = { ..._mod }
-        const handler = mod.middleware || mod.default
+        import handler from ${stringifiedPagePath}
 
         if (typeof handler !== 'function') {
           throw new Error('The Edge Function "pages${page}" must export a \`default\` function');

diff --git a/packages/next/src/build/webpack/loaders/next-middleware-loader.ts b/packages/next/src/build/webpack/loaders/next-middleware-loader.ts
@@ -44,8 +44,9 @@ export default function middlewareLoader(this: any) {
 
         enhanceGlobals()
 
-        var mod = require(${stringifiedPagePath})
-        var handler = mod.middleware || mod.default;
+        import * as _mod from ${stringifiedPagePath}
+        const mod = { ..._mod }
+        const handler = mod.middleware || mod.default
 
         if (typeof handler !== 'function') {
           throw new Error('The Middleware "pages${page}" must export a \`middleware\` or a \`default\` function');

diff --git a/packages/next/src/server/require-hook.ts b/packages/next/src/server/require-hook.ts
@@ -23,7 +23,6 @@ addHookAliases([
   // styled-jsx needs to be resolved as the external dependency.
   ['styled-jsx', require.resolve('styled-jsx')],
   ['styled-jsx/style', require.resolve('styled-jsx/style')],
-  ['styled-jsx/style', require.resolve('styled-jsx/style')],
   ['zod', dirname(require.resolve('zod/package.json'))],
 ])