Use vscode-onigmo npm package

Author: RedCMD

package-lock.json

@@ -51,7 +51,7 @@
 	"main": "./out/extension.js",
 	"browser": "./out/web/extension.js",
 	"scripts": {
-		"build": "npm run compile && npm run compile-web && npm run generate-wasm && node ./out/Onigmo/moveOnigmo",
+		"build": "npm run compile && npm run compile-web && npm run generate-wasm",
 		"package": "vsce package",
 		"watch": "tsc -watch -p ./",
 		"watch-web": "webpack --watch",
@@ -611,6 +611,7 @@
 		"oniguruma-parser-cjs": "^0.0.1",
 		"oniguruma-to-es": "^4.3.3",
 		"plist": "^3.1.0",
+		"vscode-onigmo": "^2.0.1",
 		"vscode-oniguruma": "1.7.0",
 		"web-tree-sitter": "^0.25.4",
 		"yaml": "^2.8.0"

package.json

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import * as webTreeSitter from 'web-tree-sitter';
 import * as vscodeOniguruma from 'vscode-oniguruma';
-import * as textmateOnigmo from "./Onigmo/Onigmo";
+import * as textmateOnigmo from 'vscode-onigmo';
 import * as PCRE from '@syntropiq/libpcre-ts';
 import * as onigurumaToES from 'oniguruma-to-es';
 import { closeEnoughQuestionMark, DocumentSelector, getPackageJSON, JSONParseStringRelaxed, stringify, wagnerFischer } from "./extension";

src/DiagnosticCollection.ts

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode';
 import * as vscodeOniguruma from 'vscode-oniguruma';
-import * as textmateOnigmo from "./Onigmo/Onigmo";
+import * as textmateOnigmo from 'vscode-onigmo';
 
 
 export async function initOniguruma(context: vscode.ExtensionContext): Promise<void> {
@@ -23,9 +23,9 @@ export async function initOniguruma(context: vscode.ExtensionContext): Promise<v
 
 	// https://github.com/textmate/textmate
 	// https://github.com/textmate/Onigmo/tree/Onigmo-5.13.5
-	// fork of https://github.com/k-takata/Onigmo
-	// fork of https://github.com/kkos/oniguruma
-	const uriOnigmo = vscode.Uri.joinPath(context.extensionUri, 'out', 'Onigmo', 'Onigmo.wasm');
+	// fork of https://github.com/k-takata/Onigmo/tree/Onigmo-5.13.5
+	// fork of https://github.com/kkos/oniguruma/tree/65a9b1aa03c9bc2dc01b074295b9603232cb3b78
+	const uriOnigmo = vscode.Uri.joinPath(context.extensionUri, 'node_modules', 'vscode-onigmo', 'release', 'onigmo.wasm');
 	const wasmOnigmo = await vscode.workspace.fs.readFile(uriOnigmo);
 	const optionsOnigmo: textmateOnigmo.IOptions = {
 		data: wasmOnigmo,