Unverified Commit 840b60bc authored by OJ Kwon's avatar OJ Kwon Committed by GitHub

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

parent 574e7060
......@@ -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())
}
......
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment