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
c3318d8e
Unverified
Commit
c3318d8e
authored
Mar 31, 2018
by
Tim Neutkens
Committed by
GitHub
Mar 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure hot-self-accept-loader cleans up the route correctly (#4092)
parent
7f335cb0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
hot-self-accept-loader.js
server/build/loaders/hot-self-accept-loader.js
+10
-3
webpack.js
server/build/webpack.js
+6
-3
No files found.
server/build/loaders/hot-self-accept-loader.js
View file @
c3318d8e
import
{
resolve
,
relative
}
from
'path'
import
{
resolve
,
relative
}
from
'path'
import
loaderUtils
from
'loader-utils'
module
.
exports
=
function
(
content
,
sourceMap
)
{
module
.
exports
=
function
(
content
,
sourceMap
)
{
this
.
cacheable
()
this
.
cacheable
()
const
route
=
getRoute
(
this
)
const
options
=
loaderUtils
.
getOptions
(
this
)
const
route
=
getRoute
(
this
,
options
)
// Webpack has a built in system to prevent default from colliding, giving it a random letter per export.
// Webpack has a built in system to prevent default from colliding, giving it a random letter per export.
// We can safely check if Component is undefined since all other pages imported into the entrypoint don't have __webpack_exports__.default
// We can safely check if Component is undefined since all other pages imported into the entrypoint don't have __webpack_exports__.default
...
@@ -30,11 +32,16 @@ module.exports = function (content, sourceMap) {
...
@@ -30,11 +32,16 @@ module.exports = function (content, sourceMap) {
const
nextPagesDir
=
resolve
(
__dirname
,
'..'
,
'..'
,
'..'
,
'pages'
)
const
nextPagesDir
=
resolve
(
__dirname
,
'..'
,
'..'
,
'..'
,
'pages'
)
function
getRoute
(
loaderContext
)
{
function
getRoute
(
loaderContext
,
options
)
{
const
pagesDir
=
resolve
(
loaderContext
.
options
.
context
,
'pages'
)
const
pagesDir
=
resolve
(
loaderContext
.
options
.
context
,
'pages'
)
const
{
resourcePath
}
=
loaderContext
const
{
resourcePath
}
=
loaderContext
const
dir
=
[
pagesDir
,
nextPagesDir
]
const
dir
=
[
pagesDir
,
nextPagesDir
]
.
find
((
d
)
=>
resourcePath
.
indexOf
(
d
)
===
0
)
.
find
((
d
)
=>
resourcePath
.
indexOf
(
d
)
===
0
)
const
path
=
relative
(
dir
,
resourcePath
)
if
(
!
options
.
extensions
)
{
throw
new
Error
(
'extensions is not provided to hot-self-accept-loader. Please upgrade all next-plugins to the latest version.'
)
}
const
path
=
relative
(
dir
,
resourcePath
).
replace
(
options
.
extensions
,
'.js'
)
return
'/'
+
path
.
replace
(
/
((
^|
\/)
index
)?\.
js$/
,
''
)
return
'/'
+
path
.
replace
(
/
((
^|
\/)
index
)?\.
js$/
,
''
)
}
}
server/build/webpack.js
View file @
c3318d8e
...
@@ -177,15 +177,18 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
...
@@ -177,15 +177,18 @@ export default async function getBaseWebpackConfig (dir, {dev = false, isServer
module
:
{
module
:
{
rules
:
[
rules
:
[
dev
&&
!
isServer
&&
{
dev
&&
!
isServer
&&
{
test
:
/
\.(
js|jsx
)
(\?[^
?
]
*
)?
$/
,
test
:
/
\.(
js|jsx
)
$/
,
loader
:
'hot-self-accept-loader'
,
loader
:
'hot-self-accept-loader'
,
include
:
[
include
:
[
path
.
join
(
dir
,
'pages'
),
path
.
join
(
dir
,
'pages'
),
nextPagesDir
nextPagesDir
]
],
options
:
{
extensions
:
/
\.(
js|jsx
)
$/
}
},
},
{
{
test
:
/
\.
+
(
js|jsx
)
$/
,
test
:
/
\.(
js|jsx
)
$/
,
include
:
[
dir
],
include
:
[
dir
],
exclude
:
/node_modules/
,
exclude
:
/node_modules/
,
use
:
defaultLoaders
.
babel
use
:
defaultLoaders
.
babel
...
...
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