Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
17329edc
Commit
17329edc
authored
Apr 19, 2017
by
Arunoda Susiripala
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle require.ensure errors well.
Introduce a new Promise library which runs on the same eventloop.
parent
b5a03a38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
111 additions
and
26 deletions
+111
-26
dynamic.js
lib/dynamic.js
+86
-0
handle-import.js
server/build/babel/plugins/handle-import.js
+25
-26
No files found.
lib/dynamic.js
View file @
17329edc
...
...
@@ -53,3 +53,89 @@ export function flushChunks () {
currentChunks
=
[]
return
chunks
}
export
class
SameLoopPromise
{
constructor
(
cb
)
{
this
.
onResultCallbacks
=
[]
this
.
onErrorCallbacks
=
[]
if
(
cb
)
{
cb
(
(
result
)
=>
this
.
setResult
(
result
),
(
error
)
=>
this
.
setError
(
error
)
)
}
}
setResult
(
result
)
{
this
.
gotResult
=
true
this
.
result
=
result
this
.
onResultCallbacks
.
forEach
((
cb
)
=>
cb
(
result
))
this
.
onResultCallbacks
=
[]
}
setError
(
error
)
{
this
.
gotError
=
true
this
.
error
=
error
this
.
onErrorCallbacks
.
forEach
((
cb
)
=>
cb
(
error
))
this
.
onErrorCallbacks
=
[]
}
then
(
onResult
,
onError
)
{
const
promise
=
new
SameLoopPromise
()
const
handleError
=
()
=>
{
if
(
onError
)
{
promise
.
setResult
(
onError
(
this
.
error
))
}
else
{
promise
.
setError
(
this
.
error
)
}
}
const
handleResult
=
()
=>
{
promise
.
setResult
(
onResult
(
this
.
result
))
}
if
(
this
.
gotResult
)
{
handleResult
()
return
promise
}
if
(
this
.
gotError
)
{
handleError
()
return
promise
}
this
.
onResultCallbacks
.
push
(
handleResult
)
this
.
onErrorCallbacks
.
push
(
handleError
)
return
promise
}
catch
(
onError
)
{
const
promise
=
new
SameLoopPromise
()
const
handleError
=
()
=>
{
promise
.
setResult
(
onError
(
this
.
error
))
}
const
handleResult
=
()
=>
{
promise
.
setResult
(
this
.
result
)
}
if
(
this
.
gotResult
)
{
handleResult
()
return
promise
}
if
(
this
.
gotError
)
{
handleError
()
return
promise
}
this
.
onErrorCallbacks
.
push
(
handleError
)
this
.
onResultCallbacks
.
push
(
handleResult
)
return
promise
}
}
server/build/babel/plugins/handle-import.js
View file @
17329edc
...
...
@@ -8,35 +8,34 @@ const TYPE_IMPORT = 'Import'
const
buildImport
=
(
args
)
=>
(
template
(
`
(
typeof window === 'undefined' ?
{
then(cb) {
eval('require.ensure = function (deps, callback) { callback(require) }')
require.ensure([], (require) => {
let m = require(SOURCE)
m = m.default || m
m.__webpackChunkName = '
${
args
.
name
}
.js'
cb(m);
}, 'chunks/
${
args
.
name
}
.js');
},
catch() {}
} :
{
then(cb) {
const weakId = require.resolveWeak(SOURCE)
try {
const weakModule = __webpack_require__(weakId)
return cb(weakModule.default || weakModule)
} catch (err) {}
typeof window === 'undefined' ?
new (require('next/dynamic').SameLoopPromise)((resolve, reject) => {
eval('require.ensure = function (deps, callback) { callback(require) }')
require.ensure([], (require) => {
let m = require(SOURCE)
m = m.default || m
m.__webpackChunkName = '
${
args
.
name
}
.js'
resolve(m);
}, 'chunks/
${
args
.
name
}
.js');
})
:
new (require('next/dynamic').SameLoopPromise)((resolve, reject) => {
const weakId = require.resolveWeak(SOURCE)
try {
const weakModule = __webpack_require__(weakId)
return resolve(weakModule.default || weakModule)
} catch (err) {}
require.ensure([], (require) => {
require.ensure([], (require) => {
try {
let m = require(SOURCE)
m = m.default || m
cb(m);
}, 'chunks/
${
args
.
name
}
.js');
},
catch () {}
}
resolve(m)
} catch(error) {
reject(error)
}
}, 'chunks/
${
args
.
name
}
.js');
})
)
`
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment