terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Make browser side resolve prefer mjs files (#5898)

Browse source
This commit is contained in:
Tim Neutkens 2018-12-16 16:26:45 +01:00 committed by GitHub
parent be24aaa0d2
commit 059dd309c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/next/build/webpack-config.js
View file

@ -210,7 +210,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
const resolveConfig = {
// 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: [
NEXT_PROJECT_ROOT_NODE_MODULES,
'node_modules',
@ -219,7 +219,7 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
alias: {
next: NEXT_PROJECT_ROOT
},
mainFields: [!isServer && 'browser', !isServer && 'module', 'main'].filter(Boolean)
mainFields: isServer ? ['main'] : ['browser', 'module', 'main']
}
const webpackMode = dev ? 'development' : 'production'