Skip to content

Commit 5b43f26

Browse files
wmertenswmertens
committed
fix(optimizer): let the bundler handle entries WIP
WIP because menus don't work in docs - removes entry creating from optimizer - adds manualChunks option that tells Rollup which chunks to put together - removes building at buildStart so other plugins can transform before the segment splitting
1 parent 2c4b41d commit 5b43f26

15 files changed

+114
-447
lines changed

‎.changeset/ninety-weeks-enjoy.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@builder.io/qwik': minor
3+
---
4+
5+
The optimizer plugin will now rely on Rollup to group QRL segments. It will only provide hints on which segments fit well together. The result of this change is that now code splitting happens during the transform phase only, and other Rollup/Vite plugins (such as css-in-js plugins) can transform the code before Qwik transforms it.

‎packages/qwik/src/optimizer/core/src/code_move.rs

Lines changed: 3 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
use crate::collector::{new_ident_from_id, GlobalCollect, Id, ImportKind};
2-
use crate::parse::{
3-
emit_source_code, might_need_handle_watch, HookAnalysis, PathData, TransformModule,
4-
TransformOutput,
5-
};
2+
use crate::parse::PathData;
63
use crate::transform::{add_handle_watch, create_synthetic_named_import};
74
use crate::words::*;
85

9-
use std::collections::BTreeMap;
10-
use std::path::Path;
11-
12-
use anyhow::{Context, Error};
13-
use path_slash::PathExt;
6+
use anyhow::Error;
147
use swc_atoms::JsWord;
158
use swc_common::comments::{SingleThreadedComments, SingleThreadedCommentsMap};
16-
use swc_common::{sync::Lrc, SourceMap, DUMMY_SP};
9+
use swc_common::DUMMY_SP;
1710
use swc_ecmascript::ast;
1811
use swc_ecmascript::utils::private_ident;
1912

@@ -158,32 +151,6 @@ pub fn new_module(ctx: NewModuleCtx) -> Result<(ast::Module, SingleThreadedComme
158151
Ok((module, comments))
159152
}
160153

161-
pub fn fix_path<S: AsRef<Path>, D: AsRef<Path>>(
162-
src: S,
163-
dest: D,
164-
ident: &str,
165-
) -> Result<JsWord, Error> {
166-
let src = src.as_ref();
167-
let dest = dest.as_ref();
168-
if ident.starts_with('.') {
169-
let diff = pathdiff::diff_paths(src, dest);
170-
171-
if let Some(diff) = diff {
172-
let normalize = diff.to_slash_lossy();
173-
let relative = relative_path::RelativePath::new(&normalize);
174-
let final_path = relative.join(ident).normalize();
175-
let final_str = final_path.as_str();
176-
return Ok(if final_str.starts_with('.') {
177-
JsWord::from(final_str)
178-
} else {
179-
JsWord::from(format!("./{}", final_str))
180-
});
181-
}
182-
}
183-
184-
Ok(JsWord::from(ident))
185-
}
186-
187154
fn create_named_export(expr: Box<ast::Expr>, name: &str) -> ast::ModuleItem {
188155
ast::ModuleItem::ModuleDecl(ast::ModuleDecl::ExportDecl(ast::ExportDecl {
189156
span: DUMMY_SP,
@@ -206,123 +173,6 @@ fn create_named_export(expr: Box<ast::Expr>, name: &str) -> ast::ModuleItem {
206173
}))
207174
}
208175

209-
#[test]
210-
fn test_fix_path() {
211-
assert_eq!(
212-
fix_path("src", "", "./state.qwik.mjs").unwrap(),
213-
JsWord::from("./src/state.qwik.mjs")
214-
);
215-
216-
assert_eq!(
217-
fix_path("src/path", "", "./state").unwrap(),
218-
JsWord::from("./src/path/state")
219-
);
220-
221-
assert_eq!(
222-
fix_path("src", "", "../state").unwrap(),
223-
JsWord::from("./state")
224-
);
225-
assert_eq!(
226-
fix_path("a", "a", "./state").unwrap(),
227-
JsWord::from("./state")
228-
);
229-
}
230-
231-
pub fn generate_entries(
232-
mut output: TransformOutput,
233-
core_module: &JsWord,
234-
explicit_extensions: bool,
235-
root_dir: Option<&Path>,
236-
) -> Result<TransformOutput, anyhow::Error> {
237-
let source_map = Lrc::new(SourceMap::default());
238-
let mut entries_map: BTreeMap<&str, Vec<&HookAnalysis>> = BTreeMap::new();
239-
let mut new_modules = Vec::with_capacity(output.modules.len());
240-
{
241-
let hooks: Vec<&HookAnalysis> = output.modules.iter().flat_map(|m| &m.hook).collect();
242-
for hook in hooks {
243-
if let Some(ref e) = hook.entry {
244-
entries_map.entry(e.as_ref()).or_default().push(hook);
245-
}
246-
}
247-
248-
for (entry, hooks) in &entries_map {
249-
let module = new_entry_module(entry, hooks, core_module, explicit_extensions);
250-
let (code, map) =
251-
emit_source_code(Lrc::clone(&source_map), None, &module, root_dir, false)
252-
.context("Emitting source code")?;
253-
new_modules.push(TransformModule {
254-
path: [entry, ".js"].concat(),
255-
code,
256-
map,
257-
is_entry: true,
258-
hook: None,
259-
order: 0,
260-
});
261-
}
262-
}
263-
output.modules.append(&mut new_modules);
264-
265-
Ok(output)
266-
}
267-
268-
fn new_entry_module(
269-
path: &str,
270-
hooks: &[&HookAnalysis],
271-
core_module: &JsWord,
272-
explicit_extensions: bool,
273-
) -> ast::Module {
274-
let mut module = ast::Module {
275-
span: DUMMY_SP,
276-
body: Vec::with_capacity(hooks.len()),
277-
shebang: None,
278-
};
279-
let mut need_handle_watch = false;
280-
for hook in hooks {
281-
// TODO fix the path from the entry to the hook in case of mismatched location
282-
let mut src = fix_path(
283-
hook.path.to_string(),
284-
Path::new(path).parent().unwrap().to_str().unwrap(),
285-
&["./", &hook.canonical_filename].concat(),
286-
)
287-
.unwrap()
288-
.to_string();
289-
if explicit_extensions {
290-
src = src + "." + hook.extension.as_ref();
291-
}
292-
if might_need_handle_watch(&hook.ctx_kind, &hook.ctx_name) {
293-
need_handle_watch = true;
294-
}
295-
module
296-
.body
297-
.push(ast::ModuleItem::ModuleDecl(ast::ModuleDecl::ExportNamed(
298-
ast::NamedExport {
299-
span: DUMMY_SP,
300-
type_only: false,
301-
with: None,
302-
src: Some(Box::new(ast::Str {
303-
span: DUMMY_SP,
304-
value: JsWord::from(src),
305-
raw: None,
306-
})),
307-
specifiers: vec![ast::ExportSpecifier::Named(ast::ExportNamedSpecifier {
308-
is_type_only: false,
309-
span: DUMMY_SP,
310-
orig: ast::ModuleExportName::Ident(ast::Ident::new(
311-
hook.name.clone(),
312-
DUMMY_SP,
313-
Default::default(),
314-
)),
315-
exported: None,
316-
})],
317-
},
318-
)));
319-
}
320-
if need_handle_watch {
321-
add_handle_watch(&mut module.body, core_module);
322-
}
323-
module
324-
}
325-
326176
pub fn transform_function_expr(
327177
expr: ast::Expr,
328178
use_lexical_scope: &Id,

‎packages/qwik/src/optimizer/core/src/lib.rs

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ use std::path::Path;
4343
use std::str;
4444
use swc_atoms::JsWord;
4545

46-
use crate::code_move::generate_entries;
4746
use crate::entry_strategy::parse_entry_strategy;
4847
pub use crate::entry_strategy::EntryStrategy;
4948
pub use crate::parse::EmitMode;
@@ -160,23 +159,7 @@ pub fn transform_fs(config: TransformFsOptions) -> Result<TransformOutput, Error
160159
.reduce(|| Ok(TransformOutput::new()), |x, y| Ok(x?.append(&mut y?)))?;
161160

162161
final_output.modules.sort_unstable_by_key(|key| key.order);
163-
if !matches!(
164-
config.entry_strategy,
165-
EntryStrategy::Hook | EntryStrategy::Inline | EntryStrategy::Hoist
166-
) {
167-
final_output = generate_entries(
168-
final_output,
169-
&core_module,
170-
config.explicit_extensions,
171-
root_dir,
172-
)?;
173-
}
174-
// final_output = generate_entries(
175-
// final_output,
176-
// &core_module,
177-
// config.explicit_extensions,
178-
// root_dir,
179-
// )?;
162+
180163
Ok(final_output)
181164
}
182165

@@ -231,23 +214,6 @@ pub fn transform_modules(config: TransformModulesOptions) -> Result<TransformOut
231214

232215
let mut final_output = final_output?;
233216
final_output.modules.sort_unstable_by_key(|key| key.order);
234-
if !matches!(
235-
config.entry_strategy,
236-
EntryStrategy::Hook | EntryStrategy::Inline | EntryStrategy::Hoist
237-
) {
238-
final_output = generate_entries(
239-
final_output,
240-
&core_module,
241-
config.explicit_extensions,
242-
root_dir,
243-
)?;
244-
}
245-
// final_output = generate_entries(
246-
// final_output,
247-
// &core_module,
248-
// config.explicit_extensions,
249-
// root_dir,
250-
// )?;
251217

252218
Ok(final_output)
253219
}

‎packages/qwik/src/optimizer/core/src/parse.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ pub fn transform_code(config: TransformCodeOptions) -> Result<TransformOutput, a
379379
]
380380
.concat();
381381
let need_handle_watch =
382-
might_need_handle_watch(&h.data.ctx_kind, &h.data.ctx_name) && is_entry;
382+
might_need_handle_watch(&h.data.ctx_kind, &h.data.ctx_name);
383383

384384
let (mut hook_module, comments) = new_module(NewModuleCtx {
385385
expr: h.expr,
@@ -676,7 +676,6 @@ fn handle_error(
676676
pub struct PathData {
677677
pub abs_path: PathBuf,
678678
pub rel_path: PathBuf,
679-
pub base_dir: PathBuf,
680679
pub abs_dir: PathBuf,
681680
pub rel_dir: PathBuf,
682681
pub file_stem: String,
@@ -706,7 +705,6 @@ pub fn parse_path(src: &str, base_dir: &Path) -> Result<PathData, Error> {
706705

707706
Ok(PathData {
708707
abs_path,
709-
base_dir: base_dir.to_path_buf(),
710708
rel_path: path.into(),
711709
abs_dir,
712710
rel_dir,

‎packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_11.snap

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export const App = component$(() => {
2929

3030
import dep3 from "dep3/something";
3131
export const Header_component_Header_onClick_KjD9TCNkNxY = (ev)=>dep3(ev);
32+
export { _hW } from "@builder.io/qwik";
3233

3334

3435
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";2DAQ2B,CAAC,KAAO,KAAK\"}")
@@ -59,13 +60,13 @@ import { bar as bbar } from "../state";
5960
import * as dep2 from "dep2";
6061
import { qrl } from "@builder.io/qwik";
6162
export const Header_component_UVBJuFYfvDo = ()=>{
62-
return <Header onClick={/*#__PURE__*/ qrl(()=>import("../entry_hooks"), "Header_component_Header_onClick_KjD9TCNkNxY")}>
63+
return <Header onClick={/*#__PURE__*/ qrl(()=>import("./header_component_header_onclick_kjd9tcnknxy"), "Header_component_Header_onClick_KjD9TCNkNxY")}>
6364
{dep2.stuff()}{bbar()}
6465
</Header>;
6566
};
6667

6768

68-
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;;;4CAMiC;IAC7B,QACK,OAAO,yGAA8B;YAClC,CAAC,KAAK,KAAK,IAAI,OAAO;QAC1B,EAAE;AAEV\"}")
69+
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;;;4CAMiC;IAC7B,QACK,OAAO,wIAA8B;YAClC,CAAC,KAAK,KAAK,IAAI,OAAO;QAC1B,EAAE;AAEV\"}")
6970
/*
7071
{
7172
"origin": "project/test.tsx",
@@ -120,20 +121,11 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\"
120121

121122
import { componentQrl } from "@builder.io/qwik";
122123
import { qrl } from "@builder.io/qwik";
123-
export const Header = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("../entry_hooks"), "Header_component_UVBJuFYfvDo"));
124-
export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("../entry_hooks"), "App_component_wGkRHWXaqjs"));
125-
126-
127-
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;AAMA,OAAO,MAAM,uBAAS,8FAMnB;AAEH,OAAO,MAAM,oBAAM,2FAIhB\"}")
128-
============================= entry_hooks.js (ENTRY POINT)==
129-
130-
export { Header_component_Header_onClick_KjD9TCNkNxY } from "./project/header_component_header_onclick_kjd9tcnknxy";
131-
export { Header_component_UVBJuFYfvDo } from "./project/header_component_uvbjufyfvdo";
132-
export { App_component_wGkRHWXaqjs } from "./project/app_component_wgkrhwxaqjs";
133-
export { _hW } from "@builder.io/qwik";
124+
export const Header = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./header_component_uvbjufyfvdo"), "Header_component_UVBJuFYfvDo"));
125+
export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./app_component_wgkrhwxaqjs"), "App_component_wGkRHWXaqjs"));
134126

135127

136-
None
128+
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/project/test.tsx\"],\"names\":[],\"mappings\":\";;AAMA,OAAO,MAAM,uBAAS,8GAMnB;AAEH,OAAO,MAAM,oBAAM,wGAIhB\"}")
137129
== DIAGNOSTICS ==
138130

139131
[]

‎packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_default_export.snap

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ export default component$(() => {
2121

2222
import { componentQrl } from "@builder.io/qwik";
2323
import { qrl } from "@builder.io/qwik";
24-
export default /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("../../../../src/routes/_repl/[id]/[[...slug]].tsx_entry_[[...slug]].js"), "slug_component_0AM8HPnkNs4"));
24+
export default /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./slug_component_0am8hpnkns4.js"), "slug_component_0AM8HPnkNs4"));
2525

2626

27-
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/src/routes/_repl/[id]/[[...slug]].tsx\"],\"names\":[],\"mappings\":\";;AAIA,6BAAe,oJAKZ\"}")
27+
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/src/routes/_repl/[id]/[[...slug]].tsx\"],\"names\":[],\"mappings\":\";;AAIA,6BAAe,6GAKZ\"}")
2828
============================= src/routes/_repl/[id]/slug_component_div_onclick_xevvy0qc7pa.js (ENTRY POINT)==
2929

3030
import { sibling } from "./sibling";
@@ -84,12 +84,6 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/src/routes/_repl/[id]/[[...sl
8484
]
8585
}
8686
*/
87-
============================= src/routes/_repl/[id]/[[...slug]].tsx_entry_[[...slug]].js (ENTRY POINT)==
88-
89-
export { slug_component_0AM8HPnkNs4 } from "./slug_component_0am8hpnkns4.js";
90-
91-
92-
None
9387
== DIAGNOSTICS ==
9488

9589
[]

‎packages/qwik/src/optimizer/core/src/snapshots/qwik_core__test__example_explicit_ext_no_transpile.snap

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ export const App = component$((props) => {
1919

2020
import { componentQrl } from "@builder.io/qwik";
2121
import { qrl } from "@builder.io/qwik";
22-
export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./entry_hooks.tsx"), "App_component_ckEPmXZlub0"));
22+
export const App = /*#__PURE__*/ componentQrl(/*#__PURE__*/ qrl(()=>import("./app_component_ckepmxzlub0.tsx"), "App_component_ckEPmXZlub0"));
2323

2424

25-
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;AAGA,OAAO,MAAM,oBAAM,8FAKhB\"}")
25+
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\";;AAGA,OAAO,MAAM,oBAAM,4GAKhB\"}")
2626
============================= app_component_usestyles_t35nsa5uv7u.tsx ==
2727

2828
export const App_component_useStyles_t35nSa5UV7U = 'hola';
@@ -54,8 +54,8 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma
5454
import { qrl } from "@builder.io/qwik";
5555
import { useStylesQrl } from "@builder.io/qwik";
5656
export const App_component_ckEPmXZlub0 = (props)=>{
57-
useStylesQrl(/*#__PURE__*/ qrl(()=>import("./entry_hooks.tsx"), "App_component_useStyles_t35nSa5UV7U"));
58-
return /*#__PURE__*/ qrl(()=>import("./entry_hooks.tsx"), "App_component_1_w0t0o3QMovU");
57+
useStylesQrl(/*#__PURE__*/ qrl(()=>import("./app_component_usestyles_t35nsa5uv7u.tsx"), "App_component_useStyles_t35nSa5UV7U"));
58+
return /*#__PURE__*/ qrl(()=>import("./app_component_1_w0t0o3qmovu.tsx"), "App_component_1_w0t0o3QMovU");
5959
};
6060

6161

@@ -83,6 +83,7 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma
8383
============================= app_component_1_w0t0o3qmovu.tsx ==
8484

8585
export const App_component_1_w0t0o3QMovU = ()=><div></div>;
86+
export { _hW } from "@builder.io/qwik";
8687

8788

8889
Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"mappings\":\"2CAKa,KACJ,MAAM\"}")
@@ -106,15 +107,6 @@ Some("{\"version\":3,\"sources\":[\"/user/qwik/src/test.tsx\"],\"names\":[],\"ma
106107
]
107108
}
108109
*/
109-
============================= entry_hooks.js (ENTRY POINT)==
110-
111-
export { App_component_useStyles_t35nSa5UV7U } from "./app_component_usestyles_t35nsa5uv7u.tsx";
112-
export { App_component_ckEPmXZlub0 } from "./app_component_ckepmxzlub0.tsx";
113-
export { App_component_1_w0t0o3QMovU } from "./app_component_1_w0t0o3qmovu.tsx";
114-
export { _hW } from "@builder.io/qwik";
115-
116-
117-
None
118110
== DIAGNOSTICS ==
119111

120112
[]

0 commit comments

Comments
 (0)