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: throw error for outdated compilation #8315

Merged
merged 9 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from 8 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
12 changes: 6 additions & 6 deletions crates/rspack_binding_values/src/chunk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,31 +92,31 @@ fn chunk(ukey: u32, compilation: &Compilation) -> &Chunk {

#[napi(js_name = "__chunk_inner_is_only_initial")]
pub fn is_only_initial(js_chunk_ukey: u32, js_compilation: &JsCompilation) -> bool {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunk = chunk(js_chunk_ukey, compilation);
chunk.is_only_initial(&compilation.chunk_group_by_ukey)
}

#[napi(js_name = "__chunk_inner_can_be_initial")]
pub fn can_be_initial(js_chunk_ukey: u32, js_compilation: &JsCompilation) -> bool {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunk = chunk(js_chunk_ukey, compilation);
chunk.can_be_initial(&compilation.chunk_group_by_ukey)
}

#[napi(js_name = "__chunk_inner_has_runtime")]
pub fn has_runtime(js_chunk_ukey: u32, js_compilation: &JsCompilation) -> bool {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunk = chunk(js_chunk_ukey, compilation);
chunk.has_runtime(&compilation.chunk_group_by_ukey)
}

#[napi(js_name = "__chunk_inner_get_all_async_chunks")]
pub fn get_all_async_chunks(js_chunk_ukey: u32, js_compilation: &JsCompilation) -> Vec<JsChunk> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunk = chunk(js_chunk_ukey, compilation);
chunk
Expand All @@ -128,7 +128,7 @@ pub fn get_all_async_chunks(js_chunk_ukey: u32, js_compilation: &JsCompilation)

#[napi(js_name = "__chunk_inner_get_all_initial_chunks")]
pub fn get_all_initial_chunks(js_chunk_ukey: u32, js_compilation: &JsCompilation) -> Vec<JsChunk> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunk = chunk(js_chunk_ukey, compilation);
chunk
Expand All @@ -143,7 +143,7 @@ pub fn get_all_referenced_chunks(
js_chunk_ukey: u32,
js_compilation: &JsCompilation,
) -> Vec<JsChunk> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunk = chunk(js_chunk_ukey, compilation);
chunk
Expand Down
8 changes: 4 additions & 4 deletions crates/rspack_binding_values/src/chunk_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub fn get_chunk_modules(
js_chunk_ukey: u32,
js_compilation: &JsCompilation,
) -> Vec<JsModuleWrapper> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let module_graph = compilation.get_module_graph();
let modules = compilation
Expand All @@ -33,7 +33,7 @@ pub fn get_chunk_entry_modules(
js_chunk_ukey: u32,
js_compilation: &JsCompilation,
) -> Vec<JsModuleWrapper> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let modules = compilation
.chunk_graph
Expand All @@ -51,7 +51,7 @@ pub fn get_chunk_entry_dependent_chunks_iterable(
js_chunk_ukey: u32,
js_compilation: &JsCompilation,
) -> Vec<JsChunk> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let chunks = compilation
.chunk_graph
Expand All @@ -76,7 +76,7 @@ pub fn get_chunk_modules_iterable_by_source_type(
source_type: String,
js_compilation: &JsCompilation,
) -> Result<Vec<JsModuleWrapper>> {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

Ok(
compilation
Expand Down
4 changes: 2 additions & 2 deletions crates/rspack_binding_values/src/chunk_group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ fn chunk_group(ukey: u32, compilation: &Compilation) -> &ChunkGroup {

#[napi(js_name = "__chunk_group_inner_get_chunk_group")]
pub fn get_chunk_group(ukey: u32, js_compilation: &JsCompilation) -> JsChunkGroup {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let cg = chunk_group(ukey, compilation);
JsChunkGroup::from_chunk_group(cg, compilation)
}

#[napi(js_name = "__entrypoint_inner_get_runtime_chunk")]
pub fn get_runtime_chunk(ukey: u32, js_compilation: &JsCompilation) -> JsChunk {
let compilation = unsafe { js_compilation.0.as_ref() };
let compilation = unsafe { js_compilation.inner.as_ref() };

let entrypoint = chunk_group(ukey, compilation);
let chunk_ukey = entrypoint.get_runtime_chunk(&compilation.chunk_group_by_ukey);
Expand Down
Loading
Loading