Skip to content

Commit 17ecf3d

Browse files
elrrrrrrrelrrrrrrr
authored
Merge branch 'next' into refactor/catalog-edge-resolve
2 parents b8af156 + 9d91f07 commit 17ecf3d

13 files changed

Lines changed: 597 additions & 40 deletions

File tree

‎Cargo.lock‎

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/pack-api/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ url = { workspace = true }
2121
urlencoding = { workspace = true }
2222
## turbpack specific
2323
pack-core = { workspace = true }
24-
simd-json = { workspace = true, features = ["arraybackend"] }
2524
turbo-bincode = { workspace = true }
2625
turbo-rcstr = { workspace = true }
2726
turbo-tasks = { workspace = true }

‎crates/pack-api/src/app.rs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,15 @@ impl AppEntrypoint {
237237

238238
let module_graph = self.module_graph_for_entry(asset_context, runtime_entries);
239239

240+
let name = if this.name.ends_with(".js") {
241+
this.name.as_str()
242+
} else {
243+
&format!("{}.js", this.name)
244+
};
240245
let app_chunk_group = project
241246
.server_chunking_context()
242247
.entry_chunk_group(
243-
project.dist_root().owned().await?.join(&this.name)?,
248+
project.dist_root().owned().await?.join(name)?,
244249
self.entry_evaluatable_assets(asset_context, runtime_entries),
245250
module_graph,
246251
OutputAssets::empty(),
@@ -456,7 +461,7 @@ impl Endpoint for AppEndpoint {
456461
let webpack_stats = generate_webpack_stats(output_assets, this.project.dist_root());
457462
let webpack_stats_read = webpack_stats.await?;
458463
let dist_root_owned = this.project.dist_root().owned().await?;
459-
let stats_json = simd_json::serde::to_string(&*webpack_stats_read)?;
464+
let stats_json = serde_json::to_string_pretty(&*webpack_stats_read)?;
460465
let stats_output = VirtualOutputAsset::new(
461466
dist_root_owned.join("stats.json")?,
462467
AssetContent::file(FileContent::from(File::from(stats_json)).cell()),

‎crates/pack-api/src/library.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ impl Endpoint for LibraryEndpoint {
382382
let webpack_stats = generate_webpack_stats(output_assets, this.project.dist_root());
383383
let webpack_stats_read = webpack_stats.await?;
384384
let dist_root_owned = this.project.dist_root().owned().await?;
385-
let stats_json = simd_json::serde::to_string(&*webpack_stats_read)?;
385+
let stats_json = serde_json::to_string_pretty(&*webpack_stats_read)?;
386386
let stats_output = VirtualOutputAsset::new(
387387
dist_root_owned.join("stats.json")?,
388388
AssetContent::file(FileContent::from(File::from(stats_json)).cell()),

‎crates/pack-api/src/project.rs‎

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -546,20 +546,14 @@ impl Project {
546546
.iter()
547547
.filter_map(|e| {
548548
e.library.as_ref().map(|l| {
549-
let name = e.name.clone().unwrap_or(
550-
PathBuf::from(e.import.as_str())
551-
.file_stem()
552-
.unwrap()
553-
.to_string_lossy()
554-
.into(),
555-
);
556-
let name = if name.ends_with(".js") {
557-
name
558-
} else {
559-
format!("{name}.js").into()
560-
};
561549
anyhow::Ok(LibraryEntrypoint {
562-
name,
550+
name: e.name.clone().unwrap_or(
551+
PathBuf::from(e.import.as_str())
552+
.file_stem()
553+
.unwrap()
554+
.to_string_lossy()
555+
.into(),
556+
),
563557
import: convert_to_project_relative(&e.import, &this.project_path)?,
564558
runtime_root: l.name.clone(),
565559
runtime_export: l.export.clone(),
@@ -589,21 +583,15 @@ impl Project {
589583
.filter_map(|e| {
590584
e.library.as_ref().map_or_else(
591585
|| {
592-
let name = e.name.clone().unwrap_or(
593-
PathBuf::from(e.import.as_str())
594-
.file_stem()
595-
.unwrap()
596-
.to_string_lossy()
597-
.into(),
598-
);
599-
let name = if name.ends_with(".js") {
600-
name
601-
} else {
602-
format!("{name}.js").into()
603-
};
604586
Some(async {
605587
Ok(AppEntrypoint {
606-
name,
588+
name: e.name.clone().unwrap_or(
589+
PathBuf::from(e.import.as_str())
590+
.file_stem()
591+
.unwrap()
592+
.to_string_lossy()
593+
.into(),
594+
),
607595
project: self.to_resolved().await?,
608596
import: convert_to_project_relative(&e.import, &this.project_path)?,
609597
})

‎crates/pack-api/src/webpack_stats.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,8 @@ pub struct WebpackStatsEntrypoint {
446446
#[derive(Serialize, Debug)]
447447
#[serde(rename_all = "camelCase")]
448448
pub struct WebpackStats {
449-
pub assets: Vec<WebpackStatsAsset>,
450449
pub entrypoints: FxIndexMap<RcStr, WebpackStatsEntrypoint>,
451450
pub chunks: Vec<WebpackStatsChunk>,
451+
pub assets: Vec<WebpackStatsAsset>,
452452
pub modules: Vec<WebpackStatsModule>,
453453
}

‎crates/pack-core/src/server/contexts.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ pub async fn get_server_module_options_context(
203203
enable_typescript_transform: Some(
204204
TypescriptTransformOptions::default().resolved_cell(),
205205
),
206-
ignore_dynamic_requests: false,
206+
ignore_dynamic_requests: true,
207207
..Default::default()
208208
},
209209
css: CssOptionsContext {

‎crates/pack-tests/tests/snapshot/async_chunk/output/stats.json‎

Lines changed: 182 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,182 @@
1-
{"assets":[{"type":"asset","name":"input_86dfc83f.js","info":{},"size":1045,"emitted":false,"comparedForEmit":false,"cached":false,"chunks":["input_86dfc83f.js"]},{"type":"asset","name":"main.js","info":{},"size":0,"emitted":false,"comparedForEmit":false,"cached":false,"chunks":["main.js"]},{"type":"asset","name":"input_97190704.js","info":{},"size":795,"emitted":false,"comparedForEmit":false,"cached":false,"chunks":["input_97190704.js"]},{"type":"asset","name":"input_86dfc83f.js.map","info":{},"size":0,"emitted":false,"comparedForEmit":false,"cached":false,"chunks":["input_86dfc83f.js.map"]},{"type":"asset","name":"main.js.map","info":{},"size":0,"emitted":false,"comparedForEmit":false,"cached":false,"chunks":["main.js.map"]},{"type":"asset","name":"input_97190704.js.map","info":{},"size":0,"emitted":false,"comparedForEmit":false,"cached":false,"chunks":["input_97190704.js.map"]}],"entrypoints":{"main.js":{"name":"main.js","chunks":["input_86dfc83f.js","main.js"],"assets":[{"name":"input_86dfc83f.js"},{"name":"main.js"}]}},"chunks":[{"rendered":false,"initial":false,"entry":false,"recorded":false,"id":"input_86dfc83f.js","size":1045,"hash":"","files":["input_86dfc83f.js"]},{"rendered":false,"initial":false,"entry":false,"recorded":false,"id":"main.js","size":0,"hash":"","files":["main.js"]},{"rendered":false,"initial":false,"entry":false,"recorded":false,"id":"input_97190704.js","size":795,"hash":"","files":["input_97190704.js"]}],"modules":[{"name":"async_chunk/input/import.js","id":"async_chunk/input/import.js","chunks":["input_86dfc83f.js"],"size":91},{"name":"async_chunk/input/node_modules/bar/index.js","id":"async_chunk/input/node_modules/bar/index.js","chunks":["input_86dfc83f.js"],"size":56},{"name":"async_chunk/input/index.js","id":"async_chunk/input/index.js","chunks":["input_86dfc83f.js","main.js"],"size":110},{"name":"async_chunk/input/shared.js","id":"async_chunk/input/shared.js","chunks":["input_86dfc83f.js"],"size":18},{"name":"async_chunk/input/import.js","id":"async_chunk/input/import.js","chunks":["input_97190704.js"],"size":91},{"name":"async_chunk/input/node_modules/foo/index.js","id":"async_chunk/input/node_modules/foo/index.js","chunks":["input_97190704.js"],"size":56}]}
1+
{
2+
"entrypoints": {
3+
"main": {
4+
"name": "main",
5+
"chunks": [
6+
"input_86dfc83f.js",
7+
"main.js"
8+
],
9+
"assets": [
10+
{
11+
"name": "input_86dfc83f.js"
12+
},
13+
{
14+
"name": "main.js"
15+
}
16+
]
17+
}
18+
},
19+
"chunks": [
20+
{
21+
"rendered": false,
22+
"initial": false,
23+
"entry": false,
24+
"recorded": false,
25+
"id": "input_86dfc83f.js",
26+
"size": 1045,
27+
"hash": "",
28+
"files": [
29+
"input_86dfc83f.js"
30+
]
31+
},
32+
{
33+
"rendered": false,
34+
"initial": false,
35+
"entry": false,
36+
"recorded": false,
37+
"id": "main.js",
38+
"size": 0,
39+
"hash": "",
40+
"files": [
41+
"main.js"
42+
]
43+
},
44+
{
45+
"rendered": false,
46+
"initial": false,
47+
"entry": false,
48+
"recorded": false,
49+
"id": "input_97190704.js",
50+
"size": 795,
51+
"hash": "",
52+
"files": [
53+
"input_97190704.js"
54+
]
55+
}
56+
],
57+
"assets": [
58+
{
59+
"type": "asset",
60+
"name": "input_86dfc83f.js",
61+
"info": {},
62+
"size": 1045,
63+
"emitted": false,
64+
"comparedForEmit": false,
65+
"cached": false,
66+
"chunks": [
67+
"input_86dfc83f.js"
68+
]
69+
},
70+
{
71+
"type": "asset",
72+
"name": "main.js",
73+
"info": {},
74+
"size": 0,
75+
"emitted": false,
76+
"comparedForEmit": false,
77+
"cached": false,
78+
"chunks": [
79+
"main.js"
80+
]
81+
},
82+
{
83+
"type": "asset",
84+
"name": "input_97190704.js",
85+
"info": {},
86+
"size": 795,
87+
"emitted": false,
88+
"comparedForEmit": false,
89+
"cached": false,
90+
"chunks": [
91+
"input_97190704.js"
92+
]
93+
},
94+
{
95+
"type": "asset",
96+
"name": "input_86dfc83f.js.map",
97+
"info": {},
98+
"size": 0,
99+
"emitted": false,
100+
"comparedForEmit": false,
101+
"cached": false,
102+
"chunks": [
103+
"input_86dfc83f.js.map"
104+
]
105+
},
106+
{
107+
"type": "asset",
108+
"name": "main.js.map",
109+
"info": {},
110+
"size": 0,
111+
"emitted": false,
112+
"comparedForEmit": false,
113+
"cached": false,
114+
"chunks": [
115+
"main.js.map"
116+
]
117+
},
118+
{
119+
"type": "asset",
120+
"name": "input_97190704.js.map",
121+
"info": {},
122+
"size": 0,
123+
"emitted": false,
124+
"comparedForEmit": false,
125+
"cached": false,
126+
"chunks": [
127+
"input_97190704.js.map"
128+
]
129+
}
130+
],
131+
"modules": [
132+
{
133+
"name": "async_chunk/input/import.js",
134+
"id": "async_chunk/input/import.js",
135+
"chunks": [
136+
"input_86dfc83f.js"
137+
],
138+
"size": 91
139+
},
140+
{
141+
"name": "async_chunk/input/node_modules/bar/index.js",
142+
"id": "async_chunk/input/node_modules/bar/index.js",
143+
"chunks": [
144+
"input_86dfc83f.js"
145+
],
146+
"size": 56
147+
},
148+
{
149+
"name": "async_chunk/input/index.js",
150+
"id": "async_chunk/input/index.js",
151+
"chunks": [
152+
"input_86dfc83f.js",
153+
"main.js"
154+
],
155+
"size": 110
156+
},
157+
{
158+
"name": "async_chunk/input/shared.js",
159+
"id": "async_chunk/input/shared.js",
160+
"chunks": [
161+
"input_86dfc83f.js"
162+
],
163+
"size": 18
164+
},
165+
{
166+
"name": "async_chunk/input/import.js",
167+
"id": "async_chunk/input/import.js",
168+
"chunks": [
169+
"input_97190704.js"
170+
],
171+
"size": 91
172+
},
173+
{
174+
"name": "async_chunk/input/node_modules/foo/index.js",
175+
"id": "async_chunk/input/node_modules/foo/index.js",
176+
"chunks": [
177+
"input_97190704.js"
178+
],
179+
"size": 56
180+
}
181+
]
182+
}

0 commit comments

Comments
 (0)