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
5ae7fe53
Unverified
Commit
5ae7fe53
authored
Feb 05, 2020
by
JJ Kasper
Committed by
GitHub
Feb 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
De-dupe paths returned in getStaticPaths (#10423)
* De-dupe paths returned in getStaticPaths * Remove warning
parent
ec39aa46
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
30 deletions
+8
-30
utils.ts
packages/next/build/utils.ts
+5
-5
index.js
test/integration/prerender/pages/blog/[post]/index.js
+1
-0
yarn.lock
yarn.lock
+2
-25
No files found.
packages/next/build/utils.ts
View file @
5ae7fe53
...
@@ -531,9 +531,9 @@ export async function isPageStatic(
...
@@ -531,9 +531,9 @@ export async function isPageStatic(
)
)
}
}
let
prerenderPaths
:
string
[]
|
undefined
let
prerenderPaths
:
Set
<
string
>
|
undefined
if
(
hasStaticProps
&&
hasStaticPaths
)
{
if
(
hasStaticProps
&&
hasStaticPaths
)
{
prerenderPaths
=
[]
as
string
[]
prerenderPaths
=
new
Set
()
const
_routeRegex
=
getRouteRegex
(
page
)
const
_routeRegex
=
getRouteRegex
(
page
)
const
_routeMatcher
=
getRouteMatcher
(
_routeRegex
)
const
_routeMatcher
=
getRouteMatcher
(
_routeRegex
)
...
@@ -555,7 +555,7 @@ export async function isPageStatic(
...
@@ -555,7 +555,7 @@ export async function isPageStatic(
)
)
}
}
prerenderPaths
!
.
push
(
entry
)
prerenderPaths
?.
add
(
entry
)
}
}
// For the object-provided path, we must make sure it specifies all
// For the object-provided path, we must make sure it specifies all
// required keys.
// required keys.
...
@@ -598,7 +598,7 @@ export async function isPageStatic(
...
@@ -598,7 +598,7 @@ export async function isPageStatic(
)
)
})
})
prerenderPaths
!
.
push
(
builtPage
)
prerenderPaths
?.
add
(
builtPage
)
}
}
})
})
}
}
...
@@ -607,7 +607,7 @@ export async function isPageStatic(
...
@@ -607,7 +607,7 @@ export async function isPageStatic(
return
{
return
{
isStatic
:
!
hasStaticProps
&&
!
hasGetInitialProps
&&
!
hasServerProps
,
isStatic
:
!
hasStaticProps
&&
!
hasGetInitialProps
&&
!
hasServerProps
,
isHybridAmp
:
config
.
amp
===
'hybrid'
,
isHybridAmp
:
config
.
amp
===
'hybrid'
,
prerenderRoutes
:
prerenderPaths
,
prerenderRoutes
:
prerenderPaths
&&
[...
prerenderPaths
]
,
hasStaticProps
,
hasStaticProps
,
hasServerProps
,
hasServerProps
,
}
}
...
...
test/integration/prerender/pages/blog/[post]/index.js
View file @
5ae7fe53
...
@@ -10,6 +10,7 @@ export async function unstable_getStaticPaths() {
...
@@ -10,6 +10,7 @@ export async function unstable_getStaticPaths() {
'/blog/[post3]'
,
'/blog/[post3]'
,
'/blog/post-4'
,
'/blog/post-4'
,
'/blog/post.1'
,
'/blog/post.1'
,
'/blog/post.1'
,
// handle duplicates
]
]
}
}
...
...
yarn.lock
View file @
5ae7fe53
...
@@ -4133,7 +4133,7 @@ browserify-zlib@^0.2.0:
...
@@ -4133,7 +4133,7 @@ browserify-zlib@^0.2.0:
dependencies:
dependencies:
pako "~1.0.5"
pako "~1.0.5"
browserslist@4.8.3, browserslist@^4.0.0, browserslist@^4.3.6, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.2, browserslist@^4.8.3:
browserslist@4.8.3, browserslist@^
1.3.6, browserslist@^1.5.2, browserslist@^1.7.6, browserslist@^
4.0.0, browserslist@^4.3.6, browserslist@^4.6.0, browserslist@^4.6.4, browserslist@^4.8.0, browserslist@^4.8.2, browserslist@^4.8.3:
version "4.8.3"
version "4.8.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.3.tgz#65802fcd77177c878e015f0e3189f2c4f627ba44"
integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==
integrity sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==
...
@@ -4142,14 +4142,6 @@ browserslist@4.8.3, browserslist@^4.0.0, browserslist@^4.3.6, browserslist@^4.6.
...
@@ -4142,14 +4142,6 @@ browserslist@4.8.3, browserslist@^4.0.0, browserslist@^4.3.6, browserslist@^4.6.
electron-to-chromium "^1.3.322"
electron-to-chromium "^1.3.322"
node-releases "^1.1.44"
node-releases "^1.1.44"
browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
version "1.7.7"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
dependencies:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
browserstack-local@1.4.0:
browserstack-local@1.4.0:
version "1.4.0"
version "1.4.0"
resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.0.tgz#d979cac056f57b9af159b3bcd7fdc09b4354537c"
resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.0.tgz#d979cac056f57b9af159b3bcd7fdc09b4354537c"
...
@@ -4448,21 +4440,11 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634:
...
@@ -4448,21 +4440,11 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634:
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001023.tgz#f856f71af16a5a44e81f1fcefc1673912a43da72"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001023.tgz#f856f71af16a5a44e81f1fcefc1673912a43da72"
integrity sha512-EnlshvE6oAum+wWwKmJNVaoqJMjIc0bLUy4Dj77VVnz1o6bzSPr1Ze9iPy6g5ycg1xD6jGU6vBmo7pLEz2MbCQ==
integrity sha512-EnlshvE6oAum+wWwKmJNVaoqJMjIc0bLUy4Dj77VVnz1o6bzSPr1Ze9iPy6g5ycg1xD6jGU6vBmo7pLEz2MbCQ==
caniuse-db@^1.0.30000639:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001019, caniuse-lite@^1.0.30001020:
version "1.0.30001025"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001025.tgz#33b6b126f3070a54fa8017bb5c4a0fd6b787d6f1"
integrity sha512-HtUBOYgagTFMOa8/OSVkXbDS/YiByZZoi4H+ksKgoDfNmMVoodxnH373bXleumM1kg1IXvLspLMKIS7guWEBhg==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001012, caniuse-lite@^1.0.30001017, caniuse-lite@^1.0.30001019:
version "1.0.30001019"
version "1.0.30001019"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz#857e3fccaad2b2feb3f1f6d8a8f62d747ea648e1"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz#857e3fccaad2b2feb3f1f6d8a8f62d747ea648e1"
integrity sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==
integrity sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==
caniuse-lite@^1.0.30001020:
version "1.0.30001025"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz#30336a8aca7f98618eb3cf38e35184e13d4e5fe6"
integrity sha512-SKyFdHYfXUZf5V85+PJgLYyit27q4wgvZuf8QTOk1osbypcROihMBlx9GRar2/pIcKH2r4OehdlBr9x6PXetAQ==
capitalize@1.0.0:
capitalize@1.0.0:
version "1.0.0"
version "1.0.0"
resolved "https://registry.yarnpkg.com/capitalize/-/capitalize-1.0.0.tgz#dc802c580aee101929020d2ca14b4ca8a0ae44be"
resolved "https://registry.yarnpkg.com/capitalize/-/capitalize-1.0.0.tgz#dc802c580aee101929020d2ca14b4ca8a0ae44be"
...
@@ -6220,11 +6202,6 @@ ejs@^2.6.1:
...
@@ -6220,11 +6202,6 @@ ejs@^2.6.1:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.2.7:
version "1.3.345"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.345.tgz#2569d0d54a64ef0f32a4b7e8c80afa5fe57c5d98"
integrity sha512-f8nx53+Z9Y+SPWGg3YdHrbYYfIJAtbUjpFfW4X1RwTZ94iUG7geg9tV8HqzAXX7XTNgyWgAFvce4yce8ZKxKmg==
electron-to-chromium@^1.3.322:
electron-to-chromium@^1.3.322:
version "1.3.327"
version "1.3.327"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.327.tgz#516f28b4271727004362b4ac814494ae64d9dde7"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.327.tgz#516f28b4271727004362b4ac814494ae64d9dde7"
...
...
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