mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-25 23:22:02 +00:00
fix: load webpack modules synchronously with require
(#104)
Co-authored-by: Pooya Parsa <pyapar@gmail.com>
This commit is contained in:
parent
65229ffb04
commit
c1cd37d8c5
@ -61,16 +61,26 @@ export function dynamicRequire ({ dir, globbyOptions, inline }: Options): Plugin
|
|||||||
meta: getWebpackChunkMeta(resolve(dir, id))
|
meta: getWebpackChunkMeta(resolve(dir, id))
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
return inline ? TMPL_INLINE({ chunks }) : TMPL_LAZY({ chunks })
|
||||||
|
},
|
||||||
|
renderChunk (code) {
|
||||||
if (inline) {
|
if (inline) {
|
||||||
return TMPL_INLINE({ chunks })
|
return {
|
||||||
} else {
|
map: null,
|
||||||
return TMPL_LAZY({ chunks })
|
code
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
map: null,
|
||||||
|
code: code.replace(
|
||||||
|
/Promise.resolve\(\).then\(function \(\) \{ return require\('([^']*)' \/\* webpackChunk \*\/\); \}\).then\(function \(n\) \{ return n.([a-zA-Z]*); \}\)/g,
|
||||||
|
"require('$1').$2")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getWebpackChunkMeta (src) {
|
function getWebpackChunkMeta (src: string) {
|
||||||
const chunk = require(src) || {}
|
const chunk = require(src) || {}
|
||||||
const { id, ids, modules } = chunk
|
const { id, ids, modules } = chunk
|
||||||
return {
|
return {
|
||||||
@ -93,26 +103,31 @@ export default function dynamicRequire(id) {
|
|||||||
|
|
||||||
function TMPL_LAZY ({ chunks }: TemplateContext) {
|
function TMPL_LAZY ({ chunks }: TemplateContext) {
|
||||||
return `
|
return `
|
||||||
function asyncWebpackModule(promise, id) {
|
function dynamicWebpackModule(id, getChunk) {
|
||||||
return function (module, exports, require) {
|
return function (module, exports, require) {
|
||||||
module.exports = promise.then(r => {
|
const r = getChunk()
|
||||||
|
if (r instanceof Promise) {
|
||||||
|
module.exports = r.then(r => {
|
||||||
const realModule = { exports: {}, require };
|
const realModule = { exports: {}, require };
|
||||||
r.modules[id](realModule, realModule.exports, realModule.require);
|
r.modules[id](realModule, realModule.exports, realModule.require);
|
||||||
return realModule.exports;
|
return realModule.exports;
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
r.modules[id](module, exports, require);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
function webpackChunk (meta, promise) {
|
function webpackChunk (meta, getChunk) {
|
||||||
const chunk = { ...meta, modules: {} };
|
const chunk = { ...meta, modules: {} };
|
||||||
for (const id of meta.moduleIds) {
|
for (const id of meta.moduleIds) {
|
||||||
chunk.modules[id] = asyncWebpackModule(promise, id);
|
chunk.modules[id] = dynamicWebpackModule(id, getChunk);
|
||||||
};
|
};
|
||||||
return chunk;
|
return chunk;
|
||||||
};
|
};
|
||||||
|
|
||||||
const dynamicChunks = {
|
const dynamicChunks = {
|
||||||
${chunks.map(i => ` ['${i.id}']: () => webpackChunk(${JSON.stringify(i.meta)}, import('${i.src}'))`).join(',\n')}
|
${chunks.map(i => ` ['${i.id}']: () => webpackChunk(${JSON.stringify(i.meta)}, () => import('${i.src}' /* webpackChunk */))`).join(',\n')}
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function dynamicRequire(id) {
|
export default function dynamicRequire(id) {
|
||||||
|
Loading…
Reference in New Issue
Block a user