From fe0e5ab294ab94dd187d4b1bcdfa979a867e0435 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Thu, 25 Sep 2025 14:52:15 +0000 Subject: [PATCH] build: bump `vscode-tmgrammar-test` to `0.1.3` (#64078) Update `vscode-tmgrammar-test`. PR Close #64078 --- pnpm-lock.yaml | 43 ++++++++++++------- vscode-ng-language-service/package.json | 2 +- .../syntaxes/test/driver.ts | 5 +-- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe5fba28cc0..ff585a985fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1378,8 +1378,8 @@ importers: specifier: 1.6.1 version: 1.6.1 vscode-tmgrammar-test: - specifier: 0.0.11 - version: 0.0.11 + specifier: 0.1.3 + version: 0.1.3 vscode-uri: specifier: 3.1.0 version: 3.1.0 @@ -1388,7 +1388,7 @@ importers: dependencies: '@angular/common': specifier: 21.0.0-next.5 - version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5))(rxjs@7.8.2) + version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5)) '@angular/compiler': specifier: 21.0.0-next.5 version: 21.0.0-next.5 @@ -1409,7 +1409,7 @@ importers: dependencies: '@angular/common': specifier: 21.0.0-next.5 - version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5))(rxjs@7.8.2) + version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5)) '@angular/core': specifier: 21.0.0-next.5 version: 21.0.0-next.5(@angular/compiler@21.0.0-next.5) @@ -1418,7 +1418,7 @@ importers: dependencies: '@angular/common': specifier: 21.0.0-next.5 - version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5))(rxjs@7.8.2) + version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5)) '@angular/compiler': specifier: 21.0.0-next.5 version: 21.0.0-next.5 @@ -1443,7 +1443,7 @@ importers: dependencies: '@angular/common': specifier: 21.0.0-next.5 - version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5))(rxjs@7.8.2) + version: 21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5)) '@angular/compiler': specifier: 21.0.0-next.5 version: 21.0.0-next.5 @@ -1688,7 +1688,6 @@ packages: engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0} peerDependencies: '@angular/core': 21.0.0-next.5 - rxjs: ^6.5.3 || ^7.4.0 '@angular/compiler-cli@21.0.0-next.5': resolution: {integrity: sha512-IJZJ4B0xMZMsdoM44HghiaGR87arI9kbIDIzjYDIP+vV+yL6o2ZfEs1MqjMt53NDtvYuWqk2/Pg3RZZnfBmjeQ==} @@ -5776,6 +5775,9 @@ packages: resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. + bottleneck@2.19.5: + resolution: {integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==} + boundary@2.0.0: resolution: {integrity: sha512-rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA==} @@ -6224,6 +6226,10 @@ packages: resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==} engines: {node: '>= 12'} + commander@9.5.0: + resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} + engines: {node: ^12.20.0 || >=14} + common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} @@ -12349,11 +12355,11 @@ packages: engines: {node: '>=8.9.3'} deprecated: This package has been renamed to @vscode/test-electron, please update to the new name - vscode-textmate@5.5.0: - resolution: {integrity: sha512-jToQkPGMNKn0eyKyitYeINJF0NoD240aYyKPIWJv5W2jfPt++jIRg0OSergubtGhbw6SoefkvBYEpX7TsfoSUQ==} + vscode-textmate@7.0.4: + resolution: {integrity: sha512-9hJp0xL7HW1Q5OgGe03NACo7yiCTMEk3WU/rtKXUbncLtdg6rVVNJnHwD88UhbIYU2KoxY0Dih0x+kIsmUKn2A==} - vscode-tmgrammar-test@0.0.11: - resolution: {integrity: sha512-Bd60x/OeBLAQnIxiR2GhUic1CQZOFfWM8Pd43HjdEUBf/0vcvYAlFQikOXvv+zkItHLznjKaDX7VWKPVYUF9ug==} + vscode-tmgrammar-test@0.1.3: + resolution: {integrity: sha512-Wg6Pz+ePAT1O+F/A1Fc4wS5vY2X+HNtgN4qMdL+65NLQYd1/zdDWH4fhwsLjX8wTzeXkMy49Cr4ZqWTJ7VnVxg==} hasBin: true vscode-uri@3.0.8: @@ -13326,7 +13332,7 @@ snapshots: - chokidar - supports-color - '@angular/common@21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5))(rxjs@7.8.2)': + '@angular/common@21.0.0-next.5(@angular/core@21.0.0-next.5(@angular/compiler@21.0.0-next.5))': dependencies: '@angular/core': 21.0.0-next.5(@angular/compiler@21.0.0-next.5) rxjs: 7.8.2 @@ -18247,6 +18253,8 @@ snapshots: boolean@3.2.0: {} + bottleneck@2.19.5: {} + boundary@2.0.0: {} boxen@5.1.2: @@ -18765,6 +18773,8 @@ snapshots: commander@8.3.0: {} + commander@9.5.0: {} + common-path-prefix@3.0.0: {} common-tags@1.8.2: {} @@ -26423,16 +26433,17 @@ snapshots: transitivePeerDependencies: - supports-color - vscode-textmate@5.5.0: {} + vscode-textmate@7.0.4: {} - vscode-tmgrammar-test@0.0.11: + vscode-tmgrammar-test@0.1.3: dependencies: + bottleneck: 2.19.5 chalk: 2.4.2 - commander: 2.20.3 + commander: 9.5.0 diff: 4.0.2 glob: 7.2.3 vscode-oniguruma: 1.7.0 - vscode-textmate: 5.5.0 + vscode-textmate: 7.0.4 vscode-uri@3.0.8: {} diff --git a/vscode-ng-language-service/package.json b/vscode-ng-language-service/package.json index 3ce1b6f50a0..a33666061e3 100644 --- a/vscode-ng-language-service/package.json +++ b/vscode-ng-language-service/package.json @@ -280,7 +280,7 @@ "vscode-languageserver-types": "3.16.0", "vscode-languageserver": "7.0.0", "vscode-test": "1.6.1", - "vscode-tmgrammar-test": "0.0.11", + "vscode-tmgrammar-test": "0.1.3", "vscode-uri": "3.1.0" }, "repository": { diff --git a/vscode-ng-language-service/syntaxes/test/driver.ts b/vscode-ng-language-service/syntaxes/test/driver.ts index 0ebd73e246f..8f7564a7dab 100644 --- a/vscode-ng-language-service/syntaxes/test/driver.ts +++ b/vscode-ng-language-service/syntaxes/test/driver.ts @@ -39,15 +39,12 @@ function spawn(...args: Parameters): Promise { async function snapshotTest({scopeName, grammarFiles, testFile}: TestCase): Promise { grammarFiles.push(...DUMMY_GRAMMARS); const grammarOptions = grammarFiles.reduce((acc, file) => [...acc, '-g', file], [] as string[]); - const extraArgs = process.argv.slice(3); const options = [ - 'node_modules/vscode-tmgrammar-test/dist/src/snapshot.js', + 'node_modules/vscode-tmgrammar-test/dist/snapshot.js', '-s', scopeName, ...grammarOptions, - '-t', testFile, - ...extraArgs, ]; return spawn('node', options, {stdio: 'inherit' /* use parent process IO */}).catch(