Skip to content
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.

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

feat(app): support non entry chunks #5

Draft
wants to merge 4 commits into
base: feat-app-runtime
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion crates/rolldown/src/bundler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,10 @@ impl Bundler {

output.watch_files = self.plugin_driver.watch_files.iter().map(|f| f.clone()).collect();

self.rebuild_manager.save_output(&output);
if self.rebuild_manager.enabled {
self.rebuild_manager.save_output(&output);
self.plugin_driver.clear();
}

Ok(output)
}
Expand Down
91 changes: 89 additions & 2 deletions crates/rolldown/src/module_finalizers/isolating/impl_visit_mut.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use oxc::ast::ast::{self, ExportDefaultDeclarationKind, Expression, Statement};
use oxc::ast::visit::walk_mut;
use oxc::ast::VisitMut;
use oxc::ast::{VisitMut, NONE};
use oxc::span::{CompactStr, Span, SPAN};
use rolldown_common::{Interop, Module};
use rolldown_ecmascript_utils::{AstSnippet, TakeIn};
Expand Down Expand Up @@ -68,7 +68,7 @@ impl<'ast> VisitMut<'ast> for IsolatingModuleFinalizer<'_, 'ast> {

program.body.extend(stmts);

// quick and dirty 2nd pass to rewrite globals into __rolldown_runtime.xxx
// quick and dirty extra pass to rewrite globals e.g. require -> runtime.require
walk_mut::walk_program(&mut AppRuntimeRewriter { snippet: &self.snippet }, program);
}

Expand Down Expand Up @@ -103,6 +103,93 @@ impl<'ast> VisitMut<'ast> for IsolatingModuleFinalizer<'_, 'ast> {
}
};
}
if let Expression::ImportExpression(import_expr) = expr {
// input: import("importee")
// output: runtime.ensureChunk("importee-chunk").then(function() { return runtime.require("importee-id") })
if import_expr.source.is_string_literal() && import_expr.arguments.len() == 0 {
let importee_module = self.get_importee_module(import_expr.span);
match importee_module {
Module::Normal(_importee) => {
let importee_chunk_id =
self.ctx.chunk_graph.entry_module_to_entry_chunk[&importee_module.idx()];
let importee_chunk = &self.ctx.chunk_graph.chunk_table[importee_chunk_id];
// TODO: unique chunk name?
let chunk_name = importee_chunk.name.as_ref().unwrap();
*expr = self.snippet.builder.expression_call(
SPAN,
Expression::StaticMemberExpression(
self.snippet.builder.alloc_static_member_expression(
SPAN,
self.snippet.builder.expression_call(
SPAN,
Expression::StaticMemberExpression(
self.snippet.builder.alloc_static_member_expression(
SPAN,
self.snippet.id_ref_expr("__rolldown_runtime", SPAN),
self.snippet.builder.identifier_name(SPAN, "ensureChunk"),
false,
),
),
NONE,
self.snippet.builder.vec1(ast::Argument::from(
self.snippet.string_literal_expr(chunk_name, SPAN),
)),
false,
),
self.snippet.builder.identifier_name(SPAN, "then"),
false,
),
),
NONE,
self.snippet.builder.vec1(ast::Argument::from(
self.snippet.builder.expression_function(
ast::FunctionType::FunctionExpression,
SPAN,
None::<ast::BindingIdentifier>,
false,
false,
false,
NONE,
NONE,
self.snippet.builder.formal_parameters(
SPAN,
ast::FormalParameterKind::Signature,
self.snippet.builder.vec(),
NONE,
),
NONE,
Some(self.snippet.builder.function_body(
SPAN,
self.snippet.builder.vec(),
self.snippet.builder.vec1(self.snippet.builder.statement_return(
SPAN,
Some(self.snippet.builder.expression_call(
SPAN,
Expression::StaticMemberExpression(
self.snippet.builder.alloc_static_member_expression(
SPAN,
self.snippet.id_ref_expr("__rolldown_runtime", SPAN),
self.snippet.builder.identifier_name(SPAN, "require"),
false,
),
),
NONE,
self.snippet.builder.vec1(ast::Argument::from(
self.snippet.string_literal_expr(importee_module.stable_id(), SPAN),
)),
false,
)),
)),
)),
),
)),
false,
);
}
Module::External(_) => {}
}
}
}
walk_mut::walk_expression(self, expr);
}

Expand Down
3 changes: 3 additions & 0 deletions crates/rolldown/src/module_finalizers/isolating/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ use rolldown_common::{AstScopes, IndexModules, NormalModule, SymbolRefDb};
use rolldown_ecmascript_utils::AstSnippet;
use rustc_hash::FxHashSet;

use crate::chunk_graph::ChunkGraph;

mod impl_visit_mut;

pub struct IsolatingModuleFinalizerContext<'me> {
pub module: &'me NormalModule,
pub modules: &'me IndexModules,
pub symbol_db: &'me SymbolRefDb,
pub chunk_graph: &'me ChunkGraph,
}

pub struct IsolatingModuleFinalizer<'me, 'ast> {
Expand Down
1 change: 1 addition & 0 deletions crates/rolldown/src/stages/generate_stage/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ impl<'a> GenerateStage<'a> {
module,
modules: &self.link_output.module_table.modules,
symbol_db: &self.link_output.symbol_db,
chunk_graph: &chunk_graph,
},
snippet: AstSnippet::new(alloc),
generated_imports_set: FxHashSet::default(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"config": {
"format": "app"
},
"expectExecuted": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
source: crates/rolldown_testing/src/integration_test.rs
snapshot_kind: text
---
# Assets

## dep.js

```js
var __rolldown_modules = {

"dep.js": function(__rolldown_runtime) {
//#region dep.js
__rolldown_runtime.__toCommonJS(__rolldown_runtime.exports);
__rolldown_runtime.__export(__rolldown_runtime.exports, { default: () => dep_default });
var dep_default = "[dep ok]";

//#endregion
},

};

```
## main.js

```js
var __rolldown_modules = {

"main.js": function(__rolldown_runtime) {
//#region main.js
__rolldown_runtime.__toCommonJS(__rolldown_runtime.exports);
__rolldown_runtime.__export(__rolldown_runtime.exports, { default: () => main_default });
var main_default = () => __rolldown_runtime.ensureChunk("dep").then(function() {
return __rolldown_runtime.require("dep.js");
});

//#endregion
},

};

```
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default "[dep ok]"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default () => import("./dep.js")
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"config": {
"format": "app",
"input": [
{
"import": "./main1.js",
"name": "main1"
},
{
"import": "./main2.js",
"name": "main2"
}
]
},
"expectExecuted": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
---
source: crates/rolldown_testing/src/integration_test.rs
snapshot_kind: text
---
# Assets

## dep.js

```js
var __rolldown_modules = {

"dep.js": function(__rolldown_runtime) {
//#region dep.js
__rolldown_runtime.__toCommonJS(__rolldown_runtime.exports);
__rolldown_runtime.__export(__rolldown_runtime.exports, { default: () => dep_default });
var dep_default = "[dep ok]";

//#endregion
},

};

```
## main1.js

```js
var __rolldown_modules = {

"main1.js": function(__rolldown_runtime) {
//#region main1.js
__rolldown_runtime.__toCommonJS(__rolldown_runtime.exports);
__rolldown_runtime.__export(__rolldown_runtime.exports, { default: () => main1_default });
var dep_exports = __rolldown_runtime.require("dep.js");
var main1_default = "main1: " + dep_exports.default;

//#endregion
},

};

```
## main2.js

```js
var __rolldown_modules = {

"main2.js": function(__rolldown_runtime) {
//#region main2.js
__rolldown_runtime.__toCommonJS(__rolldown_runtime.exports);
__rolldown_runtime.__export(__rolldown_runtime.exports, { default: () => main2_default });
var dep_exports = __rolldown_runtime.require("dep.js");
var main2_default = "main2: " + dep_exports.default;

//#endregion
},

};

```
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default "[dep ok]"
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import dep from "./dep.js"
export default "main1: " + dep;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import dep from "./dep.js"
export default "main2: " + dep;
Original file line number Diff line number Diff line change
Expand Up @@ -4125,6 +4125,11 @@ snapshot_kind: text
- out.js => out.js
- out.css

# tests/rolldown/function/format/app/dynamic-import-chunk

- main-!~{000}~.js => main-ot7EdN42.js
- dep-!~{001}~.js => dep-CpkzZlrt.js

# tests/rolldown/function/format/app/export-all

- main-!~{000}~.js => main-BdghrDco.js
Expand Down Expand Up @@ -4163,6 +4168,12 @@ snapshot_kind: text

- main-!~{000}~.js => main-C1Zl5Znc.js

# tests/rolldown/function/format/app/shared-chunk

- main1-!~{000}~.js => main1-R3nOeIoa.js
- main2-!~{001}~.js => main2-BbKbhREb.js
- dep-!~{002}~.js => dep-Bs9a6pBX.js

# tests/rolldown/function/format/cjs/conflict_exports_key

- main-!~{000}~.js => main-BJs_Uc9B.js
Expand Down
Loading