@rspack/binding-wasm32-wasi 1.4.8 → 1.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/binding-wasm32-wasi",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "license": "MIT",
   "description": "Node binding for rspack",
   "main": "rspack.wasi.cjs",
@@ -26,6 +26,6 @@
     "wasi-worker-browser.mjs"
   ],
   "dependencies": {
-    "@napi-rs/wasm-runtime": "^0.2.12"
+    "@napi-rs/wasm-runtime": "^1.0.1"
   }
 }

package/rspack.wasi-browser.js

@@ -1,11 +1,11 @@
 import {
+  createOnMessage as __wasmCreateOnMessageForFsProxy,
   getDefaultContext as __emnapiGetDefaultContext,
-  instantiateNapiModuleSync as __emnapiInstantiateNapiModuleSync,
+  instantiateNapiModule as __emnapiInstantiateNapiModule,
   WASI as __WASI,
-  createOnMessage as __wasmCreateOnMessageForFsProxy,
 } from '@napi-rs/wasm-runtime'
-import { memfs } from '@napi-rs/wasm-runtime/fs'
-import __wasmUrl from './rspack.wasm32-wasi.wasm?url'
+import { memfs, Buffer } from '@napi-rs/wasm-runtime/fs'
+
 
 export const { fs: __fs, vol: __volume } = memfs()
 
@@ -17,7 +17,9 @@ const __wasi = new __WASI({
   },
 })
 
+const __wasmUrl = new URL('./rspack.wasm32-wasi.wasm', import.meta.url).href
 const __emnapiContext = __emnapiGetDefaultContext()
+__emnapiContext.feature.Buffer = Buffer
 
 const __sharedMemory = new WebAssembly.Memory({
   initial: 16384,
@@ -31,7 +33,7 @@ const {
   instance: __napiInstance,
   module: __wasiModule,
   napiModule: __napiModule,
-} = __emnapiInstantiateNapiModuleSync(__wasmFile, {
+} = await __emnapiInstantiateNapiModule(__wasmFile, {
   context: __emnapiContext,
   asyncWorkPoolSize: 4,
   wasi: __wasi,
@@ -60,4 +62,57 @@ const {
     }
   },
 })
-export default __napiModule.exports
+export default __napiModule.exports
+export const Assets = __napiModule.exports.Assets
+export const AsyncDependenciesBlock = __napiModule.exports.AsyncDependenciesBlock
+export const Chunk = __napiModule.exports.Chunk
+export const ChunkGraph = __napiModule.exports.ChunkGraph
+export const ChunkGroup = __napiModule.exports.ChunkGroup
+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 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 KnownBuildInfo = __napiModule.exports.KnownBuildInfo
+export const Module = __napiModule.exports.Module
+export const ModuleGraphConnection = __napiModule.exports.ModuleGraphConnection
+export const NativeWatcher = __napiModule.exports.NativeWatcher
+export const NativeWatchResult = __napiModule.exports.NativeWatchResult
+export const NormalModule = __napiModule.exports.NormalModule
+export const RawExternalItemFnCtx = __napiModule.exports.RawExternalItemFnCtx
+export const ReadonlyResourceData = __napiModule.exports.ReadonlyResourceData
+export const Sources = __napiModule.exports.Sources
+export const BuiltinPluginName = __napiModule.exports.BuiltinPluginName
+export const cleanupGlobalTrace = __napiModule.exports.cleanupGlobalTrace
+export const EXPECTED_RSPACK_CORE_VERSION = __napiModule.exports.EXPECTED_RSPACK_CORE_VERSION
+export const formatDiagnostic = __napiModule.exports.formatDiagnostic
+export const JsLoaderState = __napiModule.exports.JsLoaderState
+export const JsRspackSeverity = __napiModule.exports.JsRspackSeverity
+export const loadBrowserslist = __napiModule.exports.loadBrowserslist
+export const minify = __napiModule.exports.minify
+export const minifySync = __napiModule.exports.minifySync
+export const RawRuleSetConditionType = __napiModule.exports.RawRuleSetConditionType
+export const registerGlobalTrace = __napiModule.exports.registerGlobalTrace
+export const RegisterJsTapKind = __napiModule.exports.RegisterJsTapKind
+export const syncTraceEvent = __napiModule.exports.syncTraceEvent
+export const transform = __napiModule.exports.transform
+export const transformSync = __napiModule.exports.transformSync

package/rspack.wasi.cjs

@@ -66,18 +66,6 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
       __wasmCreateOnMessageForFsProxy(__nodeFs)(data)
     }
 
-    // We have enabled `reuseWorker` so normally the workers never exit, unless there's any exception. 
-    // For Rust threads, aborting one thread means aborting the process, but actually aborting Node.js workers doesn't abort the main thread.
-    // I'm not sure whether it's the expected behavior of Node.js workers, or the behavior has been controlled by emnapi.
-    // Anyway, this code is used for fix the bug: 
-    // When the main thread holds a strong tsfn that prevents the Node.js event loop exiting,
-    // if the worker responsible for unref the tsfn terminates, then the main thread will never exits.
-    worker.on('exit', (code) => {
-      if (code !== 0) {
-        process.exit(code);
-      }
-    });
-
     // The main thread of Node.js waits for all the active handles before exiting.
     // But Rust threads are never waited without `thread::join`.
     // So here we hack the code of Node.js to prevent the workers from being referenced (active).
@@ -94,7 +82,7 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
       const kHandle = Object.getOwnPropertySymbols(worker).find(s =>
         s.toString().includes("kHandle")
       );
-      if (kPublicPort) {
+      if (kHandle) {
         worker[kHandle].ref = () => {};
       }
 
@@ -119,4 +107,57 @@ const { instance: __napiInstance, module: __wasiModule, napiModule: __napiModule
     }
   },
 })
-module.exports = __napiModule.exports
+module.exports = __napiModule.exports
+module.exports.Assets = __napiModule.exports.Assets
+module.exports.AsyncDependenciesBlock = __napiModule.exports.AsyncDependenciesBlock
+module.exports.Chunk = __napiModule.exports.Chunk
+module.exports.ChunkGraph = __napiModule.exports.ChunkGraph
+module.exports.ChunkGroup = __napiModule.exports.ChunkGroup
+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.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.KnownBuildInfo = __napiModule.exports.KnownBuildInfo
+module.exports.Module = __napiModule.exports.Module
+module.exports.ModuleGraphConnection = __napiModule.exports.ModuleGraphConnection
+module.exports.NativeWatcher = __napiModule.exports.NativeWatcher
+module.exports.NativeWatchResult = __napiModule.exports.NativeWatchResult
+module.exports.NormalModule = __napiModule.exports.NormalModule
+module.exports.RawExternalItemFnCtx = __napiModule.exports.RawExternalItemFnCtx
+module.exports.ReadonlyResourceData = __napiModule.exports.ReadonlyResourceData
+module.exports.Sources = __napiModule.exports.Sources
+module.exports.BuiltinPluginName = __napiModule.exports.BuiltinPluginName
+module.exports.cleanupGlobalTrace = __napiModule.exports.cleanupGlobalTrace
+module.exports.EXPECTED_RSPACK_CORE_VERSION = __napiModule.exports.EXPECTED_RSPACK_CORE_VERSION
+module.exports.formatDiagnostic = __napiModule.exports.formatDiagnostic
+module.exports.JsLoaderState = __napiModule.exports.JsLoaderState
+module.exports.JsRspackSeverity = __napiModule.exports.JsRspackSeverity
+module.exports.loadBrowserslist = __napiModule.exports.loadBrowserslist
+module.exports.minify = __napiModule.exports.minify
+module.exports.minifySync = __napiModule.exports.minifySync
+module.exports.RawRuleSetConditionType = __napiModule.exports.RawRuleSetConditionType
+module.exports.registerGlobalTrace = __napiModule.exports.registerGlobalTrace
+module.exports.RegisterJsTapKind = __napiModule.exports.RegisterJsTapKind
+module.exports.syncTraceEvent = __napiModule.exports.syncTraceEvent
+module.exports.transform = __napiModule.exports.transform
+module.exports.transformSync = __napiModule.exports.transformSync

package/wasi-worker-browser.mjs

@@ -1,4 +1,4 @@
-import { createFsProxy, instantiateNapiModuleSync, MessageHandler, WASI } from '@napi-rs/wasm-runtime'
+import { instantiateNapiModuleSync, MessageHandler, WASI, createFsProxy } from '@napi-rs/wasm-runtime'
 import { memfsExported as __memfsExported } from '@napi-rs/wasm-runtime/fs'
 
 const fs = createFsProxy(__memfsExported)