Unverified Commit 907dd27a authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Make main.js override work correctly (#6781)

parent 24d8ec56
...@@ -327,18 +327,16 @@ export default function getBaseWebpackConfig (dir: string, {dev = false, isServe ...@@ -327,18 +327,16 @@ export default function getBaseWebpackConfig (dir: string, {dev = false, isServe
const originalEntry: any = webpackConfig.entry const originalEntry: any = webpackConfig.entry
if (typeof originalEntry !== 'undefined') { if (typeof originalEntry !== 'undefined') {
webpackConfig.entry = async () => { webpackConfig.entry = async () => {
const entry = typeof originalEntry === 'function' ? await originalEntry() : originalEntry const entry: WebpackEntrypoints = typeof originalEntry === 'function' ? await originalEntry() : originalEntry
if (entry && typeof entry !== 'string' && !Array.isArray(entry)) {
// Server compilation doesn't have main.js // Server compilation doesn't have main.js
if (entry['main.js'] && entry['main.js'].length > 0) { if (clientEntries && entry['main.js'] && entry['main.js'].length > 0) {
const originalFile = clientEntries[CLIENT_STATIC_FILES_RUNTIME_MAIN]
entry[CLIENT_STATIC_FILES_RUNTIME_MAIN] = [ entry[CLIENT_STATIC_FILES_RUNTIME_MAIN] = [
...entry['main.js'], ...entry['main.js'],
originalEntry[CLIENT_STATIC_FILES_RUNTIME_MAIN] originalFile
] ]
} }
delete entry['main.js'] delete entry['main.js']
}
return entry return entry
} }
......
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