azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/Wasm] Fix incompatibilities with webpack.

Browse Source 
* Webpack doesn't support "node:" prefix out of the box, so we can just ignore it.
* Use a proper way to get a path to the script's dir.

#KT-53790 Fixed
This commit is contained in:
Zalim Bashorov
2022-09-20 23:23:56 +02:00
parent 4ac9e49abd
commit 75510e6019
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/compiler.kt
+5 -4
View File
@@ -134,13 +134,14 @@ fun generateJsWasmLoader(wasmFilePath: String, externalJs: String): String =
let wasmInstance; let wasmInstance;
let require; // Placed here to give access to it from externals (js_code) let require; // Placed here to give access to it from externals (js_code)
if (isNodeJs) { if (isNodeJs) {
const module = await import('node:module'); const module = await import(/* webpackIgnore: true */'node:module');
require = module.createRequire(import.meta.url); require = module.default.createRequire(import.meta.url);
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const url = require('url'); const url = require('url');
const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); const filepath = url.fileURLToPath(import.meta.url);
const wasmBuffer = fs.readFileSync(path.resolve(__dirname, './$wasmFilePath')); const dirpath = path.dirname(filepath);
const wasmBuffer = fs.readFileSync(path.resolve(dirpath, '$wasmFilePath'));
const wasmModule = new WebAssembly.Module(wasmBuffer); const wasmModule = new WebAssembly.Module(wasmBuffer);
wasmInstance = new WebAssembly.Instance(wasmModule, { js_code }); wasmInstance = new WebAssembly.Instance(wasmModule, { js_code });
} }