Skip to content

Commit

Permalink
Revert vscode-textmate to 4.2.2 (for #83541)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdima committed Nov 6, 2019
1 parent 515f496 commit 22d5f54
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions build/gulpfile.hygiene.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ function checkPackageJSON(actualPath) {
// missing in root is allowed
continue;
}
if (depName === 'vscode-textmate') {
// allow vscode-textmate to diverge for now
continue;
}
if (depVersion !== rootDepVersion) {
this.emit('error', `The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`);
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"vscode-proxy-agent": "^0.5.1",
"vscode-ripgrep": "^1.5.7",
"vscode-sqlite3": "4.0.8",
"vscode-textmate": "^4.3.0",
"vscode-textmate": "4.2.2",
"xterm": "4.2.0-vscode1",
"xterm-addon-search": "0.3.0",
"xterm-addon-web-links": "0.2.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9007,10 +9007,10 @@ vscode-sqlite3@4.0.8:
dependencies:
nan "^2.14.0"

vscode-textmate@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.3.0.tgz#6e1f0f273d84148cfa1e9c7ed85bd16c974f9f61"
integrity sha512-MhEZ3hvxOVuYGsrRzW/PZLDR2VdtG2+V6TIKPvmE9JT+RAq/OtPlrFd1+ZQwBefoHEhjRNuRJ0OktcFezuxPmg==
vscode-textmate@4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.2.2.tgz#0b4dabc69a6fba79a065cb6b615f66eac07c8f4c"
integrity sha512-1U4ih0E/KP1zNK/EbpUqyYtI7PY+Ccd2nDGTtiMR/UalLFnmaYkwoWhN1oI7B91ptBN8NdVwWuvyUnvJAulCUw==
dependencies:
oniguruma "^7.2.0"

Expand Down

0 comments on commit 22d5f54

Please sign in to comment.