Skip to content

fix(next-core): do not panic when parsing segment config #59170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2023
Merged

fix(next-core): do not panic when parsing segment config #59170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions packages/next-swc/crates/next-core/src/app_segment_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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())
}
Expand Down
7 changes: 4 additions & 3 deletions test/turbopack-tests-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down