Skip to content

Commit e13eb2f

Browse files
authored
CI: Fix wasm32 build (#4589)
By backporting commit toyobayashi/emnapi@128af46 as a patch.
1 parent a82a0b3 commit e13eb2f

2 files changed

Lines changed: 36 additions & 0 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ jobs:
324324
with:
325325
node-version: "22"
326326
- run: npm install
327+
- run: npx patch-package
327328
- run: npm run build:dist && emmake npm run build
328329
- name: Verify emscripten versions match
329330
run: |

‎patches/emnapi+1.11.3.patch‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/node_modules/emnapi/dist/library_napi.js b/node_modules/emnapi/dist/library_napi.js
2+
index c2ef5b0..210c4c3 100644
3+
--- a/node_modules/emnapi/dist/library_napi.js
4+
+++ b/node_modules/emnapi/dist/library_napi.js
5+
@@ -602,6 +602,12 @@ function _napi_cancel_async_work(env, work) {
6+
var emnapiString = {
7+
utf8Decoder: undefined,
8+
utf16Decoder: undefined,
9+
+ getHeapViewOrCopy: function (heap, start, end) {
10+
+ var buffer = heap.buffer;
11+
+ var isShared = Object.prototype.toString.call(buffer) === '[object SharedArrayBuffer]';
12+
+ var isResizable = buffer.resizable === true;
13+
+ return isShared || isResizable ? heap.slice(start, end) : heap.subarray(start, end);
14+
+ },
15+
init: function () {
16+
#if !TEXTDECODER || TEXTDECODER == 1
17+
var fallbackDecoder = {
18+
@@ -761,7 +767,7 @@ var emnapiString = {
19+
return str;
20+
}
21+
#endif
22+
- return emnapiString.utf8Decoder.decode({{{ getUnsharedTextDecoderView('HEAPU8', 'ptr', 'end') }}});
23+
+ return emnapiString.utf8Decoder.decode(emnapiString.getHeapViewOrCopy(HEAPU8, ptr, end));
24+
},
25+
stringToUTF8: function (str, outPtr, maxBytesToWrite) {
26+
var HEAPU8 = new Uint8Array(wasmMemory.buffer);
27+
@@ -831,7 +837,7 @@ var emnapiString = {
28+
#endif
29+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
30+
var HEAPU8 = new Uint8Array(wasmMemory.buffer);
31+
- return emnapiString.utf16Decoder.decode({{{ getUnsharedTextDecoderView('HEAPU8', 'ptr', 'end') }}});
32+
+ return emnapiString.utf16Decoder.decode(emnapiString.getHeapViewOrCopy(HEAPU8, ptr, end));
33+
},
34+
stringToUTF16: function (str, outPtr, maxBytesToWrite) {
35+
if (maxBytesToWrite === undefined) {

0 commit comments

Comments
 (0)