Unverified Commit 059dd309 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Make browser side resolve prefer mjs files (#5898)

parent be24aaa0
...@@ -210,7 +210,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer ...@@ -210,7 +210,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
const resolveConfig = { const resolveConfig = {
// Disable .mjs for node_modules bundling // Disable .mjs for node_modules bundling
extensions: ['.wasm', '.js', '.mjs', '.jsx', '.json'], extensions: isServer ? ['.wasm', '.js', '.mjs', '.jsx', '.json'] : ['.wasm', '.mjs', '.js', '.jsx', '.json'],
modules: [ modules: [
NEXT_PROJECT_ROOT_NODE_MODULES, NEXT_PROJECT_ROOT_NODE_MODULES,
'node_modules', 'node_modules',
...@@ -219,7 +219,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer ...@@ -219,7 +219,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
alias: { alias: {
next: NEXT_PROJECT_ROOT next: NEXT_PROJECT_ROOT
}, },
mainFields: [!isServer && 'browser', !isServer && 'module', 'main'].filter(Boolean) mainFields: isServer ? ['main'] : ['browser', 'module', 'main']
} }
const webpackMode = dev ? 'development' : 'production' const webpackMode = dev ? 'development' : 'production'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment