From 0251337a3d1881a6c56f02b7d35e6792e858aab0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 08:23:25 +0000 Subject: [PATCH 1/5] Bump glob from 10.3.5 to 10.3.7 in /vscode/microsoft-kiota Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.5 to 10.3.7. - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](https://github.com/isaacs/node-glob/compare/v10.3.5...v10.3.7) --- updated-dependencies: - dependency-name: glob dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vscode/microsoft-kiota/package-lock.json | 10 +++++----- vscode/microsoft-kiota/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json index 962e478d50..4c91ec264d 100644 --- a/vscode/microsoft-kiota/package-lock.json +++ b/vscode/microsoft-kiota/package-lock.json @@ -25,7 +25,7 @@ "@typescript-eslint/parser": "^6.7.2", "@vscode/test-electron": "^2.3.4", "eslint": "^8.50.0", - "glob": "^10.3.5", + "glob": "^10.3.7", "mocha": "^10.1.0", "ts-loader": "^9.4.4", "typescript": "^5.2.2", @@ -2482,9 +2482,9 @@ } }, "node_modules/glob": { - "version": "10.3.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.5.tgz", - "integrity": "sha512-bYUpUD7XDEHI4Q2O5a7PXGvyw4deKR70kHiDxzQbe925wbZknhOzUt2xBgTkYL6RBcVeXYuD9iNYeqoWbBZQnA==", + "version": "10.3.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.7.tgz", + "integrity": "sha512-wCMbE1m9Nx5yD9LYtgsVWq5VhHlk5WzJirw594qZR6AIvQYuHrdDtIktUVjQItalD53y7dqoedu9xP0u0WaxIQ==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", @@ -2494,7 +2494,7 @@ "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json index 6bbb511c32..25bd519136 100644 --- a/vscode/microsoft-kiota/package.json +++ b/vscode/microsoft-kiota/package.json @@ -265,7 +265,7 @@ "@typescript-eslint/parser": "^6.7.2", "@vscode/test-electron": "^2.3.4", "eslint": "^8.50.0", - "glob": "^10.3.5", + "glob": "^10.3.7", "mocha": "^10.1.0", "ts-loader": "^9.4.4", "typescript": "^5.2.2", From 15e67d05d69b857d052ab880b34c8da78e009c9e Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 25 Sep 2023 09:19:33 -0400 Subject: [PATCH 2/5] - excludes out directory from tracked files --- vscode/microsoft-kiota/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/vscode/microsoft-kiota/.gitignore b/vscode/microsoft-kiota/.gitignore index 2d20733dd7..a59807283a 100644 --- a/vscode/microsoft-kiota/.gitignore +++ b/vscode/microsoft-kiota/.gitignore @@ -1,3 +1,4 @@ dist/ +out/ .kiotabin/ *.vsix \ No newline at end of file From e20306b4ffbcc8afdf2df9b5dad7da8b43369e81 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 25 Sep 2023 09:30:40 -0400 Subject: [PATCH 3/5] - updates type definitions for glob --- vscode/microsoft-kiota/package-lock.json | 2 +- vscode/microsoft-kiota/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vscode/microsoft-kiota/package-lock.json b/vscode/microsoft-kiota/package-lock.json index 4c91ec264d..f6583f99e9 100644 --- a/vscode/microsoft-kiota/package-lock.json +++ b/vscode/microsoft-kiota/package-lock.json @@ -17,7 +17,7 @@ }, "devDependencies": { "@types/adm-zip": "^0.5.2", - "@types/glob": "^8.0.1", + "@types/glob": "^8.1.0", "@types/mocha": "^10.0.1", "@types/node": "20.x", "@types/vscode": "^1.82.0", diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json index 25bd519136..0a58511ef6 100644 --- a/vscode/microsoft-kiota/package.json +++ b/vscode/microsoft-kiota/package.json @@ -257,7 +257,7 @@ }, "devDependencies": { "@types/adm-zip": "^0.5.2", - "@types/glob": "^8.0.1", + "@types/glob": "^8.1.0", "@types/mocha": "^10.0.1", "@types/node": "20.x", "@types/vscode": "^1.82.0", From 45d4b843889a9634f43009ba83e0bff762e454db Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 25 Sep 2023 09:31:01 -0400 Subject: [PATCH 4/5] - updates test infrastructure to match the latest glob changes --- vscode/microsoft-kiota/src/test/suite/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vscode/microsoft-kiota/src/test/suite/index.ts b/vscode/microsoft-kiota/src/test/suite/index.ts index bde6005570..35736544f3 100644 --- a/vscode/microsoft-kiota/src/test/suite/index.ts +++ b/vscode/microsoft-kiota/src/test/suite/index.ts @@ -1,6 +1,6 @@ import * as path from 'path'; import * as Mocha from 'mocha'; -import {glob} from 'glob'; +import { __promisify__ } from 'glob'; export async function run(): Promise { // Create the mocha test @@ -10,8 +10,7 @@ export async function run(): Promise { }); const testsRoot = path.resolve(__dirname, '..'); - - const files = await glob('**/**.test.js', { cwd: testsRoot }); + const files = await __promisify__('**/**.test.js', { cwd: testsRoot }); // Add files to the test suite files.forEach(f => mocha.addFile(path.resolve(testsRoot, f))); From 4635977a96256fc798685dda7ce4186b1592cd75 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Mon, 25 Sep 2023 09:32:31 -0400 Subject: [PATCH 5/5] - updates kiota versions for extension --- vscode/microsoft-kiota/package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vscode/microsoft-kiota/package.json b/vscode/microsoft-kiota/package.json index 0a58511ef6..538d73c3c0 100644 --- a/vscode/microsoft-kiota/package.json +++ b/vscode/microsoft-kiota/package.json @@ -3,8 +3,8 @@ "displayName": "Microsoft Kiota", "publisher": "ms-graph", "description": "Client generator for HTTP REST APIs described by OpenAPI which helps eliminate the need to take a dependency on a different API client for every API that you need to call, as well as limiting the generation to the exact API surface area you're interested in, thanks to a filtering capability.", - "version": "1.5.100000002", - "kiotaVersion": "1.5.1", + "version": "1.6.100000002", + "kiotaVersion": "1.6.1", "telemetryInstrumentationKey": "4c6357e0-daf9-42b5-bdfb-67878f8957b5", "icon": "images/logo.png", "engines": { @@ -284,23 +284,23 @@ "runtimeDependencies": [ { "platformId": "win-x64", - "sha256": "F670B9DAFD787B85F3630F7CFE641E8E11DB9375F16BBC7E9041A5A8DDE4A195" + "sha256": "3AF1B8BCAD83D2492E077C6B6A6604D255F252083DC2B05E308ED2D1629F72A3" }, { "platformId": "win-x86", - "sha256": "FF09BA91F02DE7BE1F86FC3016C6138BFD52837225451A96340C58ED774699C1" + "sha256": "A1B3BBDD297E0A375729C50C8BFFF6C97E42D2C8F88AFA716AE75B3C90C8BB85" }, { "platformId": "linux-x64", - "sha256": "E5F4A3D45B476F47325B747EBAE4A62DC7FE4C4BDBE63180FF014BCA00D87210" + "sha256": "094D1F4405B40E5F39C07F049C0C7B256CB63CD1162C5FEE7B4AC12B3E11C2D3" }, { "platformId": "osx-x64", - "sha256": "C6F4C4ECF29D48071E0B6E332EF285F146183337FBA207A14B22685023339387" + "sha256": "5BD73B7E9F079B7DA2116CB48C6546530351F2B0803BAFDA5B84DE01F77FBDA0" }, { "platformId": "osx-arm64", - "sha256": "17C0B1958E848BE1A8ADC0C4CC4337FB40B08EB597A72566957B99704079D38D" + "sha256": "D8FD62BC2E47C5B664170C17126D1BF0DF1BE0A8A108FCEBCDCCA88E9AEDD125" } ] }