Adopt new package name (vscode-oniguruma)

joshuaskelly · Apr 24, 2020 · 6654073 · 6654073
1 parent 25e889a
commit 6654073
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 34 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -462,7 +462,7 @@
                     "**/vs/workbench/services/**/common/**",
                     "**/vs/workbench/api/**/common/**",
                     "vscode-textmate",
-                    "vscode-oniguruma-wasm"
+                    "vscode-oniguruma"
                 ]
             },
             {
@@ -491,7 +491,7 @@
                     "**/vs/workbench/api/{common,browser}/**",
                     "**/vs/workbench/services/**/{common,browser}/**",
                     "vscode-textmate",
-                    "vscode-oniguruma-wasm"
+                    "vscode-oniguruma"
                 ]
             },
             {

diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "sudo-prompt": "9.1.1",
     "v8-inspect-profiler": "^0.0.20",
     "vscode-nsfw": "1.2.8",
-    "vscode-oniguruma-wasm": "1.1.0",
+    "vscode-oniguruma": "1.1.1",
     "vscode-proxy-agent": "^0.5.2",
     "vscode-ripgrep": "^1.5.8",
     "vscode-sqlite3": "4.0.10",

diff --git a/remote/package.json b/remote/package.json
@@ -16,7 +16,7 @@
     "semver-umd": "^5.5.6",
     "spdlog": "^0.11.1",
     "vscode-nsfw": "1.2.8",
-    "vscode-oniguruma-wasm": "1.1.0",
+    "vscode-oniguruma": "1.1.1",
     "vscode-proxy-agent": "^0.5.2",
     "vscode-ripgrep": "^1.5.8",
     "vscode-textmate": "5.0.2",

diff --git a/remote/web/package.json b/remote/web/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.0",
 	"dependencies": {
 		"semver-umd": "^5.5.6",
-		"vscode-oniguruma-wasm": "1.1.0",
+		"vscode-oniguruma": "1.1.1",
 		"vscode-textmate": "5.0.2",
 		"xterm": "4.6.0-beta.15",
 		"xterm-addon-search": "0.6.0",

diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
@@ -7,10 +7,10 @@ semver-umd@^5.5.6:
   resolved "https://registry.yarnpkg.com/semver-umd/-/semver-umd-5.5.6.tgz#1d185bbd2caec825c564b54907cd09e14083f228"
   integrity sha512-6ARYXVi4Y4VO5HfyCjT/6xyykBtJwEXSGQ8ON4UPQSFOjZUDsbAE0J614QcBBsLTTyQMEqvsXN804vAqpydjzw==
 
-vscode-oniguruma-wasm@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma-wasm/-/vscode-oniguruma-wasm-1.1.0.tgz#9959396aa20ffe570f1b3a4d51d37ce94b73943d"
-  integrity sha512-VbJJ8lx0YFnPI7Zu+EKNYuw02NFTobKKqxZjfxnQz9AGKN3wl8D+bB748zC9DRoEX4vgWd5NYdMvdfA9zT2tCw==
+vscode-oniguruma@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.1.1.tgz#81460d148e70668b7c1abfd78ab7fcb2e2c6b316"
+  integrity sha512-4bygPUQjD5o9nLxp8f0s2TbqLte+Kz3C/IZxheIwunos69jI6OOxAhXW06RgqFbnXAw9ggUydx5qIZ7LD6iNuw==
 
 vscode-textmate@5.0.2:
   version "5.0.2"

diff --git a/remote/yarn.lock b/remote/yarn.lock
@@ -367,10 +367,10 @@ vscode-nsfw@1.2.8:
     lodash.isundefined "^3.0.1"
     nan "^2.10.0"
 
-vscode-oniguruma-wasm@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma-wasm/-/vscode-oniguruma-wasm-1.1.0.tgz#9959396aa20ffe570f1b3a4d51d37ce94b73943d"
-  integrity sha512-VbJJ8lx0YFnPI7Zu+EKNYuw02NFTobKKqxZjfxnQz9AGKN3wl8D+bB748zC9DRoEX4vgWd5NYdMvdfA9zT2tCw==
+vscode-oniguruma@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.1.1.tgz#81460d148e70668b7c1abfd78ab7fcb2e2c6b316"
+  integrity sha512-4bygPUQjD5o9nLxp8f0s2TbqLte+Kz3C/IZxheIwunos69jI6OOxAhXW06RgqFbnXAw9ggUydx5qIZ7LD6iNuw==
 
 vscode-proxy-agent@^0.5.2:
   version "0.5.2"

diff --git a/src/vs/code/browser/workbench/workbench-dev.html b/src/vs/code/browser/workbench/workbench-dev.html
@@ -28,7 +28,7 @@
 			baseUrl: `${window.location.origin}/static/out`,
 			paths: {
 				'vscode-textmate': `${window.location.origin}/static/remote/web/node_modules/vscode-textmate/release/main`,
-				'vscode-oniguruma-wasm': `${window.location.origin}/static/remote/web/node_modules/vscode-oniguruma-wasm/release/main`,
+				'vscode-oniguruma': `${window.location.origin}/static/remote/web/node_modules/vscode-oniguruma/release/main`,
 				'xterm': `${window.location.origin}/static/remote/web/node_modules/xterm/lib/xterm.js`,
 				'xterm-addon-search': `${window.location.origin}/static/remote/web/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
 				'xterm-addon-unicode11': `${window.location.origin}/static/remote/web/node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,

diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
@@ -32,7 +32,7 @@
 			baseUrl: `${window.location.origin}/static/out`,
 			paths: {
 				'vscode-textmate': `${window.location.origin}/static/node_modules/vscode-textmate/release/main`,
-				'vscode-oniguruma-wasm': `${window.location.origin}/static/node_modules/vscode-oniguruma-wasm/release/main`,
+				'vscode-oniguruma': `${window.location.origin}/static/node_modules/vscode-oniguruma/release/main`,
 				'xterm': `${window.location.origin}/static/node_modules/xterm/lib/xterm.js`,
 				'xterm-addon-search': `${window.location.origin}/static/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
 				'xterm-addon-unicode11': `${window.location.origin}/static/node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,

diff --git a/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts b/src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
@@ -344,16 +344,16 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
 	protected _onDidDisposeGrammarFactory(): void {
 	}
 
-	private _vscodeOniguruma: Promise<typeof import('vscode-oniguruma-wasm')> | null = null;
-	private _getVSCodeOniguruma(): Promise<typeof import('vscode-oniguruma-wasm')> {
+	private _vscodeOniguruma: Promise<typeof import('vscode-oniguruma')> | null = null;
+	private _getVSCodeOniguruma(): Promise<typeof import('vscode-oniguruma')> {
 		if (!this._vscodeOniguruma) {
 			this._vscodeOniguruma = this._doGetVSCodeOniguruma();
 		}
 		return this._vscodeOniguruma;
 	}
 
-	private async _doGetVSCodeOniguruma(): Promise<typeof import('vscode-oniguruma-wasm')> {
-		const [vscodeOniguruma, wasm] = await Promise.all([import('vscode-oniguruma-wasm'), this._loadVSCodeOnigurumWASM()]);
+	private async _doGetVSCodeOniguruma(): Promise<typeof import('vscode-oniguruma')> {
+		const [vscodeOniguruma, wasm] = await Promise.all([import('vscode-oniguruma'), this._loadVSCodeOnigurumWASM()]);
 		await vscodeOniguruma.loadWASM(wasm);
 		return vscodeOniguruma;
 	}

diff --git a/src/vs/workbench/services/textMate/browser/textMateService.ts b/src/vs/workbench/services/textMate/browser/textMateService.ts
@@ -29,7 +29,7 @@ export class TextMateService extends AbstractTextMateService {
 	}
 
 	protected async _loadVSCodeOnigurumWASM(): Promise<Response | ArrayBuffer> {
-		const wasmPath = require.toUrl('vscode-oniguruma-wasm/../onig.wasm');
+		const wasmPath = require.toUrl('vscode-oniguruma/../onig.wasm');
 		const response = await fetch(wasmPath);
 		// Using the response directly only works if the server sets the MIME type 'application/wasm'.
 		// Otherwise, a TypeError is thrown when using the streaming compiler.

diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts
@@ -182,8 +182,8 @@ export class TextMateService extends AbstractTextMateService {
 	protected async _loadVSCodeOnigurumWASM(): Promise<Response | ArrayBuffer> {
 		const wasmPath = (
 			this._environmentService.isBuilt
-				? require.toUrl('../../../../../../node_modules.asar.unpacked/vscode-oniguruma-wasm/release/onig.wasm')
-				: require.toUrl('../../../../../../node_modules/vscode-oniguruma-wasm/release/onig.wasm')
+				? require.toUrl('../../../../../../node_modules.asar.unpacked/vscode-oniguruma/release/onig.wasm')
+				: require.toUrl('../../../../../../node_modules/vscode-oniguruma/release/onig.wasm')
 		);
 		const response = await fetch(wasmPath);
 		return response;

diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateWorker.ts b/src/vs/workbench/services/textMate/electron-browser/textMateWorker.ts
@@ -141,12 +141,12 @@ export class TextMateWorker {
 		require.config({
 			paths: {
 				'vscode-textmate': '../node_modules/vscode-textmate/release/main',
-				'vscode-oniguruma-wasm': '../node_modules/vscode-oniguruma-wasm/release/main',
+				'vscode-oniguruma': '../node_modules/vscode-oniguruma/release/main',
 			}
 		});
 		const vscodeTextmate = await import('vscode-textmate');
-		const vscodeOniguruma = await import('vscode-oniguruma-wasm');
-		const wasmPath = require.toUrl('vscode-oniguruma-wasm/../onig.wasm');
+		const vscodeOniguruma = await import('vscode-oniguruma');
+		const wasmPath = require.toUrl('vscode-oniguruma/../onig.wasm');
 		const response = await fetch(wasmPath);
 		// Using the response directly only works if the server sets the MIME type 'application/wasm'.
 		// Otherwise, a TypeError is thrown when using the streaming compiler.

diff --git a/yarn.lock b/yarn.lock
@@ -9248,16 +9248,16 @@ typescript-formatter@7.1.0:
     commandpost "^1.0.0"
     editorconfig "^0.15.0"
 
+typescript@3.9.0-dev.20200423:
+  version "3.9.0-dev.20200423"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.0-dev.20200423.tgz#3569bd92d57ccf0b389a08a5beed1e35c193ab16"
+  integrity sha512-BZuOaEN9L3glTWfvzDhRm5ElSGhK4+OEC9Fr9aZTcWbNfCAYkvEqq6q6B65riIzputiBqeynheuX4HAjFMqw8w==
+
 typescript@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
   integrity sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=
 
-typescript@^3.9.0-dev.20200420:
-  version "3.9.0-dev.20200420"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.0-dev.20200420.tgz#99c2bc0936dbf4479b0b5260d80475ed494b1532"
-  integrity sha512-36MW6V+oXNnsSgliSjUWvtOkO21g9+iFGHPFv+O06HsCl3dcuqzBac17m8xuOuWo1LUlEgS6yAnD9fiVgvmCfg==
-
 uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
@@ -9694,10 +9694,10 @@ vscode-nsfw@1.2.8:
     lodash.isundefined "^3.0.1"
     nan "^2.10.0"
 
-vscode-oniguruma-wasm@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vscode-oniguruma-wasm/-/vscode-oniguruma-wasm-1.1.0.tgz#9959396aa20ffe570f1b3a4d51d37ce94b73943d"
-  integrity sha512-VbJJ8lx0YFnPI7Zu+EKNYuw02NFTobKKqxZjfxnQz9AGKN3wl8D+bB748zC9DRoEX4vgWd5NYdMvdfA9zT2tCw==
+vscode-oniguruma@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.1.1.tgz#81460d148e70668b7c1abfd78ab7fcb2e2c6b316"
+  integrity sha512-4bygPUQjD5o9nLxp8f0s2TbqLte+Kz3C/IZxheIwunos69jI6OOxAhXW06RgqFbnXAw9ggUydx5qIZ7LD6iNuw==
 
 vscode-proxy-agent@^0.5.2:
   version "0.5.2"