Commit dbd6f515 authored by Vlad Nicula's avatar Vlad Nicula Committed by Tim Neutkens

Fix dynamic import in non webpack env regression #3345 (#4208)

Just in case #3345 was a regression and nextjs should still support non webpack node envs for testing.
parent 9b88eef8
...@@ -16,23 +16,33 @@ const TYPE_IMPORT = 'Import' ...@@ -16,23 +16,33 @@ const TYPE_IMPORT = 'Import'
const buildImport = (args) => (template(` const buildImport = (args) => (template(`
( (
new (require('next/dynamic').SameLoopPromise)((resolve, reject) => { typeof require.resolveWeak !== 'function' ?
const weakId = require.resolveWeak(SOURCE) new (require('next/dynamic').SameLoopPromise)((resolve, reject) => {
try { eval('require.ensure = function (deps, callback) { callback(require) }')
const weakModule = __webpack_require__(weakId) require.ensure([], (require) => {
return resolve(weakModule)
} catch (err) {}
require.ensure([], (require) => {
try {
let m = require(SOURCE) let m = require(SOURCE)
m.__webpackChunkName = '${args.name}' m.__webpackChunkName = '${args.name}.js'
resolve(m) resolve(m);
} catch(error) { }, 'chunks/${args.name}.js');
reject(error) })
} :
}, 'chunks/${args.name}'); new (require('next/dynamic').SameLoopPromise)((resolve, reject) => {
}) const weakId = require.resolveWeak(SOURCE)
try {
const weakModule = __webpack_require__(weakId)
return resolve(weakModule)
} catch (err) {}
require.ensure([], (require) => {
try {
let m = require(SOURCE)
m.__webpackChunkName = '${args.name}'
resolve(m)
} catch(error) {
reject(error)
}
}, 'chunks/${args.name}');
})
) )
`)) `))
......
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