Skip to content

chore(wasm): cleanup useless start/shutdownAsyncRuntime and exports #10659

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.

Sign up for GitHub

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

Merged
CPunisher merged 3 commits into from
Jun 13, 2025
Merged

chore(wasm): cleanup useless start/shutdownAsyncRuntime and exports #10659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb61384
Cleanup start/shutdown async runtime
CPunisher Jun 13, 2025
a71aa6f
Cleanup exports
CPunisher Jun 13, 2025
5fa18a8
Update binding.d.ts
CPunisher Jun 13, 2025
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
16 changes: 0 additions & 16 deletions crates/node_binding/binding.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2694,14 +2694,6 @@ export interface RegisterJsTaps {
registerRsdoctorPluginAssetsTaps: (stages: Array<number>) => Array<{ function: ((arg: JsRsdoctorAssetPatch) => Promise<boolean | undefined>); stage: number; }>
}

/**
* Shutdown the tokio runtime manually.
*
* This is required for the wasm target with `tokio_unstable` cfg.
* In the wasm runtime, the `park` threads will hang there until the tokio::Runtime is shutdown.
*/
export declare function shutdownAsyncRuntime(): void

export interface SourceMapDevToolPluginOptions {
append?: (false | null) | string | Function
columns?: boolean
Expand All @@ -2725,14 +2717,6 @@ export interface SourcePosition {
column?: number
}

/**
* Start the async runtime manually.
*
* This is required when the async runtime is shutdown manually.
* Usually it's used in test.
*/
export declare function startAsyncRuntime(): void

export declare function syncTraceEvent(events: Array<RawTraceEvent>): void

export interface SyntheticDependencyLocation {
Expand Down
49 changes: 1 addition & 48 deletions crates/node_binding/rspack.wasi-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,51 +60,4 @@ const {
}
},
})
export default __napiModule.exports
export const Assets = __napiModule.exports.Assets
export const AsyncDependenciesBlock = __napiModule.exports.AsyncDependenciesBlock
export const BuildInfo = __napiModule.exports.BuildInfo
export const Chunks = __napiModule.exports.Chunks
export const CodeGenerationResult = __napiModule.exports.CodeGenerationResult
export const CodeGenerationResults = __napiModule.exports.CodeGenerationResults
export const ConcatenatedModule = __napiModule.exports.ConcatenatedModule
export const ContextModule = __napiModule.exports.ContextModule
export const Dependency = __napiModule.exports.Dependency
export const Diagnostics = __napiModule.exports.Diagnostics
export const EntryDataDto = __napiModule.exports.EntryDataDto
export const EntryDataDTO = __napiModule.exports.EntryDataDTO
export const EntryDependency = __napiModule.exports.EntryDependency
export const EntryOptionsDto = __napiModule.exports.EntryOptionsDto
export const EntryOptionsDTO = __napiModule.exports.EntryOptionsDTO
export const ExternalModule = __napiModule.exports.ExternalModule
export const JsChunk = __napiModule.exports.JsChunk
export const JsChunkGraph = __napiModule.exports.JsChunkGraph
export const JsChunkGroup = __napiModule.exports.JsChunkGroup
export const JsCompilation = __napiModule.exports.JsCompilation
export const JsCompiler = __napiModule.exports.JsCompiler
export const JsContextModuleFactoryAfterResolveData = __napiModule.exports.JsContextModuleFactoryAfterResolveData
export const JsContextModuleFactoryBeforeResolveData = __napiModule.exports.JsContextModuleFactoryBeforeResolveData
export const JsDependencies = __napiModule.exports.JsDependencies
export const JsEntries = __napiModule.exports.JsEntries
export const JsExportsInfo = __napiModule.exports.JsExportsInfo
export const JsModuleGraph = __napiModule.exports.JsModuleGraph
export const JsResolver = __napiModule.exports.JsResolver
export const JsResolverFactory = __napiModule.exports.JsResolverFactory
export const JsStats = __napiModule.exports.JsStats
export const Module = __napiModule.exports.Module
export const ModuleGraphConnection = __napiModule.exports.ModuleGraphConnection
export const NormalModule = __napiModule.exports.NormalModule
export const RawExternalItemFnCtx = __napiModule.exports.RawExternalItemFnCtx
export const Sources = __napiModule.exports.Sources
export const BuiltinPluginName = __napiModule.exports.BuiltinPluginName
export const cleanupGlobalTrace = __napiModule.exports.cleanupGlobalTrace
export const formatDiagnostic = __napiModule.exports.formatDiagnostic
export const JsLoaderState = __napiModule.exports.JsLoaderState
export const JsRspackSeverity = __napiModule.exports.JsRspackSeverity
export const minify = __napiModule.exports.minify
export const RawRuleSetConditionType = __napiModule.exports.RawRuleSetConditionType
export const registerGlobalTrace = __napiModule.exports.registerGlobalTrace
export const RegisterJsTapKind = __napiModule.exports.RegisterJsTapKind
export const shutdownAsyncRuntime = __napiModule.exports.shutdownAsyncRuntime
export const startAsyncRuntime = __napiModule.exports.startAsyncRuntime
export const transform = __napiModule.exports.transform
export default __napiModule.exports
49 changes: 1 addition & 48 deletions crates/node_binding/rspack.wasi.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,51 +107,4 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
}
},
})
module.exports = __napiModule.exports
module.exports.Assets = __napiModule.exports.Assets
module.exports.AsyncDependenciesBlock = __napiModule.exports.AsyncDependenciesBlock
module.exports.BuildInfo = __napiModule.exports.BuildInfo
module.exports.Chunks = __napiModule.exports.Chunks
module.exports.CodeGenerationResult = __napiModule.exports.CodeGenerationResult
module.exports.CodeGenerationResults = __napiModule.exports.CodeGenerationResults
module.exports.ConcatenatedModule = __napiModule.exports.ConcatenatedModule
module.exports.ContextModule = __napiModule.exports.ContextModule
module.exports.Dependency = __napiModule.exports.Dependency
module.exports.Diagnostics = __napiModule.exports.Diagnostics
module.exports.EntryDataDto = __napiModule.exports.EntryDataDto
module.exports.EntryDataDTO = __napiModule.exports.EntryDataDTO
module.exports.EntryDependency = __napiModule.exports.EntryDependency
module.exports.EntryOptionsDto = __napiModule.exports.EntryOptionsDto
module.exports.EntryOptionsDTO = __napiModule.exports.EntryOptionsDTO
module.exports.ExternalModule = __napiModule.exports.ExternalModule
module.exports.JsChunk = __napiModule.exports.JsChunk
module.exports.JsChunkGraph = __napiModule.exports.JsChunkGraph
module.exports.JsChunkGroup = __napiModule.exports.JsChunkGroup
module.exports.JsCompilation = __napiModule.exports.JsCompilation
module.exports.JsCompiler = __napiModule.exports.JsCompiler
module.exports.JsContextModuleFactoryAfterResolveData = __napiModule.exports.JsContextModuleFactoryAfterResolveData
module.exports.JsContextModuleFactoryBeforeResolveData = __napiModule.exports.JsContextModuleFactoryBeforeResolveData
module.exports.JsDependencies = __napiModule.exports.JsDependencies
module.exports.JsEntries = __napiModule.exports.JsEntries
module.exports.JsExportsInfo = __napiModule.exports.JsExportsInfo
module.exports.JsModuleGraph = __napiModule.exports.JsModuleGraph
module.exports.JsResolver = __napiModule.exports.JsResolver
module.exports.JsResolverFactory = __napiModule.exports.JsResolverFactory
module.exports.JsStats = __napiModule.exports.JsStats
module.exports.Module = __napiModule.exports.Module
module.exports.ModuleGraphConnection = __napiModule.exports.ModuleGraphConnection
module.exports.NormalModule = __napiModule.exports.NormalModule
module.exports.RawExternalItemFnCtx = __napiModule.exports.RawExternalItemFnCtx
module.exports.Sources = __napiModule.exports.Sources
module.exports.BuiltinPluginName = __napiModule.exports.BuiltinPluginName
module.exports.cleanupGlobalTrace = __napiModule.exports.cleanupGlobalTrace
module.exports.formatDiagnostic = __napiModule.exports.formatDiagnostic
module.exports.JsLoaderState = __napiModule.exports.JsLoaderState
module.exports.JsRspackSeverity = __napiModule.exports.JsRspackSeverity
module.exports.minify = __napiModule.exports.minify
module.exports.RawRuleSetConditionType = __napiModule.exports.RawRuleSetConditionType
module.exports.registerGlobalTrace = __napiModule.exports.registerGlobalTrace
module.exports.RegisterJsTapKind = __napiModule.exports.RegisterJsTapKind
module.exports.shutdownAsyncRuntime = __napiModule.exports.shutdownAsyncRuntime
module.exports.startAsyncRuntime = __napiModule.exports.startAsyncRuntime
module.exports.transform = __napiModule.exports.transform
module.exports = __napiModule.exports
20 changes: 0 additions & 20 deletions crates/node_binding/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,23 +568,3 @@ pub fn rspack_module_exports(exports: Object, env: Env) -> Result<()> {
build_info::export_symbols(exports, env)?;
Ok(())
}

#[napi]
/// Shutdown the tokio runtime manually.
///
/// This is required for the wasm target with `tokio_unstable` cfg.
/// In the wasm runtime, the `park` threads will hang there until the tokio::Runtime is shutdown.
pub fn shutdown_async_runtime() {
#[cfg(all(target_family = "wasm", tokio_unstable))]
napi::bindgen_prelude::shutdown_async_runtime();
}

#[napi]
/// Start the async runtime manually.
///
/// This is required when the async runtime is shutdown manually.
/// Usually it's used in test.
pub fn start_async_runtime() {
#[cfg(all(target_family = "wasm", tokio_unstable))]
napi::bindgen_prelude::start_async_runtime();
}
10 changes: 0 additions & 10 deletions packages/rspack/src/Compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,6 @@ class Compiler {
const startTime = Date.now();
this.running = true;

const instanceBinding: typeof binding = require("@rspack/binding");
let isRuntimeShutdown = false;
if (isRuntimeShutdown) {
instanceBinding.startAsyncRuntime();
isRuntimeShutdown = false;
}

const finalCallback = (err: Error | null, stats?: Stats) => {
this.idle = true;
this.cache.beginIdle();
Expand All @@ -460,9 +453,6 @@ class Compiler {
callback(err, stats);
}
this.hooks.afterDone.call(stats!);

instanceBinding.shutdownAsyncRuntime();
isRuntimeShutdown = true;
};

const onCompiled = (
Expand Down
Loading