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
ead5a8bc
Unverified
Commit
ead5a8bc
authored
Aug 30, 2018
by
Tim Neutkens
Committed by
GitHub
Aug 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split out Loadable.Capture and make NoSSR smaller (#5060)
parent
3ede8182
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
66 deletions
+61
-66
dynamic.js
lib/dynamic.js
+8
-22
loadable-capture.js
lib/loadable-capture.js
+48
-0
loadable.js
lib/loadable.js
+2
-42
render.js
server/render.js
+3
-2
No files found.
lib/dynamic.js
View file @
ead5a8bc
...
@@ -35,35 +35,21 @@ type LoadableOptions = {
...
@@ -35,35 +35,21 @@ type LoadableOptions = {
const
isServerSide
=
typeof
window
===
'undefined'
const
isServerSide
=
typeof
window
===
'undefined'
export
function
noSSR
(
LoadableInitializer
:
(
loadableOptions
:
LoadableOptions
)
=>
ElementType
,
loadableOptions
:
LoadableOptions
)
{
export
function
noSSR
(
LoadableInitializer
:
(
loadableOptions
:
LoadableOptions
)
=>
ElementType
,
loadableOptions
:
LoadableOptions
)
{
let
LoadableComponent
// Removing webpack and modules means react-loadable won't try preloading
// Removing webpack and modules means react-loadable won't try preloading
delete
loadableOptions
.
webpack
delete
loadableOptions
.
webpack
delete
loadableOptions
.
modules
delete
loadableOptions
.
modules
// This check is neccesary to prevent react-loadable from initializing on the server
// This check is neccesary to prevent react-loadable from initializing on the server
if
(
!
isServerSide
)
{
if
(
!
isServerSide
)
{
LoadableComponent
=
LoadableInitializer
(
loadableOptions
)
return
LoadableInitializer
(
loadableOptions
)
}
}
return
class
NoSSR
extends
React
.
Component
<
any
,
{
mounted
:
boolean
}
>
{
// This will only be rendered on the server side
state
=
{
mounted
:
false
}
return
()
=>
<
loadableOptions
.
loading
error
=
{
null
}
isLoading
pastDelay
=
{
false
}
timedOut
=
{
false
}
/
>
}
componentDidMount
()
{
this
.
setState
({
mounted
:
true
})
}
render
()
{
const
{
mounted
}
=
this
.
state
if
(
mounted
&&
LoadableComponent
)
{
return
<
LoadableComponent
{...
this
.
props
}
/
>
}
// Run loading component on the server and when mounting, when mounted we load the LoadableComponent
function
DefaultLoading
()
{
return
<
loadableOptions
.
loading
error
=
{
null
}
isLoading
pastDelay
=
{
false
}
timedOut
=
{
false
}
/
>
return
<
p
>
loading
...
<
/p
>
}
}
}
}
export
default
function
dynamic
(
dynamicOptions
:
any
,
options
:
NextDynamicOptions
)
{
export
default
function
dynamic
(
dynamicOptions
:
any
,
options
:
NextDynamicOptions
)
{
...
@@ -73,14 +59,14 @@ export default function dynamic (dynamicOptions: any, options: NextDynamicOption
...
@@ -73,14 +59,14 @@ export default function dynamic (dynamicOptions: any, options: NextDynamicOption
loading
:
({
error
,
isLoading
})
=>
{
loading
:
({
error
,
isLoading
})
=>
{
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
isLoading
)
{
if
(
isLoading
)
{
return
<
p
>
loading
...
<
/p
>
return
<
DefaultLoading
/
>
}
}
if
(
error
)
{
if
(
error
)
{
return
<
p
>
{
error
.
message
}
<
br
/>
{
error
.
stack
}
<
/p
>
return
<
p
>
{
error
.
message
}
<
br
/>
{
error
.
stack
}
<
/p
>
}
}
}
}
return
<
p
>
loading
...
<
/p
>
return
<
DefaultLoading
/
>
}
}
}
}
...
...
lib/loadable-capture.js
0 → 100644
View file @
ead5a8bc
/**
@copyright (c) 2017-present James Kyle <me@thejameskyle.com>
MIT License
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
*/
// https://github.com/jamiebuilds/react-loadable/blob/v5.5.0/src/index.js
// Just the `Capture` class which is only used with SSR
import
React
from
'react'
import
PropTypes
from
'prop-types'
export
default
class
Capture
extends
React
.
Component
{
static
propTypes
=
{
report
:
PropTypes
.
func
.
isRequired
};
static
childContextTypes
=
{
loadable
:
PropTypes
.
shape
({
report
:
PropTypes
.
func
.
isRequired
}).
isRequired
};
getChildContext
()
{
return
{
loadable
:
{
report
:
this
.
props
.
report
}
}
}
render
()
{
return
React
.
Children
.
only
(
this
.
props
.
children
)
}
}
lib/loadable.js
View file @
ead5a8bc
...
@@ -16,7 +16,7 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
...
@@ -16,7 +16,7 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
E
*/
*/
// https://github.com/jamiebuilds/react-loadable/blob/v5.5.0/src/index.js
// https://github.com/jamiebuilds/react-loadable/blob/v5.5.0/src/index.js
// Modified to be compatible with webpack 4 / Next.js
// Modified to be compatible with webpack 4 / Next.js
...
@@ -27,14 +27,6 @@ import PropTypes from 'prop-types'
...
@@ -27,14 +27,6 @@ import PropTypes from 'prop-types'
const
ALL_INITIALIZERS
=
[]
const
ALL_INITIALIZERS
=
[]
const
READY_INITIALIZERS
=
[]
const
READY_INITIALIZERS
=
[]
function
isWebpackReady
(
getModuleIds
)
{
return
getModuleIds
().
every
(
moduleId
=>
{
return
(
typeof
moduleId
!==
'undefined'
)
})
}
function
load
(
loader
)
{
function
load
(
loader
)
{
let
promise
=
loader
()
let
promise
=
loader
()
...
@@ -115,10 +107,6 @@ function render (loaded, props) {
...
@@ -115,10 +107,6 @@ function render (loaded, props) {
}
}
function
createLoadableComponent
(
loadFn
,
options
)
{
function
createLoadableComponent
(
loadFn
,
options
)
{
if
(
!
options
.
loading
)
{
throw
new
Error
(
'react-loadable requires a `loading` component'
)
}
let
opts
=
Object
.
assign
(
let
opts
=
Object
.
assign
(
{
{
loader
:
null
,
loader
:
null
,
...
@@ -145,9 +133,7 @@ function createLoadableComponent (loadFn, options) {
...
@@ -145,9 +133,7 @@ function createLoadableComponent (loadFn, options) {
if
(
typeof
opts
.
webpack
===
'function'
)
{
if
(
typeof
opts
.
webpack
===
'function'
)
{
READY_INITIALIZERS
.
push
(()
=>
{
READY_INITIALIZERS
.
push
(()
=>
{
if
(
isWebpackReady
(
opts
.
webpack
))
{
return
init
()
return
init
()
}
})
})
}
}
...
@@ -279,32 +265,6 @@ function LoadableMap (opts) {
...
@@ -279,32 +265,6 @@ function LoadableMap (opts) {
Loadable
.
Map
=
LoadableMap
Loadable
.
Map
=
LoadableMap
class
Capture
extends
React
.
Component
{
static
propTypes
=
{
report
:
PropTypes
.
func
.
isRequired
};
static
childContextTypes
=
{
loadable
:
PropTypes
.
shape
({
report
:
PropTypes
.
func
.
isRequired
}).
isRequired
};
getChildContext
()
{
return
{
loadable
:
{
report
:
this
.
props
.
report
}
}
}
render
()
{
return
React
.
Children
.
only
(
this
.
props
.
children
)
}
}
Loadable
.
Capture
=
Capture
function
flushInitializers
(
initializers
)
{
function
flushInitializers
(
initializers
)
{
let
promises
=
[]
let
promises
=
[]
...
...
server/render.js
View file @
ead5a8bc
...
@@ -10,6 +10,7 @@ import { loadGetInitialProps, isResSent } from '../lib/utils'
...
@@ -10,6 +10,7 @@ import { loadGetInitialProps, isResSent } from '../lib/utils'
import
Head
,
{
defaultHead
}
from
'../lib/head'
import
Head
,
{
defaultHead
}
from
'../lib/head'
import
ErrorDebug
from
'../lib/error-debug'
import
ErrorDebug
from
'../lib/error-debug'
import
Loadable
from
'../lib/loadable'
import
Loadable
from
'../lib/loadable'
import
LoadableCapture
from
'../lib/loadable-capture'
import
{
BUILD_MANIFEST
,
REACT_LOADABLE_MANIFEST
,
SERVER_DIRECTORY
,
CLIENT_STATIC_FILES_PATH
}
from
'../lib/constants'
import
{
BUILD_MANIFEST
,
REACT_LOADABLE_MANIFEST
,
SERVER_DIRECTORY
,
CLIENT_STATIC_FILES_PATH
}
from
'../lib/constants'
// Based on https://github.com/jamiebuilds/react-loadable/pull/132
// Based on https://github.com/jamiebuilds/react-loadable/pull/132
...
@@ -125,13 +126,13 @@ async function doRender (req, res, pathname, query, {
...
@@ -125,13 +126,13 @@ async function doRender (req, res, pathname, query, {
}
}
}
}
const
app
=
<
Loadable
.
Capture
report
=
{
moduleName
=>
reactLoadableModules
.
push
(
moduleName
)}
>
const
app
=
<
LoadableCapture
report
=
{
moduleName
=>
reactLoadableModules
.
push
(
moduleName
)}
>
<
EnhancedApp
{...{
<
EnhancedApp
{...{
Component
:
EnhancedComponent
,
Component
:
EnhancedComponent
,
router
,
router
,
...
props
...
props
}}
/
>
}}
/
>
<
/Loadable
.
Capture
>
<
/LoadableCapture
>
const
render
=
staticMarkup
?
renderToStaticMarkup
:
renderToString
const
render
=
staticMarkup
?
renderToStaticMarkup
:
renderToString
...
...
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