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
840b60bc
Unverified
Commit
840b60bc
authored
Dec 01, 2023
by
OJ Kwon
Committed by
GitHub
Dec 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(next-core): do not panic when parsing segment config (#59170)
parent
574e7060
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
19 deletions
+24
-19
app_segment_config.rs
packages/next-swc/crates/next-core/src/app_segment_config.rs
+20
-16
turbopack-tests-manifest.json
test/turbopack-tests-manifest.json
+4
-3
No files found.
packages/next-swc/crates/next-core/src/app_segment_config.rs
View file @
840b60bc
...
...
@@ -4,7 +4,7 @@ use anyhow::{bail, Result};
use
serde
::{
Deserialize
,
Serialize
};
use
serde_json
::
Value
;
use
swc_core
::{
common
::{
source_map
::
Pos
,
Span
,
Spanned
},
common
::{
source_map
::
Pos
,
Span
,
Spanned
,
GLOBALS
},
ecma
::
ast
::{
Expr
,
Ident
,
Program
},
};
use
turbo_tasks
::{
trace
::
TraceRawVcs
,
TryJoinIterExt
,
ValueDefault
,
Vc
};
...
...
@@ -243,33 +243,37 @@ pub async fn parse_segment_config_from_source(
let
ParseResult
::
Ok
{
program
:
Program
::
Module
(
module_ast
),
eval_context
,
globals
,
..
}
=
result
else
{
return
Ok
(
Default
::
default
());
};
let
mut
config
=
NextSegmentConfig
::
default
();
let
config
=
GLOBALS
.set
(
globals
,
||
{
let
mut
config
=
NextSegmentConfig
::
default
();
for
item
in
&
module_ast
.body
{
let
Some
(
decl
)
=
item
.as_module_decl
()
.and_then
(|
mod_decl
|
mod_decl
.as_export_decl
())
.and_then
(|
export_decl
|
export_decl
.decl
.as_var
())
else
{
continue
;
};
for
decl
in
&
decl
.decls
{
let
Some
(
ident
)
=
decl
.name
.as_ident
()
.map
(|
ident
|
ident
.deref
())
else
{
for
item
in
&
module_ast
.body
{
let
Some
(
decl
)
=
item
.as_module_decl
()
.and_then
(|
mod_decl
|
mod_decl
.as_export_decl
())
.and_then
(|
export_decl
|
export_decl
.decl
.as_var
())
else
{
continue
;
};
if
let
Some
(
init
)
=
decl
.init
.as_ref
()
{
parse_config_value
(
source
,
&
mut
config
,
ident
,
init
,
eval_context
);
for
decl
in
&
decl
.decls
{
let
Some
(
ident
)
=
decl
.name
.as_ident
()
.map
(|
ident
|
ident
.deref
())
else
{
continue
;
};
if
let
Some
(
init
)
=
decl
.init
.as_ref
()
{
parse_config_value
(
source
,
&
mut
config
,
ident
,
init
,
eval_context
);
}
}
}
}
config
});
Ok
(
config
.cell
())
}
...
...
test/turbopack-tests-manifest.json
View file @
840b60bc
...
...
@@ -6365,11 +6365,12 @@
"runtimeError"
:
false
},
"test/integration/app-dir-export/test/dynamic-missing-gsp-dev.test.ts"
:
{
"passed"
:
[],
"failed"
:
[
"app dir - with output export - dynamic missing gsp dev development mode should error when client component has generateStaticParams"
,
"passed"
:
[
"app dir - with output export - dynamic missing gsp dev development mode should error when dynamic route is missing generateStaticParams"
],
"failed"
:
[
"app dir - with output export - dynamic missing gsp dev development mode should error when client component has generateStaticParams"
],
"pending"
:
[],
"flakey"
:
[],
"runtimeError"
:
false
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