diff options
author | Veesh Goldman <rabbiveesh@gmail.com> | 2024-09-06 10:27:05 +0300 |
---|---|---|
committer | Veesh Goldman <rabbiveesh@gmail.com> | 2024-09-06 10:27:05 +0300 |
commit | e18a8c9a2a2c4fcf861482af06c050e0cebd05e2 (patch) | |
tree | 5e1788520fc4ccd40e277a44c287ed57774fd3cb | |
parent | 5ff3c85431224b38269c99b7dc4e0229f2fc6149 (diff) | |
download | PerlNavigator-e18a8c9a2a2c4fcf861482af06c050e0cebd05e2.zip |
fix: safer dynamic finding as fallback
-rw-r--r-- | server/src/parser.ts | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/server/src/parser.ts b/server/src/parser.ts index e3d51cf..951c8ee 100644 --- a/server/src/parser.ts +++ b/server/src/parser.ts @@ -594,12 +594,16 @@ function PackageEndLine(state: ParserState) { return state.codeArray.length; } -// Resolve the path to the vscode-oniguruma package -const onigurumaPkgPath = path.dirname(require.resolve('vscode-oniguruma/package.json')); -// Construct the path to onig.wasm -const onigWasmPath = path.join(onigurumaPkgPath, 'release', 'onig.wasm'); +// we first try to find by absolute path, which is needed in webpack +let onigWasmPath = path.join(__dirname, "./../node_modules/vscode-oniguruma/release/onig.wasm") +if (!fs.existsSync(onigWasmPath)) { + // dynmacially retrieve the path to onig.wasm (we need to eval the require to stop webpack from + // bundling the wasm, which doesn't werk) + onigWasmPath = eval('require.resolve')('vscode-oniguruma/release/onig.wasm'); +} // Read the file const wasmBin = fs.readFileSync(onigWasmPath).buffer; + const vscodeOnigurumaLib = oniguruma.loadWASM(wasmBin).then(() => { return { createOnigScanner(patterns: any) { |