From 94d0811d304cefe34aafb0dc8a7058e6c69079ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:05:37 -0800 Subject: [PATCH 01/97] Bump @types/vscode from 1.85.0 to 1.86.0 (#528) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 013b9d58..6badc346 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/semver": "^7.5.6", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", - "@types/vscode": "^1.82.0", + "@types/vscode": "^1.86.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.0.3", "esbuild": "^0.20.0", @@ -1477,9 +1477,9 @@ "dev": true }, "node_modules/@types/vscode": { - "version": "1.85.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.85.0.tgz", - "integrity": "sha512-CF/RBon/GXwdfmnjZj0WTUMZN5H6YITOfBCP4iEZlOtVQXuzw6t7Le7+cR+7JzdMrnlm7Mfp49Oj2TuSXIWo3g==", + "version": "1.86.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.86.0.tgz", + "integrity": "sha512-DnIXf2ftWv+9LWOB5OJeIeaLigLHF7fdXF6atfc7X5g2w/wVZBgk0amP7b+ub5xAuW1q7qP5YcFvOcit/DtyCQ==", "dev": true }, "node_modules/@types/yargs": { diff --git a/package.json b/package.json index 230f63ed..97722071 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/semver": "^7.5.6", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", - "@types/vscode": "^1.82.0", + "@types/vscode": "^1.86.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.0.3", "esbuild": "^0.20.0", From 4dcf98d59dcff3924d76bf6bb4f761cafe8c59a5 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Fri, 9 Feb 2024 16:07:03 -0800 Subject: [PATCH 02/97] Add startup notifications defined by remote GH source (#502) --- .metadata/README.md | 32 ++++++ .metadata/notifications.json | 15 +++ .../dependency-installer.ts | 10 +- .../installers/flow-cli-installer.ts | 24 +++-- extension/src/extension.ts | 28 +++--- extension/src/main.ts | 5 - extension/src/storage/storage-provider.ts | 21 ++++ extension/src/ui/notification-provider.ts | 98 +++++++++++++++++++ extension/src/ui/prompts.ts | 35 +++++-- .../test/integration/2 - commands.test.ts | 25 +++-- foo.cdc | 0 11 files changed, 247 insertions(+), 46 deletions(-) create mode 100644 .metadata/README.md create mode 100644 .metadata/notifications.json create mode 100644 extension/src/storage/storage-provider.ts create mode 100644 extension/src/ui/notification-provider.ts delete mode 100644 foo.cdc diff --git a/.metadata/README.md b/.metadata/README.md new file mode 100644 index 00000000..daa8a3c1 --- /dev/null +++ b/.metadata/README.md @@ -0,0 +1,32 @@ +# Extension metadata + +**DO NOT DELETE THIS FOLDER UNLESS YOU KNOW WHAT YOU ARE DOING** + +This folder contains remotely-updated metadata to provide updates to the Cadence VSCode Extension without requiring a new release of the extension itself. When consuming this metadata, the latest commit to the default repository branch should be assumed to be the latest version of the extension metadata. + +Currently, it is only used by the Cadence VSCode Extension to fetch any notifications that should be displayed to the user. + +## Notfications schema + +```ts +interface Notification { + _type: 'Notification' + id: string + type: 'error' | 'info' | 'warning' + text: string + buttons?: Array<{ + label: string + link: string + }> + suppressable?: boolean +} +``` + +### Fields + +- `_type`: The type of the object. Should always be `"Notification"`. +- `id`: A unique identifier for the notification. This is used to determine if the notification has already been displayed to the user. +- `type`: The type of notification. Can be `"info"`, `"warning"`, or `"error"`. +- `text`: The text to display to the user. +- `buttons`: An array of buttons to display to the user. Each button should have a `label` field and a `link` field. The `link` field should be a URL to open when the button is clicked. +- `suppressable`: Whether or not the user should be able to suppress the notification. (defaults to `true`) \ No newline at end of file diff --git a/.metadata/notifications.json b/.metadata/notifications.json new file mode 100644 index 00000000..093d3023 --- /dev/null +++ b/.metadata/notifications.json @@ -0,0 +1,15 @@ +[ + { + "_type": "Notification", + "id": "1", + "type": "info", + "text": "Cadence 1.0 pre-release builds are now available! Developers should begin upgrading their projects - see the Cadence 1.0 Migration Guide for more details.", + "buttons": [ + { + "label": "Learn More", + "link": "https://cadence-lang.org/docs/cadence-migration-guide" + } + ], + "suppressable": false + } +] \ No newline at end of file diff --git a/extension/src/dependency-installer/dependency-installer.ts b/extension/src/dependency-installer/dependency-installer.ts index a1d72a3d..6c154061 100644 --- a/extension/src/dependency-installer/dependency-installer.ts +++ b/extension/src/dependency-installer/dependency-installer.ts @@ -40,8 +40,12 @@ export class DependencyInstaller { // Prompt user to install missing dependencies promptUserErrorMessage( 'Not all dependencies are installed: ' + missing.map(x => x.getName()).join(', '), - 'Install Missing Dependencies', - () => { void this.#installMissingDependencies() } + [ + { + label: 'Install Missing Dependencies', + callback: () => { void this.#installMissingDependencies() } + } + ] ) } }) @@ -76,7 +80,7 @@ export class DependencyInstaller { const missing = await this.missingDependencies.getValue() const installed: Installer[] = this.registeredInstallers.filter(x => !missing.includes(x)) - await new Promise((resolve, reject) => { + await new Promise((resolve) => { setTimeout(() => { resolve() }, 2000) }) diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts index 43401e88..79ae0045 100644 --- a/extension/src/dependency-installer/installers/flow-cli-installer.ts +++ b/extension/src/dependency-installer/installers/flow-cli-installer.ts @@ -86,11 +86,13 @@ export class InstallFlowCLI extends Installer { if (latest != null && latestStr != null && semver.compare(latest, currentVersion) === 1) { promptUserInfoMessage( 'There is a new Flow CLI version available: ' + latestStr, - 'Install latest Flow CLI', - async () => { - await this.runInstall() - await this.#context.refreshDependencies() - } + [{ + label: 'Install latest Flow CLI', + callback: async () => { + await this.runInstall() + await this.#context.refreshDependencies() + } + }] ) } } @@ -106,11 +108,13 @@ export class InstallFlowCLI extends Installer { })) { promptUserErrorMessage( 'Incompatible Flow CLI version: ' + version.format(), - 'Install latest Flow CLI', - async () => { - await this.runInstall() - await this.#context.refreshDependencies() - } + [{ + label: 'Install latest Flow CLI', + callback: async () => { + await this.runInstall() + await this.#context.refreshDependencies() + } + }] ) return false } diff --git a/extension/src/extension.ts b/extension/src/extension.ts index f4957d62..527c494f 100644 --- a/extension/src/extension.ts +++ b/extension/src/extension.ts @@ -1,4 +1,5 @@ -/* The extension */ +import './crypto-polyfill' + import { CommandController } from './commands/command-controller' import { ExtensionContext } from 'vscode' import { DependencyInstaller } from './dependency-installer/dependency-installer' @@ -8,9 +9,9 @@ import { JSONSchemaProvider } from './json-schema-provider' import { LanguageServerAPI } from './server/language-server' import { FlowConfig } from './server/flow-config' import { TestProvider } from './test-provider/test-provider' +import { StorageProvider } from './storage/storage-provider' import * as path from 'path' - -import './crypto-polyfill' +import { NotificationProvider } from './ui/notification-provider' // The container for all data relevant to the extension. export class Extension { @@ -18,21 +19,28 @@ export class Extension { static #instance: Extension static initialized = false - static initialize (settings: Settings, ctx?: ExtensionContext): Extension { + static initialize (settings: Settings, ctx: ExtensionContext): Extension { Extension.#instance = new Extension(settings, ctx) Extension.initialized = true return Extension.#instance } - ctx: ExtensionContext | undefined + ctx: ExtensionContext languageServer: LanguageServerAPI #dependencyInstaller: DependencyInstaller #commands: CommandController - #testProvider?: TestProvider + #testProvider: TestProvider - private constructor (settings: Settings, ctx: ExtensionContext | undefined) { + private constructor (settings: Settings, ctx: ExtensionContext) { this.ctx = ctx + // Initialize Storage Provider + const storageProvider = new StorageProvider(ctx?.globalState) + + // Display any notifications from remote server + const notificationProvider = new NotificationProvider(storageProvider) + notificationProvider.activate() + // Register Flow version provider const flowVersionProvider = new FlowVersionProvider(settings) @@ -63,7 +71,7 @@ export class Extension { this.#commands = new CommandController(this.#dependencyInstaller) // Initialize TestProvider - const extensionPath = ctx?.extensionPath ?? '' + const extensionPath = ctx.extensionPath ?? '' const parserLocation = path.resolve(extensionPath, 'out/extension/cadence-parser.wasm') this.#testProvider = new TestProvider(parserLocation, settings, flowConfig) } @@ -73,8 +81,4 @@ export class Extension { await this.languageServer.deactivate() this.#testProvider?.dispose() } - - async executeCommand (command: string): Promise { - return await this.#commands.executeCommand(command) - } } diff --git a/extension/src/main.ts b/extension/src/main.ts index 0a1f55b4..ca70af88 100644 --- a/extension/src/main.ts +++ b/extension/src/main.ts @@ -31,8 +31,3 @@ export function deactivate (): Thenable | undefined { void Telemetry.deactivate() return (ext === undefined ? undefined : ext?.deactivate()) } - -export async function testActivate (settings: Settings): Promise { - ext = Extension.initialize(settings) - return ext -} diff --git a/extension/src/storage/storage-provider.ts b/extension/src/storage/storage-provider.ts new file mode 100644 index 00000000..a7fd04ee --- /dev/null +++ b/extension/src/storage/storage-provider.ts @@ -0,0 +1,21 @@ +import { Memento } from 'vscode' + +interface State { + dismissedNotifications: string[] +} + +export class StorageProvider { + #globalState: Memento + + constructor (globalState: Memento) { + this.#globalState = globalState + } + + get(key: T, fallback: State[T]): State[T] { + return this.#globalState.get(key, fallback) + } + + async set(key: T, value: State[T]): Promise { + return await (this.#globalState.update(key, value) as Promise) + } +} diff --git a/extension/src/ui/notification-provider.ts b/extension/src/ui/notification-provider.ts new file mode 100644 index 00000000..c17080ed --- /dev/null +++ b/extension/src/ui/notification-provider.ts @@ -0,0 +1,98 @@ +import { StorageProvider } from '../storage/storage-provider' +import { promptUserErrorMessage, promptUserInfoMessage, promptUserWarningMessage } from './prompts' +import * as vscode from 'vscode' + +const NOTIFICATIONS_URL = 'https://raw.githubusercontent.com/onflow/vscode-cadence/master/.metadata/notifications.json' + +export interface Notification { + _type: 'Notification' + id: string + type: 'error' | 'info' | 'warning' + text: string + buttons?: Array<{ + label: string + link: string + }> + suppressable?: boolean +} + +export class NotificationProvider { + #storageProvider: StorageProvider + + constructor ( + storageProvider: StorageProvider + ) { + this.#storageProvider = storageProvider + } + + activate (): void { + void this.#fetchAndDisplayNotifications() + } + + async #fetchAndDisplayNotifications (): Promise { + // Fetch notifications + const notifications = await this.#fetchNotifications() + + // Display all valid notifications + notifications + .filter(this.#notificationFilter.bind(this)) + .forEach(this.#displayNotification.bind(this)) + } + + #displayNotification (notification: Notification): void { + const transformButton = (button: { label: string, link: string }): { label: string, callback: () => void } => { + return { + label: button.label, + callback: () => { + void vscode.env.openExternal(vscode.Uri.parse(button.link)) + } + } + } + + // Transform buttons + let buttons: Array<{ label: string, callback: () => void }> = [] + if (notification.suppressable === true) { + buttons = [{ + label: 'Don\'t show again', + callback: () => { + this.#dismissNotification(notification) + } + }] + } + buttons = buttons?.concat(notification.buttons?.map(transformButton) ?? []) + + if (notification.type === 'error') { + promptUserErrorMessage(notification.text, buttons) + } else if (notification.type === 'info') { + promptUserInfoMessage(notification.text, buttons) + } else if (notification.type === 'warning') { + promptUserWarningMessage(notification.text, buttons) + } + } + + #notificationFilter (notification: Notification): boolean { + if (notification.suppressable === true && this.#isNotificationDismissed(notification)) { + return false + } + + return true + } + + async #fetchNotifications (): Promise { + return await fetch(NOTIFICATIONS_URL).then(async res => await res.json()).then((notifications: Notification[]) => { + return notifications + }).catch(() => { + return [] + }) + } + + #dismissNotification (notification: Notification): void { + const dismissedNotifications = this.#storageProvider.get('dismissedNotifications', []) + void this.#storageProvider.set('dismissedNotifications', [...dismissedNotifications, notification.id]) + } + + #isNotificationDismissed (notification: Notification): boolean { + const dismissedNotifications = this.#storageProvider.get('dismissedNotifications', []) + return dismissedNotifications.includes(notification.id) + } +} diff --git a/extension/src/ui/prompts.ts b/extension/src/ui/prompts.ts index 594d5962..e16287a7 100644 --- a/extension/src/ui/prompts.ts +++ b/extension/src/ui/prompts.ts @@ -1,24 +1,43 @@ /* Information and error prompts */ import { window } from 'vscode' -export function promptUserInfoMessage (message: string, buttonText: string, callback: Function): void { +export interface PromptButton { + label: string + callback: Function +} + +export function promptUserInfoMessage (message: string, buttons: PromptButton[] = []): void { window.showInformationMessage( message, - buttonText + ...buttons.map((button) => button.label) ).then((choice) => { - if (choice === buttonText) { - callback() + const button = buttons.find((button) => button.label === choice) + if (button != null) { + button.callback() } }, () => {}) } -export function promptUserErrorMessage (message: string, buttonText: string, callback: Function): void { +export function promptUserErrorMessage (message: string, buttons: PromptButton[] = []): void { window.showErrorMessage( message, - buttonText + ...buttons.map((button) => button.label) + ).then((choice) => { + const button = buttons.find((button) => button.label === choice) + if (button != null) { + button.callback() + } + }, () => {}) +} + +export function promptUserWarningMessage (message: string, buttons: PromptButton[] = []): void { + window.showWarningMessage( + message, + ...buttons.map((button) => button.label) ).then((choice) => { - if (choice === buttonText) { - callback() + const button = buttons.find((button) => button.label === choice) + if (button != null) { + button.callback() } }, () => {}) } diff --git a/extension/test/integration/2 - commands.test.ts b/extension/test/integration/2 - commands.test.ts index 6fb426ce..e87c5a4f 100644 --- a/extension/test/integration/2 - commands.test.ts +++ b/extension/test/integration/2 - commands.test.ts @@ -1,26 +1,35 @@ -import { getMockSettings } from '../mock/mockSettings' -import { Settings } from '../../src/settings/settings' import { MaxTimeout } from '../globals' import { before, after } from 'mocha' import * as assert from 'assert' -import { ext, testActivate } from '../../src/main' import * as commands from '../../src/commands/command-constants' +import { CommandController } from '../../src/commands/command-controller' +import { DependencyInstaller } from '../../src/dependency-installer/dependency-installer' +import * as sinon from 'sinon' suite('Extension Commands', () => { - let settings: Settings + let checkDependenciesStub: sinon.SinonStub + let mockDependencyInstaller: DependencyInstaller + let commandController: CommandController before(async function () { this.timeout(MaxTimeout) - settings = getMockSettings() - await testActivate(settings) + + // Initialize the command controller & mock dependencies + checkDependenciesStub = sinon.stub() + mockDependencyInstaller = { + checkDependencies: checkDependenciesStub + } as any + commandController = new CommandController(mockDependencyInstaller) }) after(async function () { this.timeout(MaxTimeout) - await ext?.deactivate() }) test('Command: Check Dependencies', async () => { - assert.strictEqual(await ext?.executeCommand(commands.CHECK_DEPENDENCIES), true) + assert.ok(commandController.executeCommand(commands.CHECK_DEPENDENCIES)) + + // Check that the dependency installer was called to check dependencies + assert.ok(checkDependenciesStub.calledOnce) }).timeout(MaxTimeout) }) diff --git a/foo.cdc b/foo.cdc deleted file mode 100644 index e69de29b..00000000 From 2ada2a015842365acc61ce2a2ef9bb81a41bbbe1 Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:13:22 -0800 Subject: [PATCH 03/97] Update notifications.json (#530) --- .metadata/notifications.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.metadata/notifications.json b/.metadata/notifications.json index 093d3023..6cb767a0 100644 --- a/.metadata/notifications.json +++ b/.metadata/notifications.json @@ -7,9 +7,9 @@ "buttons": [ { "label": "Learn More", - "link": "https://cadence-lang.org/docs/cadence-migration-guide" + "link": "https://cadence-lang.org/docs/cadence_migration_guide" } ], "suppressable": false } -] \ No newline at end of file +] From bf05b0c8a3c2998c9605b4efc636a17dba01f649 Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:13:35 -0800 Subject: [PATCH 04/97] Bump version (#531) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97722071..df515119 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.2.0", + "version": "2.2.1", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From 12d7f140c9263647361173800cfcbb6036c39869 Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:22:37 -0800 Subject: [PATCH 05/97] Revert @types/vscode version (#532) Co-authored-by: Jordan Ribbink --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6badc346..5624dfcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.2.0", + "version": "2.2.1", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", @@ -39,7 +39,7 @@ "@types/semver": "^7.5.6", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", - "@types/vscode": "^1.86.0", + "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.0.3", "esbuild": "^0.20.0", diff --git a/package.json b/package.json index df515119..3c20b56a 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/semver": "^7.5.6", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", - "@types/vscode": "^1.86.0", + "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.0.3", "esbuild": "^0.20.0", From b1fb95c886e341a781063415dcfdd5d580dbb018 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:22:55 -0800 Subject: [PATCH 06/97] Bump semver and @types/semver (#535) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5624dfcc..478f1202 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "object-hash": "^3.0.0", "os-name": "^6.0.0", "rxjs": "^7.8.1", - "semver": "^7.5.4", + "semver": "^7.6.0", "sleep-synchronously": "^2.0.0", "uuid": "^9.0.1", "vscode-languageclient": "^9.0.1" @@ -36,7 +36,7 @@ "@types/mocha": "^10.0.6", "@types/node": "^20.11.16", "@types/object-hash": "^3.0.6", - "@types/semver": "^7.5.6", + "@types/semver": "^7.5.7", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", @@ -1444,9 +1444,9 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", + "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==", "dev": true }, "node_modules/@types/sinon": { @@ -7825,9 +7825,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dependencies": { "lru-cache": "^6.0.0" }, diff --git a/package.json b/package.json index 3c20b56a..768762c5 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/mocha": "^10.0.6", "@types/node": "^20.11.16", "@types/object-hash": "^3.0.6", - "@types/semver": "^7.5.6", + "@types/semver": "^7.5.7", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", @@ -221,7 +221,7 @@ "object-hash": "^3.0.0", "os-name": "^6.0.0", "rxjs": "^7.8.1", - "semver": "^7.5.4", + "semver": "^7.6.0", "sleep-synchronously": "^2.0.0", "uuid": "^9.0.1", "vscode-languageclient": "^9.0.1" From 5421537838cd70cf96f1f68bd86e98c1d5833f4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:23:15 -0800 Subject: [PATCH 07/97] Bump chai from 5.0.3 to 5.1.0 (#540) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 478f1202..9323560c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", - "chai": "^5.0.3", + "chai": "^5.1.0", "esbuild": "^0.20.0", "glob": "^10.3.10", "mkdirp": "^3.0.1", @@ -2293,9 +2293,9 @@ } }, "node_modules/chai": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.0.3.tgz", - "integrity": "sha512-wKGCtYv2kVY5WEjKqQ3fSIZWtTFveZCtzinhTZbx3/trVkxefiwovhpU9kRVCwxvKKCEjTWXPdM1/T7zPoDgow==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.0.tgz", + "integrity": "sha512-kDZ7MZyM6Q1DhR9jy7dalKohXQ2yrlXkk59CR52aRKxJrobmlBNqnFQxX9xOX8w+4mz8SYlKJa/7D7ddltFXCw==", "dev": true, "dependencies": { "assertion-error": "^2.0.1", diff --git a/package.json b/package.json index 768762c5..ef37927a 100644 --- a/package.json +++ b/package.json @@ -192,7 +192,7 @@ "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", - "chai": "^5.0.3", + "chai": "^5.1.0", "esbuild": "^0.20.0", "glob": "^10.3.10", "mkdirp": "^3.0.1", From 154204528501acc7b5a15f1426d3f8f763423969 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:23:27 -0800 Subject: [PATCH 08/97] Bump @sentry/node from 7.99.0 to 7.101.1 (#539) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9323560c..0784cad9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.99.0", + "@sentry/node": "^7.101.1", "@vscode/vsce": "^2.23.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1202,58 +1202,58 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.99.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.99.0.tgz", - "integrity": "sha512-z3JQhHjoM1KdM20qrHwRClKJrNLr2CcKtCluq7xevLtXHJWNAQQbafnWD+Aoj85EWXBzKt9yJMv2ltcXJ+at+w==", + "version": "7.101.1", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.101.1.tgz", + "integrity": "sha512-ihjWG8x4x0ozx6t+EHoXLKbsPrgzYLCpeBLWyS+M6n3hn6cmHM76c8nZw3ldhUQi5UYL3LFC/JZ50b4oSxtlrg==", "dependencies": { - "@sentry/core": "7.99.0", - "@sentry/types": "7.99.0", - "@sentry/utils": "7.99.0" + "@sentry/core": "7.101.1", + "@sentry/types": "7.101.1", + "@sentry/utils": "7.101.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.99.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.99.0.tgz", - "integrity": "sha512-vOAtzcAXEUtS/oW7wi3wMkZ3hsb5Ch96gKyrrj/mXdOp2zrcwdNV6N9/pawq2E9P/7Pw8AXw4CeDZztZrjQLuA==", + "version": "7.101.1", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.101.1.tgz", + "integrity": "sha512-XSmXXeYT1d4O14eDF3OXPJFUgaN2qYEeIGUztqPX9nBs9/ij8y/kZOayFqlIMnfGvjOUM+63sy/2xDBOpFn6ug==", "dependencies": { - "@sentry/types": "7.99.0", - "@sentry/utils": "7.99.0" + "@sentry/types": "7.101.1", + "@sentry/utils": "7.101.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.99.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.99.0.tgz", - "integrity": "sha512-34wYtLddnPcQ8qvKq62AfxowaMFw+GMUZGv7fIs9FxeBqqqn6Ckl0gFCTADudIIBQ3rSbmN7sHJIXdyiQv+pcw==", + "version": "7.101.1", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.101.1.tgz", + "integrity": "sha512-iXSxUT6Zbt/KUY0+fRcW5II6Tgp2zdTfhBW+fQuDt/UUZt7Ypvb+6n4U2oom3LJfttmD7mdjQuT4+vsNImDjTQ==", "dependencies": { - "@sentry-internal/tracing": "7.99.0", - "@sentry/core": "7.99.0", - "@sentry/types": "7.99.0", - "@sentry/utils": "7.99.0" + "@sentry-internal/tracing": "7.101.1", + "@sentry/core": "7.101.1", + "@sentry/types": "7.101.1", + "@sentry/utils": "7.101.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.99.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.99.0.tgz", - "integrity": "sha512-94qwOw4w40sAs5mCmzcGyj8ZUu/KhnWnuMZARRq96k+SjRW/tHFAOlIdnFSrt3BLPvSOK7R3bVAskZQ0N4FTmA==", + "version": "7.101.1", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.101.1.tgz", + "integrity": "sha512-bwtkQvrCZ6JGc7vqX7TEAKBgkbQFORt84FFS3JQQb8G3efTt9fZd2ReY4buteKQdlALl8h1QWVngTLmI+kyUuw==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.99.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.99.0.tgz", - "integrity": "sha512-cYZy5WNTkWs5GgggGnjfGqC44CWir0pAv4GVVSx0fsup4D4pMKBJPrtub15f9uC+QkUf3vVkqwpBqeFxtmJQTQ==", + "version": "7.101.1", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.101.1.tgz", + "integrity": "sha512-Nrg0nrEI3nrOCd9SLJ/WGzxS5KMQE4cryLOvrDcHJRWpsSyGBF1hLLerk84Nsw/0myMsn7zTYU+xoq7idNsX5A==", "dependencies": { - "@sentry/types": "7.99.0" + "@sentry/types": "7.101.1" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index ef37927a..6e353da0 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.99.0", + "@sentry/node": "^7.101.1", "@vscode/vsce": "^2.23.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From dc53d6bacee1a0d078af8c790d61e265a5f61198 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:23:52 -0800 Subject: [PATCH 09/97] Bump mocha from 10.2.0 to 10.3.0 (#536) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 62 +++++++++-------------------------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0784cad9..7586d07d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "esbuild": "^0.20.0", "glob": "^10.3.10", "mkdirp": "^3.0.1", - "mocha": "^10.2.0", + "mocha": "^10.3.0", "nyc": "^15.1.0", "ovsx": "^0.8.3", "rimraf": "^5.0.5", @@ -6217,9 +6217,9 @@ "optional": true }, "node_modules/mocha": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", - "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz", + "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==", "dev": true, "dependencies": { "ansi-colors": "4.1.1", @@ -6229,13 +6229,12 @@ "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.2.0", + "glob": "8.1.0", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", "minimatch": "5.0.1", "ms": "2.1.3", - "nanoid": "3.3.3", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", @@ -6250,10 +6249,6 @@ }, "engines": { "node": ">= 14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" } }, "node_modules/mocha/node_modules/argparse": { @@ -6293,47 +6288,24 @@ } }, "node_modules/mocha/node_modules/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { - "node": "*" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/mocha/node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/mocha/node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/mocha/node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -6410,18 +6382,6 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, - "node_modules/nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/napi-build-utils": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", diff --git a/package.json b/package.json index 6e353da0..960b0c9d 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "esbuild": "^0.20.0", "glob": "^10.3.10", "mkdirp": "^3.0.1", - "mocha": "^10.2.0", + "mocha": "^10.3.0", "nyc": "^15.1.0", "ovsx": "^0.8.3", "rimraf": "^5.0.5", From d466da277f06061c145cae0f46deaf1ecbd8232c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:24:04 -0800 Subject: [PATCH 10/97] Bump @types/node from 20.11.16 to 20.11.19 (#541) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7586d07d..94fff776 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.14.202", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.16", + "@types/node": "^20.11.19", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.7", "@types/sinon": "^17.0.3", @@ -1429,9 +1429,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.16", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz", - "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==", + "version": "20.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", + "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index 960b0c9d..03ae95e8 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "@types/lodash": "^4.14.202", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.16", + "@types/node": "^20.11.19", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.7", "@types/sinon": "^17.0.3", From e70d382fae4ce04c63dc6aa96e75ba8f62352961 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Fri, 1 Mar 2024 10:21:16 -0800 Subject: [PATCH 11/97] Update logo (#548) --- images/file-logo.png | Bin 6080 -> 0 bytes images/icon.png | Bin 99323 -> 26575 bytes package.json | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 images/file-logo.png mode change 100644 => 100755 images/icon.png diff --git a/images/file-logo.png b/images/file-logo.png deleted file mode 100644 index 2ca898185ad86916ab555abc3ccf2fe432df0734..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6080 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 diff --git a/images/icon.png b/images/icon.png old mode 100644 new mode 100755 index 8e873fa7d06c81b06060e1f8fc362258d2a08b22..1cb427d60220f298a30d4009f565c2915e860132 GIT binary patch literal 26575 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 bQu9M#e}6RJd5fK<*uq?#<~bg-XJ-5lp>}OV literal 99323 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⪻#TZa^S?E-0fV)@x`~Fyec}pn7lJWWLx-0J^mH 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 Date: Mon, 11 Mar 2024 15:20:59 -0700 Subject: [PATCH 12/97] Bump @types/node from 20.11.19 to 20.11.25 (#553) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 94fff776..97289feb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.14.202", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.19", + "@types/node": "^20.11.25", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.7", "@types/sinon": "^17.0.3", @@ -1429,9 +1429,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", - "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", + "version": "20.11.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.25.tgz", + "integrity": "sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index 4a4c2cfd..a471f6d4 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "@types/lodash": "^4.14.202", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.19", + "@types/node": "^20.11.25", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.7", "@types/sinon": "^17.0.3", From 7275525a08a8b0fd65af776910a1e3bb7287b10a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:21:13 -0700 Subject: [PATCH 13/97] Bump actions/add-to-project from 0.5.0 to 0.6.0 (#550) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-issues-to-devx-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-issues-to-devx-project.yml b/.github/workflows/add-issues-to-devx-project.yml index ea2b8e0c..4413cee8 100644 --- a/.github/workflows/add-issues-to-devx-project.yml +++ b/.github/workflows/add-issues-to-devx-project.yml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.5.0 + - uses: actions/add-to-project@v0.6.0 with: project-url: https://github.com/orgs/onflow/projects/13 github-token: ${{ secrets.GH_ACTION_FOR_PROJECTS }} From 15f38b2686cb83575d2b375cc1682bb1eadf3188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:21:24 -0700 Subject: [PATCH 14/97] Bump @sentry/node from 7.101.1 to 7.106.0 (#552) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97289feb..e7d69cf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.101.1", + "@sentry/node": "^7.106.0", "@vscode/vsce": "^2.23.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1202,58 +1202,58 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.101.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.101.1.tgz", - "integrity": "sha512-ihjWG8x4x0ozx6t+EHoXLKbsPrgzYLCpeBLWyS+M6n3hn6cmHM76c8nZw3ldhUQi5UYL3LFC/JZ50b4oSxtlrg==", + "version": "7.106.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.106.0.tgz", + "integrity": "sha512-O8Es6Sa/tP80nfl+8soNfWzeRNFcT484SvjLR8BS3pHM9KDAlwNXyoQhFr2BKNYL1irbq6UF6eku4xCnUKVmqA==", "dependencies": { - "@sentry/core": "7.101.1", - "@sentry/types": "7.101.1", - "@sentry/utils": "7.101.1" + "@sentry/core": "7.106.0", + "@sentry/types": "7.106.0", + "@sentry/utils": "7.106.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.101.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.101.1.tgz", - "integrity": "sha512-XSmXXeYT1d4O14eDF3OXPJFUgaN2qYEeIGUztqPX9nBs9/ij8y/kZOayFqlIMnfGvjOUM+63sy/2xDBOpFn6ug==", + "version": "7.106.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.106.0.tgz", + "integrity": "sha512-Dc13XtnyFaXup2E4vCbzuG0QKAVjrJBk4qfGwvSJaTuopEaEWBs2MpK6hRzFhsz9S3T0La7c1F/62NptvTUWsQ==", "dependencies": { - "@sentry/types": "7.101.1", - "@sentry/utils": "7.101.1" + "@sentry/types": "7.106.0", + "@sentry/utils": "7.106.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.101.1", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.101.1.tgz", - "integrity": "sha512-iXSxUT6Zbt/KUY0+fRcW5II6Tgp2zdTfhBW+fQuDt/UUZt7Ypvb+6n4U2oom3LJfttmD7mdjQuT4+vsNImDjTQ==", + "version": "7.106.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.106.0.tgz", + "integrity": "sha512-4DIqbu5K7//lK/k2nV8lqKeGQzhu2T1OpJFmiUrjN6fUKWivGFjZrcmQDS7tvhAAyJezkL3LlrNU4tjPHUElPA==", "dependencies": { - "@sentry-internal/tracing": "7.101.1", - "@sentry/core": "7.101.1", - "@sentry/types": "7.101.1", - "@sentry/utils": "7.101.1" + "@sentry-internal/tracing": "7.106.0", + "@sentry/core": "7.106.0", + "@sentry/types": "7.106.0", + "@sentry/utils": "7.106.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.101.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.101.1.tgz", - "integrity": "sha512-bwtkQvrCZ6JGc7vqX7TEAKBgkbQFORt84FFS3JQQb8G3efTt9fZd2ReY4buteKQdlALl8h1QWVngTLmI+kyUuw==", + "version": "7.106.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.106.0.tgz", + "integrity": "sha512-oKTkDaL6P9xJC5/zHLRemHTWboUqRYjkJNaZCN63j4kJqGy56wee4vDtDese/NWWn4U4C1QV1h+Mifm2HmDcQg==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.101.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.101.1.tgz", - "integrity": "sha512-Nrg0nrEI3nrOCd9SLJ/WGzxS5KMQE4cryLOvrDcHJRWpsSyGBF1hLLerk84Nsw/0myMsn7zTYU+xoq7idNsX5A==", + "version": "7.106.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.106.0.tgz", + "integrity": "sha512-bVsePsXLpFu/1sH4rpJrPcnVxW2fXXfGfGxKs6Bm+dkOMbuVTlk/KAzIbdjCDIpVlrMDJmMNEv5xgTFjgWDkjw==", "dependencies": { - "@sentry/types": "7.101.1" + "@sentry/types": "7.106.0" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index a471f6d4..b968562c 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.101.1", + "@sentry/node": "^7.106.0", "@vscode/vsce": "^2.23.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From f8c1b37c015fd18f16af41f7ce4f4f9f380e1b38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:21:35 -0700 Subject: [PATCH 15/97] Bump @types/chai from 4.3.11 to 4.3.12 (#545) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e7d69cf4..79396b33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@types/chai": "^4.3.11", + "@types/chai": "^4.3.12", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.14.202", @@ -1343,9 +1343,9 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.11", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.11.tgz", - "integrity": "sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ==", + "version": "4.3.12", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.12.tgz", + "integrity": "sha512-zNKDHG/1yxm8Il6uCCVsm+dRdEsJlFoDu73X17y09bId6UwoYww+vFBsAcRzl8knM1sab3Dp1VRikFQwDOtDDw==", "dev": true }, "node_modules/@types/expect": { diff --git a/package.json b/package.json index b968562c..f023d5de 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ ] }, "devDependencies": { - "@types/chai": "^4.3.11", + "@types/chai": "^4.3.12", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.14.202", From 2213085cba1e96b67b6ca539e03496ba18ae423b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:22:10 -0700 Subject: [PATCH 16/97] Bump @vscode/vsce from 2.23.0 to 2.24.0 (#546) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 23 ++++++++++------------- package.json | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79396b33..31594d39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^7.106.0", - "@vscode/vsce": "^2.23.0", + "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", @@ -1700,15 +1700,14 @@ } }, "node_modules/@vscode/vsce": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.23.0.tgz", - "integrity": "sha512-Wf9yN8feZf4XmUW/erXyKQvCL577u72AQv4AI4Cwt5o5NyE49C5mpfw3pN78BJYYG3qnSIxwRo7JPvEurkQuNA==", + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.24.0.tgz", + "integrity": "sha512-p6CIXpH5HXDqmUkgFXvIKTjZpZxy/uDx4d/UsfhS9vQUun43KDNUbYeZocyAHgqcJlPEurgArHz9te1PPiqPyA==", "dependencies": { "azure-devops-node-api": "^11.0.1", "chalk": "^2.4.2", "cheerio": "^1.0.0-rc.9", "commander": "^6.2.1", - "find-yarn-workspace-root": "^2.0.0", "glob": "^7.0.6", "hosted-git-info": "^4.0.2", "jsonc-parser": "^3.2.0", @@ -2149,6 +2148,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -3893,6 +3893,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3933,14 +3934,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/find-yarn-workspace-root": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz", - "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==", - "dependencies": { - "micromatch": "^4.0.2" - } - }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -4923,6 +4916,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -6110,6 +6104,7 @@ "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -7219,6 +7214,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -8557,6 +8553,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, diff --git a/package.json b/package.json index f023d5de..d0f41781 100644 --- a/package.json +++ b/package.json @@ -210,7 +210,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^7.106.0", - "@vscode/vsce": "^2.23.0", + "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", From 2ce921581a804fa32317b829c54c1c0fd904975a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:22:21 -0700 Subject: [PATCH 17/97] Bump @types/semver from 7.5.7 to 7.5.8 (#544) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31594d39..84337864 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@types/mocha": "^10.0.6", "@types/node": "^20.11.25", "@types/object-hash": "^3.0.6", - "@types/semver": "^7.5.7", + "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", @@ -1444,9 +1444,9 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", - "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/sinon": { diff --git a/package.json b/package.json index d0f41781..2c424c77 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/mocha": "^10.0.6", "@types/node": "^20.11.25", "@types/object-hash": "^3.0.6", - "@types/semver": "^7.5.7", + "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", From 55d38a8aa5676246cf56e75a0729ad8b179b4947 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:19:55 -0700 Subject: [PATCH 18/97] Bump @types/node from 20.11.25 to 20.11.28 (#557) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 84337864..6e57978f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.14.202", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.25", + "@types/node": "^20.11.28", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", @@ -1429,9 +1429,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.25.tgz", - "integrity": "sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==", + "version": "20.11.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.28.tgz", + "integrity": "sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index 2c424c77..b5d4043a 100644 --- a/package.json +++ b/package.json @@ -185,7 +185,7 @@ "@types/lodash": "^4.14.202", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.25", + "@types/node": "^20.11.28", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", From a851b26243d97d28153200cadd811a06f9524146 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:20:08 -0700 Subject: [PATCH 19/97] Bump follow-redirects from 1.15.4 to 1.15.6 (#555) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e57978f..ef5e29e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3998,9 +3998,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { From a57c1966d39007b33c2ec78486316d155cf04a5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:20:23 -0700 Subject: [PATCH 20/97] Bump @sentry/node from 7.106.0 to 7.107.0 (#556) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef5e29e5..ef1a9b34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.106.0", + "@sentry/node": "^7.107.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1202,58 +1202,58 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.106.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.106.0.tgz", - "integrity": "sha512-O8Es6Sa/tP80nfl+8soNfWzeRNFcT484SvjLR8BS3pHM9KDAlwNXyoQhFr2BKNYL1irbq6UF6eku4xCnUKVmqA==", + "version": "7.107.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.107.0.tgz", + "integrity": "sha512-le9wM8+OHBbq7m/8P7JUJ1UhSPIty+Z/HmRXc5Z64ODZcOwFV6TmDpYx729IXDdz36XUKmeI+BeM7yQdTTZPfQ==", "dependencies": { - "@sentry/core": "7.106.0", - "@sentry/types": "7.106.0", - "@sentry/utils": "7.106.0" + "@sentry/core": "7.107.0", + "@sentry/types": "7.107.0", + "@sentry/utils": "7.107.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.106.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.106.0.tgz", - "integrity": "sha512-Dc13XtnyFaXup2E4vCbzuG0QKAVjrJBk4qfGwvSJaTuopEaEWBs2MpK6hRzFhsz9S3T0La7c1F/62NptvTUWsQ==", + "version": "7.107.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.107.0.tgz", + "integrity": "sha512-C7ogye6+KPyBi8NVL0P8Rxx3Ur7Td8ufnjxosVy678lqY+dcYPk/HONROrzUFYW5fMKWL4/KYnwP+x9uHnkDmw==", "dependencies": { - "@sentry/types": "7.106.0", - "@sentry/utils": "7.106.0" + "@sentry/types": "7.107.0", + "@sentry/utils": "7.107.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.106.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.106.0.tgz", - "integrity": "sha512-4DIqbu5K7//lK/k2nV8lqKeGQzhu2T1OpJFmiUrjN6fUKWivGFjZrcmQDS7tvhAAyJezkL3LlrNU4tjPHUElPA==", + "version": "7.107.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.107.0.tgz", + "integrity": "sha512-UZXkG7uThT2YyPW8AOSKRXp1LbVcBHufa4r1XAwBukA2FKO6HHJPjMUgY6DYVQ6k+BmA56CNfVjYrdLbyjBYYA==", "dependencies": { - "@sentry-internal/tracing": "7.106.0", - "@sentry/core": "7.106.0", - "@sentry/types": "7.106.0", - "@sentry/utils": "7.106.0" + "@sentry-internal/tracing": "7.107.0", + "@sentry/core": "7.107.0", + "@sentry/types": "7.107.0", + "@sentry/utils": "7.107.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.106.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.106.0.tgz", - "integrity": "sha512-oKTkDaL6P9xJC5/zHLRemHTWboUqRYjkJNaZCN63j4kJqGy56wee4vDtDese/NWWn4U4C1QV1h+Mifm2HmDcQg==", + "version": "7.107.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.107.0.tgz", + "integrity": "sha512-H7qcPjPSUWHE/Zf5bR1EE24G0pGVuJgrSx8Tvvl5nKEepswMYlbXHRVSDN0gTk/E5Z7cqf+hUBOpkQgZyps77w==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.106.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.106.0.tgz", - "integrity": "sha512-bVsePsXLpFu/1sH4rpJrPcnVxW2fXXfGfGxKs6Bm+dkOMbuVTlk/KAzIbdjCDIpVlrMDJmMNEv5xgTFjgWDkjw==", + "version": "7.107.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.107.0.tgz", + "integrity": "sha512-C6PbN5gHh73MRHohnReeQ60N8rrLYa9LciHue3Ru2290eSThg4CzsPnx4SzkGpkSeVlhhptKtKZ+hp/ha3iVuw==", "dependencies": { - "@sentry/types": "7.106.0" + "@sentry/types": "7.107.0" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index b5d4043a..38583cbc 100644 --- a/package.json +++ b/package.json @@ -209,7 +209,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.106.0", + "@sentry/node": "^7.107.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 0a55ede48f8ec784e77c6244b68b89c4c9967509 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:21:04 -0700 Subject: [PATCH 21/97] Bump @types/lodash from 4.14.202 to 4.17.0 (#559) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef1a9b34..fb963144 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/chai": "^4.3.12", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.14.202", + "@types/lodash": "^4.17.0", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", "@types/node": "^20.11.28", @@ -1405,9 +1405,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.14.202", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz", - "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", + "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==", "dev": true }, "node_modules/@types/minimatch": { diff --git a/package.json b/package.json index 38583cbc..0b62f4ac 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "@types/chai": "^4.3.12", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.14.202", + "@types/lodash": "^4.17.0", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", "@types/node": "^20.11.28", From 1ac5a1f0409b2035a4c3ced186469438cf221d44 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Fri, 22 Mar 2024 07:38:46 -0700 Subject: [PATCH 22/97] Add CLI version switching (#560) --- .../dependency-installer.ts | 11 +- .../src/dependency-installer/installer.ts | 4 +- .../installers/flow-cli-installer.ts | 10 +- extension/src/extension.ts | 22 +- extension/src/flow-cli/cli-provider.ts | 156 ++++++++ .../src/flow-cli/cli-selection-provider.ts | 155 ++++++++ .../src/flow-cli/flow-version-provider.ts | 57 --- extension/src/json-schema-provider.ts | 114 +++--- extension/src/server/language-server.ts | 82 ++-- extension/src/settings/settings.ts | 32 +- extension/src/test-provider/test-resolver.ts | 3 - .../test/integration/0 - dependencies.test.ts | 12 +- .../integration/1 - language-server.test.ts | 25 +- extension/test/integration/3 - schema.test.ts | 44 ++- extension/test/mock/mockSettings.ts | 13 +- extension/test/unit/parser.test.ts | 2 +- package-lock.json | 370 +----------------- package.json | 5 + 18 files changed, 539 insertions(+), 578 deletions(-) create mode 100644 extension/src/flow-cli/cli-provider.ts create mode 100644 extension/src/flow-cli/cli-selection-provider.ts delete mode 100644 extension/src/flow-cli/flow-version-provider.ts diff --git a/extension/src/dependency-installer/dependency-installer.ts b/extension/src/dependency-installer/dependency-installer.ts index 6c154061..525e640d 100644 --- a/extension/src/dependency-installer/dependency-installer.ts +++ b/extension/src/dependency-installer/dependency-installer.ts @@ -4,7 +4,7 @@ import { Installer, InstallerConstructor, InstallerContext, InstallError } from import { promptUserErrorMessage } from '../ui/prompts' import { StateCache } from '../utils/state-cache' import { LanguageServerAPI } from '../server/language-server' -import { FlowVersionProvider } from '../flow-cli/flow-version-provider' +import { CliProvider } from '../flow-cli/cli-provider' const INSTALLERS: InstallerConstructor[] = [ InstallFlowCLI @@ -15,12 +15,14 @@ export class DependencyInstaller { missingDependencies: StateCache #installerContext: InstallerContext - constructor (languageServerApi: LanguageServerAPI, flowVersionProvider: FlowVersionProvider) { + constructor (languageServerApi: LanguageServerAPI, cliProvider: CliProvider) { this.#installerContext = { refreshDependencies: this.checkDependencies.bind(this), languageServerApi, - flowVersionProvider + cliProvider } + + // Register installers this.#registerInstallers() // Create state cache for missing dependencies @@ -54,7 +56,8 @@ export class DependencyInstaller { async checkDependencies (): Promise { // Invalidate and wait for state to update // This will trigger the missingDependencies subscriptions - await this.missingDependencies.getValue(true) + this.missingDependencies.invalidate() + await this.missingDependencies.getValue() } async installMissing (): Promise { diff --git a/extension/src/dependency-installer/installer.ts b/extension/src/dependency-installer/installer.ts index 0a7d20f5..15444d26 100644 --- a/extension/src/dependency-installer/installer.ts +++ b/extension/src/dependency-installer/installer.ts @@ -2,7 +2,7 @@ import { window } from 'vscode' import { envVars } from '../utils/shell/env-vars' import { LanguageServerAPI } from '../server/language-server' -import { FlowVersionProvider } from '../flow-cli/flow-version-provider' +import { CliProvider } from '../flow-cli/cli-provider' // InstallError is thrown if install fails export class InstallError extends Error {} @@ -10,7 +10,7 @@ export class InstallError extends Error {} export interface InstallerContext { refreshDependencies: () => Promise languageServerApi: LanguageServerAPI - flowVersionProvider: FlowVersionProvider + cliProvider: CliProvider } export type InstallerConstructor = new (context: InstallerContext) => Installer diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts index 79ae0045..32d4c951 100644 --- a/extension/src/dependency-installer/installers/flow-cli-installer.ts +++ b/extension/src/dependency-installer/installers/flow-cli-installer.ts @@ -99,9 +99,9 @@ export class InstallFlowCLI extends Installer { async checkVersion (vsn?: semver.SemVer): Promise { // Get user's version informaton - this.#context.flowVersionProvider.refresh() - const version = vsn ?? await this.#context.flowVersionProvider.getVersion() - if (version === null) return false + this.#context.cliProvider.refresh() + const version = vsn ?? await this.#context.cliProvider.getAvailableBinaries().then(x => x.find(y => y.name === 'flow')?.version) + if (version == null) return false if (!semver.satisfies(version, COMPATIBLE_FLOW_CLI_VERSIONS, { includePrerelease: true @@ -127,8 +127,8 @@ export class InstallFlowCLI extends Installer { async verifyInstall (): Promise { // Check if flow version is valid to verify install - this.#context.flowVersionProvider.refresh() - const version = await this.#context.flowVersionProvider.getVersion() + this.#context.cliProvider.refresh() + const version = await this.#context.cliProvider.getAvailableBinaries().then(x => x.find(y => y.name === 'flow')?.version) if (version == null) return false // Check flow-cli version number diff --git a/extension/src/extension.ts b/extension/src/extension.ts index 527c494f..cf48d280 100644 --- a/extension/src/extension.ts +++ b/extension/src/extension.ts @@ -4,7 +4,7 @@ import { CommandController } from './commands/command-controller' import { ExtensionContext } from 'vscode' import { DependencyInstaller } from './dependency-installer/dependency-installer' import { Settings } from './settings/settings' -import { FlowVersionProvider } from './flow-cli/flow-version-provider' +import { CliProvider } from './flow-cli/cli-provider' import { JSONSchemaProvider } from './json-schema-provider' import { LanguageServerAPI } from './server/language-server' import { FlowConfig } from './server/flow-config' @@ -12,6 +12,7 @@ import { TestProvider } from './test-provider/test-provider' import { StorageProvider } from './storage/storage-provider' import * as path from 'path' import { NotificationProvider } from './ui/notification-provider' +import { CliSelectionProvider } from './flow-cli/cli-selection-provider' // The container for all data relevant to the extension. export class Extension { @@ -30,6 +31,8 @@ export class Extension { #dependencyInstaller: DependencyInstaller #commands: CommandController #testProvider: TestProvider + #schemaProvider: JSONSchemaProvider + #cliSelectionProvider: CliSelectionProvider private constructor (settings: Settings, ctx: ExtensionContext) { this.ctx = ctx @@ -41,24 +44,27 @@ export class Extension { const notificationProvider = new NotificationProvider(storageProvider) notificationProvider.activate() - // Register Flow version provider - const flowVersionProvider = new FlowVersionProvider(settings) + // Register CliProvider + const cliProvider = new CliProvider(settings) + + // Register CliSelectionProvider + this.#cliSelectionProvider = new CliSelectionProvider(cliProvider) // Register JSON schema provider - if (ctx != null) JSONSchemaProvider.register(ctx, flowVersionProvider.state$) + this.#schemaProvider = new JSONSchemaProvider(ctx.extensionPath, cliProvider) // Initialize Flow Config const flowConfig = new FlowConfig(settings) void flowConfig.activate() // Initialize Language Server - this.languageServer = new LanguageServerAPI(settings, flowConfig) + this.languageServer = new LanguageServerAPI(settings, cliProvider, flowConfig) // Check for any missing dependencies // The language server will start if all dependencies are installed // Otherwise, the language server will not start and will start after // the user installs the missing dependencies - this.#dependencyInstaller = new DependencyInstaller(this.languageServer, flowVersionProvider) + this.#dependencyInstaller = new DependencyInstaller(this.languageServer, cliProvider) this.#dependencyInstaller.missingDependencies.subscribe((missing) => { if (missing.length === 0) { void this.languageServer.activate() @@ -79,6 +85,8 @@ export class Extension { // Called on exit async deactivate (): Promise { await this.languageServer.deactivate() - this.#testProvider?.dispose() + this.#testProvider.dispose() + this.#schemaProvider.dispose() + this.#cliSelectionProvider.dispose() } } diff --git a/extension/src/flow-cli/cli-provider.ts b/extension/src/flow-cli/cli-provider.ts new file mode 100644 index 00000000..3cfe03cc --- /dev/null +++ b/extension/src/flow-cli/cli-provider.ts @@ -0,0 +1,156 @@ +import { BehaviorSubject, Observable, distinctUntilChanged, pairwise, startWith } from 'rxjs' +import { execDefault } from '../utils/shell/exec' +import { StateCache } from '../utils/state-cache' +import * as semver from 'semver' +import * as vscode from 'vscode' +import { Settings } from '../settings/settings' +import { isEqual } from 'lodash' + +const CHECK_FLOW_CLI_CMD = (flowCommand: string): string => `${flowCommand} version` +const KNOWN_BINS = ['flow', 'flow-c1'] + +const CADENCE_V1_CLI_REGEX = /-cadence-v1.0.0/g + +export interface CliBinary { + name: string + version: semver.SemVer +} + +interface AvailableBinariesCache { + [key: string]: StateCache +} + +export class CliProvider { + #selectedBinaryName: BehaviorSubject + #currentBinary$: StateCache + #availableBinaries: AvailableBinariesCache = {} + #availableBinaries$: StateCache + #settings: Settings + + constructor (settings: Settings) { + this.#settings = settings + + this.#selectedBinaryName = new BehaviorSubject(settings.getSettings().flowCommand) + this.#settings.watch$(config => config.flowCommand).subscribe((flowCommand) => { + this.#selectedBinaryName.next(flowCommand) + }) + + this.#availableBinaries = KNOWN_BINS.reduce((acc, bin) => { + acc[bin] = new StateCache(async () => await this.#fetchBinaryInformation(bin)) + acc[bin].subscribe(() => { + this.#availableBinaries$.invalidate() + }) + return acc + }, {}) + + this.#availableBinaries$ = new StateCache(async () => { + return await this.getAvailableBinaries() + }) + + this.#currentBinary$ = new StateCache(async () => { + const name: string = this.#selectedBinaryName.getValue() + return await this.#availableBinaries[name].getValue() + }) + + // Display warning to user if binary doesn't exist (only if not using the default binary) + this.#currentBinary$.subscribe((binary) => { + if (binary === null && this.#selectedBinaryName.getValue() !== 'flow') { + void vscode.window.showErrorMessage(`The configured Flow CLI binary "${this.#selectedBinaryName.getValue()}" does not exist. Please check your settings.`) + } + }) + + this.#watchForBinaryChanges() + } + + #watchForBinaryChanges (): void { + // Subscribe to changes in the selected binary to update the caches + this.#selectedBinaryName.pipe(distinctUntilChanged(), startWith(null), pairwise()).subscribe(([prev, curr]) => { + // Swap out the cache for the selected binary + if (prev != null && !KNOWN_BINS.includes(prev)) { + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete this.#availableBinaries[prev] + } + if (curr != null && !KNOWN_BINS.includes(curr)) { + this.#availableBinaries[curr] = new StateCache(async () => await this.#fetchBinaryInformation(curr)) + this.#availableBinaries[curr].subscribe(() => { + this.#availableBinaries$.invalidate() + }) + } + + // Invalidate the current binary cache + this.#currentBinary$.invalidate() + + // Invalidate the available binaries cache + this.#availableBinaries$.invalidate() + }) + } + + async #fetchBinaryInformation (bin: string): Promise { + try { + // Get user's version informaton + const buffer: string = (await execDefault(CHECK_FLOW_CLI_CMD( + bin + ))).stdout + + // Format version string from output + let versionStr: string | null = parseFlowCliVersion(buffer) + + versionStr = semver.clean(versionStr) + if (versionStr === null) return null + + // Ensure user has a compatible version number installed + const version: semver.SemVer | null = semver.parse(versionStr) + if (version === null) return null + + return { name: bin, version } + } catch { + return null + } + } + + refresh (): void { + for (const bin in this.#availableBinaries) { + this.#availableBinaries[bin].invalidate() + } + this.#currentBinary$.invalidate() + } + + get availableBinaries$ (): Observable { + return new Observable((subscriber) => { + this.#availableBinaries$.subscribe((binaries) => { + subscriber.next(binaries) + }) + }).pipe(distinctUntilChanged(isEqual)) + } + + async getAvailableBinaries (): Promise { + const bins: CliBinary[] = [] + for (const name in this.#availableBinaries) { + const binary = await this.#availableBinaries[name].getValue().catch(() => null) + if (binary !== null) { + bins.push(binary) + } + } + return bins + } + + get currentBinary$ (): Observable { + return this.#currentBinary$.pipe(distinctUntilChanged(isEqual)) + } + + async getCurrentBinary (): Promise { + return await this.#currentBinary$.getValue() + } + + async setCurrentBinary (name: string): Promise { + await this.#settings.updateSettings({ flowCommand: name }) + } +} + +export function isCadenceV1Cli (version: semver.SemVer): boolean { + return CADENCE_V1_CLI_REGEX.test(version.raw) +} + +export function parseFlowCliVersion (buffer: Buffer | string): string { + return (buffer.toString().split('\n')[0]).split(' ')[1] +} diff --git a/extension/src/flow-cli/cli-selection-provider.ts b/extension/src/flow-cli/cli-selection-provider.ts new file mode 100644 index 00000000..53637926 --- /dev/null +++ b/extension/src/flow-cli/cli-selection-provider.ts @@ -0,0 +1,155 @@ +import { zip } from 'rxjs' +import { CliBinary, CliProvider } from './cli-provider' +import { SemVer } from 'semver' +import * as vscode from 'vscode' + +const CHANGE_CADENCE_VERSION = 'cadence.changeCadenceVersion' +const CADENCE_V1_CLI_REGEX = /-cadence-v1.0.0/g +// label with icon +const GET_BINARY_LABEL = (version: SemVer): string => `Flow CLI v${version.format()}` + +export class CliSelectionProvider { + #statusBarItem: vscode.StatusBarItem | undefined + #cliProvider: CliProvider + #showSelector: boolean = false + #versionSelector: vscode.QuickPick | undefined + #disposables: vscode.Disposable[] = [] + + constructor (cliProvider: CliProvider) { + this.#cliProvider = cliProvider + + // Register the command to toggle the version + this.#disposables.push(vscode.commands.registerCommand(CHANGE_CADENCE_VERSION, async () => { + this.#cliProvider.refresh() + await this.#toggleSelector(true) + })) + + // Register UI components + zip(this.#cliProvider.currentBinary$, this.#cliProvider.availableBinaries$).subscribe(() => { + void this.#refreshSelector() + }) + this.#cliProvider.currentBinary$.subscribe((binary) => { + this.#statusBarItem?.dispose() + this.#statusBarItem = this.#createStatusBarItem(binary?.version ?? null) + this.#statusBarItem.show() + }) + } + + #createStatusBarItem (version: SemVer | null): vscode.StatusBarItem { + const statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1) + statusBarItem.command = CHANGE_CADENCE_VERSION + statusBarItem.color = new vscode.ThemeColor('statusBar.foreground') + statusBarItem.tooltip = 'Click to change the Flow CLI version' + + if (version != null) { + statusBarItem.text = GET_BINARY_LABEL(version) + } else { + statusBarItem.text = '$(error) Flow CLI not found' + statusBarItem.color = new vscode.ThemeColor('errorForeground') + } + + return statusBarItem + } + + #createVersionSelector (currentBinary: CliBinary | null, availableBinaries: CliBinary[]): vscode.QuickPick { + const versionSelector = vscode.window.createQuickPick() + versionSelector.title = 'Select a Flow CLI version' + + // Update selected binary when the user selects a version + this.#disposables.push(versionSelector.onDidAccept(async () => { + if (versionSelector.selectedItems.length === 0) return + await this.#toggleSelector(false) + + const selected = versionSelector.selectedItems[0] + + if (selected instanceof CustomBinaryItem) { + void vscode.window.showOpenDialog({ + canSelectFiles: true, + canSelectFolders: false, + canSelectMany: false, + openLabel: 'Choose a Flow CLI binary' + }).then((uri) => { + if (uri != null) { + void this.#cliProvider.setCurrentBinary(uri[0].fsPath) + } + }) + } else if (selected instanceof AvailableBinaryItem) { + void this.#cliProvider.setCurrentBinary(selected.path) + } + })) + + // Update available versions + const items: Array = availableBinaries.map(binary => new AvailableBinaryItem(binary)) + items.push(new CustomBinaryItem()) + versionSelector.items = items + + // Select the current binary + if (currentBinary !== null) { + const currentBinaryItem = versionSelector.items.find(item => item instanceof AvailableBinaryItem && item.path === currentBinary.name) + if (currentBinaryItem != null) { + versionSelector.selectedItems = [currentBinaryItem] + } + } + + return versionSelector + } + + async #toggleSelector (show: boolean): Promise { + this.#showSelector = show + await this.#refreshSelector() + } + + async #refreshSelector (): Promise { + if (this.#showSelector) { + this.#versionSelector?.dispose() + const currentBinary = await this.#cliProvider.getCurrentBinary() + const availableBinaries = await this.#cliProvider.getAvailableBinaries() + this.#versionSelector = this.#createVersionSelector(currentBinary, availableBinaries) + this.#disposables.push(this.#versionSelector) + this.#versionSelector.show() + } else { + this.#versionSelector?.dispose() + } + } + + dispose (): void { + this.#disposables.forEach(disposable => disposable.dispose()) + this.#statusBarItem?.dispose() + this.#versionSelector?.dispose() + } +} + +class AvailableBinaryItem implements vscode.QuickPickItem { + detail?: string + picked?: boolean + alwaysShow?: boolean + #binary: CliBinary + + constructor (binary: CliBinary) { + this.#binary = binary + } + + get label (): string { + return GET_BINARY_LABEL(this.#binary.version) + } + + get description (): string { + return `(${this.#binary.name})` + } + + get path (): string { + return this.#binary.name + } +} + +class CustomBinaryItem implements vscode.QuickPickItem { + label: string + + constructor () { + this.label = 'Choose a custom version...' + } +} + +export function isCliCadenceV1 (version: SemVer): boolean { + return CADENCE_V1_CLI_REGEX.test(version.raw) +} diff --git a/extension/src/flow-cli/flow-version-provider.ts b/extension/src/flow-cli/flow-version-provider.ts deleted file mode 100644 index d3bf1bc0..00000000 --- a/extension/src/flow-cli/flow-version-provider.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { Settings } from '../settings/settings' -import { execDefault } from '../utils/shell/exec' -import { StateCache } from '../utils/state-cache' -import * as semver from 'semver' - -const CHECK_FLOW_CLI_CMD = (flowCommand: string): string => `${flowCommand} version` - -export class FlowVersionProvider { - #settings: Settings - #stateCache: StateCache - #parseCliVersion: (buffer: Buffer | string) => string - - constructor (settings: Settings, parseCliVersion: (buffer: Buffer | string) => string = parseFlowCliVersion) { - this.#stateCache = new StateCache(async () => await this.#fetchFlowVersion()) - this.#settings = settings - this.#parseCliVersion = parseCliVersion - } - - async #fetchFlowVersion (): Promise { - try { - // Get user's version informaton - const buffer: string = (await execDefault(CHECK_FLOW_CLI_CMD( - this.#settings.getSettings().flowCommand - ))).stdout - - // Format version string from output - let versionStr: string | null = this.#parseCliVersion(buffer) - - versionStr = semver.clean(versionStr) - if (versionStr === null) return null - - // Ensure user has a compatible version number installed - const version: semver.SemVer | null = semver.parse(versionStr) - if (version === null) return null - - return version - } catch { - return null - } - } - - refresh (): void { - this.#stateCache.invalidate() - } - - async getVersion (): Promise { - return await this.#stateCache.getValue() - } - - get state$ (): StateCache { - return this.#stateCache - } -} - -export function parseFlowCliVersion (buffer: Buffer | string): string { - return (buffer.toString().split('\n')[0]).split(' ')[1] -} diff --git a/extension/src/json-schema-provider.ts b/extension/src/json-schema-provider.ts index a8fdb0f5..a423f7a6 100644 --- a/extension/src/json-schema-provider.ts +++ b/extension/src/json-schema-provider.ts @@ -2,68 +2,67 @@ import * as vscode from 'vscode' import { readFile } from 'fs' import { promisify } from 'util' import { resolve } from 'path' -import { SemVer } from 'semver' import fetch from 'node-fetch' -import { StateCache } from './utils/state-cache' -import { Subscription } from 'rxjs' +import { CliProvider } from './flow-cli/cli-provider' -const GET_FLOW_SCHEMA_URL = (version: SemVer): string => `https://raw.githubusercontent.com/onflow/flow-cli/v${version.format()}/flowkit/schema.json` +const CADENCE_SCHEMA_URI = 'cadence-schema' +const GET_FLOW_SCHEMA_URL = (version: string): string => `https://raw.githubusercontent.com/onflow/flow-cli/v${version}/flowkit/schema.json` // This class provides the JSON schema for the flow.json file // It is accessible via the URI scheme "cadence-schema:///flow.json" export class JSONSchemaProvider implements vscode.FileSystemProvider, vscode.Disposable { - static CADENCE_SCHEMA_URI = 'cadence-schema' - static #instance: JSONSchemaProvider | null - #contentProviderDisposable: vscode.Disposable | undefined - #flowVersionSubscription: Subscription - #flowVersion: StateCache - #flowSchema: StateCache - #showLocalError: boolean = false - - static register (ctx: vscode.ExtensionContext, flowVersion: StateCache): void { - if (JSONSchemaProvider.#instance != null) { - JSONSchemaProvider.#instance.dispose() - } + #extensionPath: string + #cliProvider: CliProvider + #schemaCache: { [version: string]: Promise } = {} - // Create a provider for the cadence-schema URI scheme, this will be deactivated when the extension is deactivated - JSONSchemaProvider.#instance = new JSONSchemaProvider( - ctx, - flowVersion, - { dispose: () => contentProviderDisposable.dispose() } - ) - const contentProviderDisposable = vscode.workspace.registerFileSystemProvider( - JSONSchemaProvider.CADENCE_SCHEMA_URI, - JSONSchemaProvider.#instance - ) - ctx.subscriptions.push( - JSONSchemaProvider.#instance + constructor ( + extensionPath: string, + cliProvider: CliProvider + ) { + this.#extensionPath = extensionPath + this.#cliProvider = cliProvider + + // Register the schema provider + this.#contentProviderDisposable = vscode.workspace.registerFileSystemProvider( + CADENCE_SCHEMA_URI, + this ) } - private constructor ( - private readonly ctx: vscode.ExtensionContext, - flowVersion: StateCache, - contentProviderDisposable: vscode.Disposable - ) { - this.#flowVersion = flowVersion - this.#contentProviderDisposable = contentProviderDisposable - this.#flowSchema = new StateCache(async () => await this.#resolveFlowSchema()) + async #getFlowSchema (): Promise { + const cliBinary = await this.#cliProvider.getCurrentBinary() + if (cliBinary == null) { + void vscode.window.showWarningMessage('Cannot get flow-cli version, using local schema instead. Please install flow-cli to get the latest schema.') + return await this.getLocalSchema() + } - // Invalidate the schema when the flow-cli version changes - this.#flowVersionSubscription = this.#flowVersion.subscribe( - () => this.#flowSchema.invalidate() - ) + const version = cliBinary.version.format() + if (this.#schemaCache[version] == null) { + // Try to get schema from flow-cli repo based on the flow-cli version + this.#schemaCache[version] = fetch(GET_FLOW_SCHEMA_URL(version)).then(async (response: Response) => { + if (!response.ok) { + throw new Error(`Failed to fetch schema for flow-cli version ${version}`) + } + return await response.text() + }).catch(async () => { + void vscode.window.showWarningMessage('Failed to fetch flow.json schema from flow-cli repo, using local schema instead. Please update flow-cli to the latest version to get the latest schema.') + return await this.getLocalSchema() + }) + } + + return await this.#schemaCache[version] + } + + async getLocalSchema (): Promise { + const schemaUrl = resolve(this.#extensionPath, 'flow-schema.json') + return await promisify(readFile)(schemaUrl).then(x => x.toString()) } async readFile (uri: vscode.Uri): Promise { if (uri.path === '/flow.json') { - const schema = await this.#flowSchema.getValue() - if (this.#showLocalError) { - void vscode.window.showWarningMessage('Failed to fetch flow.json schema from flow-cli repo, using local schema instead. Please update flow-cli to the latest version to get the latest schema.') - this.#showLocalError = false - } - return Buffer.from(schema, 'utf-8') + const schema = await this.#getFlowSchema() + return Buffer.from(schema) } else { throw new Error('Unknown schema') } @@ -76,7 +75,7 @@ export class JSONSchemaProvider implements vscode.FileSystemProvider, vscode.Dis type: vscode.FileType.File, ctime: 0, mtime: 0, - size: await this.#flowSchema.getValue().then(x => x.length) + size: await this.#getFlowSchema().then(x => x.length) } } else { throw new Error('Unknown schema') @@ -87,27 +86,6 @@ export class JSONSchemaProvider implements vscode.FileSystemProvider, vscode.Dis if (this.#contentProviderDisposable != null) { this.#contentProviderDisposable.dispose() } - this.#flowVersionSubscription.unsubscribe() - } - - async #resolveFlowSchema (): Promise { - return await this.#flowVersion.getValue().then(async (cliVersion) => { - // Verify that version is valid (could be null if flow-cli is not installed, etc.) - if (cliVersion == null) throw new Error('Failed to get flow-cli version, please make sure flow-cli is installed and in your PATH') - - // Try to get schema from flow-cli repo based on the flow-cli version - return fetch(GET_FLOW_SCHEMA_URL(cliVersion)) - }).then(async (response: Response) => { - if (!response.ok) { - throw new Error(`Failed to fetch schema from flow-cli repo: ${response.statusText}`) - } - return await response.text() - }).catch(async () => { - // Fallback to local schema - this.#showLocalError = true - const schemaUrl = resolve(this.ctx.extensionPath, 'flow-schema.json') - return await promisify(readFile)(schemaUrl).then(x => x.toString()) - }) } // Unsupported file system provider methods diff --git a/extension/src/server/language-server.ts b/extension/src/server/language-server.ts index f643b07b..1973cd34 100644 --- a/extension/src/server/language-server.ts +++ b/extension/src/server/language-server.ts @@ -3,36 +3,50 @@ import { window } from 'vscode' import { Settings } from '../settings/settings' import { exec } from 'child_process' import { ExecuteCommandRequest } from 'vscode-languageclient' -import { BehaviorSubject, Subscription, filter, firstValueFrom } from 'rxjs' +import { BehaviorSubject, Subscription, filter, firstValueFrom, skip } from 'rxjs' import { envVars } from '../utils/shell/env-vars' import { FlowConfig } from './flow-config' +import { CliProvider } from '../flow-cli/cli-provider' // Identities for commands handled by the Language server const RELOAD_CONFIGURATION = 'cadence.server.flow.reloadConfiguration' export class LanguageServerAPI { - config: FlowConfig + #settings: Settings + #config: FlowConfig + #cliProvider: CliProvider client: LanguageClient | null = null - settings: Settings clientState$ = new BehaviorSubject(State.Stopped) #subscriptions: Subscription[] = [] #isActive = false - constructor (settings: Settings, config: FlowConfig) { - this.settings = settings - this.config = config + constructor (settings: Settings, cliProvider: CliProvider, config: FlowConfig) { + this.#settings = settings + this.#cliProvider = cliProvider + this.#config = config } + // Activates the language server manager + // This will control the lifecycle of the language server + // & restart it when necessary async activate (): Promise { if (this.isActive) return await this.deactivate() this.#isActive = true - await this.startClient() + this.#subscribeToConfigChanges() this.#subscribeToSettingsChanges() + this.#subscribeToBinaryChanges() + + // Report error, but an error starting is non-terminal + // The server will be restarted if conditions change which make it possible + // (e.g. a new binary is selected, or the config file is created) + await this.startClient().catch((e) => { + console.error(e) + }) } async deactivate (): Promise { @@ -58,10 +72,15 @@ export class LanguageServerAPI { // Set client state to starting this.clientState$.next(State.Starting) - const accessCheckMode: string = this.settings.getSettings().accessCheckMode - const configPath: string | null = this.config.configPath + const accessCheckMode: string = this.#settings.getSettings().accessCheckMode + const configPath: string | null = this.#config.configPath - if (this.settings.getSettings().flowCommand !== 'flow') { + const binaryPath = (await this.#cliProvider.getCurrentBinary())?.name + if (binaryPath == null) { + throw new Error('No flow binary found') + } + + if (binaryPath !== 'flow') { try { exec('killall dlv') // Required when running language server locally on mac } catch (err) { void err } @@ -72,7 +91,7 @@ export class LanguageServerAPI { 'cadence', 'Cadence', { - command: this.settings.getSettings().flowCommand, + command: binaryPath, args: ['cadence', 'language-server', '--enable-flow-client=false'], options: { env @@ -99,20 +118,17 @@ export class LanguageServerAPI { void window.showErrorMessage(`Cadence language server failed to start: ${err.message}`) }) } catch (e) { - await this.client?.stop() - this.clientState$.next(State.Stopped) + await this.stopClient() throw e } } async stopClient (): Promise { - // Prevent stopping multiple times (important since LanguageClient state may be startFailed) - if (this.clientState$.getValue() === State.Stopped) return - // Set emulator state to disconnected this.clientState$.next(State.Stopped) await this.client?.stop() + await this.client?.dispose() this.client = null } @@ -122,34 +138,50 @@ export class LanguageServerAPI { } #subscribeToConfigChanges (): void { - const tryReloadConfig = (): void => { void this.#sendRequest(RELOAD_CONFIGURATION).catch(() => {}) } + const tryReloadConfig = (): void => { + void this.#sendRequest(RELOAD_CONFIGURATION).catch((e: any) => { + void window.showErrorMessage(`Failed to reload configuration: ${String(e)}`) + }) + } - this.#subscriptions.push(this.config.fileModified$.subscribe(() => { + this.#subscriptions.push(this.#config.fileModified$.subscribe(function notify (this: LanguageServerAPI): void { // Reload configuration if (this.clientState$.getValue() === State.Running) { tryReloadConfig() } else if (this.clientState$.getValue() === State.Starting) { // Wait for client to connect void firstValueFrom(this.clientState$.pipe(filter((state) => state === State.Running))).then(() => { - tryReloadConfig() + notify.call(this) }) + } else { + // Start client + void this.startClient() } - })) + }.bind(this))) - this.#subscriptions.push(this.config.pathChanged$.subscribe(() => { + this.#subscriptions.push(this.#config.pathChanged$.subscribe(() => { // Restart client void this.restart() })) } #subscribeToSettingsChanges (): void { - const onChange = (): void => { + // Subscribe to changes in the flowCommand setting to restart the client + // Skip the first value since we don't want to restart the client when it's first initialized + this.#settings.watch$((config) => config.flowCommand).pipe(skip(1)).subscribe(() => { // Restart client void this.restart() - } + }) + } - this.#subscriptions.push(this.settings.watch$((config) => config.flowCommand).subscribe(onChange)) - this.#subscriptions.push(this.settings.watch$((config) => config.accessCheckMode).subscribe(onChange)) + #subscribeToBinaryChanges (): void { + // Subscribe to changes in the selected binary to restart the client + // Skip the first value since we don't want to restart the client when it's first initialized + const subscription = this.#cliProvider.currentBinary$.pipe(skip(1)).subscribe(() => { + // Restart client + void this.restart() + }) + this.#subscriptions.push(subscription) } async #sendRequest (cmd: string, args: any[] = []): Promise { diff --git a/extension/src/settings/settings.ts b/extension/src/settings/settings.ts index 9a7bc773..e759e068 100644 --- a/extension/src/settings/settings.ts +++ b/extension/src/settings/settings.ts @@ -1,8 +1,10 @@ /* Workspace Settings */ -import { BehaviorSubject, Observable, distinctUntilChanged, map, skip } from 'rxjs' -import { workspace, Disposable } from 'vscode' +import { BehaviorSubject, Observable, distinctUntilChanged, map } from 'rxjs' +import { workspace, Disposable, ConfigurationTarget } from 'vscode' import { isEqual } from 'lodash' +const CONFIGURATION_KEY = 'cadence' + // Schema for the cadence configuration export interface CadenceConfiguration { flowCommand: string @@ -20,7 +22,7 @@ export class Settings implements Disposable { constructor () { // Watch for configuration changes this.#disposables.push(workspace.onDidChangeConfiguration((e) => { - if (e.affectsConfiguration('cadence')) { + if (e.affectsConfiguration(CONFIGURATION_KEY)) { this.#configuration$.next(this.#getConfiguration()) } })) @@ -38,27 +40,41 @@ export class Settings implements Disposable { * settings.watch$(config => config.flowCommand) */ watch$ (selector: (config: CadenceConfiguration) => T = (config) => config as unknown as T): Observable { - return this.#configuration$.asObservable().pipe( - skip(1), + return this.#configuration$.pipe( map(selector), distinctUntilChanged(isEqual) ) } /** - * Returns the current configuration - * + * Get the current configuration * @returns The current configuration */ getSettings (): CadenceConfiguration { return this.#configuration$.value } + async updateSettings (config: Partial, target?: ConfigurationTarget): Promise { + // Recursively update all keys in the configuration + async function update (section: string, obj: any): Promise { + await Promise.all(Object.entries(obj).map(async ([key, value]) => { + const newKey = `${section}.${key}` + if (typeof value === 'object' && !Array.isArray(value)) { + await update(newKey, value) + } else { + await workspace.getConfiguration().update(newKey, value, target) + } + })) + } + + await update(CONFIGURATION_KEY, config) + } + dispose (): void { this.#configuration$.complete() } #getConfiguration (): CadenceConfiguration { - return workspace.getConfiguration('cadence') as unknown as CadenceConfiguration + return workspace.getConfiguration(CONFIGURATION_KEY) as unknown as CadenceConfiguration } } diff --git a/extension/src/test-provider/test-resolver.ts b/extension/src/test-provider/test-resolver.ts index 422887fc..4dd149fd 100644 --- a/extension/src/test-provider/test-resolver.ts +++ b/extension/src/test-provider/test-resolver.ts @@ -1,6 +1,5 @@ import * as vscode from 'vscode' import * as CadenceParser from '@onflow/cadence-parser' -import { StateCache } from '../utils/state-cache' import { QueuedMutator, TestFunction, TestTrie } from './test-trie' import { isDirectory } from '../utils/utils' @@ -26,7 +25,6 @@ interface Declaration { } export class TestResolver implements vscode.Disposable { - testTree: StateCache #controller: vscode.TestController #parser: Thenable #testTrie: QueuedMutator @@ -35,7 +33,6 @@ export class TestResolver implements vscode.Disposable { constructor (parserLocation: string, controller: vscode.TestController, testTrie: QueuedMutator) { this.#controller = controller this.#parser = vscode.workspace.fs.readFile(vscode.Uri.file(parserLocation)).then(async buffer => await CadenceParser.CadenceParser.create(buffer)) - this.testTree = new StateCache(async () => await Promise.resolve()) this.#testTrie = testTrie void this.watchFiles() diff --git a/extension/test/integration/0 - dependencies.test.ts b/extension/test/integration/0 - dependencies.test.ts index 674daf97..2114475d 100644 --- a/extension/test/integration/0 - dependencies.test.ts +++ b/extension/test/integration/0 - dependencies.test.ts @@ -4,15 +4,15 @@ import { MaxTimeout } from '../globals' import { InstallFlowCLI } from '../../src/dependency-installer/installers/flow-cli-installer' import { stub } from 'sinon' import { before } from 'mocha' -import { FlowVersionProvider } from '../../src/flow-cli/flow-version-provider' +import { CliProvider } from '../../src/flow-cli/cli-provider' import { getMockSettings } from '../mock/mockSettings' // Note: Dependency installation must run before other integration tests suite('Dependency Installer', () => { - let flowVersionProvider: any + let cliProvider: any before(async function () { - flowVersionProvider = new FlowVersionProvider(getMockSettings()) + cliProvider = new CliProvider(getMockSettings()) }) test('Install Missing Dependencies', async () => { @@ -21,7 +21,7 @@ suite('Dependency Installer', () => { deactivate: stub(), isActive: true } - const dependencyManager = new DependencyInstaller(mockLanguageServerApi as any, flowVersionProvider) + const dependencyManager = new DependencyInstaller(mockLanguageServerApi as any, cliProvider) await assert.doesNotReject(async () => { await dependencyManager.installMissing() }) // Check that all dependencies are installed @@ -42,7 +42,7 @@ suite('Dependency Installer', () => { const mockInstallerContext = { refreshDependencies: async () => {}, languageServerApi: mockLanguageServerApi as any, - flowVersionProvider + cliProvider } const flowCliInstaller = new InstallFlowCLI(mockInstallerContext) @@ -65,7 +65,7 @@ suite('Dependency Installer', () => { const mockInstallerContext = { refreshDependencies: async () => {}, languageServerApi: mockLanguageServerApi as any, - flowVersionProvider + cliProvider } const flowCliInstaller = new InstallFlowCLI(mockInstallerContext) diff --git a/extension/test/integration/1 - language-server.test.ts b/extension/test/integration/1 - language-server.test.ts index f5673b58..3fc9f30b 100644 --- a/extension/test/integration/1 - language-server.test.ts +++ b/extension/test/integration/1 - language-server.test.ts @@ -5,8 +5,11 @@ import { LanguageServerAPI } from '../../src/server/language-server' import { FlowConfig } from '../../src/server/flow-config' import { Settings } from '../../src/settings/settings' import { MaxTimeout } from '../globals' -import { Subject } from 'rxjs' +import { BehaviorSubject, Subject } from 'rxjs' import { State } from 'vscode-languageclient' +import * as sinon from 'sinon' +import { CliBinary } from '../../src/flow-cli/cli-provider' +import { SemVer } from 'semver' suite('Language Server & Emulator Integration', () => { let LS: LanguageServerAPI @@ -14,6 +17,7 @@ suite('Language Server & Emulator Integration', () => { let mockConfig: FlowConfig let fileModified$: Subject let pathChanged$: Subject + let cliBinary$: BehaviorSubject before(async function () { this.timeout(MaxTimeout) @@ -27,7 +31,17 @@ suite('Language Server & Emulator Integration', () => { configPath: null } as any - LS = new LanguageServerAPI(settings, mockConfig) + // create a mock cli provider without invokign the constructor + cliBinary$ = new BehaviorSubject({ + name: 'flow', + version: new SemVer('1.0.0') + }) + const mockCliProvider = { + currentBinary$: cliBinary$, + getCurrentBinary: sinon.stub().callsFake(async () => cliBinary$.getValue()) + } as any + + LS = new LanguageServerAPI(settings, mockCliProvider, mockConfig) await LS.activate() }) @@ -37,7 +51,6 @@ suite('Language Server & Emulator Integration', () => { }) test('Language Server Client', async () => { - await LS.startClient() assert.notStrictEqual(LS.client, undefined) assert.equal(LS.client?.state, State.Running) }) @@ -46,9 +59,13 @@ suite('Language Server & Emulator Integration', () => { const client = LS.client await LS.deactivate() - // Check that client remains stopped even if config changes + // Check that client remains stopped even if config changes or CLI binary changes fileModified$.next() pathChanged$.next('foo') + cliBinary$.next({ + name: 'flow', + version: new SemVer('1.0.1') + }) assert.equal(client?.state, State.Stopped) assert.equal(LS.client, null) diff --git a/extension/test/integration/3 - schema.test.ts b/extension/test/integration/3 - schema.test.ts index 1083ccf6..7759781c 100644 --- a/extension/test/integration/3 - schema.test.ts +++ b/extension/test/integration/3 - schema.test.ts @@ -2,32 +2,40 @@ import { MaxTimeout } from '../globals' import { before, after } from 'mocha' import * as assert from 'assert' import * as vscode from 'vscode' -import { StateCache } from '../../src/utils/state-cache' import { SemVer } from 'semver' import { JSONSchemaProvider } from '../../src/json-schema-provider' import * as fetch from 'node-fetch' import { readFileSync } from 'fs' import * as path from 'path' +import * as sinon from 'sinon' +import { CliProvider } from '../../src/flow-cli/cli-provider' +import { Subject } from 'rxjs' suite('JSON schema tests', () => { let mockFlowVersionValue: SemVer | null = null - let mockFlowVersion: StateCache - let mockContext: vscode.ExtensionContext + let mockCliProvider: CliProvider + let extensionPath: string + let schemaProvider: JSONSchemaProvider let originalFetch: typeof fetch before(async function () { this.timeout(MaxTimeout) - // Mock extension context - mockContext = { - extensionPath: path.resolve(__dirname, '../../../..'), - subscriptions: [] as vscode.Disposable[] + // Mock extension path + extensionPath = path.resolve(__dirname, '../../../..') + + // Mock cli provider + mockCliProvider = { + currentBinary$: new Subject(), + getCurrentBinary: sinon.stub().callsFake(async () => ((mockFlowVersionValue != null) + ? { + name: 'flow', + version: mockFlowVersionValue + } + : null)) } as any - // Mock flow version - mockFlowVersion = new StateCache(async () => mockFlowVersionValue) - // Mock fetch (assertion is for linter workaround) originalFetch = fetch.default ;(fetch as unknown as any).default = async (url: string) => { @@ -49,43 +57,39 @@ suite('JSON schema tests', () => { } // Initialize the schema provider - JSONSchemaProvider.register(mockContext, mockFlowVersion) + schemaProvider = new JSONSchemaProvider(extensionPath, mockCliProvider) }) after(async function () { this.timeout(MaxTimeout) - // Restore fetch (assertion is for linter workaround) + // Restore fetch ;(fetch as unknown as any).default = originalFetch - // Clear subscriptions - mockContext.subscriptions.forEach((sub) => sub.dispose()) - ;(mockContext as any).subscriptions = [] + // Dispose the schema provider + schemaProvider.dispose() }) test('Defaults to local schema when version not found', async () => { mockFlowVersionValue = new SemVer('0.0.0') - mockFlowVersion.invalidate() // Assert that the schema is the same as the local schema await vscode.workspace.fs.readFile(vscode.Uri.parse('cadence-schema:///flow.json')).then((data) => { - assert.strictEqual(data.toString(), readFileSync(path.resolve(mockContext.extensionPath, './flow-schema.json'), 'utf-8')) + assert.strictEqual(data.toString(), readFileSync(path.resolve(extensionPath, './flow-schema.json'), 'utf-8')) }) }).timeout(MaxTimeout) test('Defaults to local schema when version is invalid', async () => { mockFlowVersionValue = null - mockFlowVersion.invalidate() // Assert that the schema is the same as the local schema await vscode.workspace.fs.readFile(vscode.Uri.parse('cadence-schema:///flow.json')).then((data) => { - assert.strictEqual(data.toString(), readFileSync(path.resolve(mockContext.extensionPath, './flow-schema.json'), 'utf-8')) + assert.strictEqual(data.toString(), readFileSync(path.resolve(extensionPath, './flow-schema.json'), 'utf-8')) }) }).timeout(MaxTimeout) test('Fetches remote schema for current CLI version', async () => { mockFlowVersionValue = new SemVer('1.0.0') - mockFlowVersion.invalidate() // Assert that the schema is the same as the remote schema await vscode.workspace.fs.readFile(vscode.Uri.parse('cadence-schema:///flow.json')).then((data) => { diff --git a/extension/test/mock/mockSettings.ts b/extension/test/mock/mockSettings.ts index e341fa31..9a6f7a5e 100644 --- a/extension/test/mock/mockSettings.ts +++ b/extension/test/mock/mockSettings.ts @@ -1,15 +1,15 @@ -import { BehaviorSubject, Observable, of, map, distinctUntilChanged, skip } from 'rxjs' +import { BehaviorSubject, Observable, of, map, distinctUntilChanged } from 'rxjs' import { CadenceConfiguration, Settings } from '../../src/settings/settings' import * as path from 'path' import { isEqual } from 'lodash' -export function getMockSettings (settings$: BehaviorSubject> | Partial | null = null): Settings { +export function getMockSettings (_settings$: BehaviorSubject> | Partial | null = null): Settings { const mockSettings: Settings = { getSettings, watch$ } as any function getSettings (): Partial { - if (!(settings$ instanceof BehaviorSubject) && settings$ != null) return settings$ + if (!(_settings$ instanceof BehaviorSubject) && _settings$ != null) return _settings$ - return settings$?.getValue() ?? { + return _settings$?.getValue() ?? { flowCommand: 'flow', accessCheckMode: 'strict', customConfigPath: path.join(__dirname, '../integration/fixtures/workspace/flow.json'), @@ -20,10 +20,9 @@ export function getMockSettings (settings$: BehaviorSubject (selector: (config: CadenceConfiguration) => T = (config) => config as unknown as T): Observable { - if (!(settings$ instanceof BehaviorSubject)) return of() + if (!(_settings$ instanceof BehaviorSubject)) return of() - return settings$.asObservable().pipe( - skip(1), + return _settings$.asObservable().pipe( map(selector as any), distinctUntilChanged(isEqual) ) diff --git a/extension/test/unit/parser.test.ts b/extension/test/unit/parser.test.ts index fe3ae107..6aba70a6 100644 --- a/extension/test/unit/parser.test.ts +++ b/extension/test/unit/parser.test.ts @@ -1,5 +1,5 @@ import * as assert from 'assert' -import { parseFlowCliVersion } from '../../src/flow-cli/flow-version-provider' +import { parseFlowCliVersion } from '../../src/flow-cli/cli-provider' import { execDefault } from '../../src/utils/shell/exec' import { ASSERT_EQUAL } from '../globals' import * as semver from 'semver' diff --git a/package-lock.json b/package-lock.json index fb963144..b9873970 100644 --- a/package-lock.json +++ b/package-lock.json @@ -398,70 +398,6 @@ "node": ">=12" } }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz", - "integrity": "sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.0.tgz", - "integrity": "sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz", - "integrity": "sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.0.tgz", - "integrity": "sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@esbuild/darwin-arm64": { "version": "0.20.0", "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz", @@ -478,294 +414,6 @@ "node": ">=12" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz", - "integrity": "sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz", - "integrity": "sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz", - "integrity": "sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz", - "integrity": "sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz", - "integrity": "sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz", - "integrity": "sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz", - "integrity": "sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz", - "integrity": "sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz", - "integrity": "sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz", - "integrity": "sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz", - "integrity": "sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz", - "integrity": "sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz", - "integrity": "sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz", - "integrity": "sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz", - "integrity": "sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz", - "integrity": "sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz", - "integrity": "sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz", - "integrity": "sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@eslint/eslintrc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", @@ -1343,9 +991,9 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.12", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.12.tgz", - "integrity": "sha512-zNKDHG/1yxm8Il6uCCVsm+dRdEsJlFoDu73X17y09bId6UwoYww+vFBsAcRzl8knM1sab3Dp1VRikFQwDOtDDw==", + "version": "4.3.13", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.13.tgz", + "integrity": "sha512-+LxQEbg4BDUf88utmhpUpTyYn1zHao443aGnXIAQak9ZMt9Rtsic0Oig0OS1xyIqdDXc5uMekoC6NaiUlkT/qA==", "dev": true }, "node_modules/@types/expect": { @@ -1429,9 +1077,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.28", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.28.tgz", - "integrity": "sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==", + "version": "20.11.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", + "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -3998,9 +3646,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 0b62f4ac..7ad8ac2f 100644 --- a/package.json +++ b/package.json @@ -98,6 +98,11 @@ "command": "cadence.checkDepencencies", "category": "Cadence", "title": "Check Dependencies" + }, + { + "command": "cadence.changeCadenceVersion", + "category": "Cadence", + "title": "Change Cadence Version" } ], "configuration": { From a76c04953b5ba447d5fe217dbc10622e399b137e Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Fri, 22 Mar 2024 09:02:31 -0700 Subject: [PATCH 23/97] Bump to v2.3.0 (#565) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b9873970..c9f8afc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.2.1", + "version": "2.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.2.1", + "version": "2.3.0", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", diff --git a/package.json b/package.json index 7ad8ac2f..1cb76d8b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.2.1", + "version": "2.3.0", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From e0e3a2aa681521d234a75f8b393e341319b99263 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Tue, 26 Mar 2024 12:43:54 -0700 Subject: [PATCH 24/97] Use JSON `flow version` output (#567) --- extension/src/flow-cli/cli-provider.ts | 32 +++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/extension/src/flow-cli/cli-provider.ts b/extension/src/flow-cli/cli-provider.ts index 3cfe03cc..38286657 100644 --- a/extension/src/flow-cli/cli-provider.ts +++ b/extension/src/flow-cli/cli-provider.ts @@ -6,7 +6,9 @@ import * as vscode from 'vscode' import { Settings } from '../settings/settings' import { isEqual } from 'lodash' -const CHECK_FLOW_CLI_CMD = (flowCommand: string): string => `${flowCommand} version` +const CHECK_FLOW_CLI_CMD = (flowCommand: string): string => `${flowCommand} version --output=json` +const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowCommand} version` + const KNOWN_BINS = ['flow', 'flow-c1'] const CADENCE_V1_CLI_REGEX = /-cadence-v1.0.0/g @@ -16,6 +18,10 @@ export interface CliBinary { version: semver.SemVer } +interface FlowVersionOutput { + version: string +} + interface AvailableBinariesCache { [key: string]: StateCache } @@ -85,6 +91,7 @@ export class CliProvider { }) } + // Fetches the binary information for the given binary async #fetchBinaryInformation (bin: string): Promise { try { // Get user's version informaton @@ -92,6 +99,29 @@ export class CliProvider { bin ))).stdout + // Format version string from output + const versionInfo: FlowVersionOutput = JSON.parse(buffer) + + // Ensure user has a compatible version number installed + const version: semver.SemVer | null = semver.parse(versionInfo.version) + if (version === null) return null + + return { name: bin, version } + } catch { + // Fallback to old method if JSON is not supported/fails + return await this.#fetchBinaryInformationOld(bin) + } + } + + // Old version of fetchBinaryInformation (before JSON was supported) + // Used as fallback for old CLI versions + async #fetchBinaryInformationOld (bin: string): Promise { + try { + // Get user's version informaton + const buffer: string = (await execDefault(CHECK_FLOW_CLI_CMD_NO_JSON( + bin + ))).stdout + // Format version string from output let versionStr: string | null = parseFlowCliVersion(buffer) From 9b7fd37c89f0dee3801a5dfda4aeeea22ff74747 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 12:44:13 -0700 Subject: [PATCH 25/97] Bump elliptic from 6.5.4 to 6.5.5 (#569) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c9f8afc9..34d1429a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", - "elliptic": "^6.5.4", + "elliptic": "^6.5.5", "lodash": "^4.17.21", "mixpanel": "^0.18.0", "node-fetch": "^2.6.1", @@ -2533,9 +2533,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", + "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", diff --git a/package.json b/package.json index 1cb76d8b..0d5b6acd 100644 --- a/package.json +++ b/package.json @@ -219,7 +219,7 @@ "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", - "elliptic": "^6.5.4", + "elliptic": "^6.5.5", "lodash": "^4.17.21", "mixpanel": "^0.18.0", "node-fetch": "^2.6.1", From 97d9fe3a5a0b230f6c3df1d49053da93fc79f419 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 12:44:26 -0700 Subject: [PATCH 26/97] Bump ovsx from 0.8.3 to 0.8.4 (#572) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 34d1429a..fabbb3f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.3.0", "nyc": "^15.1.0", - "ovsx": "^0.8.3", + "ovsx": "^0.8.4", "rimraf": "^5.0.5", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", @@ -6615,9 +6615,9 @@ } }, "node_modules/ovsx": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.8.3.tgz", - "integrity": "sha512-LG7wTzy4eYV/KolFeO4AwWPzQSARvCONzd5oHQlNvYOlji2r/zjbdK8pyObZN84uZlk6rQBWrJrAdJfh/SX0Hg==", + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.8.4.tgz", + "integrity": "sha512-RMtGSVNM4NWSF9uVWCUqaYiA7ID8Vqm/rSk2W37eYVrDLOI/3do2IRY7rQYkvJqb6sS6LAnALODBkD50tIM1kw==", "dev": true, "dependencies": { "@vscode/vsce": "^2.19.0", diff --git a/package.json b/package.json index 0d5b6acd..0ba41a31 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.3.0", "nyc": "^15.1.0", - "ovsx": "^0.8.3", + "ovsx": "^0.8.4", "rimraf": "^5.0.5", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", From f99deea07a5ce6fdfad51f635805e93153739cbc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 12:44:38 -0700 Subject: [PATCH 27/97] Bump @types/chai from 4.3.13 to 4.3.14 (#571) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fabbb3f5..d1ac4bb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@types/chai": "^4.3.12", + "@types/chai": "^4.3.14", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.0", @@ -991,9 +991,9 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.13", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.13.tgz", - "integrity": "sha512-+LxQEbg4BDUf88utmhpUpTyYn1zHao443aGnXIAQak9ZMt9Rtsic0Oig0OS1xyIqdDXc5uMekoC6NaiUlkT/qA==", + "version": "4.3.14", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.14.tgz", + "integrity": "sha512-Wj71sXE4Q4AkGdG9Tvq1u/fquNz9EdG4LIJMwVVII7ashjD/8cf8fyIfJAjRr6YcsXnSE8cOGQPq1gqeR8z+3w==", "dev": true }, "node_modules/@types/expect": { diff --git a/package.json b/package.json index 0ba41a31..1c5e8743 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ ] }, "devDependencies": { - "@types/chai": "^4.3.12", + "@types/chai": "^4.3.14", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.0", From 5803eb818f0c3d42b5c4c4a2f2abc8305c718e52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 12:44:51 -0700 Subject: [PATCH 28/97] Bump @sentry/node from 7.107.0 to 7.108.0 (#570) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1ac4bb7..699d1774 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.107.0", + "@sentry/node": "^7.108.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -850,58 +850,58 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.107.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.107.0.tgz", - "integrity": "sha512-le9wM8+OHBbq7m/8P7JUJ1UhSPIty+Z/HmRXc5Z64ODZcOwFV6TmDpYx729IXDdz36XUKmeI+BeM7yQdTTZPfQ==", + "version": "7.108.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.108.0.tgz", + "integrity": "sha512-zuK5XsTsb+U+hgn3SPetYDAogrXsM16U/LLoMW7+TlC6UjlHGYQvmX3o+M2vntejoU1QZS8m1bCAZSMWEypAEw==", "dependencies": { - "@sentry/core": "7.107.0", - "@sentry/types": "7.107.0", - "@sentry/utils": "7.107.0" + "@sentry/core": "7.108.0", + "@sentry/types": "7.108.0", + "@sentry/utils": "7.108.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.107.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.107.0.tgz", - "integrity": "sha512-C7ogye6+KPyBi8NVL0P8Rxx3Ur7Td8ufnjxosVy678lqY+dcYPk/HONROrzUFYW5fMKWL4/KYnwP+x9uHnkDmw==", + "version": "7.108.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.108.0.tgz", + "integrity": "sha512-I/VNZCFgLASxHZaD0EtxZRM34WG9w2gozqgrKGNMzAymwmQ3K9g/1qmBy4e6iS3YRptb7J5UhQkZQHrcwBbjWQ==", "dependencies": { - "@sentry/types": "7.107.0", - "@sentry/utils": "7.107.0" + "@sentry/types": "7.108.0", + "@sentry/utils": "7.108.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.107.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.107.0.tgz", - "integrity": "sha512-UZXkG7uThT2YyPW8AOSKRXp1LbVcBHufa4r1XAwBukA2FKO6HHJPjMUgY6DYVQ6k+BmA56CNfVjYrdLbyjBYYA==", + "version": "7.108.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.108.0.tgz", + "integrity": "sha512-pMxc9txnDDkU4Z8k2Uw/DPSLPehNtWV3mjJ3+my0AMORGYrXLkJI93tddlE5z/7k+GEJdj1HsOLgxUN0OU+HGA==", "dependencies": { - "@sentry-internal/tracing": "7.107.0", - "@sentry/core": "7.107.0", - "@sentry/types": "7.107.0", - "@sentry/utils": "7.107.0" + "@sentry-internal/tracing": "7.108.0", + "@sentry/core": "7.108.0", + "@sentry/types": "7.108.0", + "@sentry/utils": "7.108.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.107.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.107.0.tgz", - "integrity": "sha512-H7qcPjPSUWHE/Zf5bR1EE24G0pGVuJgrSx8Tvvl5nKEepswMYlbXHRVSDN0gTk/E5Z7cqf+hUBOpkQgZyps77w==", + "version": "7.108.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.108.0.tgz", + "integrity": "sha512-bKtHITmBN3kqtqE5eVvL8mY8znM05vEodENwRpcm6TSrrBjC2RnwNWVwGstYDdHpNfFuKwC8mLY9bgMJcENo8g==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.107.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.107.0.tgz", - "integrity": "sha512-C6PbN5gHh73MRHohnReeQ60N8rrLYa9LciHue3Ru2290eSThg4CzsPnx4SzkGpkSeVlhhptKtKZ+hp/ha3iVuw==", + "version": "7.108.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.108.0.tgz", + "integrity": "sha512-a45yEFD5qtgZaIFRAcFkG8C8lnDzn6t4LfLXuV4OafGAy/3ZAN3XN8wDnrruHkiUezSSANGsLg3bXaLW/JLvJw==", "dependencies": { - "@sentry/types": "7.107.0" + "@sentry/types": "7.108.0" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index 1c5e8743..bc176932 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.107.0", + "@sentry/node": "^7.108.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From add1492e1d4a8179449d52d41a15de04708be468 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 12:45:02 -0700 Subject: [PATCH 29/97] Bump actions/add-to-project from 0.6.0 to 0.6.1 (#568) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-issues-to-devx-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-issues-to-devx-project.yml b/.github/workflows/add-issues-to-devx-project.yml index 4413cee8..44cd3e14 100644 --- a/.github/workflows/add-issues-to-devx-project.yml +++ b/.github/workflows/add-issues-to-devx-project.yml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.6.0 + - uses: actions/add-to-project@v0.6.1 with: project-url: https://github.com/orgs/onflow/projects/13 github-token: ${{ secrets.GH_ACTION_FOR_PROJECTS }} From b9761f3926b37e886f9d00cdb47ab05c4b8fdf0b Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Tue, 2 Apr 2024 13:24:03 -0700 Subject: [PATCH 30/97] Add temporary patch for broken `flow version` output (#582) --- extension/src/flow-cli/cli-provider.ts | 18 +++++++++++------- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/extension/src/flow-cli/cli-provider.ts b/extension/src/flow-cli/cli-provider.ts index 38286657..a5b2181a 100644 --- a/extension/src/flow-cli/cli-provider.ts +++ b/extension/src/flow-cli/cli-provider.ts @@ -12,6 +12,7 @@ const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowComma const KNOWN_BINS = ['flow', 'flow-c1'] const CADENCE_V1_CLI_REGEX = /-cadence-v1.0.0/g +const LEGACY_VERSION_REGEXP = /Version:\s*(v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(\s|$)/m export interface CliBinary { name: string @@ -118,14 +119,17 @@ export class CliProvider { async #fetchBinaryInformationOld (bin: string): Promise { try { // Get user's version informaton - const buffer: string = (await execDefault(CHECK_FLOW_CLI_CMD_NO_JSON( + const output = (await execDefault(CHECK_FLOW_CLI_CMD_NO_JSON( bin - ))).stdout + ))) - // Format version string from output - let versionStr: string | null = parseFlowCliVersion(buffer) + let versionStr: string | null = parseFlowCliVersion(output.stdout) + if (versionStr === null) { + // Try to fallback to stderr as patch for bugged version + versionStr = parseFlowCliVersion(output.stderr) + } - versionStr = semver.clean(versionStr) + versionStr = versionStr != null ? semver.clean(versionStr) : null if (versionStr === null) return null // Ensure user has a compatible version number installed @@ -181,6 +185,6 @@ export function isCadenceV1Cli (version: semver.SemVer): boolean { return CADENCE_V1_CLI_REGEX.test(version.raw) } -export function parseFlowCliVersion (buffer: Buffer | string): string { - return (buffer.toString().split('\n')[0]).split(' ')[1] +export function parseFlowCliVersion (buffer: Buffer | string): string | null { + return buffer.toString().match(LEGACY_VERSION_REGEXP)?.[1] ?? null } diff --git a/package-lock.json b/package-lock.json index 699d1774..f75e1c84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.3.0", + "version": "2.3.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.3.0", + "version": "2.3.1", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", diff --git a/package.json b/package.json index bc176932..ea22849d 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.3.0", + "version": "2.3.1", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From 2a2a1dfcbed260f8ff33f5d86aa9f270bc28fcda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:22:58 -0700 Subject: [PATCH 31/97] Bump actions/add-to-project from 0.6.1 to 1.0.0 (#581) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-issues-to-devx-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-issues-to-devx-project.yml b/.github/workflows/add-issues-to-devx-project.yml index 44cd3e14..4ba39a6d 100644 --- a/.github/workflows/add-issues-to-devx-project.yml +++ b/.github/workflows/add-issues-to-devx-project.yml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.6.1 + - uses: actions/add-to-project@v1.0.0 with: project-url: https://github.com/orgs/onflow/projects/13 github-token: ${{ secrets.GH_ACTION_FOR_PROJECTS }} From e632ddb7626168c3275f6392d599323a6a6cfbfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:23:09 -0700 Subject: [PATCH 32/97] Bump mocha from 10.3.0 to 10.4.0 (#579) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f75e1c84..0bf2041a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "esbuild": "^0.20.0", "glob": "^10.3.10", "mkdirp": "^3.0.1", - "mocha": "^10.3.0", + "mocha": "^10.4.0", "nyc": "^15.1.0", "ovsx": "^0.8.4", "rimraf": "^5.0.5", @@ -5860,9 +5860,9 @@ "optional": true }, "node_modules/mocha": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz", - "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz", + "integrity": "sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==", "dev": true, "dependencies": { "ansi-colors": "4.1.1", diff --git a/package.json b/package.json index ea22849d..7dc336e3 100644 --- a/package.json +++ b/package.json @@ -201,7 +201,7 @@ "esbuild": "^0.20.0", "glob": "^10.3.10", "mkdirp": "^3.0.1", - "mocha": "^10.3.0", + "mocha": "^10.4.0", "nyc": "^15.1.0", "ovsx": "^0.8.4", "rimraf": "^5.0.5", From 3d6ece2dfd62f16c8e6ff36e368f9c5975419052 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:23:41 -0700 Subject: [PATCH 33/97] Bump @sentry/node from 7.108.0 to 7.109.0 (#580) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bf2041a..8656a91b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.108.0", + "@sentry/node": "^7.109.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -850,58 +850,58 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.108.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.108.0.tgz", - "integrity": "sha512-zuK5XsTsb+U+hgn3SPetYDAogrXsM16U/LLoMW7+TlC6UjlHGYQvmX3o+M2vntejoU1QZS8m1bCAZSMWEypAEw==", + "version": "7.109.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.109.0.tgz", + "integrity": "sha512-PzK/joC5tCuh2R/PRh+7dp+uuZl7pTsBIjPhVZHMTtb9+ls65WkdZJ1/uKXPouyz8NOo9Xok7aEvEo9seongyw==", "dependencies": { - "@sentry/core": "7.108.0", - "@sentry/types": "7.108.0", - "@sentry/utils": "7.108.0" + "@sentry/core": "7.109.0", + "@sentry/types": "7.109.0", + "@sentry/utils": "7.109.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.108.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.108.0.tgz", - "integrity": "sha512-I/VNZCFgLASxHZaD0EtxZRM34WG9w2gozqgrKGNMzAymwmQ3K9g/1qmBy4e6iS3YRptb7J5UhQkZQHrcwBbjWQ==", + "version": "7.109.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.109.0.tgz", + "integrity": "sha512-xwD4U0IlvvlE/x/g/W1I8b4Cfb16SsCMmiEuBf6XxvAa3OfWBxKoqLifb3GyrbxMC4LbIIZCN/SvLlnGJPgszA==", "dependencies": { - "@sentry/types": "7.108.0", - "@sentry/utils": "7.108.0" + "@sentry/types": "7.109.0", + "@sentry/utils": "7.109.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.108.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.108.0.tgz", - "integrity": "sha512-pMxc9txnDDkU4Z8k2Uw/DPSLPehNtWV3mjJ3+my0AMORGYrXLkJI93tddlE5z/7k+GEJdj1HsOLgxUN0OU+HGA==", + "version": "7.109.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.109.0.tgz", + "integrity": "sha512-tqMNAES4X/iBl1eZRCmc29p//0id01FBLEiesNo5nk6ECl6/SaGMFAEwu1gsn90h/Bjgr04slwFOS4cR45V2PQ==", "dependencies": { - "@sentry-internal/tracing": "7.108.0", - "@sentry/core": "7.108.0", - "@sentry/types": "7.108.0", - "@sentry/utils": "7.108.0" + "@sentry-internal/tracing": "7.109.0", + "@sentry/core": "7.109.0", + "@sentry/types": "7.109.0", + "@sentry/utils": "7.109.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.108.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.108.0.tgz", - "integrity": "sha512-bKtHITmBN3kqtqE5eVvL8mY8znM05vEodENwRpcm6TSrrBjC2RnwNWVwGstYDdHpNfFuKwC8mLY9bgMJcENo8g==", + "version": "7.109.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.109.0.tgz", + "integrity": "sha512-egCBnDv3YpVFoNzRLdP0soVrxVLCQ+rovREKJ1sw3rA2/MFH9WJ+DZZexsX89yeAFzy1IFsCp7/dEqudusml6g==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.108.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.108.0.tgz", - "integrity": "sha512-a45yEFD5qtgZaIFRAcFkG8C8lnDzn6t4LfLXuV4OafGAy/3ZAN3XN8wDnrruHkiUezSSANGsLg3bXaLW/JLvJw==", + "version": "7.109.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.109.0.tgz", + "integrity": "sha512-3RjxMOLMBwZ5VSiH84+o/3NY2An4Zldjz0EbfEQNRY9yffRiCPJSQiCJID8EoylCFOh/PAhPimBhqbtWJxX6iw==", "dependencies": { - "@sentry/types": "7.108.0" + "@sentry/types": "7.109.0" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index 7dc336e3..43ef139c 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.108.0", + "@sentry/node": "^7.109.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 1e788a0c876af574d5b1edd97f45f7a6258c9a4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:23:55 -0700 Subject: [PATCH 34/97] Bump esbuild from 0.20.0 to 0.20.2 (#576) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 412 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 383 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8656a91b..f91e557a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.1.0", - "esbuild": "^0.20.0", + "esbuild": "^0.20.2", "glob": "^10.3.10", "mkdirp": "^3.0.1", "mocha": "^10.4.0", @@ -398,10 +398,74 @@ "node": ">=12" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz", - "integrity": "sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -414,6 +478,294 @@ "node": ">=12" } }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/@eslint/eslintrc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", @@ -2672,9 +3024,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.0.tgz", - "integrity": "sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, "bin": { @@ -2684,29 +3036,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.0", - "@esbuild/android-arm": "0.20.0", - "@esbuild/android-arm64": "0.20.0", - "@esbuild/android-x64": "0.20.0", - "@esbuild/darwin-arm64": "0.20.0", - "@esbuild/darwin-x64": "0.20.0", - "@esbuild/freebsd-arm64": "0.20.0", - "@esbuild/freebsd-x64": "0.20.0", - "@esbuild/linux-arm": "0.20.0", - "@esbuild/linux-arm64": "0.20.0", - "@esbuild/linux-ia32": "0.20.0", - "@esbuild/linux-loong64": "0.20.0", - "@esbuild/linux-mips64el": "0.20.0", - "@esbuild/linux-ppc64": "0.20.0", - "@esbuild/linux-riscv64": "0.20.0", - "@esbuild/linux-s390x": "0.20.0", - "@esbuild/linux-x64": "0.20.0", - "@esbuild/netbsd-x64": "0.20.0", - "@esbuild/openbsd-x64": "0.20.0", - "@esbuild/sunos-x64": "0.20.0", - "@esbuild/win32-arm64": "0.20.0", - "@esbuild/win32-ia32": "0.20.0", - "@esbuild/win32-x64": "0.20.0" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/escalade": { diff --git a/package.json b/package.json index 43ef139c..76a86621 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.1.0", - "esbuild": "^0.20.0", + "esbuild": "^0.20.2", "glob": "^10.3.10", "mkdirp": "^3.0.1", "mocha": "^10.4.0", From 306af1c7d0ff266d57622428b5612801e2295396 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 06:38:40 -0700 Subject: [PATCH 35/97] Bump ovsx from 0.8.4 to 0.9.0 (#588) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f91e557a..441fc88f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", - "ovsx": "^0.8.4", + "ovsx": "^0.9.0", "rimraf": "^5.0.5", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", @@ -6967,24 +6967,24 @@ } }, "node_modules/ovsx": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.8.4.tgz", - "integrity": "sha512-RMtGSVNM4NWSF9uVWCUqaYiA7ID8Vqm/rSk2W37eYVrDLOI/3do2IRY7rQYkvJqb6sS6LAnALODBkD50tIM1kw==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.9.0.tgz", + "integrity": "sha512-4dWT/lU/WaLWy0iSL4yOMDZZEWEjESqDxrcqxHpOzJoq40DimogsIuHi9bIAAwBYYn2e9CJcf8gDIblEPpQLKA==", "dev": true, "dependencies": { - "@vscode/vsce": "^2.19.0", + "@vscode/vsce": "^2.24.0", "commander": "^6.1.0", "follow-redirects": "^1.14.6", "is-ci": "^2.0.0", "leven": "^3.1.0", - "semver": "^7.5.2", + "semver": "^7.6.0", "tmp": "^0.2.1" }, "bin": { "ovsx": "lib/ovsx" }, "engines": { - "node": ">= 14" + "node": ">= 18" } }, "node_modules/p-limit": { diff --git a/package.json b/package.json index 76a86621..be0e51c5 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", - "ovsx": "^0.8.4", + "ovsx": "^0.9.0", "rimraf": "^5.0.5", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", From a321cba89e661dfd6fb43eaeb710694d6d1180e9 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Wed, 17 Apr 2024 15:29:14 -0700 Subject: [PATCH 36/97] Refactor CLI version selection (#593) --- .../installers/flow-cli-installer.ts | 10 +- extension/src/flow-cli/cli-provider.ts | 176 ++++-------------- .../src/flow-cli/cli-selection-provider.ts | 45 +++-- .../src/flow-cli/cli-versions-provider.ts | 146 +++++++++++++++ extension/src/server/language-server.ts | 5 +- .../integration/1 - language-server.test.ts | 6 +- extension/test/unit/parser.test.ts | 8 +- package.json | 4 +- 8 files changed, 227 insertions(+), 173 deletions(-) create mode 100644 extension/src/flow-cli/cli-versions-provider.ts diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts index 32d4c951..fa8f971b 100644 --- a/extension/src/dependency-installer/installers/flow-cli-installer.ts +++ b/extension/src/dependency-installer/installers/flow-cli-installer.ts @@ -6,6 +6,7 @@ import { Installer, InstallerConstructor, InstallerContext } from '../installer' import * as semver from 'semver' import fetch from 'node-fetch' import { HomebrewInstaller } from './homebrew-installer' +import { KNOWN_FLOW_COMMANDS } from '../../flow-cli/cli-versions-provider' // Command to check flow-cli const COMPATIBLE_FLOW_CLI_VERSIONS = '>=1.6.0' @@ -97,10 +98,9 @@ export class InstallFlowCLI extends Installer { } } - async checkVersion (vsn?: semver.SemVer): Promise { + async checkVersion (version: semver.SemVer): Promise { // Get user's version informaton this.#context.cliProvider.refresh() - const version = vsn ?? await this.#context.cliProvider.getAvailableBinaries().then(x => x.find(y => y.name === 'flow')?.version) if (version == null) return false if (!semver.satisfies(version, COMPATIBLE_FLOW_CLI_VERSIONS, { @@ -128,7 +128,11 @@ export class InstallFlowCLI extends Installer { async verifyInstall (): Promise { // Check if flow version is valid to verify install this.#context.cliProvider.refresh() - const version = await this.#context.cliProvider.getAvailableBinaries().then(x => x.find(y => y.name === 'flow')?.version) + const installedVersions = await this.#context.cliProvider.getBinaryVersions().catch((e) => { + void window.showErrorMessage(`Failed to check CLI version: ${String(e.message)}`) + return [] + }) + const version = installedVersions.find(y => y.command === KNOWN_FLOW_COMMANDS.DEFAULT)?.version if (version == null) return false // Check flow-cli version number diff --git a/extension/src/flow-cli/cli-provider.ts b/extension/src/flow-cli/cli-provider.ts index a5b2181a..dd9bdb39 100644 --- a/extension/src/flow-cli/cli-provider.ts +++ b/extension/src/flow-cli/cli-provider.ts @@ -1,67 +1,37 @@ import { BehaviorSubject, Observable, distinctUntilChanged, pairwise, startWith } from 'rxjs' -import { execDefault } from '../utils/shell/exec' import { StateCache } from '../utils/state-cache' -import * as semver from 'semver' import * as vscode from 'vscode' import { Settings } from '../settings/settings' import { isEqual } from 'lodash' - -const CHECK_FLOW_CLI_CMD = (flowCommand: string): string => `${flowCommand} version --output=json` -const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowCommand} version` - -const KNOWN_BINS = ['flow', 'flow-c1'] - -const CADENCE_V1_CLI_REGEX = /-cadence-v1.0.0/g -const LEGACY_VERSION_REGEXP = /Version:\s*(v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(\s|$)/m - -export interface CliBinary { - name: string - version: semver.SemVer -} - -interface FlowVersionOutput { - version: string -} - -interface AvailableBinariesCache { - [key: string]: StateCache -} +import { CliBinary, CliVersionsProvider, KNOWN_FLOW_COMMANDS } from './cli-versions-provider' export class CliProvider { #selectedBinaryName: BehaviorSubject #currentBinary$: StateCache - #availableBinaries: AvailableBinariesCache = {} - #availableBinaries$: StateCache + #cliVersionsProvider: CliVersionsProvider #settings: Settings constructor (settings: Settings) { + const initialBinaryPath = settings.getSettings().flowCommand + this.#settings = settings + this.#cliVersionsProvider = new CliVersionsProvider([initialBinaryPath]) + this.#selectedBinaryName = new BehaviorSubject(initialBinaryPath) + this.#currentBinary$ = new StateCache(async () => { + const name: string = this.#selectedBinaryName.getValue() + const versionCache = this.#cliVersionsProvider.get(name) + if (versionCache == null) return null + return await versionCache.getValue() + }) - this.#selectedBinaryName = new BehaviorSubject(settings.getSettings().flowCommand) + // Bind the selected binary to the settings this.#settings.watch$(config => config.flowCommand).subscribe((flowCommand) => { this.#selectedBinaryName.next(flowCommand) }) - this.#availableBinaries = KNOWN_BINS.reduce((acc, bin) => { - acc[bin] = new StateCache(async () => await this.#fetchBinaryInformation(bin)) - acc[bin].subscribe(() => { - this.#availableBinaries$.invalidate() - }) - return acc - }, {}) - - this.#availableBinaries$ = new StateCache(async () => { - return await this.getAvailableBinaries() - }) - - this.#currentBinary$ = new StateCache(async () => { - const name: string = this.#selectedBinaryName.getValue() - return await this.#availableBinaries[name].getValue() - }) - // Display warning to user if binary doesn't exist (only if not using the default binary) - this.#currentBinary$.subscribe((binary) => { - if (binary === null && this.#selectedBinaryName.getValue() !== 'flow') { + this.currentBinary$.subscribe((binary) => { + if (binary === null && this.#selectedBinaryName.getValue() !== KNOWN_FLOW_COMMANDS.DEFAULT) { void vscode.window.showErrorMessage(`The configured Flow CLI binary "${this.#selectedBinaryName.getValue()}" does not exist. Please check your settings.`) } }) @@ -72,119 +42,43 @@ export class CliProvider { #watchForBinaryChanges (): void { // Subscribe to changes in the selected binary to update the caches this.#selectedBinaryName.pipe(distinctUntilChanged(), startWith(null), pairwise()).subscribe(([prev, curr]) => { - // Swap out the cache for the selected binary - if (prev != null && !KNOWN_BINS.includes(prev)) { - // eslint-disable-next-line @typescript-eslint/no-dynamic-delete - delete this.#availableBinaries[prev] - } - if (curr != null && !KNOWN_BINS.includes(curr)) { - this.#availableBinaries[curr] = new StateCache(async () => await this.#fetchBinaryInformation(curr)) - this.#availableBinaries[curr].subscribe(() => { - this.#availableBinaries$.invalidate() - }) - } + // Remove the previous binary from the cache + if (prev != null) this.#cliVersionsProvider.remove(prev) + + // Add the current binary to the cache + if (curr != null) this.#cliVersionsProvider.add(curr) // Invalidate the current binary cache this.#currentBinary$.invalidate() - - // Invalidate the available binaries cache - this.#availableBinaries$.invalidate() }) } - // Fetches the binary information for the given binary - async #fetchBinaryInformation (bin: string): Promise { - try { - // Get user's version informaton - const buffer: string = (await execDefault(CHECK_FLOW_CLI_CMD( - bin - ))).stdout - - // Format version string from output - const versionInfo: FlowVersionOutput = JSON.parse(buffer) - - // Ensure user has a compatible version number installed - const version: semver.SemVer | null = semver.parse(versionInfo.version) - if (version === null) return null - - return { name: bin, version } - } catch { - // Fallback to old method if JSON is not supported/fails - return await this.#fetchBinaryInformationOld(bin) - } - } - - // Old version of fetchBinaryInformation (before JSON was supported) - // Used as fallback for old CLI versions - async #fetchBinaryInformationOld (bin: string): Promise { - try { - // Get user's version informaton - const output = (await execDefault(CHECK_FLOW_CLI_CMD_NO_JSON( - bin - ))) - - let versionStr: string | null = parseFlowCliVersion(output.stdout) - if (versionStr === null) { - // Try to fallback to stderr as patch for bugged version - versionStr = parseFlowCliVersion(output.stderr) - } - - versionStr = versionStr != null ? semver.clean(versionStr) : null - if (versionStr === null) return null - - // Ensure user has a compatible version number installed - const version: semver.SemVer | null = semver.parse(versionStr) - if (version === null) return null - - return { name: bin, version } - } catch { - return null - } - } - - refresh (): void { - for (const bin in this.#availableBinaries) { - this.#availableBinaries[bin].invalidate() - } - this.#currentBinary$.invalidate() - } - - get availableBinaries$ (): Observable { - return new Observable((subscriber) => { - this.#availableBinaries$.subscribe((binaries) => { - subscriber.next(binaries) - }) - }).pipe(distinctUntilChanged(isEqual)) + async getCurrentBinary (): Promise { + return await this.#currentBinary$.getValue() } - async getAvailableBinaries (): Promise { - const bins: CliBinary[] = [] - for (const name in this.#availableBinaries) { - const binary = await this.#availableBinaries[name].getValue().catch(() => null) - if (binary !== null) { - bins.push(binary) - } + async setCurrentBinary (name: string): Promise { + if (vscode.workspace.workspaceFolders == null) { + await this.#settings.updateSettings({ flowCommand: name }, vscode.ConfigurationTarget.Global) + } else { + await this.#settings.updateSettings({ flowCommand: name }) } - return bins } get currentBinary$ (): Observable { return this.#currentBinary$.pipe(distinctUntilChanged(isEqual)) } - async getCurrentBinary (): Promise { - return await this.#currentBinary$.getValue() + async getBinaryVersions (): Promise { + return await this.#cliVersionsProvider.getVersions() } - async setCurrentBinary (name: string): Promise { - await this.#settings.updateSettings({ flowCommand: name }) + get binaryVersions$ (): Observable { + return this.#cliVersionsProvider.versions$.pipe(distinctUntilChanged(isEqual)) } -} - -export function isCadenceV1Cli (version: semver.SemVer): boolean { - return CADENCE_V1_CLI_REGEX.test(version.raw) -} -export function parseFlowCliVersion (buffer: Buffer | string): string | null { - return buffer.toString().match(LEGACY_VERSION_REGEXP)?.[1] ?? null + // Refresh all cached binary versions + refresh (): void { + this.#cliVersionsProvider.refresh() + } } diff --git a/extension/src/flow-cli/cli-selection-provider.ts b/extension/src/flow-cli/cli-selection-provider.ts index 53637926..29034bf0 100644 --- a/extension/src/flow-cli/cli-selection-provider.ts +++ b/extension/src/flow-cli/cli-selection-provider.ts @@ -1,9 +1,10 @@ +import * as vscode from 'vscode' import { zip } from 'rxjs' -import { CliBinary, CliProvider } from './cli-provider' +import { CliProvider } from './cli-provider' import { SemVer } from 'semver' -import * as vscode from 'vscode' +import { CliBinary } from './cli-versions-provider' -const CHANGE_CADENCE_VERSION = 'cadence.changeCadenceVersion' +const CHANGE_CLI_BINARY = 'cadence.changeFlowCliBinary' const CADENCE_V1_CLI_REGEX = /-cadence-v1.0.0/g // label with icon const GET_BINARY_LABEL = (version: SemVer): string => `Flow CLI v${version.format()}` @@ -19,13 +20,13 @@ export class CliSelectionProvider { this.#cliProvider = cliProvider // Register the command to toggle the version - this.#disposables.push(vscode.commands.registerCommand(CHANGE_CADENCE_VERSION, async () => { + this.#disposables.push(vscode.commands.registerCommand(CHANGE_CLI_BINARY, async () => { this.#cliProvider.refresh() await this.#toggleSelector(true) })) // Register UI components - zip(this.#cliProvider.currentBinary$, this.#cliProvider.availableBinaries$).subscribe(() => { + zip(this.#cliProvider.currentBinary$, this.#cliProvider.binaryVersions$).subscribe(() => { void this.#refreshSelector() }) this.#cliProvider.currentBinary$.subscribe((binary) => { @@ -37,7 +38,7 @@ export class CliSelectionProvider { #createStatusBarItem (version: SemVer | null): vscode.StatusBarItem { const statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1) - statusBarItem.command = CHANGE_CADENCE_VERSION + statusBarItem.command = CHANGE_CLI_BINARY statusBarItem.color = new vscode.ThemeColor('statusBar.foreground') statusBarItem.tooltip = 'Click to change the Flow CLI version' @@ -74,23 +75,31 @@ export class CliSelectionProvider { } }) } else if (selected instanceof AvailableBinaryItem) { - void this.#cliProvider.setCurrentBinary(selected.path) + void this.#cliProvider.setCurrentBinary(selected.command) } })) + this.#disposables.push(versionSelector.onDidHide(() => { + void this.#toggleSelector(false) + })) + // Update available versions const items: Array = availableBinaries.map(binary => new AvailableBinaryItem(binary)) items.push(new CustomBinaryItem()) - versionSelector.items = items - // Select the current binary - if (currentBinary !== null) { - const currentBinaryItem = versionSelector.items.find(item => item instanceof AvailableBinaryItem && item.path === currentBinary.name) - if (currentBinaryItem != null) { - versionSelector.selectedItems = [currentBinaryItem] - } + // Hoist the current binary to the top of the list + const currentBinaryIndex = items.findIndex(item => + item instanceof AvailableBinaryItem && + currentBinary != null && + item.command === currentBinary.command + ) + if (currentBinaryIndex !== -1) { + const currentBinaryItem = items[currentBinaryIndex] + items.splice(currentBinaryIndex, 1) + items.unshift(currentBinaryItem) } + versionSelector.items = items return versionSelector } @@ -103,7 +112,7 @@ export class CliSelectionProvider { if (this.#showSelector) { this.#versionSelector?.dispose() const currentBinary = await this.#cliProvider.getCurrentBinary() - const availableBinaries = await this.#cliProvider.getAvailableBinaries() + const availableBinaries = await this.#cliProvider.getBinaryVersions() this.#versionSelector = this.#createVersionSelector(currentBinary, availableBinaries) this.#disposables.push(this.#versionSelector) this.#versionSelector.show() @@ -134,11 +143,11 @@ class AvailableBinaryItem implements vscode.QuickPickItem { } get description (): string { - return `(${this.#binary.name})` + return `(${this.#binary.command})` } - get path (): string { - return this.#binary.name + get command (): string { + return this.#binary.command } } diff --git a/extension/src/flow-cli/cli-versions-provider.ts b/extension/src/flow-cli/cli-versions-provider.ts new file mode 100644 index 00000000..035677ac --- /dev/null +++ b/extension/src/flow-cli/cli-versions-provider.ts @@ -0,0 +1,146 @@ +import * as semver from 'semver' +import { StateCache } from '../utils/state-cache' +import { execDefault } from '../utils/shell/exec' +import { Observable, distinctUntilChanged } from 'rxjs' +import { isEqual } from 'lodash' + +const CHECK_FLOW_CLI_CMD = (flowCommand: string): string => `${flowCommand} version --output=json` +const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowCommand} version` + +export enum KNOWN_FLOW_COMMANDS { + DEFAULT = 'flow', + CADENCE_V1 = 'flow-c1', +} + +// Matches the version number from the output of the Flow CLI +const LEGACY_VERSION_REGEXP = /Version:\s*v(.*)(?:\s|$)/m + +export interface CliBinary { + command: string + version: semver.SemVer +} + +interface FlowVersionOutput { + version: string +} + +export class CliVersionsProvider { + #rootCache: StateCache + #caches: { [key: string]: StateCache } = {} + + constructor (seedBinaries: string[] = []) { + // Seed the caches with the known binaries + Object.values(KNOWN_FLOW_COMMANDS).forEach((bin) => { + this.add(bin) + }) + + // Seed the caches with any additional binaries + seedBinaries.forEach((bin) => { + this.add(bin) + }) + + // Create the root cache. This cache will hold all the binary information + // and is a combination of all the individual caches for each binary + this.#rootCache = new StateCache(async () => { + const binaries = await Promise.all( + Object.keys(this.#caches).map(async (bin) => { + return await this.#caches[bin].getValue().catch(() => null) + }) + ) + + // Filter out missing binaries + return binaries.filter((bin) => bin != null) as CliBinary[] + }) + } + + add (command: string): void { + if (this.#caches[command] != null) return + this.#caches[command] = new StateCache(async () => await this.#fetchBinaryInformation(command)) + this.#caches[command].subscribe(() => { + this.#rootCache?.invalidate() + }) + this.#rootCache?.invalidate() + } + + remove (command: string): void { + // Known binaries cannot be removed + if (this.#caches[command] == null || (Object.values(KNOWN_FLOW_COMMANDS) as string[]).includes(command)) return + // eslint-disable-next-line @typescript-eslint/no-dynamic-delete + delete this.#caches[command] + this.#rootCache?.invalidate() + } + + get (name: string): StateCache | null { + return this.#caches[name] ?? null + } + + // Fetches the binary information for the given binary + async #fetchBinaryInformation (bin: string): Promise { + try { + // Get user's version informaton + const buffer: string = (await execDefault(CHECK_FLOW_CLI_CMD( + bin + ))).stdout + + // Format version string from output + const versionInfo: FlowVersionOutput = JSON.parse(buffer) + + return cliBinaryFromVersion(bin, versionInfo.version) + } catch { + // Fallback to old method if JSON is not supported/fails + return await this.#fetchBinaryInformationOld(bin) + } + } + + // Old version of fetchBinaryInformation (before JSON was supported) + // Used as fallback for old CLI versions + async #fetchBinaryInformationOld (bin: string): Promise { + try { + // Get user's version informaton + const output = (await execDefault(CHECK_FLOW_CLI_CMD_NO_JSON( + bin + ))) + + let versionStr: string | null = parseFlowCliVersion(output.stdout) + if (versionStr === null) { + // Try to fallback to stderr as patch for bugged version + versionStr = parseFlowCliVersion(output.stderr) + } + + if (versionStr == null) return null + + return cliBinaryFromVersion(bin, versionStr) + } catch { + return null + } + } + + refresh (): void { + Object.keys(this.#caches).forEach((bin) => { + this.#caches[bin].invalidate() + }) + this.#rootCache.invalidate() + } + + async getVersions (): Promise { + return await this.#rootCache.getValue() + } + + get versions$ (): Observable { + return this.#rootCache.pipe(distinctUntilChanged(isEqual)) + } +} + +export function parseFlowCliVersion (buffer: Buffer | string): string | null { + const rawMatch = buffer.toString().match(LEGACY_VERSION_REGEXP)?.[1] ?? null + if (rawMatch == null) return null + return semver.clean(rawMatch) +} + +function cliBinaryFromVersion (bin: string, versionStr: string): CliBinary | null { + // Ensure user has a compatible version number installed + const version: semver.SemVer | null = semver.parse(versionStr) + if (version === null) return null + + return { command: bin, version } +} diff --git a/extension/src/server/language-server.ts b/extension/src/server/language-server.ts index 1973cd34..ad74ca80 100644 --- a/extension/src/server/language-server.ts +++ b/extension/src/server/language-server.ts @@ -7,6 +7,7 @@ import { BehaviorSubject, Subscription, filter, firstValueFrom, skip } from 'rxj import { envVars } from '../utils/shell/env-vars' import { FlowConfig } from './flow-config' import { CliProvider } from '../flow-cli/cli-provider' +import { KNOWN_FLOW_COMMANDS } from '../flow-cli/cli-versions-provider' // Identities for commands handled by the Language server const RELOAD_CONFIGURATION = 'cadence.server.flow.reloadConfiguration' @@ -75,12 +76,12 @@ export class LanguageServerAPI { const accessCheckMode: string = this.#settings.getSettings().accessCheckMode const configPath: string | null = this.#config.configPath - const binaryPath = (await this.#cliProvider.getCurrentBinary())?.name + const binaryPath = (await this.#cliProvider.getCurrentBinary())?.command if (binaryPath == null) { throw new Error('No flow binary found') } - if (binaryPath !== 'flow') { + if (binaryPath !== KNOWN_FLOW_COMMANDS.DEFAULT) { try { exec('killall dlv') // Required when running language server locally on mac } catch (err) { void err } diff --git a/extension/test/integration/1 - language-server.test.ts b/extension/test/integration/1 - language-server.test.ts index 3fc9f30b..47c9ab36 100644 --- a/extension/test/integration/1 - language-server.test.ts +++ b/extension/test/integration/1 - language-server.test.ts @@ -8,8 +8,8 @@ import { MaxTimeout } from '../globals' import { BehaviorSubject, Subject } from 'rxjs' import { State } from 'vscode-languageclient' import * as sinon from 'sinon' -import { CliBinary } from '../../src/flow-cli/cli-provider' import { SemVer } from 'semver' +import { CliBinary } from '../../src/flow-cli/cli-versions-provider' suite('Language Server & Emulator Integration', () => { let LS: LanguageServerAPI @@ -33,7 +33,7 @@ suite('Language Server & Emulator Integration', () => { // create a mock cli provider without invokign the constructor cliBinary$ = new BehaviorSubject({ - name: 'flow', + command: 'flow', version: new SemVer('1.0.0') }) const mockCliProvider = { @@ -63,7 +63,7 @@ suite('Language Server & Emulator Integration', () => { fileModified$.next() pathChanged$.next('foo') cliBinary$.next({ - name: 'flow', + command: 'flow', version: new SemVer('1.0.1') }) diff --git a/extension/test/unit/parser.test.ts b/extension/test/unit/parser.test.ts index 6aba70a6..41f48829 100644 --- a/extension/test/unit/parser.test.ts +++ b/extension/test/unit/parser.test.ts @@ -1,5 +1,5 @@ import * as assert from 'assert' -import { parseFlowCliVersion } from '../../src/flow-cli/cli-provider' +import { parseFlowCliVersion } from '../../src/flow-cli/cli-versions-provider' import { execDefault } from '../../src/utils/shell/exec' import { ASSERT_EQUAL } from '../globals' import * as semver from 'semver' @@ -8,17 +8,17 @@ suite('Parsing Unit Tests', () => { test('Flow CLI Version Parsing (buffer input)', async () => { let versionTest: Buffer = Buffer.from('Version: v0.1.0\nCommit: 0a1b2c3d') let formatted = parseFlowCliVersion(versionTest) - ASSERT_EQUAL(formatted, 'v0.1.0') + ASSERT_EQUAL(formatted, '0.1.0') versionTest = Buffer.from('Version: v0.1.0') formatted = parseFlowCliVersion(versionTest) - ASSERT_EQUAL(formatted, 'v0.1.0') + ASSERT_EQUAL(formatted, '0.1.0') }) test('Flow CLI Version Parsing (string input)', async () => { const versionTest: string = 'Version: v0.1.0\nCommit: 0a1b2c3d' const formatted = parseFlowCliVersion(versionTest) - ASSERT_EQUAL(formatted, 'v0.1.0') + ASSERT_EQUAL(formatted, '0.1.0') }) test('Flow CLI Version Parsing produces valid semver from Flow CLI output', async () => { diff --git a/package.json b/package.json index be0e51c5..714ef41c 100644 --- a/package.json +++ b/package.json @@ -100,9 +100,9 @@ "title": "Check Dependencies" }, { - "command": "cadence.changeCadenceVersion", + "command": "cadence.changeFlowCliBinary", "category": "Cadence", - "title": "Change Cadence Version" + "title": "Change Flow CLI Binary" } ], "configuration": { From ef64efc1b848f61b490aa2b6cee4e0ca7b6b3caa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:37:49 -0700 Subject: [PATCH 37/97] Bump @types/node from 20.11.30 to 20.12.7 (#592) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 441fc88f..1db5f6c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.17.0", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.28", + "@types/node": "^20.12.7", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", @@ -1429,9 +1429,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", - "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", + "version": "20.12.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", + "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", "dev": true, "dependencies": { "undici-types": "~5.26.4" diff --git a/package.json b/package.json index 714ef41c..d7ae3d98 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/lodash": "^4.17.0", "@types/mixpanel": "^2.14.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.28", + "@types/node": "^20.12.7", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", From 80f21601346fc7901788666344fe9d7c6331024e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:38:05 -0700 Subject: [PATCH 38/97] Bump @sentry/node from 7.109.0 to 7.110.0 (#590) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1db5f6c7..113699c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.109.0", + "@sentry/node": "^7.110.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1202,58 +1202,58 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.109.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.109.0.tgz", - "integrity": "sha512-PzK/joC5tCuh2R/PRh+7dp+uuZl7pTsBIjPhVZHMTtb9+ls65WkdZJ1/uKXPouyz8NOo9Xok7aEvEo9seongyw==", + "version": "7.110.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.110.0.tgz", + "integrity": "sha512-IIHHa9e/mE7uOMJfNELI8adyoELxOy6u6TNCn5t6fphmq84w8FTc9adXkG/FY2AQpglkIvlILojfMROFB2aaAQ==", "dependencies": { - "@sentry/core": "7.109.0", - "@sentry/types": "7.109.0", - "@sentry/utils": "7.109.0" + "@sentry/core": "7.110.0", + "@sentry/types": "7.110.0", + "@sentry/utils": "7.110.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.109.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.109.0.tgz", - "integrity": "sha512-xwD4U0IlvvlE/x/g/W1I8b4Cfb16SsCMmiEuBf6XxvAa3OfWBxKoqLifb3GyrbxMC4LbIIZCN/SvLlnGJPgszA==", + "version": "7.110.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.110.0.tgz", + "integrity": "sha512-g4suCQO94mZsKVaAbyD1zLFC5YSuBQCIPHXx9fdgtfoPib7BWjWWePkllkrvsKAv4u8Oq05RfnKOhOMRHpOKqg==", "dependencies": { - "@sentry/types": "7.109.0", - "@sentry/utils": "7.109.0" + "@sentry/types": "7.110.0", + "@sentry/utils": "7.110.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.109.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.109.0.tgz", - "integrity": "sha512-tqMNAES4X/iBl1eZRCmc29p//0id01FBLEiesNo5nk6ECl6/SaGMFAEwu1gsn90h/Bjgr04slwFOS4cR45V2PQ==", + "version": "7.110.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.110.0.tgz", + "integrity": "sha512-YPfweCSzo/omnx5q1xOEZfI8Em3jnPqj7OM4ObXmoSKEK+kM1oUF3BTRzw5BJOaOCSTBFY1RAsGyfVIyrwxWnA==", "dependencies": { - "@sentry-internal/tracing": "7.109.0", - "@sentry/core": "7.109.0", - "@sentry/types": "7.109.0", - "@sentry/utils": "7.109.0" + "@sentry-internal/tracing": "7.110.0", + "@sentry/core": "7.110.0", + "@sentry/types": "7.110.0", + "@sentry/utils": "7.110.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.109.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.109.0.tgz", - "integrity": "sha512-egCBnDv3YpVFoNzRLdP0soVrxVLCQ+rovREKJ1sw3rA2/MFH9WJ+DZZexsX89yeAFzy1IFsCp7/dEqudusml6g==", + "version": "7.110.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.110.0.tgz", + "integrity": "sha512-DqYBLyE8thC5P5MuPn+sj8tL60nCd/f5cerFFPcudn5nJ4Zs1eI6lKlwwyHYTEu5c4KFjCB0qql6kXfwAHmTyA==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.109.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.109.0.tgz", - "integrity": "sha512-3RjxMOLMBwZ5VSiH84+o/3NY2An4Zldjz0EbfEQNRY9yffRiCPJSQiCJID8EoylCFOh/PAhPimBhqbtWJxX6iw==", + "version": "7.110.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.110.0.tgz", + "integrity": "sha512-VBsdLLN+5tf73fhf/Cm7JIsUJ6y9DkJj8h4I6Mxx0rszrvOyH6S5px40K+V4jdLBzMEvVinC7q2Cbf1YM18BSw==", "dependencies": { - "@sentry/types": "7.109.0" + "@sentry/types": "7.110.0" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index d7ae3d98..83c8177d 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.109.0", + "@sentry/node": "^7.110.0", "@vscode/vsce": "^2.24.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From d0fafce8a6a827d603adc225fd38189cb58e4429 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:38:17 -0700 Subject: [PATCH 39/97] Bump actions/add-to-project from 1.0.0 to 1.0.1 (#589) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-issues-to-devx-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-issues-to-devx-project.yml b/.github/workflows/add-issues-to-devx-project.yml index 4ba39a6d..d00e3014 100644 --- a/.github/workflows/add-issues-to-devx-project.yml +++ b/.github/workflows/add-issues-to-devx-project.yml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v1.0.0 + - uses: actions/add-to-project@v1.0.1 with: project-url: https://github.com/orgs/onflow/projects/13 github-token: ${{ secrets.GH_ACTION_FOR_PROJECTS }} From fd469e5eb60f40a83311bd8882db24e72c7404bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 08:38:28 -0700 Subject: [PATCH 40/97] Bump glob from 10.3.10 to 10.3.12 (#585) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 113699c9..3bb08fcf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@vscode/test-electron": "^2.3.9", "chai": "^5.1.0", "esbuild": "^0.20.2", - "glob": "^10.3.10", + "glob": "^10.3.12", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", @@ -4285,16 +4285,16 @@ "optional": true }, "node_modules/glob": { - "version": "10.3.10", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", - "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "version": "10.3.12", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", + "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.5", + "jackspeak": "^2.3.6", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", - "path-scurry": "^1.10.1" + "minipass": "^7.0.4", + "path-scurry": "^1.10.2" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -6171,9 +6171,9 @@ "devOptional": true }, "node_modules/minipass": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.1.tgz", - "integrity": "sha512-NQ8MCKimInjVlaIqx51RKJJB7mINVkLTJbsZKmto4UAAOC/CWXES8PGaOgoBZyqoUsUA/U3DToGK7GJkkHbjJw==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, "engines": { "node": ">=16 || 14 >=14.17" @@ -7148,12 +7148,12 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", - "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", + "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", "dev": true, "dependencies": { - "lru-cache": "^9.1.1 || ^10.0.0", + "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { @@ -7164,9 +7164,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz", - "integrity": "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", "dev": true, "engines": { "node": "14 || >=16.14" diff --git a/package.json b/package.json index 83c8177d..c923580a 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "@vscode/test-electron": "^2.3.9", "chai": "^5.1.0", "esbuild": "^0.20.2", - "glob": "^10.3.10", + "glob": "^10.3.12", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", From 3c329a9512428087d25dd6a90749286994997cdd Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Thu, 18 Apr 2024 09:29:46 -0700 Subject: [PATCH 41/97] Release v2.3.2 (#594) --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3bb08fcf..ac9258aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.3.1", + "version": "2.3.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.3.1", + "version": "2.3.2", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", diff --git a/package.json b/package.json index c923580a..e425382f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.3.1", + "version": "2.3.2", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From 2af432a621ffd7349084b0e41f3f73066f8de758 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Fri, 26 Apr 2024 11:14:51 -0700 Subject: [PATCH 42/97] Use Homebrew to check for latest Flow CLI version (#600) --- .../installers/flow-cli-installer.ts | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts index fa8f971b..1a8d73c9 100644 --- a/extension/src/dependency-installer/installers/flow-cli-installer.ts +++ b/extension/src/dependency-installer/installers/flow-cli-installer.ts @@ -8,6 +8,13 @@ import fetch from 'node-fetch' import { HomebrewInstaller } from './homebrew-installer' import { KNOWN_FLOW_COMMANDS } from '../../flow-cli/cli-versions-provider' +// Relevant subset of Homebrew formulae JSON +interface HomebrewVersionInfo { + versions: { + stable: string + } +} + // Command to check flow-cli const COMPATIBLE_FLOW_CLI_VERSIONS = '>=1.6.0' @@ -21,7 +28,8 @@ const BASH_INSTALL_FLOW_CLI = (githubToken?: string): string => `${ githubToken != null ? `GITHUB_TOKEN=${githubToken} ` : '' }sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)"` -const VERSION_INFO_URL = 'https://raw.githubusercontent.com/onflow/flow-cli/master/version.txt' +const VERSION_INFO_URL = 'https://formulae.brew.sh/api/formula/flow-cli.json' + export class InstallFlowCLI extends Installer { #githubToken: string | undefined #context: InstallerContext @@ -78,24 +86,26 @@ export class InstallFlowCLI extends Installer { await execVscodeTerminal('Install Flow CLI', BASH_INSTALL_FLOW_CLI()) } - async findLatestVersion (currentVersion: semver.SemVer): Promise { - const response = await fetch(VERSION_INFO_URL) - const latestStr = semver.clean(await response.text()) - const latest: semver.SemVer | null = semver.parse(latestStr) - - // Check if latest version > current version - if (latest != null && latestStr != null && semver.compare(latest, currentVersion) === 1) { - promptUserInfoMessage( - 'There is a new Flow CLI version available: ' + latestStr, - [{ - label: 'Install latest Flow CLI', - callback: async () => { - await this.runInstall() - await this.#context.refreshDependencies() - } - }] - ) - } + async maybeNotifyNewerVersion (currentVersion: semver.SemVer): Promise { + try { + const response = await fetch(VERSION_INFO_URL) + const { versions: { stable: latestStr } }: HomebrewVersionInfo = await response.json() + const latest: semver.SemVer | null = semver.parse(latestStr) + + // Check if latest version > current version + if (latest != null && latestStr != null && semver.compare(latest, currentVersion) === 1) { + promptUserInfoMessage( + 'There is a new Flow CLI version available: ' + latest.format(), + [{ + label: 'Install latest Flow CLI', + callback: async () => { + await this.runInstall() + await this.#context.refreshDependencies() + } + }] + ) + } + } catch (e) {} } async checkVersion (version: semver.SemVer): Promise { @@ -119,8 +129,8 @@ export class InstallFlowCLI extends Installer { return false } - // Check for newer version - await this.findLatestVersion(version) + // Maybe notify user of newer version, non-blocking + void this.maybeNotifyNewerVersion(version) return true } From 5ebf86206a0aed60993635ff3fa2601cdbe2606c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:38:23 -0700 Subject: [PATCH 43/97] Bump ovsx from 0.9.0 to 0.9.1 (#597) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 706 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 650 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac9258aa..16e03eb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", - "ovsx": "^0.9.0", + "ovsx": "^0.9.1", "rimraf": "^5.0.5", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", @@ -59,6 +59,282 @@ "vscode": "^1.82.0" } }, + "node_modules/@azure/abort-controller": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz", + "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==", + "dependencies": { + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/@azure/abort-controller/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/core-auth": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.7.2.tgz", + "integrity": "sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g==", + "dependencies": { + "@azure/abort-controller": "^2.0.0", + "@azure/core-util": "^1.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-auth/node_modules/@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-auth/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/core-client": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.9.2.tgz", + "integrity": "sha512-kRdry/rav3fUKHl/aDLd/pDLcB+4pOFwPPTVEExuMyaI5r+JBbMWqRbCY1pn5BniDaU3lRxO9eaQ1AmSMehl/w==", + "dependencies": { + "@azure/abort-controller": "^2.0.0", + "@azure/core-auth": "^1.4.0", + "@azure/core-rest-pipeline": "^1.9.1", + "@azure/core-tracing": "^1.0.0", + "@azure/core-util": "^1.6.1", + "@azure/logger": "^1.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-client/node_modules/@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-client/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/core-rest-pipeline": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.15.2.tgz", + "integrity": "sha512-BmWfpjc/QXc2ipHOh6LbUzp3ONCaa6xzIssTU0DwH9bbYNXJlGUL6tujx5TrbVd/QQknmS+vlQJGrCq2oL1gZA==", + "dependencies": { + "@azure/abort-controller": "^2.0.0", + "@azure/core-auth": "^1.4.0", + "@azure/core-tracing": "^1.0.1", + "@azure/core-util": "^1.3.0", + "@azure/logger": "^1.0.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/http-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/https-proxy-agent": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", + "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@azure/core-rest-pipeline/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/core-tracing": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.1.2.tgz", + "integrity": "sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-tracing/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/core-util": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz", + "integrity": "sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==", + "dependencies": { + "@azure/abort-controller": "^2.0.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-util/node_modules/@azure/abort-controller": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", + "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/core-util/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/identity": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.1.0.tgz", + "integrity": "sha512-BhYkF8Xr2gXjyDxocm0pc9RI5J5a1jw8iW0dw6Bx95OGdYbuMyFZrrwNw4eYSqQ2BB6FZOqpJP3vjsAqRcvDhw==", + "dependencies": { + "@azure/abort-controller": "^1.0.0", + "@azure/core-auth": "^1.5.0", + "@azure/core-client": "^1.4.0", + "@azure/core-rest-pipeline": "^1.1.0", + "@azure/core-tracing": "^1.0.0", + "@azure/core-util": "^1.3.0", + "@azure/logger": "^1.0.0", + "@azure/msal-browser": "^3.11.1", + "@azure/msal-node": "^2.6.6", + "events": "^3.0.0", + "jws": "^4.0.0", + "open": "^8.0.0", + "stoppable": "^1.1.0", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/identity/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/logger": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.1.2.tgz", + "integrity": "sha512-l170uE7bsKpIU6B/giRc9i4NI0Mj+tANMMMxf7Zi/5cKzEqPayP7+X1WPrG7e+91JgY8N+7K7nF2WOi7iVhXvg==", + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/@azure/logger/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/@azure/msal-browser": { + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.13.0.tgz", + "integrity": "sha512-fD906nmJei3yE7la6DZTdUtXKvpwzJURkfsiz9747Icv4pit77cegSm6prJTKLQ1fw4iiZzrrWwxnhMLrTf5gQ==", + "dependencies": { + "@azure/msal-common": "14.9.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@azure/msal-common": { + "version": "14.9.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.9.0.tgz", + "integrity": "sha512-yzBPRlWPnTBeixxLNI3BBIgF5/bHpbhoRVuuDBnYjCyWRavaPUsKAHUDYLqpGkBLDciA6TCc6GOxN4/S3WiSxg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@azure/msal-node": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.7.0.tgz", + "integrity": "sha512-wXD8LkUvHICeSWZydqg6o8Yvv+grlBEcmLGu+QEI4FcwFendbTEZrlSygnAXXSOCVaGAirWLchca35qrgpO6Jw==", + "dependencies": { + "@azure/msal-common": "14.9.0", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@azure/msal-node/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@babel/code-frame": { "version": "7.22.13", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", @@ -1700,14 +1976,17 @@ } }, "node_modules/@vscode/vsce": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.24.0.tgz", - "integrity": "sha512-p6CIXpH5HXDqmUkgFXvIKTjZpZxy/uDx4d/UsfhS9vQUun43KDNUbYeZocyAHgqcJlPEurgArHz9te1PPiqPyA==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.26.0.tgz", + "integrity": "sha512-v54ltgMzUG8lGY0kAgaOlry57xse1RlWzes9FotfGEx+Fr05KeR8rZicQzEMDmi9QnOgVWHuiEq+xA2HWkAz+Q==", "dependencies": { - "azure-devops-node-api": "^11.0.1", + "@azure/identity": "^4.1.0", + "azure-devops-node-api": "^12.5.0", "chalk": "^2.4.2", "cheerio": "^1.0.0-rc.9", + "cockatiel": "^3.1.2", "commander": "^6.2.1", + "form-data": "^4.0.0", "glob": "^7.0.6", "hosted-git-info": "^4.0.2", "jsonc-parser": "^3.2.0", @@ -1729,7 +2008,7 @@ "vsce": "vsce" }, "engines": { - "node": ">= 14" + "node": ">= 16" }, "optionalDependencies": { "keytar": "^7.7.0" @@ -2059,6 +2338,11 @@ "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.1.tgz", "integrity": "sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/available-typed-arrays": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", @@ -2072,9 +2356,9 @@ } }, "node_modules/azure-devops-node-api": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz", - "integrity": "sha512-YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A==", + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-12.5.0.tgz", + "integrity": "sha512-R5eFskGvOm3U/GzeAuxRkUsAl0hrAwGgWn6zAd2KrZmrEhWZVqLew4OOupbQlXUuojUzpGtq62SmdhJ06N88og==", "dependencies": { "tunnel": "0.0.6", "typed-rest-client": "^1.8.4" @@ -2222,6 +2506,11 @@ "node": "*" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==" + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -2253,12 +2542,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2494,6 +2789,14 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/cockatiel": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cockatiel/-/cockatiel-3.1.2.tgz", + "integrity": "sha512-5yARKww0dWyWg2/3xZeXgoxjHLwpVqFptj9Zy7qioJ6+/L0ARM184sgMUrQDjxw7ePJWlGhV998mKhzrxT0/Kg==", + "engines": { + "node": ">=16" + } + }, "node_modules/code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", @@ -2522,6 +2825,17 @@ "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", @@ -2743,6 +3057,30 @@ "node": ">=8" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "engines": { + "node": ">=8" + } + }, "node_modules/define-properties": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", @@ -2759,6 +3097,14 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", @@ -2878,6 +3224,14 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "dev": true }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/electron-to-chromium": { "version": "1.3.798", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.798.tgz", @@ -2977,6 +3331,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-set-tostringtag": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", @@ -3757,6 +4130,14 @@ "node": ">=0.10.0" } }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "engines": { + "node": ">=0.8.x" + } + }, "node_modules/execa": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", @@ -4039,6 +4420,19 @@ "node": ">=8.0.0" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fromentries": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", @@ -4085,9 +4479,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.5", @@ -4207,13 +4604,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4427,7 +4829,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -4451,6 +4852,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -4476,12 +4878,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4491,7 +4892,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -4565,6 +4965,17 @@ "node": ">=8" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -4870,6 +5281,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -5082,6 +5507,17 @@ "node": ">=0.10.0" } }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -5734,6 +6170,46 @@ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, + "node_modules/jsonwebtoken/node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jsonwebtoken/node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/jsx-ast-utils": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz", @@ -5795,6 +6271,25 @@ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, + "node_modules/jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "dependencies": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + }, "node_modules/keytar": { "version": "7.9.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz", @@ -5888,12 +6383,47 @@ "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==", "dev": true }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -6124,6 +6654,25 @@ "node": ">=4" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mimic-fn": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", @@ -6817,9 +7366,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6934,6 +7483,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -6967,12 +7532,12 @@ } }, "node_modules/ovsx": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.9.0.tgz", - "integrity": "sha512-4dWT/lU/WaLWy0iSL4yOMDZZEWEjESqDxrcqxHpOzJoq40DimogsIuHi9bIAAwBYYn2e9CJcf8gDIblEPpQLKA==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.9.1.tgz", + "integrity": "sha512-faORiHeVdRFXVjvwjGvsGdfw49ocUZwUvjrrObZDzhlkKkrUS8L2afeXF8goeuv1YbTV8lmFfBYAt0C4FaoVuQ==", "dev": true, "dependencies": { - "@vscode/vsce": "^2.24.0", + "@vscode/vsce": "^2.25.0", "commander": "^6.1.0", "follow-redirects": "^1.14.6", "is-ci": "^2.0.0", @@ -6984,7 +7549,7 @@ "ovsx": "lib/ovsx" }, "engines": { - "node": ">= 18" + "node": ">= 16" } }, "node_modules/p-limit": { @@ -7503,11 +8068,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", + "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -7758,8 +8323,7 @@ "node_modules/safe-buffer": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", - "devOptional": true + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" }, "node_modules/safe-regex-test": { "version": "1.0.0", @@ -7809,6 +8373,22 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "devOptional": true }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -7816,13 +8396,17 @@ "dev": true }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8182,6 +8766,15 @@ "node": ">=6" } }, + "node_modules/stoppable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", + "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==", + "engines": { + "node": ">=4", + "npm": ">=6" + } + }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -8828,10 +9421,9 @@ } }, "node_modules/typed-rest-client": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.5.tgz", - "integrity": "sha512-952/Aegu3lTqUAI1anbDLbewojnF/gh8at9iy1CIrfS1h/+MtNjB1Y9z6ZF5n2kZd+97em56lZ9uu7Zz3y/pwg==", - "deprecated": "1.8.5 contains changes that are not compatible with Node 6", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.11.tgz", + "integrity": "sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==", "dependencies": { "qs": "^6.9.1", "tunnel": "0.0.6", @@ -8881,9 +9473,9 @@ } }, "node_modules/underscore": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", + "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" }, "node_modules/undici-types": { "version": "5.26.5", diff --git a/package.json b/package.json index e425382f..f289689b 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", - "ovsx": "^0.9.0", + "ovsx": "^0.9.1", "rimraf": "^5.0.5", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", From 9111d3c005acd4670c382fc40c7b608901083f35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:38:38 -0700 Subject: [PATCH 44/97] Bump @vscode/vsce from 2.24.0 to 2.26.0 (#595) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16e03eb7..e514956a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^7.110.0", - "@vscode/vsce": "^2.24.0", + "@vscode/vsce": "^2.26.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", diff --git a/package.json b/package.json index f289689b..13015c06 100644 --- a/package.json +++ b/package.json @@ -215,7 +215,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^7.110.0", - "@vscode/vsce": "^2.24.0", + "@vscode/vsce": "^2.26.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", From 0e5f54130fc826e34afc0eb5810ec708d88151aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:39:17 -0700 Subject: [PATCH 45/97] Bump @types/mixpanel from 2.14.8 to 2.14.9 (#598) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e514956a..d3c3b7fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.0", - "@types/mixpanel": "^2.14.8", + "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.12.7", "@types/object-hash": "^3.0.6", @@ -1693,9 +1693,9 @@ "dev": true }, "node_modules/@types/mixpanel": { - "version": "2.14.8", - "resolved": "https://registry.npmjs.org/@types/mixpanel/-/mixpanel-2.14.8.tgz", - "integrity": "sha512-rWDZESfhXO9ST7piwTO9VAtEVRMvxQFWgvDZv3B+dd0+gNz847Cf55rHPmGZTTMAkgsOLeqNyxbqJmcZbJLsxw==", + "version": "2.14.9", + "resolved": "https://registry.npmjs.org/@types/mixpanel/-/mixpanel-2.14.9.tgz", + "integrity": "sha512-/0xAtxlluEBz3f/cmM04tVTmP94mPEME6TBl+kKA7HtPWlvxH/fMSmp4ZdV2b/SN+7FLHm/aR6Fau8wZrjvoZQ==", "dev": true }, "node_modules/@types/mocha": { diff --git a/package.json b/package.json index 13015c06..e5d9cab0 100644 --- a/package.json +++ b/package.json @@ -188,7 +188,7 @@ "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.0", - "@types/mixpanel": "^2.14.8", + "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.12.7", "@types/object-hash": "^3.0.6", From f61ca0b0d13647a34b24a619076c669a518d2bfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 17:39:23 +0000 Subject: [PATCH 46/97] Bump @sentry/node from 7.110.0 to 7.112.2 (#602) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 86 ++++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 59 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index d3c3b7fa..6325d6b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.110.0", + "@sentry/node": "^7.112.2", "@vscode/vsce": "^2.26.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1478,58 +1478,73 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.110.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.110.0.tgz", - "integrity": "sha512-IIHHa9e/mE7uOMJfNELI8adyoELxOy6u6TNCn5t6fphmq84w8FTc9adXkG/FY2AQpglkIvlILojfMROFB2aaAQ==", + "version": "7.112.2", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.112.2.tgz", + "integrity": "sha512-fT1Y46J4lfXZkgFkb03YMNeIEs2xS6jdKMoukMFQfRfVvL9fSWEbTgZpHPd/YTT8r2i082XzjtAoQNgklm/0Hw==", "dependencies": { - "@sentry/core": "7.110.0", - "@sentry/types": "7.110.0", - "@sentry/utils": "7.110.0" + "@sentry/core": "7.112.2", + "@sentry/types": "7.112.2", + "@sentry/utils": "7.112.2" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.110.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.110.0.tgz", - "integrity": "sha512-g4suCQO94mZsKVaAbyD1zLFC5YSuBQCIPHXx9fdgtfoPib7BWjWWePkllkrvsKAv4u8Oq05RfnKOhOMRHpOKqg==", + "version": "7.112.2", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.112.2.tgz", + "integrity": "sha512-gHPCcJobbMkk0VR18J65WYQTt3ED4qC6X9lHKp27Ddt63E+MDGkG6lvYBU1LS8cV7CdyBGC1XXDCfor61GvLsA==", "dependencies": { - "@sentry/types": "7.110.0", - "@sentry/utils": "7.110.0" + "@sentry/types": "7.112.2", + "@sentry/utils": "7.112.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry/integrations": { + "version": "7.112.2", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.112.2.tgz", + "integrity": "sha512-ioC2yyU6DqtLkdmWnm87oNvdn2+9oKctJeA4t+jkS6JaJ10DcezjCwiLscX4rhB9aWJV3IWF7Op0O6K3w0t2Hg==", + "dependencies": { + "@sentry/core": "7.112.2", + "@sentry/types": "7.112.2", + "@sentry/utils": "7.112.2", + "localforage": "^1.8.1" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/node": { - "version": "7.110.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.110.0.tgz", - "integrity": "sha512-YPfweCSzo/omnx5q1xOEZfI8Em3jnPqj7OM4ObXmoSKEK+kM1oUF3BTRzw5BJOaOCSTBFY1RAsGyfVIyrwxWnA==", + "version": "7.112.2", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.112.2.tgz", + "integrity": "sha512-MNzkqER8jc2xOS3ArkCLH5hakzu15tcjeC7qjU7rQ1Ms4WuV+MG0docSRESux0/p23Qjzf9tZOc8C5Eq+Sxduw==", "dependencies": { - "@sentry-internal/tracing": "7.110.0", - "@sentry/core": "7.110.0", - "@sentry/types": "7.110.0", - "@sentry/utils": "7.110.0" + "@sentry-internal/tracing": "7.112.2", + "@sentry/core": "7.112.2", + "@sentry/integrations": "7.112.2", + "@sentry/types": "7.112.2", + "@sentry/utils": "7.112.2" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.110.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.110.0.tgz", - "integrity": "sha512-DqYBLyE8thC5P5MuPn+sj8tL60nCd/f5cerFFPcudn5nJ4Zs1eI6lKlwwyHYTEu5c4KFjCB0qql6kXfwAHmTyA==", + "version": "7.112.2", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.112.2.tgz", + "integrity": "sha512-kCMLt7yhY5OkWE9MeowlTNmox9pqDxcpvqguMo4BDNZM5+v9SEb1AauAdR78E1a1V8TyCzjBD7JDfXWhvpYBcQ==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.110.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.110.0.tgz", - "integrity": "sha512-VBsdLLN+5tf73fhf/Cm7JIsUJ6y9DkJj8h4I6Mxx0rszrvOyH6S5px40K+V4jdLBzMEvVinC7q2Cbf1YM18BSw==", + "version": "7.112.2", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.112.2.tgz", + "integrity": "sha512-OjLh0hx0t1EcL4ZIjf+4svlmmP+tHUDGcr5qpFWH78tjmkPW4+cqPuZCZfHSuWcDdeiaXi8TnYoVRqDcJKK/eQ==", "dependencies": { - "@sentry/types": "7.110.0" + "@sentry/types": "7.112.2" }, "engines": { "node": ">=8" @@ -5096,8 +5111,7 @@ "node_modules/immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", - "dev": true + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" }, "node_modules/import-fresh": { "version": "3.3.0", @@ -6351,6 +6365,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/localforage": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", + "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", + "dependencies": { + "lie": "3.1.1" + } + }, + "node_modules/localforage/node_modules/lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", diff --git a/package.json b/package.json index e5d9cab0..a1dfe784 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.110.0", + "@sentry/node": "^7.112.2", "@vscode/vsce": "^2.26.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From ee55247ea679801301fc70d247c14a805f1101ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 18:47:38 -0700 Subject: [PATCH 47/97] Bump @types/lodash from 4.17.0 to 4.17.1 (#603) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6325d6b8..d41183a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/chai": "^4.3.14", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.0", + "@types/lodash": "^4.17.1", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.12.7", @@ -1696,9 +1696,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", - "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", + "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==", "dev": true }, "node_modules/@types/minimatch": { diff --git a/package.json b/package.json index a1dfe784..b5222146 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/chai": "^4.3.14", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.0", + "@types/lodash": "^4.17.1", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.12.7", From 45e487348eb2201fae1bd8539bf8d11015332b30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 18:47:54 -0700 Subject: [PATCH 48/97] Bump @sentry/node from 7.112.2 to 7.113.0 (#604) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 66 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index d41183a2..dd8d5954 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.112.2", + "@sentry/node": "^7.113.0", "@vscode/vsce": "^2.26.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1478,38 +1478,38 @@ } }, "node_modules/@sentry-internal/tracing": { - "version": "7.112.2", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.112.2.tgz", - "integrity": "sha512-fT1Y46J4lfXZkgFkb03YMNeIEs2xS6jdKMoukMFQfRfVvL9fSWEbTgZpHPd/YTT8r2i082XzjtAoQNgklm/0Hw==", + "version": "7.113.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.113.0.tgz", + "integrity": "sha512-8MDnYENRMnEfQjvN4gkFYFaaBSiMFSU/6SQZfY9pLI3V105z6JQ4D0PGMAUVowXilwNZVpKNYohE7XByuhEC7Q==", "dependencies": { - "@sentry/core": "7.112.2", - "@sentry/types": "7.112.2", - "@sentry/utils": "7.112.2" + "@sentry/core": "7.113.0", + "@sentry/types": "7.113.0", + "@sentry/utils": "7.113.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.112.2", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.112.2.tgz", - "integrity": "sha512-gHPCcJobbMkk0VR18J65WYQTt3ED4qC6X9lHKp27Ddt63E+MDGkG6lvYBU1LS8cV7CdyBGC1XXDCfor61GvLsA==", + "version": "7.113.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.113.0.tgz", + "integrity": "sha512-pg75y3C5PG2+ur27A0Re37YTCEnX0liiEU7EOxWDGutH17x3ySwlYqLQmZsFZTSnvzv7t3MGsNZ8nT5O0746YA==", "dependencies": { - "@sentry/types": "7.112.2", - "@sentry/utils": "7.112.2" + "@sentry/types": "7.113.0", + "@sentry/utils": "7.113.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/integrations": { - "version": "7.112.2", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.112.2.tgz", - "integrity": "sha512-ioC2yyU6DqtLkdmWnm87oNvdn2+9oKctJeA4t+jkS6JaJ10DcezjCwiLscX4rhB9aWJV3IWF7Op0O6K3w0t2Hg==", + "version": "7.113.0", + "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.113.0.tgz", + "integrity": "sha512-w0sspGBQ+6+V/9bgCkpuM3CGwTYoQEVeTW6iNebFKbtN7MrM3XsGAM9I2cW1jVxFZROqCBPFtd2cs5n0j14aAg==", "dependencies": { - "@sentry/core": "7.112.2", - "@sentry/types": "7.112.2", - "@sentry/utils": "7.112.2", + "@sentry/core": "7.113.0", + "@sentry/types": "7.113.0", + "@sentry/utils": "7.113.0", "localforage": "^1.8.1" }, "engines": { @@ -1517,34 +1517,34 @@ } }, "node_modules/@sentry/node": { - "version": "7.112.2", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.112.2.tgz", - "integrity": "sha512-MNzkqER8jc2xOS3ArkCLH5hakzu15tcjeC7qjU7rQ1Ms4WuV+MG0docSRESux0/p23Qjzf9tZOc8C5Eq+Sxduw==", + "version": "7.113.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.113.0.tgz", + "integrity": "sha512-Vam4Ia0I9fhVw8GJOzcLP7MiiHJSKl8L9LzLMMLG3+2/dFnDQOyS7sOfk3GqgpwzqPiusP9vFu7CFSX7EMQbTg==", "dependencies": { - "@sentry-internal/tracing": "7.112.2", - "@sentry/core": "7.112.2", - "@sentry/integrations": "7.112.2", - "@sentry/types": "7.112.2", - "@sentry/utils": "7.112.2" + "@sentry-internal/tracing": "7.113.0", + "@sentry/core": "7.113.0", + "@sentry/integrations": "7.113.0", + "@sentry/types": "7.113.0", + "@sentry/utils": "7.113.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.112.2", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.112.2.tgz", - "integrity": "sha512-kCMLt7yhY5OkWE9MeowlTNmox9pqDxcpvqguMo4BDNZM5+v9SEb1AauAdR78E1a1V8TyCzjBD7JDfXWhvpYBcQ==", + "version": "7.113.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.113.0.tgz", + "integrity": "sha512-PJbTbvkcPu/LuRwwXB1He8m+GjDDLKBtu3lWg5xOZaF5IRdXQU2xwtdXXsjge4PZR00tF7MO7X8ZynTgWbYaew==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.112.2", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.112.2.tgz", - "integrity": "sha512-OjLh0hx0t1EcL4ZIjf+4svlmmP+tHUDGcr5qpFWH78tjmkPW4+cqPuZCZfHSuWcDdeiaXi8TnYoVRqDcJKK/eQ==", + "version": "7.113.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.113.0.tgz", + "integrity": "sha512-nzKsErwmze1mmEsbW2AwL2oB+I5v6cDEJY4sdfLekA4qZbYZ8pV5iWza6IRl4XfzGTE1qpkZmEjPU9eyo0yvYw==", "dependencies": { - "@sentry/types": "7.112.2" + "@sentry/types": "7.113.0" }, "engines": { "node": ">=8" diff --git a/package.json b/package.json index b5222146..bdcb8af4 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.112.2", + "@sentry/node": "^7.113.0", "@vscode/vsce": "^2.26.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From ada753a1b1da88e2f4c9fd8bb896247111c2adcb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 18:48:08 -0700 Subject: [PATCH 49/97] Bump @types/chai from 4.3.14 to 4.3.16 (#606) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd8d5954..788c33fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@types/chai": "^4.3.14", + "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.1", @@ -1634,9 +1634,9 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.14", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.14.tgz", - "integrity": "sha512-Wj71sXE4Q4AkGdG9Tvq1u/fquNz9EdG4LIJMwVVII7ashjD/8cf8fyIfJAjRr6YcsXnSE8cOGQPq1gqeR8z+3w==", + "version": "4.3.16", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", + "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", "dev": true }, "node_modules/@types/expect": { diff --git a/package.json b/package.json index bdcb8af4..e8d1a89a 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ ] }, "devDependencies": { - "@types/chai": "^4.3.14", + "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.1", From af505c1f7b30a05838f1cc8d3a34dfe3c3fd0037 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 01:51:02 +0000 Subject: [PATCH 50/97] Bump @vscode/vsce from 2.26.0 to 2.26.1 (#605) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 788c33fd..ced51c35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^7.113.0", - "@vscode/vsce": "^2.26.0", + "@vscode/vsce": "^2.26.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", @@ -1991,9 +1991,9 @@ } }, "node_modules/@vscode/vsce": { - "version": "2.26.0", - "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.26.0.tgz", - "integrity": "sha512-v54ltgMzUG8lGY0kAgaOlry57xse1RlWzes9FotfGEx+Fr05KeR8rZicQzEMDmi9QnOgVWHuiEq+xA2HWkAz+Q==", + "version": "2.26.1", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.26.1.tgz", + "integrity": "sha512-QOG6Ht7V93nhwcBxPWcG33UK0qDGEoJdg0xtVeaTN27W6PGdMJUJGTPhB/sNHUIFKwvwzv/zMAHvDgMNXbcwlA==", "dependencies": { "@azure/identity": "^4.1.0", "azure-devops-node-api": "^12.5.0", diff --git a/package.json b/package.json index e8d1a89a..ed10b7e0 100644 --- a/package.json +++ b/package.json @@ -215,7 +215,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^7.113.0", - "@vscode/vsce": "^2.26.0", + "@vscode/vsce": "^2.26.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", From 6571cb40ec5dc032e3028e76ac1dc9cb29a8074c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 10:48:23 -0700 Subject: [PATCH 51/97] Bump esbuild from 0.20.2 to 0.21.3 (#614) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 192 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/package-lock.json b/package-lock.json index ced51c35..ffe72c76 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.1.0", - "esbuild": "^0.20.2", + "esbuild": "^0.21.3", "glob": "^10.3.12", "mkdirp": "^3.0.1", "mocha": "^10.4.0", @@ -675,9 +675,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", - "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.3.tgz", + "integrity": "sha512-yTgnwQpFVYfvvo4SvRFB0SwrW8YjOxEoT7wfMT7Ol5v7v5LDNvSGo67aExmxOb87nQNeWPVvaGBNfQ7BXcrZ9w==", "cpu": [ "ppc64" ], @@ -691,9 +691,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", - "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.3.tgz", + "integrity": "sha512-bviJOLMgurLJtF1/mAoJLxDZDL6oU5/ztMHnJQRejbJrSc9FFu0QoUoFhvi6qSKJEw9y5oGyvr9fuDtzJ30rNQ==", "cpu": [ "arm" ], @@ -707,9 +707,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", - "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.3.tgz", + "integrity": "sha512-c+ty9necz3zB1Y+d/N+mC6KVVkGUUOcm4ZmT5i/Fk5arOaY3i6CA3P5wo/7+XzV8cb4GrI/Zjp8NuOQ9Lfsosw==", "cpu": [ "arm64" ], @@ -723,9 +723,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", - "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.3.tgz", + "integrity": "sha512-JReHfYCRK3FVX4Ra+y5EBH1b9e16TV2OxrPAvzMsGeES0X2Ndm9ImQRI4Ket757vhc5XBOuGperw63upesclRw==", "cpu": [ "x64" ], @@ -739,9 +739,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", - "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.3.tgz", + "integrity": "sha512-U3fuQ0xNiAkXOmQ6w5dKpEvXQRSpHOnbw7gEfHCRXPeTKW9sBzVck6C5Yneb8LfJm0l6le4NQfkNPnWMSlTFUQ==", "cpu": [ "arm64" ], @@ -755,9 +755,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", - "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.3.tgz", + "integrity": "sha512-3m1CEB7F07s19wmaMNI2KANLcnaqryJxO1fXHUV5j1rWn+wMxdUYoPyO2TnAbfRZdi7ADRwJClmOwgT13qlP3Q==", "cpu": [ "x64" ], @@ -771,9 +771,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", - "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.3.tgz", + "integrity": "sha512-fsNAAl5pU6wmKHq91cHWQT0Fz0vtyE1JauMzKotrwqIKAswwP5cpHUCxZNSTuA/JlqtScq20/5KZ+TxQdovU/g==", "cpu": [ "arm64" ], @@ -787,9 +787,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", - "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.3.tgz", + "integrity": "sha512-tci+UJ4zP5EGF4rp8XlZIdq1q1a/1h9XuronfxTMCNBslpCtmk97Q/5qqy1Mu4zIc0yswN/yP/BLX+NTUC1bXA==", "cpu": [ "x64" ], @@ -803,9 +803,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", - "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.3.tgz", + "integrity": "sha512-f6kz2QpSuyHHg01cDawj0vkyMwuIvN62UAguQfnNVzbge2uWLhA7TCXOn83DT0ZvyJmBI943MItgTovUob36SQ==", "cpu": [ "arm" ], @@ -819,9 +819,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", - "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.3.tgz", + "integrity": "sha512-vvG6R5g5ieB4eCJBQevyDMb31LMHthLpXTc2IGkFnPWS/GzIFDnaYFp558O+XybTmYrVjxnryru7QRleJvmZ6Q==", "cpu": [ "arm64" ], @@ -835,9 +835,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", - "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.3.tgz", + "integrity": "sha512-HjCWhH7K96Na+66TacDLJmOI9R8iDWDDiqe17C7znGvvE4sW1ECt9ly0AJ3dJH62jHyVqW9xpxZEU1jKdt+29A==", "cpu": [ "ia32" ], @@ -851,9 +851,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", - "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.3.tgz", + "integrity": "sha512-BGpimEccmHBZRcAhdlRIxMp7x9PyJxUtj7apL2IuoG9VxvU/l/v1z015nFs7Si7tXUwEsvjc1rOJdZCn4QTU+Q==", "cpu": [ "loong64" ], @@ -867,9 +867,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", - "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.3.tgz", + "integrity": "sha512-5rMOWkp7FQGtAH3QJddP4w3s47iT20hwftqdm7b+loe95o8JU8ro3qZbhgMRy0VuFU0DizymF1pBKkn3YHWtsw==", "cpu": [ "mips64el" ], @@ -883,9 +883,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", - "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.3.tgz", + "integrity": "sha512-h0zj1ldel89V5sjPLo5H1SyMzp4VrgN1tPkN29TmjvO1/r0MuMRwJxL8QY05SmfsZRs6TF0c/IDH3u7XYYmbAg==", "cpu": [ "ppc64" ], @@ -899,9 +899,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", - "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.3.tgz", + "integrity": "sha512-dkAKcTsTJ+CRX6bnO17qDJbLoW37npd5gSNtSzjYQr0svghLJYGYB0NF1SNcU1vDcjXLYS5pO4qOW4YbFama4A==", "cpu": [ "riscv64" ], @@ -915,9 +915,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", - "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.3.tgz", + "integrity": "sha512-vnD1YUkovEdnZWEuMmy2X2JmzsHQqPpZElXx6dxENcIwTu+Cu5ERax6+Ke1QsE814Zf3c6rxCfwQdCTQ7tPuXA==", "cpu": [ "s390x" ], @@ -931,9 +931,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", - "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.3.tgz", + "integrity": "sha512-IOXOIm9WaK7plL2gMhsWJd+l2bfrhfilv0uPTptoRoSb2p09RghhQQp9YY6ZJhk/kqmeRt6siRdMSLLwzuT0KQ==", "cpu": [ "x64" ], @@ -947,9 +947,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", - "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.3.tgz", + "integrity": "sha512-uTgCwsvQ5+vCQnqM//EfDSuomo2LhdWhFPS8VL8xKf+PKTCrcT/2kPPoWMTs22aB63MLdGMJiE3f1PHvCDmUOw==", "cpu": [ "x64" ], @@ -963,9 +963,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", - "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.3.tgz", + "integrity": "sha512-vNAkR17Ub2MgEud2Wag/OE4HTSI6zlb291UYzHez/psiKarp0J8PKGDnAhMBcHFoOHMXHfExzmjMojJNbAStrQ==", "cpu": [ "x64" ], @@ -979,9 +979,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", - "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.3.tgz", + "integrity": "sha512-W8H9jlGiSBomkgmouaRoTXo49j4w4Kfbl6I1bIdO/vT0+0u4f20ko3ELzV3hPI6XV6JNBVX+8BC+ajHkvffIJA==", "cpu": [ "x64" ], @@ -995,9 +995,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", - "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.3.tgz", + "integrity": "sha512-EjEomwyLSCg8Ag3LDILIqYCZAq/y3diJ04PnqGRgq8/4O3VNlXyMd54j/saShaN4h5o5mivOjAzmU6C3X4v0xw==", "cpu": [ "arm64" ], @@ -1011,9 +1011,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", - "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.3.tgz", + "integrity": "sha512-WGiE/GgbsEwR33++5rzjiYsKyHywE8QSZPF7Rfx9EBfK3Qn3xyR6IjyCr5Uk38Kg8fG4/2phN7sXp4NPWd3fcw==", "cpu": [ "ia32" ], @@ -1027,9 +1027,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", - "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.3.tgz", + "integrity": "sha512-xRxC0jaJWDLYvcUvjQmHCJSfMrgmUuvsoXgDeU/wTorQ1ngDdUBuFtgY3W1Pc5sprGAvZBtWdJX7RPg/iZZUqA==", "cpu": [ "x64" ], @@ -3412,9 +3412,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", - "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.3.tgz", + "integrity": "sha512-Kgq0/ZsAPzKrbOjCQcjoSmPoWhlcVnGAUo7jvaLHoxW1Drto0KGkR1xBNg2Cp43b9ImvxmPEJZ9xkfcnqPsfBw==", "dev": true, "hasInstallScript": true, "bin": { @@ -3424,29 +3424,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.2", - "@esbuild/android-arm": "0.20.2", - "@esbuild/android-arm64": "0.20.2", - "@esbuild/android-x64": "0.20.2", - "@esbuild/darwin-arm64": "0.20.2", - "@esbuild/darwin-x64": "0.20.2", - "@esbuild/freebsd-arm64": "0.20.2", - "@esbuild/freebsd-x64": "0.20.2", - "@esbuild/linux-arm": "0.20.2", - "@esbuild/linux-arm64": "0.20.2", - "@esbuild/linux-ia32": "0.20.2", - "@esbuild/linux-loong64": "0.20.2", - "@esbuild/linux-mips64el": "0.20.2", - "@esbuild/linux-ppc64": "0.20.2", - "@esbuild/linux-riscv64": "0.20.2", - "@esbuild/linux-s390x": "0.20.2", - "@esbuild/linux-x64": "0.20.2", - "@esbuild/netbsd-x64": "0.20.2", - "@esbuild/openbsd-x64": "0.20.2", - "@esbuild/sunos-x64": "0.20.2", - "@esbuild/win32-arm64": "0.20.2", - "@esbuild/win32-ia32": "0.20.2", - "@esbuild/win32-x64": "0.20.2" + "@esbuild/aix-ppc64": "0.21.3", + "@esbuild/android-arm": "0.21.3", + "@esbuild/android-arm64": "0.21.3", + "@esbuild/android-x64": "0.21.3", + "@esbuild/darwin-arm64": "0.21.3", + "@esbuild/darwin-x64": "0.21.3", + "@esbuild/freebsd-arm64": "0.21.3", + "@esbuild/freebsd-x64": "0.21.3", + "@esbuild/linux-arm": "0.21.3", + "@esbuild/linux-arm64": "0.21.3", + "@esbuild/linux-ia32": "0.21.3", + "@esbuild/linux-loong64": "0.21.3", + "@esbuild/linux-mips64el": "0.21.3", + "@esbuild/linux-ppc64": "0.21.3", + "@esbuild/linux-riscv64": "0.21.3", + "@esbuild/linux-s390x": "0.21.3", + "@esbuild/linux-x64": "0.21.3", + "@esbuild/netbsd-x64": "0.21.3", + "@esbuild/openbsd-x64": "0.21.3", + "@esbuild/sunos-x64": "0.21.3", + "@esbuild/win32-arm64": "0.21.3", + "@esbuild/win32-ia32": "0.21.3", + "@esbuild/win32-x64": "0.21.3" } }, "node_modules/escalade": { diff --git a/package.json b/package.json index ed10b7e0..45ebda8e 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", "chai": "^5.1.0", - "esbuild": "^0.20.2", + "esbuild": "^0.21.3", "glob": "^10.3.12", "mkdirp": "^3.0.1", "mocha": "^10.4.0", From f86565ee76d6e748d67c46dd19b4191f36c9ad5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 12:58:37 -0700 Subject: [PATCH 52/97] Bump rimraf from 5.0.5 to 5.0.7 (#609) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ffe72c76..8fad78b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "mocha": "^10.4.0", "nyc": "^15.1.0", "ovsx": "^0.9.1", - "rimraf": "^5.0.5", + "rimraf": "^5.0.7", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", "ts-node": "^10.9.2", @@ -8297,9 +8297,9 @@ } }, "node_modules/rimraf": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz", - "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz", + "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==", "dev": true, "dependencies": { "glob": "^10.3.7" @@ -8308,7 +8308,7 @@ "rimraf": "dist/esm/bin.mjs" }, "engines": { - "node": ">=14" + "node": ">=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/package.json b/package.json index 45ebda8e..17ff929e 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "mocha": "^10.4.0", "nyc": "^15.1.0", "ovsx": "^0.9.1", - "rimraf": "^5.0.5", + "rimraf": "^5.0.7", "sinon": "^17.0.1", "ts-mocha": "^10.0.0", "ts-node": "^10.9.2", From 280d126a60bb35183a0be85d90834df0eae5db5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 12:59:02 -0700 Subject: [PATCH 53/97] Bump semver from 6.3.0 to 7.6.2 (#615) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 51 ++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fad78b2..bb664427 100644 --- a/package-lock.json +++ b/package-lock.json @@ -388,9 +388,9 @@ } }, "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -449,9 +449,9 @@ } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -3730,9 +3730,9 @@ } }, "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -3834,9 +3834,9 @@ } }, "node_modules/eslint-plugin-react/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -5580,9 +5580,9 @@ } }, "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -6599,9 +6599,9 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -7691,9 +7691,9 @@ } }, "node_modules/parse-semver/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "bin": { "semver": "bin/semver" } @@ -8375,12 +8375,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dependencies": { - "lru-cache": "^6.0.0" - }, + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", "bin": { "semver": "bin/semver.js" }, From 0e6826ecfbca43802d0903dc1a3687eae7a0fb1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 12:59:18 -0700 Subject: [PATCH 54/97] Bump chai from 5.1.0 to 5.1.1 (#608) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb664427..f83665bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", - "chai": "^5.1.0", + "chai": "^5.1.1", "esbuild": "^0.21.3", "glob": "^10.3.12", "mkdirp": "^3.0.1", @@ -2603,13 +2603,13 @@ } }, "node_modules/chai": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.0.tgz", - "integrity": "sha512-kDZ7MZyM6Q1DhR9jy7dalKohXQ2yrlXkk59CR52aRKxJrobmlBNqnFQxX9xOX8w+4mz8SYlKJa/7D7ddltFXCw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz", + "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==", "dev": true, "dependencies": { "assertion-error": "^2.0.1", - "check-error": "^2.0.0", + "check-error": "^2.1.1", "deep-eql": "^5.0.1", "loupe": "^3.1.0", "pathval": "^2.0.0" @@ -2632,9 +2632,9 @@ } }, "node_modules/check-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.0.0.tgz", - "integrity": "sha512-tjLAOBHKVxtPoHe/SA7kNOMvhCRdCJ3vETdeY0RuAc9popf+hyaSV6ZEg9hr4cpWF7jmo/JSWEnLDrnijS9Tog==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", "dev": true, "engines": { "node": ">= 16" diff --git a/package.json b/package.json index 17ff929e..35425aea 100644 --- a/package.json +++ b/package.json @@ -197,7 +197,7 @@ "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.9", - "chai": "^5.1.0", + "chai": "^5.1.1", "esbuild": "^0.21.3", "glob": "^10.3.12", "mkdirp": "^3.0.1", From 77259058b41bebbc0115d9a0a0b32e42aa208294 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 12:59:34 -0700 Subject: [PATCH 55/97] Bump glob from 10.3.12 to 10.3.15 (#610) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 32 ++++++++++++++++---------------- package.json | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index f83665bc..035225ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@vscode/test-electron": "^2.3.9", "chai": "^5.1.1", "esbuild": "^0.21.3", - "glob": "^10.3.12", + "glob": "^10.3.15", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", @@ -4702,22 +4702,22 @@ "optional": true }, "node_modules/glob": { - "version": "10.3.12", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", - "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", + "version": "10.3.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.15.tgz", + "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.3.6", "minimatch": "^9.0.1", "minipass": "^7.0.4", - "path-scurry": "^1.10.2" + "path-scurry": "^1.11.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=16 || 14 >=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -6750,9 +6750,9 @@ "devOptional": true }, "node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", + "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", "dev": true, "engines": { "node": ">=16 || 14 >=14.17" @@ -7743,25 +7743,25 @@ "dev": true }, "node_modules/path-scurry": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", - "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=16 || 14 >=14.18" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", - "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", "dev": true, "engines": { "node": "14 || >=16.14" diff --git a/package.json b/package.json index 35425aea..78557490 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "@vscode/test-electron": "^2.3.9", "chai": "^5.1.1", "esbuild": "^0.21.3", - "glob": "^10.3.12", + "glob": "^10.3.15", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", From ec0ff1a5e3ecf102698d0d881eddd97b6b417163 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 13:17:54 -0700 Subject: [PATCH 56/97] Bump @sentry/node from 7.113.0 to 8.4.0 (#619) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 872 +++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- 2 files changed, 795 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index 035225ce..9f2df4f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.113.0", + "@sentry/node": "^8.4.0", "@vscode/vsce": "^2.26.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1467,6 +1467,373 @@ "resolved": "https://registry.npmjs.org/@onflow/decode/-/decode-0.0.11.tgz", "integrity": "sha512-i4JTznywSpXTyBIwnrzEXqEBJRZu8xYDRS4Q0mTzP1+0GdESm+Wq44qvtN68vEcNNfSLJixKeGs/T0nvkJDh4A==" }, + "node_modules/@opentelemetry/api": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz", + "integrity": "sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@opentelemetry/api-logs": { + "version": "0.51.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.51.1.tgz", + "integrity": "sha512-E3skn949Pk1z2XtXu/lxf6QAZpawuTM/IUEXcAzpiUkTd73Hmvw26FiN3cJuTmkpM5hZzHwkomVdtrh/n/zzwA==", + "dependencies": { + "@opentelemetry/api": "^1.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/context-async-hooks": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.24.1.tgz", + "integrity": "sha512-R5r6DO4kgEOVBxFXhXjwospLQkv+sYxwCfjvoZBe7Zm6KKXAV9kDSJhi/D1BweowdZmO+sdbENLs374gER8hpQ==", + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.9.0" + } + }, + "node_modules/@opentelemetry/core": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.24.1.tgz", + "integrity": "sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.24.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.9.0" + } + }, + "node_modules/@opentelemetry/instrumentation": { + "version": "0.51.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.51.1.tgz", + "integrity": "sha512-JIrvhpgqY6437QIqToyozrUG1h5UhwHkaGK/WAX+fkrpyPtc+RO5FkRtUd9BH0MibabHHvqsnBGKfKVijbmp8w==", + "dependencies": { + "@opentelemetry/api-logs": "0.51.1", + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "1.7.4", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", + "shimmer": "^1.2.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-connect": { + "version": "0.36.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.36.0.tgz", + "integrity": "sha512-k9++bmJZ9zDEs3u3DnKTn2l7QTiNFg3gPx7G9rW0TPnP+xZoBSBTrEcGYBaqflQlrFG23Q58+X1sM2ayWPv5Fg==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.0.0", + "@types/connect": "3.4.36" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-express": { + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.39.0.tgz", + "integrity": "sha512-AG8U7z7D0JcBu/7dDcwb47UMEzj9/FMiJV2iQZqrsZnxR3FjB9J9oIH2iszJYci2eUdp2WbdvtpD9RV/zmME5A==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-fastify": { + "version": "0.36.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.36.1.tgz", + "integrity": "sha512-3Nfm43PI0I+3EX+1YbSy6xbDu276R1Dh1tqAk68yd4yirnIh52Kd5B+nJ8CgHA7o3UKakpBjj6vSzi5vNCzJIA==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-graphql": { + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.40.0.tgz", + "integrity": "sha512-LVRdEHWACWOczv2imD+mhUrLMxsEjPPi32vIZJT57zygR5aUiA4em8X3aiGOCycgbMWkIu8xOSGSxdx3JmzN+w==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-hapi": { + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.38.0.tgz", + "integrity": "sha512-ZcOqEuwuutTDYIjhDIStix22ECblG/i9pHje23QGs4Q4YS4RMaZ5hKCoQJxW88Z4K7T53rQkdISmoXFKDV8xMg==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-http": { + "version": "0.51.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.51.1.tgz", + "integrity": "sha512-6b3nZnFFEz/3xZ6w8bVxctPUWIPWiXuPQ725530JgxnN1cvYFd8CJ75PrHZNjynmzSSnqBkN3ef4R9N+RpMh8Q==", + "dependencies": { + "@opentelemetry/core": "1.24.1", + "@opentelemetry/instrumentation": "0.51.1", + "@opentelemetry/semantic-conventions": "1.24.1", + "semver": "^7.5.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-ioredis": { + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.40.0.tgz", + "integrity": "sha512-Jv/fH7KhpWe4KBirsiqeUJIYrsdR2iu2l4nWhfOlRvaZ+zYIiLEzTQR6QhBbyRoAbU4OuYJzjWusOmmpGBnwng==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/redis-common": "^0.36.2", + "@opentelemetry/semantic-conventions": "^1.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-koa": { + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.40.0.tgz", + "integrity": "sha512-dJc3H/bKMcgUYcQpLF+1IbmUKus0e5Fnn/+ru/3voIRHwMADT3rFSUcGLWSczkg68BCgz0vFWGDTvPtcWIFr7A==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0", + "@types/koa": "2.14.0", + "@types/koa__router": "12.0.3" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-mongodb": { + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.43.0.tgz", + "integrity": "sha512-bMKej7Y76QVUD3l55Q9YqizXybHUzF3pujsBFjqbZrRn2WYqtsDtTUlbCK7fvXNPwFInqZ2KhnTqd0gwo8MzaQ==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/sdk-metrics": "^1.9.1", + "@opentelemetry/semantic-conventions": "^1.22.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-mongoose": { + "version": "0.38.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.38.1.tgz", + "integrity": "sha512-zaeiasdnRjXe6VhYCBMdkmAVh1S5MmXC/0spet+yqoaViGnYst/DOxPvhwg3yT4Yag5crZNWsVXnA538UjP6Ow==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-mysql": { + "version": "0.38.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.38.1.tgz", + "integrity": "sha512-+iBAawUaTfX/HAlvySwozx0C2B6LBfNPXX1W8Z2On1Uva33AGkw2UjL9XgIg1Pj4eLZ9R4EoJ/aFz+Xj4E/7Fw==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0", + "@types/mysql": "2.15.22" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-mysql2": { + "version": "0.38.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.38.1.tgz", + "integrity": "sha512-qkpHMgWSDTYVB1vlZ9sspf7l2wdS5DDq/rbIepDwX5BA0N0068JTQqh0CgAh34tdFqSCnWXIhcyOXC2TtRb0sg==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0", + "@opentelemetry/sql-common": "^0.40.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-nestjs-core": { + "version": "0.37.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.37.1.tgz", + "integrity": "sha512-ebYQjHZEmGHWEALwwDGhSQVLBaurFnuLIkZD5igPXrt7ohfF4lc5/4al1LO+vKc0NHk8SJWStuRueT86ISA8Vg==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-pg": { + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.41.0.tgz", + "integrity": "sha512-BSlhpivzBD77meQNZY9fS4aKgydA8AJBzv2dqvxXFy/Hq64b7HURgw/ztbmwFeYwdF5raZZUifiiNSMLpOJoSA==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/semantic-conventions": "^1.22.0", + "@opentelemetry/sql-common": "^0.40.1", + "@types/pg": "8.6.1", + "@types/pg-pool": "2.0.4" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/redis-common": { + "version": "0.36.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz", + "integrity": "sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/resources": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.24.1.tgz", + "integrity": "sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==", + "dependencies": { + "@opentelemetry/core": "1.24.1", + "@opentelemetry/semantic-conventions": "1.24.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.9.0" + } + }, + "node_modules/@opentelemetry/sdk-metrics": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.24.1.tgz", + "integrity": "sha512-FrAqCbbGao9iKI+Mgh+OsC9+U2YMoXnlDHe06yH7dvavCKzE3S892dGtX54+WhSFVxHR/TMRVJiK/CV93GR0TQ==", + "dependencies": { + "@opentelemetry/core": "1.24.1", + "@opentelemetry/resources": "1.24.1", + "lodash.merge": "^4.6.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.3.0 <1.9.0" + } + }, + "node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.24.1.tgz", + "integrity": "sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==", + "dependencies": { + "@opentelemetry/core": "1.24.1", + "@opentelemetry/resources": "1.24.1", + "@opentelemetry/semantic-conventions": "1.24.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.9.0" + } + }, + "node_modules/@opentelemetry/semantic-conventions": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz", + "integrity": "sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/sql-common": { + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/sql-common/-/sql-common-0.40.1.tgz", + "integrity": "sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==", + "dependencies": { + "@opentelemetry/core": "^1.1.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1477,77 +1844,104 @@ "node": ">=14" } }, - "node_modules/@sentry-internal/tracing": { - "version": "7.113.0", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.113.0.tgz", - "integrity": "sha512-8MDnYENRMnEfQjvN4gkFYFaaBSiMFSU/6SQZfY9pLI3V105z6JQ4D0PGMAUVowXilwNZVpKNYohE7XByuhEC7Q==", + "node_modules/@prisma/instrumentation": { + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.14.0.tgz", + "integrity": "sha512-DeybWvIZzu/mUsOYP9MVd6AyBj+MP7xIMrcuIn25MX8FiQX39QBnET5KhszTAip/ToctUuDwSJ46QkIoyo3RFA==", "dependencies": { - "@sentry/core": "7.113.0", - "@sentry/types": "7.113.0", - "@sentry/utils": "7.113.0" - }, - "engines": { - "node": ">=8" + "@opentelemetry/api": "^1.8", + "@opentelemetry/instrumentation": "^0.49 || ^0.50 || ^0.51", + "@opentelemetry/sdk-trace-base": "^1.22" } }, "node_modules/@sentry/core": { - "version": "7.113.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.113.0.tgz", - "integrity": "sha512-pg75y3C5PG2+ur27A0Re37YTCEnX0liiEU7EOxWDGutH17x3ySwlYqLQmZsFZTSnvzv7t3MGsNZ8nT5O0746YA==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.4.0.tgz", + "integrity": "sha512-0eACPlJvKloFIlcT1c/vjGnvqxLxpGyGuSsU7uonrkmBqIRwLYXWtR4PoHapysKtjPVoHAn9au50ut6ymC2V8Q==", "dependencies": { - "@sentry/types": "7.113.0", - "@sentry/utils": "7.113.0" + "@sentry/types": "8.4.0", + "@sentry/utils": "8.4.0" }, "engines": { - "node": ">=8" + "node": ">=14.18" } }, - "node_modules/@sentry/integrations": { - "version": "7.113.0", - "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.113.0.tgz", - "integrity": "sha512-w0sspGBQ+6+V/9bgCkpuM3CGwTYoQEVeTW6iNebFKbtN7MrM3XsGAM9I2cW1jVxFZROqCBPFtd2cs5n0j14aAg==", - "dependencies": { - "@sentry/core": "7.113.0", - "@sentry/types": "7.113.0", - "@sentry/utils": "7.113.0", - "localforage": "^1.8.1" + "node_modules/@sentry/node": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.4.0.tgz", + "integrity": "sha512-k0uqG2F8BQWATIEghA1jQ0tBAr9mJsyS+ZiruXjbixy8kd7+ZM1CCiqeqqrYaanS0hI0mvtg9uxTQzBa1SMQsA==", + "dependencies": { + "@opentelemetry/api": "^1.8.0", + "@opentelemetry/context-async-hooks": "^1.23.0", + "@opentelemetry/core": "^1.24.1", + "@opentelemetry/instrumentation": "^0.51.1", + "@opentelemetry/instrumentation-connect": "0.36.0", + "@opentelemetry/instrumentation-express": "0.39.0", + "@opentelemetry/instrumentation-fastify": "0.36.1", + "@opentelemetry/instrumentation-graphql": "0.40.0", + "@opentelemetry/instrumentation-hapi": "0.38.0", + "@opentelemetry/instrumentation-http": "0.51.1", + "@opentelemetry/instrumentation-ioredis": "0.40.0", + "@opentelemetry/instrumentation-koa": "0.40.0", + "@opentelemetry/instrumentation-mongodb": "0.43.0", + "@opentelemetry/instrumentation-mongoose": "0.38.1", + "@opentelemetry/instrumentation-mysql": "0.38.1", + "@opentelemetry/instrumentation-mysql2": "0.38.1", + "@opentelemetry/instrumentation-nestjs-core": "0.37.1", + "@opentelemetry/instrumentation-pg": "0.41.0", + "@opentelemetry/resources": "^1.23.0", + "@opentelemetry/sdk-trace-base": "^1.23.0", + "@opentelemetry/semantic-conventions": "^1.23.0", + "@prisma/instrumentation": "5.14.0", + "@sentry/core": "8.4.0", + "@sentry/opentelemetry": "8.4.0", + "@sentry/types": "8.4.0", + "@sentry/utils": "8.4.0" }, "engines": { - "node": ">=8" + "node": ">=14.18" + }, + "optionalDependencies": { + "opentelemetry-instrumentation-fetch-node": "1.2.0" } }, - "node_modules/@sentry/node": { - "version": "7.113.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.113.0.tgz", - "integrity": "sha512-Vam4Ia0I9fhVw8GJOzcLP7MiiHJSKl8L9LzLMMLG3+2/dFnDQOyS7sOfk3GqgpwzqPiusP9vFu7CFSX7EMQbTg==", + "node_modules/@sentry/opentelemetry": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.4.0.tgz", + "integrity": "sha512-1YXLuRHMhzPzoiD8Pzts5GlZY4V5GSXGn5aBmFlJ13vSrUK6C4qhPfZMboppntPihOxupCPg3XP76ZMj6+XuOg==", "dependencies": { - "@sentry-internal/tracing": "7.113.0", - "@sentry/core": "7.113.0", - "@sentry/integrations": "7.113.0", - "@sentry/types": "7.113.0", - "@sentry/utils": "7.113.0" + "@sentry/core": "8.4.0", + "@sentry/types": "8.4.0", + "@sentry/utils": "8.4.0" }, "engines": { - "node": ">=8" + "node": ">=14.18" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.8.0", + "@opentelemetry/core": "^1.24.1", + "@opentelemetry/instrumentation": "^0.51.1", + "@opentelemetry/sdk-trace-base": "^1.23.0", + "@opentelemetry/semantic-conventions": "^1.23.0" } }, "node_modules/@sentry/types": { - "version": "7.113.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.113.0.tgz", - "integrity": "sha512-PJbTbvkcPu/LuRwwXB1He8m+GjDDLKBtu3lWg5xOZaF5IRdXQU2xwtdXXsjge4PZR00tF7MO7X8ZynTgWbYaew==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.4.0.tgz", + "integrity": "sha512-mHUaaYEQCNukzYsTLp4rP2NNO17vUf+oSGS6qmhrsGqmGNICKw2CIwJlPPGeAkq9Y4tiUOye2m5OT1xsOtxLIw==", "engines": { - "node": ">=8" + "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "7.113.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.113.0.tgz", - "integrity": "sha512-nzKsErwmze1mmEsbW2AwL2oB+I5v6cDEJY4sdfLekA4qZbYZ8pV5iWza6IRl4XfzGTE1qpkZmEjPU9eyo0yvYw==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.4.0.tgz", + "integrity": "sha512-oDF0RVWW0AyEnsP1x4McHUvQSAxJgx3G6wM9Sb4wc1F8rwsHnCtGHc+WRZ5Gd2AXC5EGkfbg5919+1ku/L4Dww==", "dependencies": { - "@sentry/types": "7.113.0" + "@sentry/types": "8.4.0" }, "engines": { - "node": ">=8" + "node": ">=14.18" } }, "node_modules/@sinclair/typebox": { @@ -1633,12 +2027,53 @@ "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", "dev": true }, + "node_modules/@types/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, "node_modules/@types/chai": { "version": "4.3.16", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", "dev": true }, + "node_modules/@types/connect": { + "version": "3.4.36", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz", + "integrity": "sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/content-disposition": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.8.tgz", + "integrity": "sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==" + }, + "node_modules/@types/cookies": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.9.0.tgz", + "integrity": "sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==", + "dependencies": { + "@types/connect": "*", + "@types/express": "*", + "@types/keygrip": "*", + "@types/node": "*" + } + }, "node_modules/@types/expect": { "version": "24.3.0", "resolved": "https://registry.npmjs.org/@types/expect/-/expect-24.3.0.tgz", @@ -1649,6 +2084,28 @@ "expect": "*" } }, + "node_modules/@types/express": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.19.1", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.1.tgz", + "integrity": "sha512-ej0phymbFLoCB26dbbq5PGScsf2JAJ4IJHjG10LalgUV36XKTmA4GdA+PVllKvRk0sEKt64X8975qFnkSi0hqA==", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, "node_modules/@types/glob": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.0.1.tgz", @@ -1659,6 +2116,16 @@ "@types/node": "*" } }, + "node_modules/@types/http-assert": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.5.tgz", + "integrity": "sha512-4+tE/lwdAahgZT1g30Jkdm9PzFRde0xwxBNUyRsCitRvCQB90iuA2uJYdUnhnANRcqGXaWOGY4FEoxeElNAK2g==" + }, + "node_modules/@types/http-errors": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==" + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -1695,12 +2162,53 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "node_modules/@types/keygrip": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.6.tgz", + "integrity": "sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==" + }, + "node_modules/@types/koa": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.14.0.tgz", + "integrity": "sha512-DTDUyznHGNHAl+wd1n0z1jxNajduyTh8R53xoewuerdBzGo6Ogj6F2299BFtrexJw4NtgjsI5SMPCmV9gZwGXA==", + "dependencies": { + "@types/accepts": "*", + "@types/content-disposition": "*", + "@types/cookies": "*", + "@types/http-assert": "*", + "@types/http-errors": "*", + "@types/keygrip": "*", + "@types/koa-compose": "*", + "@types/node": "*" + } + }, + "node_modules/@types/koa__router": { + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/@types/koa__router/-/koa__router-12.0.3.tgz", + "integrity": "sha512-5YUJVv6NwM1z7m6FuYpKfNLTZ932Z6EF6xy2BbtpJSyn13DKNQEkXVffFVSnJHxvwwWh2SAeumpjAYUELqgjyw==", + "dependencies": { + "@types/koa": "*" + } + }, + "node_modules/@types/koa-compose": { + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.8.tgz", + "integrity": "sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==", + "dependencies": { + "@types/koa": "*" + } + }, "node_modules/@types/lodash": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==", "dev": true }, + "node_modules/@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" + }, "node_modules/@types/minimatch": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", @@ -1719,11 +2227,18 @@ "integrity": "sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==", "dev": true }, + "node_modules/@types/mysql": { + "version": "2.15.22", + "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.22.tgz", + "integrity": "sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/node": { "version": "20.12.7", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", - "dev": true, "dependencies": { "undici-types": "~5.26.4" } @@ -1734,12 +2249,64 @@ "integrity": "sha512-fOBV8C1FIu2ELinoILQ+ApxcUKz4ngq+IWUYrxSGjXzzjUALijilampwkMgEtJ+h2njAW3pi853QpzNVCHB73w==", "dev": true }, + "node_modules/@types/pg": { + "version": "8.6.1", + "resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.6.1.tgz", + "integrity": "sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==", + "dependencies": { + "@types/node": "*", + "pg-protocol": "*", + "pg-types": "^2.2.0" + } + }, + "node_modules/@types/pg-pool": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/pg-pool/-/pg-pool-2.0.4.tgz", + "integrity": "sha512-qZAvkv1K3QbmHHFYSNRYPkRjOWRLBYrL4B9c+wG0GSVGBw0NtJwPcgx/DSddeDJvRGMHCEQ4VMEVfuJ/0gZ3XQ==", + "dependencies": { + "@types/pg": "*" + } + }, + "node_modules/@types/qs": { + "version": "6.9.15", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", + "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==" + }, + "node_modules/@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==" + }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, + "node_modules/@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/@types/serve-static": { + "version": "1.15.7", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", + "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", + "dependencies": { + "@types/http-errors": "*", + "@types/node": "*", + "@types/send": "*" + } + }, + "node_modules/@types/shimmer": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz", + "integrity": "sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==" + }, "node_modules/@types/sinon": { "version": "17.0.3", "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.3.tgz", @@ -2061,10 +2628,9 @@ } }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", - "dev": true, + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "bin": { "acorn": "bin/acorn" }, @@ -2072,6 +2638,23 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "optional": true, + "peerDependencies": { + "acorn": "^8" + } + }, + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -2713,6 +3296,11 @@ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, + "node_modules/cjs-module-lexer": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", + "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==" + }, "node_modules/clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -4867,7 +5455,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -5111,7 +5698,8 @@ "node_modules/immediate": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "dev": true }, "node_modules/import-fresh": { "version": "3.3.0", @@ -5138,6 +5726,17 @@ "node": ">=4" } }, + "node_modules/import-in-the-middle": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.4.tgz", + "integrity": "sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==", + "dependencies": { + "acorn": "^8.8.2", + "acorn-import-attributes": "^1.9.5", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -5272,7 +5871,6 @@ "version": "2.11.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "dev": true, "dependencies": { "has": "^1.0.3" }, @@ -6365,22 +6963,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/localforage": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", - "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", - "dependencies": { - "lie": "3.1.1" - } - }, - "node_modules/localforage/node_modules/lie": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", - "dependencies": { - "immediate": "~3.0.5" - } - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -6446,8 +7028,7 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, "node_modules/lodash.once": { "version": "4.1.1", @@ -6946,6 +7527,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/module-details-from-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.3.tgz", + "integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==" + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -7529,6 +8115,51 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/opentelemetry-instrumentation-fetch-node": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/opentelemetry-instrumentation-fetch-node/-/opentelemetry-instrumentation-fetch-node-1.2.0.tgz", + "integrity": "sha512-aiSt/4ubOTyb1N5C2ZbGrBvaJOXIZhZvpRPYuUVxQJe27wJZqf/o65iPrqgLcgfeOLaQ8cS2Q+762jrYvniTrA==", + "optional": true, + "dependencies": { + "@opentelemetry/api": "^1.6.0", + "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/semantic-conventions": "^1.17.0" + }, + "engines": { + "node": ">18.0.0" + } + }, + "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/@opentelemetry/instrumentation": { + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.43.0.tgz", + "integrity": "sha512-S1uHE+sxaepgp+t8lvIDuRgyjJWisAb733198kwQTUc9ZtYQ2V2gmyCtR1x21ePGVLoMiX/NWY7WA290hwkjJQ==", + "optional": true, + "dependencies": { + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "1.4.2", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", + "shimmer": "^1.2.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/import-in-the-middle": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz", + "integrity": "sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==", + "optional": true, + "dependencies": { + "acorn": "^8.8.2", + "acorn-import-assertions": "^1.9.0", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, "node_modules/optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -7739,8 +8370,7 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-scurry": { "version": "1.11.1", @@ -7805,6 +8435,34 @@ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" }, + "node_modules/pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/pg-protocol": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz", + "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==" + }, + "node_modules/pg-types": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz", + "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==", + "dependencies": { + "pg-int8": "1.0.1", + "postgres-array": "~2.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.4", + "postgres-interval": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -7973,6 +8631,41 @@ "node": ">=8" } }, + "node_modules/postgres-array": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz", + "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/postgres-bytea": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-date": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz", + "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postgres-interval": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz", + "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==", + "dependencies": { + "xtend": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/prebuild-install": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", @@ -8254,6 +8947,19 @@ "node": ">=0.10.0" } }, + "node_modules/require-in-the-middle": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.3.0.tgz", + "integrity": "sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==", + "dependencies": { + "debug": "^4.1.1", + "module-details-from-path": "^1.0.3", + "resolve": "^1.22.1" + }, + "engines": { + "node": ">=8.6.0" + } + }, "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -8264,7 +8970,6 @@ "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "dev": true, "dependencies": { "is-core-module": "^2.9.0", "path-parse": "^1.0.7", @@ -8422,6 +9127,11 @@ "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", "dev": true }, + "node_modules/shimmer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" + }, "node_modules/side-channel": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", @@ -9034,7 +9744,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -9507,8 +10216,7 @@ "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "node_modules/uri-js": { "version": "4.4.1", @@ -9868,6 +10576,14 @@ "node": ">=4.0" } }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "engines": { + "node": ">=0.4" + } + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/package.json b/package.json index 78557490..3afb66c4 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^7.113.0", + "@sentry/node": "^8.4.0", "@vscode/vsce": "^2.26.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 451de875c66b30f18db3e542c0c4ac864cc1e7b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 13:18:07 -0700 Subject: [PATCH 57/97] Bump glob from 10.3.15 to 10.4.1 (#618) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 34 +++++++++++++++++----------------- package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9f2df4f4..2a7eb03a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@vscode/test-electron": "^2.3.9", "chai": "^5.1.1", "esbuild": "^0.21.3", - "glob": "^10.3.15", + "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", @@ -5290,16 +5290,16 @@ "optional": true }, "node_modules/glob": { - "version": "10.3.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.15.tgz", - "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", + "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" @@ -5349,9 +5349,9 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -6324,9 +6324,9 @@ } }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", + "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -7331,9 +7331,9 @@ "devOptional": true }, "node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true, "engines": { "node": ">=16 || 14 >=14.17" diff --git a/package.json b/package.json index 3afb66c4..07a68bc9 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "@vscode/test-electron": "^2.3.9", "chai": "^5.1.1", "esbuild": "^0.21.3", - "glob": "^10.3.15", + "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^15.1.0", From 5d782888890325ff8a1439139a6851b2d3a073fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 13:18:19 -0700 Subject: [PATCH 58/97] Bump @types/lodash from 4.17.1 to 4.17.4 (#620) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a7eb03a..2422a194 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.1", + "@types/lodash": "^4.17.4", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.12.7", @@ -2199,9 +2199,9 @@ } }, "node_modules/@types/lodash": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", - "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==", + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==", "dev": true }, "node_modules/@types/mime": { diff --git a/package.json b/package.json index 07a68bc9..702536ed 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.1", + "@types/lodash": "^4.17.4", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.12.7", From c69dffd2aaa4d1960c3a7aca4f783f9f7af3c658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 13:18:47 -0700 Subject: [PATCH 59/97] Bump @vscode/test-electron from 2.3.9 to 2.3.10 (#616) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2422a194..dfa2c3a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", - "@vscode/test-electron": "^2.3.9", + "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", "esbuild": "^0.21.3", "glob": "^10.4.1", @@ -2543,9 +2543,9 @@ } }, "node_modules/@vscode/test-electron": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.9.tgz", - "integrity": "sha512-z3eiChaCQXMqBnk2aHHSEkobmC2VRalFQN0ApOAtydL172zXGxTwGrRtviT5HnUB+Q+G3vtEYFtuQkYqBzYgMA==", + "version": "2.3.10", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.10.tgz", + "integrity": "sha512-FxMqrvUm6a8S5tP4CymNJ40e6kD+wUTWTc6K32U629yrCCa+kl/rmpkC2gKpN4F4zjg1r+0Hnk9sl0+N2atsYA==", "dev": true, "dependencies": { "http-proxy-agent": "^4.0.1", diff --git a/package.json b/package.json index 702536ed..44c8bf20 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "@types/sinon": "^17.0.3", "@types/uuid": "^9.0.8", "@types/vscode": "^1.82.0", - "@vscode/test-electron": "^2.3.9", + "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", "esbuild": "^0.21.3", "glob": "^10.4.1", From df205c6f9227ff586c7f606a6049f1e98d335fed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 13:27:36 -0700 Subject: [PATCH 60/97] Bump esbuild from 0.21.3 to 0.21.4 (#617) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 192 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfa2c3a1..5210f5a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", - "esbuild": "^0.21.3", + "esbuild": "^0.21.4", "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", @@ -675,9 +675,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.3.tgz", - "integrity": "sha512-yTgnwQpFVYfvvo4SvRFB0SwrW8YjOxEoT7wfMT7Ol5v7v5LDNvSGo67aExmxOb87nQNeWPVvaGBNfQ7BXcrZ9w==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.4.tgz", + "integrity": "sha512-Zrm+B33R4LWPLjDEVnEqt2+SLTATlru1q/xYKVn8oVTbiRBGmK2VIMoIYGJDGyftnGaC788IuzGFAlb7IQ0Y8A==", "cpu": [ "ppc64" ], @@ -691,9 +691,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.3.tgz", - "integrity": "sha512-bviJOLMgurLJtF1/mAoJLxDZDL6oU5/ztMHnJQRejbJrSc9FFu0QoUoFhvi6qSKJEw9y5oGyvr9fuDtzJ30rNQ==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.4.tgz", + "integrity": "sha512-E7H/yTd8kGQfY4z9t3nRPk/hrhaCajfA3YSQSBrst8B+3uTcgsi8N+ZWYCaeIDsiVs6m65JPCaQN/DxBRclF3A==", "cpu": [ "arm" ], @@ -707,9 +707,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.3.tgz", - "integrity": "sha512-c+ty9necz3zB1Y+d/N+mC6KVVkGUUOcm4ZmT5i/Fk5arOaY3i6CA3P5wo/7+XzV8cb4GrI/Zjp8NuOQ9Lfsosw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.4.tgz", + "integrity": "sha512-fYFnz+ObClJ3dNiITySBUx+oNalYUT18/AryMxfovLkYWbutXsct3Wz2ZWAcGGppp+RVVX5FiXeLYGi97umisA==", "cpu": [ "arm64" ], @@ -723,9 +723,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.3.tgz", - "integrity": "sha512-JReHfYCRK3FVX4Ra+y5EBH1b9e16TV2OxrPAvzMsGeES0X2Ndm9ImQRI4Ket757vhc5XBOuGperw63upesclRw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.4.tgz", + "integrity": "sha512-mDqmlge3hFbEPbCWxp4fM6hqq7aZfLEHZAKGP9viq9wMUBVQx202aDIfc3l+d2cKhUJM741VrCXEzRFhPDKH3Q==", "cpu": [ "x64" ], @@ -739,9 +739,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.3.tgz", - "integrity": "sha512-U3fuQ0xNiAkXOmQ6w5dKpEvXQRSpHOnbw7gEfHCRXPeTKW9sBzVck6C5Yneb8LfJm0l6le4NQfkNPnWMSlTFUQ==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.4.tgz", + "integrity": "sha512-72eaIrDZDSiWqpmCzVaBD58c8ea8cw/U0fq/PPOTqE3c53D0xVMRt2ooIABZ6/wj99Y+h4ksT/+I+srCDLU9TA==", "cpu": [ "arm64" ], @@ -755,9 +755,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.3.tgz", - "integrity": "sha512-3m1CEB7F07s19wmaMNI2KANLcnaqryJxO1fXHUV5j1rWn+wMxdUYoPyO2TnAbfRZdi7ADRwJClmOwgT13qlP3Q==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.4.tgz", + "integrity": "sha512-uBsuwRMehGmw1JC7Vecu/upOjTsMhgahmDkWhGLWxIgUn2x/Y4tIwUZngsmVb6XyPSTXJYS4YiASKPcm9Zitag==", "cpu": [ "x64" ], @@ -771,9 +771,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.3.tgz", - "integrity": "sha512-fsNAAl5pU6wmKHq91cHWQT0Fz0vtyE1JauMzKotrwqIKAswwP5cpHUCxZNSTuA/JlqtScq20/5KZ+TxQdovU/g==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.4.tgz", + "integrity": "sha512-8JfuSC6YMSAEIZIWNL3GtdUT5NhUA/CMUCpZdDRolUXNAXEE/Vbpe6qlGLpfThtY5NwXq8Hi4nJy4YfPh+TwAg==", "cpu": [ "arm64" ], @@ -787,9 +787,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.3.tgz", - "integrity": "sha512-tci+UJ4zP5EGF4rp8XlZIdq1q1a/1h9XuronfxTMCNBslpCtmk97Q/5qqy1Mu4zIc0yswN/yP/BLX+NTUC1bXA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.4.tgz", + "integrity": "sha512-8d9y9eQhxv4ef7JmXny7591P/PYsDFc4+STaxC1GBv0tMyCdyWfXu2jBuqRsyhY8uL2HU8uPyscgE2KxCY9imQ==", "cpu": [ "x64" ], @@ -803,9 +803,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.3.tgz", - "integrity": "sha512-f6kz2QpSuyHHg01cDawj0vkyMwuIvN62UAguQfnNVzbge2uWLhA7TCXOn83DT0ZvyJmBI943MItgTovUob36SQ==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.4.tgz", + "integrity": "sha512-2rqFFefpYmpMs+FWjkzSgXg5vViocqpq5a1PSRgT0AvSgxoXmGF17qfGAzKedg6wAwyM7UltrKVo9kxaJLMF/g==", "cpu": [ "arm" ], @@ -819,9 +819,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.3.tgz", - "integrity": "sha512-vvG6R5g5ieB4eCJBQevyDMb31LMHthLpXTc2IGkFnPWS/GzIFDnaYFp558O+XybTmYrVjxnryru7QRleJvmZ6Q==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.4.tgz", + "integrity": "sha512-/GLD2orjNU50v9PcxNpYZi+y8dJ7e7/LhQukN3S4jNDXCKkyyiyAz9zDw3siZ7Eh1tRcnCHAo/WcqKMzmi4eMQ==", "cpu": [ "arm64" ], @@ -835,9 +835,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.3.tgz", - "integrity": "sha512-HjCWhH7K96Na+66TacDLJmOI9R8iDWDDiqe17C7znGvvE4sW1ECt9ly0AJ3dJH62jHyVqW9xpxZEU1jKdt+29A==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.4.tgz", + "integrity": "sha512-pNftBl7m/tFG3t2m/tSjuYeWIffzwAZT9m08+9DPLizxVOsUl8DdFzn9HvJrTQwe3wvJnwTdl92AonY36w/25g==", "cpu": [ "ia32" ], @@ -851,9 +851,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.3.tgz", - "integrity": "sha512-BGpimEccmHBZRcAhdlRIxMp7x9PyJxUtj7apL2IuoG9VxvU/l/v1z015nFs7Si7tXUwEsvjc1rOJdZCn4QTU+Q==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.4.tgz", + "integrity": "sha512-cSD2gzCK5LuVX+hszzXQzlWya6c7hilO71L9h4KHwqI4qeqZ57bAtkgcC2YioXjsbfAv4lPn3qe3b00Zt+jIfQ==", "cpu": [ "loong64" ], @@ -867,9 +867,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.3.tgz", - "integrity": "sha512-5rMOWkp7FQGtAH3QJddP4w3s47iT20hwftqdm7b+loe95o8JU8ro3qZbhgMRy0VuFU0DizymF1pBKkn3YHWtsw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.4.tgz", + "integrity": "sha512-qtzAd3BJh7UdbiXCrg6npWLYU0YpufsV9XlufKhMhYMJGJCdfX/G6+PNd0+v877X1JG5VmjBLUiFB0o8EUSicA==", "cpu": [ "mips64el" ], @@ -883,9 +883,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.3.tgz", - "integrity": "sha512-h0zj1ldel89V5sjPLo5H1SyMzp4VrgN1tPkN29TmjvO1/r0MuMRwJxL8QY05SmfsZRs6TF0c/IDH3u7XYYmbAg==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.4.tgz", + "integrity": "sha512-yB8AYzOTaL0D5+2a4xEy7OVvbcypvDR05MsB/VVPVA7nL4hc5w5Dyd/ddnayStDgJE59fAgNEOdLhBxjfx5+dg==", "cpu": [ "ppc64" ], @@ -899,9 +899,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.3.tgz", - "integrity": "sha512-dkAKcTsTJ+CRX6bnO17qDJbLoW37npd5gSNtSzjYQr0svghLJYGYB0NF1SNcU1vDcjXLYS5pO4qOW4YbFama4A==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.4.tgz", + "integrity": "sha512-Y5AgOuVzPjQdgU59ramLoqSSiXddu7F3F+LI5hYy/d1UHN7K5oLzYBDZe23QmQJ9PIVUXwOdKJ/jZahPdxzm9w==", "cpu": [ "riscv64" ], @@ -915,9 +915,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.3.tgz", - "integrity": "sha512-vnD1YUkovEdnZWEuMmy2X2JmzsHQqPpZElXx6dxENcIwTu+Cu5ERax6+Ke1QsE814Zf3c6rxCfwQdCTQ7tPuXA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.4.tgz", + "integrity": "sha512-Iqc/l/FFwtt8FoTK9riYv9zQNms7B8u+vAI/rxKuN10HgQIXaPzKZc479lZ0x6+vKVQbu55GdpYpeNWzjOhgbA==", "cpu": [ "s390x" ], @@ -931,9 +931,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.3.tgz", - "integrity": "sha512-IOXOIm9WaK7plL2gMhsWJd+l2bfrhfilv0uPTptoRoSb2p09RghhQQp9YY6ZJhk/kqmeRt6siRdMSLLwzuT0KQ==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.4.tgz", + "integrity": "sha512-Td9jv782UMAFsuLZINfUpoF5mZIbAj+jv1YVtE58rFtfvoKRiKSkRGQfHTgKamLVT/fO7203bHa3wU122V/Bdg==", "cpu": [ "x64" ], @@ -947,9 +947,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.3.tgz", - "integrity": "sha512-uTgCwsvQ5+vCQnqM//EfDSuomo2LhdWhFPS8VL8xKf+PKTCrcT/2kPPoWMTs22aB63MLdGMJiE3f1PHvCDmUOw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.4.tgz", + "integrity": "sha512-Awn38oSXxsPMQxaV0Ipb7W/gxZtk5Tx3+W+rAPdZkyEhQ6968r9NvtkjhnhbEgWXYbgV+JEONJ6PcdBS+nlcpA==", "cpu": [ "x64" ], @@ -963,9 +963,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.3.tgz", - "integrity": "sha512-vNAkR17Ub2MgEud2Wag/OE4HTSI6zlb291UYzHez/psiKarp0J8PKGDnAhMBcHFoOHMXHfExzmjMojJNbAStrQ==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.4.tgz", + "integrity": "sha512-IsUmQeCY0aU374R82fxIPu6vkOybWIMc3hVGZ3ChRwL9hA1TwY+tS0lgFWV5+F1+1ssuvvXt3HFqe8roCip8Hg==", "cpu": [ "x64" ], @@ -979,9 +979,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.3.tgz", - "integrity": "sha512-W8H9jlGiSBomkgmouaRoTXo49j4w4Kfbl6I1bIdO/vT0+0u4f20ko3ELzV3hPI6XV6JNBVX+8BC+ajHkvffIJA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.4.tgz", + "integrity": "sha512-hsKhgZ4teLUaDA6FG/QIu2q0rI6I36tZVfM4DBZv3BG0mkMIdEnMbhc4xwLvLJSS22uWmaVkFkqWgIS0gPIm+A==", "cpu": [ "x64" ], @@ -995,9 +995,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.3.tgz", - "integrity": "sha512-EjEomwyLSCg8Ag3LDILIqYCZAq/y3diJ04PnqGRgq8/4O3VNlXyMd54j/saShaN4h5o5mivOjAzmU6C3X4v0xw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.4.tgz", + "integrity": "sha512-UUfMgMoXPoA/bvGUNfUBFLCh0gt9dxZYIx9W4rfJr7+hKe5jxxHmfOK8YSH4qsHLLN4Ck8JZ+v7Q5fIm1huErg==", "cpu": [ "arm64" ], @@ -1011,9 +1011,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.3.tgz", - "integrity": "sha512-WGiE/GgbsEwR33++5rzjiYsKyHywE8QSZPF7Rfx9EBfK3Qn3xyR6IjyCr5Uk38Kg8fG4/2phN7sXp4NPWd3fcw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.4.tgz", + "integrity": "sha512-yIxbspZb5kGCAHWm8dexALQ9en1IYDfErzjSEq1KzXFniHv019VT3mNtTK7t8qdy4TwT6QYHI9sEZabONHg+aw==", "cpu": [ "ia32" ], @@ -1027,9 +1027,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.3.tgz", - "integrity": "sha512-xRxC0jaJWDLYvcUvjQmHCJSfMrgmUuvsoXgDeU/wTorQ1ngDdUBuFtgY3W1Pc5sprGAvZBtWdJX7RPg/iZZUqA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.4.tgz", + "integrity": "sha512-sywLRD3UK/qRJt0oBwdpYLBibk7KiRfbswmWRDabuncQYSlf8aLEEUor/oP6KRz8KEG+HoiVLBhPRD5JWjS8Sg==", "cpu": [ "x64" ], @@ -4000,9 +4000,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.3.tgz", - "integrity": "sha512-Kgq0/ZsAPzKrbOjCQcjoSmPoWhlcVnGAUo7jvaLHoxW1Drto0KGkR1xBNg2Cp43b9ImvxmPEJZ9xkfcnqPsfBw==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.4.tgz", + "integrity": "sha512-sFMcNNrj+Q0ZDolrp5pDhH0nRPN9hLIM3fRPwgbLYJeSHHgnXSnbV3xYgSVuOeLWH9c73VwmEverVzupIv5xuA==", "dev": true, "hasInstallScript": true, "bin": { @@ -4012,29 +4012,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.21.3", - "@esbuild/android-arm": "0.21.3", - "@esbuild/android-arm64": "0.21.3", - "@esbuild/android-x64": "0.21.3", - "@esbuild/darwin-arm64": "0.21.3", - "@esbuild/darwin-x64": "0.21.3", - "@esbuild/freebsd-arm64": "0.21.3", - "@esbuild/freebsd-x64": "0.21.3", - "@esbuild/linux-arm": "0.21.3", - "@esbuild/linux-arm64": "0.21.3", - "@esbuild/linux-ia32": "0.21.3", - "@esbuild/linux-loong64": "0.21.3", - "@esbuild/linux-mips64el": "0.21.3", - "@esbuild/linux-ppc64": "0.21.3", - "@esbuild/linux-riscv64": "0.21.3", - "@esbuild/linux-s390x": "0.21.3", - "@esbuild/linux-x64": "0.21.3", - "@esbuild/netbsd-x64": "0.21.3", - "@esbuild/openbsd-x64": "0.21.3", - "@esbuild/sunos-x64": "0.21.3", - "@esbuild/win32-arm64": "0.21.3", - "@esbuild/win32-ia32": "0.21.3", - "@esbuild/win32-x64": "0.21.3" + "@esbuild/aix-ppc64": "0.21.4", + "@esbuild/android-arm": "0.21.4", + "@esbuild/android-arm64": "0.21.4", + "@esbuild/android-x64": "0.21.4", + "@esbuild/darwin-arm64": "0.21.4", + "@esbuild/darwin-x64": "0.21.4", + "@esbuild/freebsd-arm64": "0.21.4", + "@esbuild/freebsd-x64": "0.21.4", + "@esbuild/linux-arm": "0.21.4", + "@esbuild/linux-arm64": "0.21.4", + "@esbuild/linux-ia32": "0.21.4", + "@esbuild/linux-loong64": "0.21.4", + "@esbuild/linux-mips64el": "0.21.4", + "@esbuild/linux-ppc64": "0.21.4", + "@esbuild/linux-riscv64": "0.21.4", + "@esbuild/linux-s390x": "0.21.4", + "@esbuild/linux-x64": "0.21.4", + "@esbuild/netbsd-x64": "0.21.4", + "@esbuild/openbsd-x64": "0.21.4", + "@esbuild/sunos-x64": "0.21.4", + "@esbuild/win32-arm64": "0.21.4", + "@esbuild/win32-ia32": "0.21.4", + "@esbuild/win32-x64": "0.21.4" } }, "node_modules/escalade": { diff --git a/package.json b/package.json index 44c8bf20..8045bf1f 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", - "esbuild": "^0.21.3", + "esbuild": "^0.21.4", "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", From 102e1a154928444362047334d28ec38c8bb35160 Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Wed, 29 May 2024 13:31:47 -0700 Subject: [PATCH 61/97] Bump to v2.3.3 (#622) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8045bf1f..b8a7fba6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.3.2", + "version": "2.3.3", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From 6c3a92ce7d5c79a8c41be5bab766d63a54fbfe6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 08:28:08 -0700 Subject: [PATCH 62/97] Bump sinon from 17.0.1 to 18.0.0 (#625) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 96 +++++++++++++++-------------------------------- package.json | 2 +- 2 files changed, 31 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5210f5a5..76edd9e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.3.2", + "version": "2.3.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.3.2", + "version": "2.3.3", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", @@ -49,7 +49,7 @@ "nyc": "^15.1.0", "ovsx": "^0.9.1", "rimraf": "^5.0.7", - "sinon": "^17.0.1", + "sinon": "^18.0.0", "ts-mocha": "^10.0.0", "ts-node": "^10.9.2", "ts-standard": "^12.0.2", @@ -1951,9 +1951,9 @@ "dev": true }, "node_modules/@sinonjs/commons": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", + "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, "dependencies": { "type-detect": "4.0.8" @@ -6878,9 +6878,9 @@ } }, "node_modules/just-extend": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz", - "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", + "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", "dev": true }, "node_modules/jwa": { @@ -7561,43 +7561,16 @@ "dev": true }, "node_modules/nise": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.5.tgz", - "integrity": "sha512-VJuPIfUFaXNRzETTQEEItTOP8Y171ijr+JLq42wHes3DiryR8vT+1TXQW/Rx8JNUhyYYWyIvjXTU6dOhJcs9Nw==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^2.0.0", - "@sinonjs/fake-timers": "^10.0.2", - "@sinonjs/text-encoding": "^0.7.1", - "just-extend": "^4.0.2", - "path-to-regexp": "^1.7.0" - } - }, - "node_modules/nise/node_modules/@sinonjs/commons": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz", - "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==", - "dev": true, - "dependencies": { - "type-detect": "4.0.8" - } - }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", - "dev": true, - "dependencies": { - "@sinonjs/commons": "^3.0.0" - } - }, - "node_modules/nise/node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", - "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-6.0.0.tgz", + "integrity": "sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg==", "dev": true, "dependencies": { - "type-detect": "4.0.8" + "@sinonjs/commons": "^3.0.0", + "@sinonjs/fake-timers": "^11.2.2", + "@sinonjs/text-encoding": "^0.7.2", + "just-extend": "^6.2.0", + "path-to-regexp": "^6.2.1" } }, "node_modules/node-abi": { @@ -8398,18 +8371,9 @@ } }, "node_modules/path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "dev": true, - "dependencies": { - "isarray": "0.0.1" - } - }, - "node_modules/path-to-regexp/node_modules/isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", + "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", "dev": true }, "node_modules/path-type": { @@ -9201,17 +9165,17 @@ } }, "node_modules/sinon": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-17.0.1.tgz", - "integrity": "sha512-wmwE19Lie0MLT+ZYNpDymasPHUKTaZHUH/pKEubRXIzySv9Atnlw+BUMGCzWgV7b7wO+Hw6f1TEOr0IUnmU8/g==", + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.0.tgz", + "integrity": "sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA==", "dev": true, "dependencies": { - "@sinonjs/commons": "^3.0.0", + "@sinonjs/commons": "^3.0.1", "@sinonjs/fake-timers": "^11.2.2", "@sinonjs/samsam": "^8.0.0", - "diff": "^5.1.0", - "nise": "^5.1.5", - "supports-color": "^7.2.0" + "diff": "^5.2.0", + "nise": "^6.0.0", + "supports-color": "^7" }, "funding": { "type": "opencollective", @@ -9219,9 +9183,9 @@ } }, "node_modules/sinon/node_modules/diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "engines": { "node": ">=0.3.1" diff --git a/package.json b/package.json index b8a7fba6..e8f0261f 100644 --- a/package.json +++ b/package.json @@ -205,7 +205,7 @@ "nyc": "^15.1.0", "ovsx": "^0.9.1", "rimraf": "^5.0.7", - "sinon": "^17.0.1", + "sinon": "^18.0.0", "ts-mocha": "^10.0.0", "ts-node": "^10.9.2", "ts-standard": "^12.0.2", From 5d4d750f6a855eb34570bddbaa3705cedcdcf9c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 08:28:21 -0700 Subject: [PATCH 63/97] Bump @types/node from 20.12.7 to 20.14.0 (#624) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76edd9e1..03c10344 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.17.4", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.12.7", + "@types/node": "^20.14.0", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", @@ -2236,9 +2236,9 @@ } }, "node_modules/@types/node": { - "version": "20.12.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz", - "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==", + "version": "20.14.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz", + "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==", "dependencies": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index e8f0261f..7d54b92e 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/lodash": "^4.17.4", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.12.7", + "@types/node": "^20.14.0", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", From c27fd55ff1b937c90ce29027f287250cbd73b8c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 08:28:32 -0700 Subject: [PATCH 64/97] Bump @sentry/node from 8.4.0 to 8.7.0 (#623) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 64 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03c10344..cca1e7d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^8.4.0", + "@sentry/node": "^8.7.0", "@vscode/vsce": "^2.26.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1531,13 +1531,13 @@ } }, "node_modules/@opentelemetry/instrumentation-connect": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.36.0.tgz", - "integrity": "sha512-k9++bmJZ9zDEs3u3DnKTn2l7QTiNFg3gPx7G9rW0TPnP+xZoBSBTrEcGYBaqflQlrFG23Q58+X1sM2ayWPv5Fg==", + "version": "0.36.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.36.1.tgz", + "integrity": "sha512-xI5Q/CMmzBmHshPnzzjD19ptFaYO/rQWzokpNio4QixZYWhJsa35QgRvN9FhPkwgtuJIbt/CWWAufJ3egJNHEA==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.51.0", - "@opentelemetry/semantic-conventions": "^1.0.0", + "@opentelemetry/semantic-conventions": "^1.22.0", "@types/connect": "3.4.36" }, "engines": { @@ -1855,27 +1855,27 @@ } }, "node_modules/@sentry/core": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.4.0.tgz", - "integrity": "sha512-0eACPlJvKloFIlcT1c/vjGnvqxLxpGyGuSsU7uonrkmBqIRwLYXWtR4PoHapysKtjPVoHAn9au50ut6ymC2V8Q==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.7.0.tgz", + "integrity": "sha512-Sq/46B+5nWmgnCD6dEMZ6HTkKbV/KAdgaSvT8oXDb9OWoPy1jJ/gbLrhLs62KbjuDQk4/vWnOgHiKQbcslSzMw==", "dependencies": { - "@sentry/types": "8.4.0", - "@sentry/utils": "8.4.0" + "@sentry/types": "8.7.0", + "@sentry/utils": "8.7.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/node": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.4.0.tgz", - "integrity": "sha512-k0uqG2F8BQWATIEghA1jQ0tBAr9mJsyS+ZiruXjbixy8kd7+ZM1CCiqeqqrYaanS0hI0mvtg9uxTQzBa1SMQsA==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.7.0.tgz", + "integrity": "sha512-El1LmXGVe8Ahi5oUdlrE5s3Or23/iGnnntNvaYymXk4BmL4dJtv7ttlQ94ZrI9QWs8VnfM7eHqCd+OPjTh0XJQ==", "dependencies": { "@opentelemetry/api": "^1.8.0", - "@opentelemetry/context-async-hooks": "^1.23.0", + "@opentelemetry/context-async-hooks": "^1.24.1", "@opentelemetry/core": "^1.24.1", "@opentelemetry/instrumentation": "^0.51.1", - "@opentelemetry/instrumentation-connect": "0.36.0", + "@opentelemetry/instrumentation-connect": "0.36.1", "@opentelemetry/instrumentation-express": "0.39.0", "@opentelemetry/instrumentation-fastify": "0.36.1", "@opentelemetry/instrumentation-graphql": "0.40.0", @@ -1893,10 +1893,10 @@ "@opentelemetry/sdk-trace-base": "^1.23.0", "@opentelemetry/semantic-conventions": "^1.23.0", "@prisma/instrumentation": "5.14.0", - "@sentry/core": "8.4.0", - "@sentry/opentelemetry": "8.4.0", - "@sentry/types": "8.4.0", - "@sentry/utils": "8.4.0" + "@sentry/core": "8.7.0", + "@sentry/opentelemetry": "8.7.0", + "@sentry/types": "8.7.0", + "@sentry/utils": "8.7.0" }, "engines": { "node": ">=14.18" @@ -1906,13 +1906,13 @@ } }, "node_modules/@sentry/opentelemetry": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.4.0.tgz", - "integrity": "sha512-1YXLuRHMhzPzoiD8Pzts5GlZY4V5GSXGn5aBmFlJ13vSrUK6C4qhPfZMboppntPihOxupCPg3XP76ZMj6+XuOg==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.7.0.tgz", + "integrity": "sha512-I9JEXnqXDBPr5MtgEYRvmcolmpugSgH1QV+SFnfOPc40Mu/npNsJq7oqbGzhlCe4H45XD6LJzFlc7BfoCzwAsQ==", "dependencies": { - "@sentry/core": "8.4.0", - "@sentry/types": "8.4.0", - "@sentry/utils": "8.4.0" + "@sentry/core": "8.7.0", + "@sentry/types": "8.7.0", + "@sentry/utils": "8.7.0" }, "engines": { "node": ">=14.18" @@ -1926,19 +1926,19 @@ } }, "node_modules/@sentry/types": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.4.0.tgz", - "integrity": "sha512-mHUaaYEQCNukzYsTLp4rP2NNO17vUf+oSGS6qmhrsGqmGNICKw2CIwJlPPGeAkq9Y4tiUOye2m5OT1xsOtxLIw==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.7.0.tgz", + "integrity": "sha512-11KLOKumP6akugVGLvSoEig+JlP0ZEzW3nN9P+ppgdIx9HAxMIh6UvumbieG4/DWjAh2kh6NPNfUw3gk2Gfq1A==", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.4.0.tgz", - "integrity": "sha512-oDF0RVWW0AyEnsP1x4McHUvQSAxJgx3G6wM9Sb4wc1F8rwsHnCtGHc+WRZ5Gd2AXC5EGkfbg5919+1ku/L4Dww==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.7.0.tgz", + "integrity": "sha512-aWmcbSoOmrbzll/FkNQFJcCtLAuJLvTYbRKiCSkV3FScA7UaA742HkTZAPFiioALFIESWk/fcGZqtN0s4I281Q==", "dependencies": { - "@sentry/types": "8.4.0" + "@sentry/types": "8.7.0" }, "engines": { "node": ">=14.18" diff --git a/package.json b/package.json index 7d54b92e..b7e94fbd 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^8.4.0", + "@sentry/node": "^8.7.0", "@vscode/vsce": "^2.26.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 9c8f0103f38b747bcdad5b9503a3f37b1d4bcf40 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Thu, 6 Jun 2024 13:22:02 -0700 Subject: [PATCH 65/97] Fix crypto polyfill (#627) --- extension/src/crypto-polyfill.ts | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/extension/src/crypto-polyfill.ts b/extension/src/crypto-polyfill.ts index 3820647a..912ef7a7 100644 --- a/extension/src/crypto-polyfill.ts +++ b/extension/src/crypto-polyfill.ts @@ -1,21 +1,7 @@ import * as crypto from 'crypto' -globalThis.crypto = { - getRandomValues: (buffer: Buffer) => { - const buf = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength) - if (!(buf instanceof Uint8Array)) { - throw new TypeError('expected Uint8Array') - } - if (buf.length > 65536) { - const e = new Error() - // @ts-expect-error - e.code = 22 - e.message = `Failed to execute 'getRandomValues' on 'Crypto': The 'ArrayBufferView's byte length (${buf.length}) exceeds the number of bytes of entropy available via this API (65536).` - e.name = 'QuotaExceededError' - throw e - } - const bytes = crypto.randomBytes(buf.length) - buf.set(bytes) - return buf - } -} as any +if (globalThis.crypto == null) { + Object.defineProperty(globalThis, 'crypto', { + value: crypto + }) +} From 850a8b8eca448f4c0ca6faee67a8d1f337434695 Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:24:02 -0700 Subject: [PATCH 66/97] Bump to v2.3.4 (#628) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b7e94fbd..ae2473e1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.3.3", + "version": "2.3.4", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From 905de3fd0861cd3b8acae72e0b2c108631764e5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 9 Jun 2024 20:02:10 -0700 Subject: [PATCH 67/97] Bump nyc from 15.1.0 to 17.0.0 (#632) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 524 ++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 303 insertions(+), 223 deletions(-) diff --git a/package-lock.json b/package-lock.json index cca1e7d7..fcfe9245 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.3.3", + "version": "2.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.3.3", + "version": "2.3.4", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", @@ -46,7 +46,7 @@ "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", - "nyc": "^15.1.0", + "nyc": "^17.0.0", "ovsx": "^0.9.1", "rimraf": "^5.0.7", "sinon": "^18.0.0", @@ -59,6 +59,29 @@ "vscode": "^1.82.0" } }, + "node_modules/@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@ampproject/remapping/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, "node_modules/@azure/abort-controller": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz", @@ -336,48 +359,48 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.13", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", - "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz", + "integrity": "sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", - "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.0", - "@babel/helper-compilation-targets": "^7.15.0", - "@babel/helper-module-transforms": "^7.15.0", - "@babel/helpers": "^7.14.8", - "@babel/parser": "^7.15.0", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0", - "convert-source-map": "^1.7.0", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz", + "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-compilation-targets": "^7.24.7", + "@babel/helper-module-transforms": "^7.24.7", + "@babel/helpers": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/template": "^7.24.7", + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" + "json5": "^2.2.3", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -387,6 +410,12 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -396,24 +425,15 @@ "semver": "bin/semver.js" } }, - "node_modules/@babel/core/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/@babel/generator": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", - "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz", + "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==", "dev": true, "dependencies": { - "@babel/types": "^7.23.0", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", + "@babel/types": "^7.24.7", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" }, "engines": { @@ -421,31 +441,38 @@ } }, "node_modules/@babel/generator/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", - "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz", + "integrity": "sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.15.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.16.6", - "semver": "^6.3.0" + "@babel/compat-data": "^7.24.7", + "@babel/helper-validator-option": "^7.24.7", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -457,154 +484,165 @@ "semver": "bin/semver.js" } }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz", + "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==", "dev": true, + "dependencies": { + "@babel/types": "^7.24.7" + }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz", + "integrity": "sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==", "dev": true, "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz", + "integrity": "sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", - "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.21.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", - "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz", + "integrity": "sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.20.2", - "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.20.7", - "@babel/traverse": "^7.21.2", - "@babel/types": "^7.21.2" + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", - "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", "dev": true, "dependencies": { - "@babel/types": "^7.20.2" + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz", + "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz", + "integrity": "sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", - "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz", + "integrity": "sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz", - "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz", + "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==", "dev": true, "dependencies": { - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8" + "@babel/template": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", "dev": true, "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.7", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", - "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz", + "integrity": "sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -614,34 +652,34 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz", + "integrity": "sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", - "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", - "debug": "^4.1.0", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz", + "integrity": "sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.24.7", + "@babel/helper-environment-visitor": "^7.24.7", + "@babel/helper-function-name": "^7.24.7", + "@babel/helper-hoist-variables": "^7.24.7", + "@babel/helper-split-export-declaration": "^7.24.7", + "@babel/parser": "^7.24.7", + "@babel/types": "^7.24.7", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -649,13 +687,13 @@ } }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz", + "integrity": "sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1372,19 +1410,29 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" } }, + "node_modules/@jridgewell/gen-mapping/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", @@ -1395,9 +1443,9 @@ } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, "engines": { "node": ">=6.0.0" @@ -3050,26 +3098,35 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.16.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz", - "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==", + "version": "4.23.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", + "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "dependencies": { - "caniuse-lite": "^1.0.30001248", - "colorette": "^1.2.2", - "electron-to-chromium": "^1.3.793", - "escalade": "^3.1.1", - "node-releases": "^1.1.73" + "caniuse-lite": "^1.0.30001629", + "electron-to-chromium": "^1.4.796", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.16" }, "bin": { "browserslist": "cli.js" }, "engines": { "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" } }, "node_modules/buffer": { @@ -3176,14 +3233,24 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001249", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz", - "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw==", + "version": "1.0.30001629", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz", + "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==", "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] }, "node_modules/chai": { "version": "5.1.1", @@ -3422,12 +3489,6 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, - "node_modules/colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", - "dev": true - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3465,18 +3526,9 @@ "optional": true }, "node_modules/convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.1.1" - } - }, - "node_modules/convert-source-map/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true }, "node_modules/core-util-is": { @@ -3836,9 +3888,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.3.798", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.798.tgz", - "integrity": "sha512-fwsr6oXAORoV9a6Ak2vMCdXfmHIpAGgpOGesulS1cbGgJmrMl3H+GicUyRG3t+z9uHTMrIuMTleFDW+EUFYT3g==", + "version": "1.4.796", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.796.tgz", + "integrity": "sha512-NglN/xprcM+SHD2XCli4oC6bWe6kHoytcyLKCWXmRL854F0qhPhaYgUswUsglnPxYaNQIg2uMY4BvaomIf3kLA==", "dev": true }, "node_modules/elliptic": { @@ -4038,9 +4090,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "engines": { "node": ">=6" @@ -6142,9 +6194,9 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "node_modules/istanbul-lib-coverage": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", - "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, "engines": { "node": ">=8" @@ -6163,27 +6215,19 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz", + "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==", "dev": true, "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/istanbul-lib-processinfo": { @@ -7612,9 +7656,9 @@ } }, "node_modules/node-releases": { - "version": "1.1.73", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", - "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "node_modules/normalize-path": { @@ -7684,9 +7728,9 @@ } }, "node_modules/nyc": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", - "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.0.0.tgz", + "integrity": "sha512-ISp44nqNCaPugLLGGfknzQwSwt10SSS5IMoPR7GLoMAyS18Iw5js8U7ga2VF9lYuMZ42gOHr3UddZw4WZltxKg==", "dev": true, "dependencies": { "@istanbuljs/load-nyc-config": "^1.0.0", @@ -7701,7 +7745,7 @@ "glob": "^7.1.6", "istanbul-lib-coverage": "^3.0.0", "istanbul-lib-hook": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-instrument": "^6.0.2", "istanbul-lib-processinfo": "^2.0.2", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", @@ -7721,7 +7765,7 @@ "nyc": "bin/nyc.js" }, "engines": { - "node": ">=8.9" + "node": ">=18" } }, "node_modules/nyc/node_modules/ansi-regex": { @@ -8427,6 +8471,12 @@ "node": ">=4" } }, + "node_modules/picocolors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "dev": true + }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", @@ -9836,7 +9886,7 @@ "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, "engines": { "node": ">=4" @@ -10182,6 +10232,36 @@ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, + "node_modules/update-browserslist-db": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", + "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", diff --git a/package.json b/package.json index ae2473e1..547d6a1f 100644 --- a/package.json +++ b/package.json @@ -202,7 +202,7 @@ "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", - "nyc": "^15.1.0", + "nyc": "^17.0.0", "ovsx": "^0.9.1", "rimraf": "^5.0.7", "sinon": "^18.0.0", From 607cc3b56345839d24b546bb97d6973d552056a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 9 Jun 2024 20:02:22 -0700 Subject: [PATCH 68/97] Bump @types/lodash from 4.17.4 to 4.17.5 (#630) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fcfe9245..08c641fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.4", + "@types/lodash": "^4.17.5", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.14.0", @@ -2247,9 +2247,9 @@ } }, "node_modules/@types/lodash": { - "version": "4.17.4", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==", + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", "dev": true }, "node_modules/@types/mime": { diff --git a/package.json b/package.json index 547d6a1f..2d56f9b9 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.4", + "@types/lodash": "^4.17.5", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.14.0", From 3cb6aa82fa0d19f1cc285784423a3c0521ef80bb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 9 Jun 2024 20:02:35 -0700 Subject: [PATCH 69/97] Bump @types/node from 20.14.0 to 20.14.2 (#629) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 08c641fb..054b1a38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.17.5", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.14.0", + "@types/node": "^20.14.2", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", @@ -2284,9 +2284,9 @@ } }, "node_modules/@types/node": { - "version": "20.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.0.tgz", - "integrity": "sha512-5cHBxFGJx6L4s56Bubp4fglrEpmyJypsqI6RgzMfBHWUJQGWAAi8cWcgetEbZXHYXo9C2Fa4EEds/uSyS4cxmA==", + "version": "20.14.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", + "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", "dependencies": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index 2d56f9b9..46ed1b86 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/lodash": "^4.17.5", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.14.0", + "@types/node": "^20.14.2", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", From 7c3c2e0474d5f9eb5e39344ccb84cc3aefcc0041 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 9 Jun 2024 20:02:47 -0700 Subject: [PATCH 70/97] Bump @vscode/vsce from 2.26.1 to 2.27.0 (#631) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 134 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 2 +- 2 files changed, 131 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 054b1a38..55025047 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^8.7.0", - "@vscode/vsce": "^2.26.1", + "@vscode/vsce": "^2.27.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", @@ -2606,11 +2606,12 @@ } }, "node_modules/@vscode/vsce": { - "version": "2.26.1", - "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.26.1.tgz", - "integrity": "sha512-QOG6Ht7V93nhwcBxPWcG33UK0qDGEoJdg0xtVeaTN27W6PGdMJUJGTPhB/sNHUIFKwvwzv/zMAHvDgMNXbcwlA==", + "version": "2.27.0", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.27.0.tgz", + "integrity": "sha512-FFUMBVSyyjjJpWszwqk7d4U3YllY8FdWslbUDMRki1x4ZjA3Z0hmRMfypWrjP9sptbSR9nyPFU4uqjhy2qRB/w==", "dependencies": { "@azure/identity": "^4.1.0", + "@vscode/vsce-sign": "^2.0.0", "azure-devops-node-api": "^12.5.0", "chalk": "^2.4.2", "cheerio": "^1.0.0-rc.9", @@ -2644,6 +2645,131 @@ "keytar": "^7.7.0" } }, + "node_modules/@vscode/vsce-sign": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign/-/vsce-sign-2.0.4.tgz", + "integrity": "sha512-0uL32egStKYfy60IqnynAChMTbL0oqpqk0Ew0YHiIb+fayuGZWADuIPHWUcY1GCnAA+VgchOPDMxnc2R3XGWEA==", + "hasInstallScript": true, + "optionalDependencies": { + "@vscode/vsce-sign-alpine-arm64": "2.0.2", + "@vscode/vsce-sign-alpine-x64": "2.0.2", + "@vscode/vsce-sign-darwin-arm64": "2.0.2", + "@vscode/vsce-sign-darwin-x64": "2.0.2", + "@vscode/vsce-sign-linux-arm": "2.0.2", + "@vscode/vsce-sign-linux-arm64": "2.0.2", + "@vscode/vsce-sign-linux-x64": "2.0.2", + "@vscode/vsce-sign-win32-arm64": "2.0.2", + "@vscode/vsce-sign-win32-x64": "2.0.2" + } + }, + "node_modules/@vscode/vsce-sign-alpine-arm64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.2.tgz", + "integrity": "sha512-E80YvqhtZCLUv3YAf9+tIbbqoinWLCO/B3j03yQPbjT3ZIHCliKZlsy1peNc4XNZ5uIb87Jn0HWx/ZbPXviuAQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "alpine" + ] + }, + "node_modules/@vscode/vsce-sign-alpine-x64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-alpine-x64/-/vsce-sign-alpine-x64-2.0.2.tgz", + "integrity": "sha512-n1WC15MSMvTaeJ5KjWCzo0nzjydwxLyoHiMJHu1Ov0VWTZiddasmOQHekA47tFRycnt4FsQrlkSCTdgHppn6bw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "alpine" + ] + }, + "node_modules/@vscode/vsce-sign-darwin-arm64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-darwin-arm64/-/vsce-sign-darwin-arm64-2.0.2.tgz", + "integrity": "sha512-rz8F4pMcxPj8fjKAJIfkUT8ycG9CjIp888VY/6pq6cuI2qEzQ0+b5p3xb74CJnBbSC0p2eRVoe+WgNCAxCLtzQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@vscode/vsce-sign-darwin-x64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-darwin-x64/-/vsce-sign-darwin-x64-2.0.2.tgz", + "integrity": "sha512-MCjPrQ5MY/QVoZ6n0D92jcRb7eYvxAujG/AH2yM6lI0BspvJQxp0o9s5oiAM9r32r9tkLpiy5s2icsbwefAQIw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@vscode/vsce-sign-linux-arm": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm/-/vsce-sign-linux-arm-2.0.2.tgz", + "integrity": "sha512-Fkb5jpbfhZKVw3xwR6t7WYfwKZktVGNXdg1m08uEx1anO0oUPUkoQRsNm4QniL3hmfw0ijg00YA6TrxCRkPVOQ==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@vscode/vsce-sign-linux-arm64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-arm64/-/vsce-sign-linux-arm64-2.0.2.tgz", + "integrity": "sha512-Ybeu7cA6+/koxszsORXX0OJk9N0GgfHq70Wqi4vv2iJCZvBrOWwcIrxKjvFtwyDgdeQzgPheH5nhLVl5eQy7WA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@vscode/vsce-sign-linux-x64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-linux-x64/-/vsce-sign-linux-x64-2.0.2.tgz", + "integrity": "sha512-NsPPFVtLaTlVJKOiTnO8Cl78LZNWy0Q8iAg+LlBiCDEgC12Gt4WXOSs2pmcIjDYzj2kY4NwdeN1mBTaujYZaPg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@vscode/vsce-sign-win32-arm64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-win32-arm64/-/vsce-sign-win32-arm64-2.0.2.tgz", + "integrity": "sha512-wPs848ymZ3Ny+Y1Qlyi7mcT6VSigG89FWQnp2qRYCyMhdJxOpA4lDwxzlpL8fG6xC8GjQjGDkwbkWUcCobvksQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@vscode/vsce-sign-win32-x64": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@vscode/vsce-sign-win32-x64/-/vsce-sign-win32-x64-2.0.2.tgz", + "integrity": "sha512-pAiRN6qSAhDM5SVOIxgx+2xnoVUePHbRNC7OD2aOR3WltTKxxF25OfpK8h8UQ7A0BuRkSgREbB59DBlFk4iAeg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@vscode/vsce/node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", diff --git a/package.json b/package.json index 46ed1b86..5ac26666 100644 --- a/package.json +++ b/package.json @@ -215,7 +215,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^8.7.0", - "@vscode/vsce": "^2.26.1", + "@vscode/vsce": "^2.27.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", From ec8a6f60e80e3650c1b3fe89e49e912294f5e69e Mon Sep 17 00:00:00 2001 From: nichita-rusin <116542109+nichita-rusin@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:14:14 +0300 Subject: [PATCH 71/97] Upgrade `os-name` to avoid crash on Windows (#635) Co-authored-by: Jordan Ribbink --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55025047..765d33ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7797,9 +7797,9 @@ } }, "node_modules/npm-run-path": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", - "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dependencies": { "path-key": "^4.0.0" }, @@ -10545,9 +10545,9 @@ } }, "node_modules/windows-release": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-6.0.0.tgz", - "integrity": "sha512-qng0N206UCKRgN+fc6Y+ERV4itBoXxLuElzl7guDe6bxDqMEyZ5POekJEy4+3traFDUM/aeBwR7/PpHpZiP8gQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-6.0.1.tgz", + "integrity": "sha512-MS3BzG8QK33dAyqwxfYJCJ03arkwKaddUOvvnnlFdXLudflsQF6I8yAxrLBeQk4yO8wjdH/+ax0YzxJEDrOftg==", "dependencies": { "execa": "^8.0.1" }, diff --git a/package.json b/package.json index 5ac26666..532d1b64 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.3.4", + "version": "2.3.5", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From 361739e0f37baacd74d869d9b72933949e005cf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:52:22 -0700 Subject: [PATCH 72/97] Bump @azure/msal-node from 2.7.0 to 2.9.2 (#637) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 765d33ab..a8be5d46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cadence", - "version": "2.3.4", + "version": "2.3.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.3.4", + "version": "2.3.5", "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", @@ -338,11 +338,11 @@ } }, "node_modules/@azure/msal-node": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.7.0.tgz", - "integrity": "sha512-wXD8LkUvHICeSWZydqg6o8Yvv+grlBEcmLGu+QEI4FcwFendbTEZrlSygnAXXSOCVaGAirWLchca35qrgpO6Jw==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz", + "integrity": "sha512-8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==", "dependencies": { - "@azure/msal-common": "14.9.0", + "@azure/msal-common": "14.12.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, @@ -350,6 +350,14 @@ "node": ">=16" } }, + "node_modules/@azure/msal-node/node_modules/@azure/msal-common": { + "version": "14.12.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz", + "integrity": "sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/@azure/msal-node/node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", From 320b8ecdb6c1f2b72da7df8fa5b6ec5f78e555e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:52:39 -0700 Subject: [PATCH 73/97] Bump @azure/identity from 4.1.0 to 4.2.1 (#636) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a8be5d46..a7f2ff8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -274,9 +274,9 @@ "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/@azure/identity": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.1.0.tgz", - "integrity": "sha512-BhYkF8Xr2gXjyDxocm0pc9RI5J5a1jw8iW0dw6Bx95OGdYbuMyFZrrwNw4eYSqQ2BB6FZOqpJP3vjsAqRcvDhw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.2.1.tgz", + "integrity": "sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.5.0", @@ -286,7 +286,7 @@ "@azure/core-util": "^1.3.0", "@azure/logger": "^1.0.0", "@azure/msal-browser": "^3.11.1", - "@azure/msal-node": "^2.6.6", + "@azure/msal-node": "^2.9.2", "events": "^3.0.0", "jws": "^4.0.0", "open": "^8.0.0", From f329968ec12a0924a8d14c397883888b2685f9d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:28:58 -0700 Subject: [PATCH 74/97] Bump braces from 3.0.2 to 3.0.3 (#638) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7f2ff8f..2b3d3631 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3209,12 +3209,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -5060,9 +5060,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" From efe8ffc8d86e96151144fed4af565cbfb7bfb55b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:40:27 -0700 Subject: [PATCH 75/97] Bump @sentry/node from 8.7.0 to 8.13.0 (#646) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 351 ++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 185 insertions(+), 168 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b3d3631..e51bb99e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^8.7.0", + "@sentry/node": "^8.13.0", "@vscode/vsce": "^2.27.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1524,17 +1524,17 @@ "integrity": "sha512-i4JTznywSpXTyBIwnrzEXqEBJRZu8xYDRS4Q0mTzP1+0GdESm+Wq44qvtN68vEcNNfSLJixKeGs/T0nvkJDh4A==" }, "node_modules/@opentelemetry/api": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.8.0.tgz", - "integrity": "sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", + "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", "engines": { "node": ">=8.0.0" } }, "node_modules/@opentelemetry/api-logs": { - "version": "0.51.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.51.1.tgz", - "integrity": "sha512-E3skn949Pk1z2XtXu/lxf6QAZpawuTM/IUEXcAzpiUkTd73Hmvw26FiN3cJuTmkpM5hZzHwkomVdtrh/n/zzwA==", + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.52.1.tgz", + "integrity": "sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==", "dependencies": { "@opentelemetry/api": "^1.0.0" }, @@ -1543,38 +1543,38 @@ } }, "node_modules/@opentelemetry/context-async-hooks": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.24.1.tgz", - "integrity": "sha512-R5r6DO4kgEOVBxFXhXjwospLQkv+sYxwCfjvoZBe7Zm6KKXAV9kDSJhi/D1BweowdZmO+sdbENLs374gER8hpQ==", + "version": "1.25.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.25.1.tgz", + "integrity": "sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==", "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" + "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "node_modules/@opentelemetry/core": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.24.1.tgz", - "integrity": "sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg==", + "version": "1.25.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.1.tgz", + "integrity": "sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==", "dependencies": { - "@opentelemetry/semantic-conventions": "1.24.1" + "@opentelemetry/semantic-conventions": "1.25.1" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" + "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "node_modules/@opentelemetry/instrumentation": { - "version": "0.51.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.51.1.tgz", - "integrity": "sha512-JIrvhpgqY6437QIqToyozrUG1h5UhwHkaGK/WAX+fkrpyPtc+RO5FkRtUd9BH0MibabHHvqsnBGKfKVijbmp8w==", + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.52.1.tgz", + "integrity": "sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==", "dependencies": { - "@opentelemetry/api-logs": "0.51.1", + "@opentelemetry/api-logs": "0.52.1", "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.4", + "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -1587,12 +1587,12 @@ } }, "node_modules/@opentelemetry/instrumentation-connect": { - "version": "0.36.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.36.1.tgz", - "integrity": "sha512-xI5Q/CMmzBmHshPnzzjD19ptFaYO/rQWzokpNio4QixZYWhJsa35QgRvN9FhPkwgtuJIbt/CWWAufJ3egJNHEA==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.37.0.tgz", + "integrity": "sha512-SeQktDIH5rNzjiEiazWiJAIXkmnLOnNV7wwHpahrqE0Ph+Z3heqMfxRtoMtbdJSIYLfcNZYO51AjxZ00IXufdw==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@types/connect": "3.4.36" }, @@ -1604,12 +1604,12 @@ } }, "node_modules/@opentelemetry/instrumentation-express": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.39.0.tgz", - "integrity": "sha512-AG8U7z7D0JcBu/7dDcwb47UMEzj9/FMiJV2iQZqrsZnxR3FjB9J9oIH2iszJYci2eUdp2WbdvtpD9RV/zmME5A==", + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.40.1.tgz", + "integrity": "sha512-+RKMvVe2zw3kIXRup9c1jFu3T4d0fs5aKy015TpiMyoCKX1UMu3Z0lfgYtuyiSTANvg5hZnDbWmQmqSPj9VTvg==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0" }, "engines": { @@ -1620,12 +1620,12 @@ } }, "node_modules/@opentelemetry/instrumentation-fastify": { - "version": "0.36.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.36.1.tgz", - "integrity": "sha512-3Nfm43PI0I+3EX+1YbSy6xbDu276R1Dh1tqAk68yd4yirnIh52Kd5B+nJ8CgHA7o3UKakpBjj6vSzi5vNCzJIA==", + "version": "0.37.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.37.0.tgz", + "integrity": "sha512-WRjwzNZgupSzbEYvo9s+QuHJRqZJjVdNxSEpGBwWK8RKLlHGwGVAu0gcc2gPamJWUJsGqPGvahAPWM18ZkWj6A==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0" }, "engines": { @@ -1636,11 +1636,11 @@ } }, "node_modules/@opentelemetry/instrumentation-graphql": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.40.0.tgz", - "integrity": "sha512-LVRdEHWACWOczv2imD+mhUrLMxsEjPPi32vIZJT57zygR5aUiA4em8X3aiGOCycgbMWkIu8xOSGSxdx3JmzN+w==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.41.0.tgz", + "integrity": "sha512-R/gXeljgIhaRDKquVkKYT5QHPnFouM8ooyePZEP0kqyaVAedtR1V7NfAUJbxfTG5fBQa5wdmLjvu63+tzRXZCA==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0" + "@opentelemetry/instrumentation": "^0.52.0" }, "engines": { "node": ">=14" @@ -1650,13 +1650,13 @@ } }, "node_modules/@opentelemetry/instrumentation-hapi": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.38.0.tgz", - "integrity": "sha512-ZcOqEuwuutTDYIjhDIStix22ECblG/i9pHje23QGs4Q4YS4RMaZ5hKCoQJxW88Z4K7T53rQkdISmoXFKDV8xMg==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.39.0.tgz", + "integrity": "sha512-ik2nA9Yj2s2ay+aNY+tJsKCsEx6Tsc2g/MK0iWBW5tibwrWKTy1pdVt5sB3kd5Gkimqj23UV5+FH2JFcQLeKug==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.51.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/semantic-conventions": "^1.22.0" }, "engines": { "node": ">=14" @@ -1666,13 +1666,13 @@ } }, "node_modules/@opentelemetry/instrumentation-http": { - "version": "0.51.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.51.1.tgz", - "integrity": "sha512-6b3nZnFFEz/3xZ6w8bVxctPUWIPWiXuPQ725530JgxnN1cvYFd8CJ75PrHZNjynmzSSnqBkN3ef4R9N+RpMh8Q==", + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.52.1.tgz", + "integrity": "sha512-dG/aevWhaP+7OLv4BQQSEKMJv8GyeOp3Wxl31NHqE8xo9/fYMfEljiZphUHIfyg4gnZ9swMyWjfOQs5GUQe54Q==", "dependencies": { - "@opentelemetry/core": "1.24.1", - "@opentelemetry/instrumentation": "0.51.1", - "@opentelemetry/semantic-conventions": "1.24.1", + "@opentelemetry/core": "1.25.1", + "@opentelemetry/instrumentation": "0.52.1", + "@opentelemetry/semantic-conventions": "1.25.1", "semver": "^7.5.2" }, "engines": { @@ -1683,13 +1683,13 @@ } }, "node_modules/@opentelemetry/instrumentation-ioredis": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.40.0.tgz", - "integrity": "sha512-Jv/fH7KhpWe4KBirsiqeUJIYrsdR2iu2l4nWhfOlRvaZ+zYIiLEzTQR6QhBbyRoAbU4OuYJzjWusOmmpGBnwng==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.41.0.tgz", + "integrity": "sha512-rxiLloU8VyeJGm5j2fZS8ShVdB82n7VNP8wTwfUQqDwRfHCnkzGr+buKoxuhGD91gtwJ91RHkjHA1Eg6RqsUTg==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/redis-common": "^0.36.2", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/semantic-conventions": "^1.23.0" }, "engines": { "node": ">=14" @@ -1699,12 +1699,12 @@ } }, "node_modules/@opentelemetry/instrumentation-koa": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.40.0.tgz", - "integrity": "sha512-dJc3H/bKMcgUYcQpLF+1IbmUKus0e5Fnn/+ru/3voIRHwMADT3rFSUcGLWSczkg68BCgz0vFWGDTvPtcWIFr7A==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.41.0.tgz", + "integrity": "sha512-mbPnDt7ELvpM2S0vixYUsde7122lgegLOJQxx8iJQbB8YHal/xnTh9v7IfArSVzIDo+E+080hxZyUZD4boOWkw==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@types/koa": "2.14.0", "@types/koa__router": "12.0.3" @@ -1717,11 +1717,11 @@ } }, "node_modules/@opentelemetry/instrumentation-mongodb": { - "version": "0.43.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.43.0.tgz", - "integrity": "sha512-bMKej7Y76QVUD3l55Q9YqizXybHUzF3pujsBFjqbZrRn2WYqtsDtTUlbCK7fvXNPwFInqZ2KhnTqd0gwo8MzaQ==", + "version": "0.45.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.45.0.tgz", + "integrity": "sha512-xnZP9+ayeB1JJyNE9cIiwhOJTzNEsRhXVdLgfzmrs48Chhhk026mQdM5CITfyXSCfN73FGAIB8d91+pflJEfWQ==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/sdk-metrics": "^1.9.1", "@opentelemetry/semantic-conventions": "^1.22.0" }, @@ -1733,12 +1733,12 @@ } }, "node_modules/@opentelemetry/instrumentation-mongoose": { - "version": "0.38.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.38.1.tgz", - "integrity": "sha512-zaeiasdnRjXe6VhYCBMdkmAVh1S5MmXC/0spet+yqoaViGnYst/DOxPvhwg3yT4Yag5crZNWsVXnA538UjP6Ow==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.39.0.tgz", + "integrity": "sha512-J1r66A7zJklPPhMtrFOO7/Ud2p0Pv5u8+r23Cd1JUH6fYPmftNJVsLp2urAt6PHK4jVqpP/YegN8wzjJ2mZNPQ==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0" }, "engines": { @@ -1749,11 +1749,11 @@ } }, "node_modules/@opentelemetry/instrumentation-mysql": { - "version": "0.38.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.38.1.tgz", - "integrity": "sha512-+iBAawUaTfX/HAlvySwozx0C2B6LBfNPXX1W8Z2On1Uva33AGkw2UjL9XgIg1Pj4eLZ9R4EoJ/aFz+Xj4E/7Fw==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.39.0.tgz", + "integrity": "sha512-8snHPh83rhrDf31v9Kq0Nf+ts8hdr7NguuszRqZomZBHgE0+UyXZSkXHAAFZoBPPRMGyM68uaFE5hVtFl+wOcA==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@types/mysql": "2.15.22" }, @@ -1765,11 +1765,11 @@ } }, "node_modules/@opentelemetry/instrumentation-mysql2": { - "version": "0.38.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.38.1.tgz", - "integrity": "sha512-qkpHMgWSDTYVB1vlZ9sspf7l2wdS5DDq/rbIepDwX5BA0N0068JTQqh0CgAh34tdFqSCnWXIhcyOXC2TtRb0sg==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.39.0.tgz", + "integrity": "sha512-Iypuq2z6TCfriAXCIZjRq8GTFCKhQv5SpXbmI+e60rYdXw8NHtMH4NXcGF0eKTuoCsC59IYSTUvDQYDKReaszA==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@opentelemetry/sql-common": "^0.40.1" }, @@ -1781,12 +1781,12 @@ } }, "node_modules/@opentelemetry/instrumentation-nestjs-core": { - "version": "0.37.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.37.1.tgz", - "integrity": "sha512-ebYQjHZEmGHWEALwwDGhSQVLBaurFnuLIkZD5igPXrt7ohfF4lc5/4al1LO+vKc0NHk8SJWStuRueT86ISA8Vg==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.38.0.tgz", + "integrity": "sha512-M381Df1dM8aqihZz2yK+ugvMFK5vlHG/835dc67Sx2hH4pQEQYDA2PpFPTgc9AYYOydQaj7ClFQunESimjXDgg==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0", - "@opentelemetry/semantic-conventions": "^1.0.0" + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/semantic-conventions": "^1.23.0" }, "engines": { "node": ">=14" @@ -1796,11 +1796,11 @@ } }, "node_modules/@opentelemetry/instrumentation-pg": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.41.0.tgz", - "integrity": "sha512-BSlhpivzBD77meQNZY9fS4aKgydA8AJBzv2dqvxXFy/Hq64b7HURgw/ztbmwFeYwdF5raZZUifiiNSMLpOJoSA==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.42.0.tgz", + "integrity": "sha512-sjgcM8CswYy8zxHgXv4RAZ09DlYhQ+9TdlourUs63Df/ek5RrB1ZbjznqW7PB6c3TyJJmX6AVtPTjAsROovEjA==", "dependencies": { - "@opentelemetry/instrumentation": "^0.51.0", + "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", "@opentelemetry/sql-common": "^0.40.1", "@types/pg": "8.6.1", @@ -1813,6 +1813,22 @@ "@opentelemetry/api": "^1.3.0" } }, + "node_modules/@opentelemetry/instrumentation-redis-4": { + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.40.0.tgz", + "integrity": "sha512-0ieQYJb6yl35kXA75LQUPhHtGjtQU9L85KlWa7d4ohBbk/iQKZ3X3CFl5jC5vNMq/GGPB3+w3IxNvALlHtrp7A==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/redis-common": "^0.36.2", + "@opentelemetry/semantic-conventions": "^1.22.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, "node_modules/@opentelemetry/redis-common": { "version": "0.36.2", "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz", @@ -1822,56 +1838,56 @@ } }, "node_modules/@opentelemetry/resources": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.24.1.tgz", - "integrity": "sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==", + "version": "1.25.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.1.tgz", + "integrity": "sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==", "dependencies": { - "@opentelemetry/core": "1.24.1", - "@opentelemetry/semantic-conventions": "1.24.1" + "@opentelemetry/core": "1.25.1", + "@opentelemetry/semantic-conventions": "1.25.1" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" + "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "node_modules/@opentelemetry/sdk-metrics": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.24.1.tgz", - "integrity": "sha512-FrAqCbbGao9iKI+Mgh+OsC9+U2YMoXnlDHe06yH7dvavCKzE3S892dGtX54+WhSFVxHR/TMRVJiK/CV93GR0TQ==", + "version": "1.25.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.25.1.tgz", + "integrity": "sha512-9Mb7q5ioFL4E4dDrc4wC/A3NTHDat44v4I3p2pLPSxRvqUbDIQyMVr9uK+EU69+HWhlET1VaSrRzwdckWqY15Q==", "dependencies": { - "@opentelemetry/core": "1.24.1", - "@opentelemetry/resources": "1.24.1", + "@opentelemetry/core": "1.25.1", + "@opentelemetry/resources": "1.25.1", "lodash.merge": "^4.6.2" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.3.0 <1.9.0" + "@opentelemetry/api": ">=1.3.0 <1.10.0" } }, "node_modules/@opentelemetry/sdk-trace-base": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.24.1.tgz", - "integrity": "sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==", + "version": "1.25.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz", + "integrity": "sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==", "dependencies": { - "@opentelemetry/core": "1.24.1", - "@opentelemetry/resources": "1.24.1", - "@opentelemetry/semantic-conventions": "1.24.1" + "@opentelemetry/core": "1.25.1", + "@opentelemetry/resources": "1.25.1", + "@opentelemetry/semantic-conventions": "1.25.1" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.9.0" + "@opentelemetry/api": ">=1.0.0 <1.10.0" } }, "node_modules/@opentelemetry/semantic-conventions": { - "version": "1.24.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.24.1.tgz", - "integrity": "sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==", + "version": "1.25.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz", + "integrity": "sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==", "engines": { "node": ">=14" } @@ -1901,58 +1917,59 @@ } }, "node_modules/@prisma/instrumentation": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.14.0.tgz", - "integrity": "sha512-DeybWvIZzu/mUsOYP9MVd6AyBj+MP7xIMrcuIn25MX8FiQX39QBnET5KhszTAip/ToctUuDwSJ46QkIoyo3RFA==", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.16.0.tgz", + "integrity": "sha512-MVzNRW2ikWvVNnMIEgQMcwWxpFD+XF2U2h0Qz7MjutRqJxrhWexWV2aSi2OXRaU8UL5wzWw7pnjdKUzYhWauLg==", "dependencies": { "@opentelemetry/api": "^1.8", - "@opentelemetry/instrumentation": "^0.49 || ^0.50 || ^0.51", + "@opentelemetry/instrumentation": "^0.49 || ^0.50 || ^0.51 || ^0.52.0", "@opentelemetry/sdk-trace-base": "^1.22" } }, "node_modules/@sentry/core": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.7.0.tgz", - "integrity": "sha512-Sq/46B+5nWmgnCD6dEMZ6HTkKbV/KAdgaSvT8oXDb9OWoPy1jJ/gbLrhLs62KbjuDQk4/vWnOgHiKQbcslSzMw==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.13.0.tgz", + "integrity": "sha512-N9Qg4ZGxZWp8eb2eUUHVVKgjBLtFIjS805nG92s6yJmkvOpKm6mLtcUaT/iDf3Hta6nG+xRkhbE3r+Z4cbXG8w==", "dependencies": { - "@sentry/types": "8.7.0", - "@sentry/utils": "8.7.0" + "@sentry/types": "8.13.0", + "@sentry/utils": "8.13.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/node": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.7.0.tgz", - "integrity": "sha512-El1LmXGVe8Ahi5oUdlrE5s3Or23/iGnnntNvaYymXk4BmL4dJtv7ttlQ94ZrI9QWs8VnfM7eHqCd+OPjTh0XJQ==", - "dependencies": { - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/context-async-hooks": "^1.24.1", - "@opentelemetry/core": "^1.24.1", - "@opentelemetry/instrumentation": "^0.51.1", - "@opentelemetry/instrumentation-connect": "0.36.1", - "@opentelemetry/instrumentation-express": "0.39.0", - "@opentelemetry/instrumentation-fastify": "0.36.1", - "@opentelemetry/instrumentation-graphql": "0.40.0", - "@opentelemetry/instrumentation-hapi": "0.38.0", - "@opentelemetry/instrumentation-http": "0.51.1", - "@opentelemetry/instrumentation-ioredis": "0.40.0", - "@opentelemetry/instrumentation-koa": "0.40.0", - "@opentelemetry/instrumentation-mongodb": "0.43.0", - "@opentelemetry/instrumentation-mongoose": "0.38.1", - "@opentelemetry/instrumentation-mysql": "0.38.1", - "@opentelemetry/instrumentation-mysql2": "0.38.1", - "@opentelemetry/instrumentation-nestjs-core": "0.37.1", - "@opentelemetry/instrumentation-pg": "0.41.0", - "@opentelemetry/resources": "^1.23.0", - "@opentelemetry/sdk-trace-base": "^1.23.0", - "@opentelemetry/semantic-conventions": "^1.23.0", - "@prisma/instrumentation": "5.14.0", - "@sentry/core": "8.7.0", - "@sentry/opentelemetry": "8.7.0", - "@sentry/types": "8.7.0", - "@sentry/utils": "8.7.0" + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.13.0.tgz", + "integrity": "sha512-OeZ7K90RhyxfwfreerIi4cszzHrPRRH36STJno2+p3sIGbG5VScOccqXzYEOAqHpByxnti4KQN34BLAT2BFOEA==", + "dependencies": { + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/context-async-hooks": "^1.25.1", + "@opentelemetry/core": "^1.25.1", + "@opentelemetry/instrumentation": "^0.52.1", + "@opentelemetry/instrumentation-connect": "0.37.0", + "@opentelemetry/instrumentation-express": "0.40.1", + "@opentelemetry/instrumentation-fastify": "0.37.0", + "@opentelemetry/instrumentation-graphql": "0.41.0", + "@opentelemetry/instrumentation-hapi": "0.39.0", + "@opentelemetry/instrumentation-http": "0.52.1", + "@opentelemetry/instrumentation-ioredis": "0.41.0", + "@opentelemetry/instrumentation-koa": "0.41.0", + "@opentelemetry/instrumentation-mongodb": "0.45.0", + "@opentelemetry/instrumentation-mongoose": "0.39.0", + "@opentelemetry/instrumentation-mysql": "0.39.0", + "@opentelemetry/instrumentation-mysql2": "0.39.0", + "@opentelemetry/instrumentation-nestjs-core": "0.38.0", + "@opentelemetry/instrumentation-pg": "0.42.0", + "@opentelemetry/instrumentation-redis-4": "0.40.0", + "@opentelemetry/resources": "^1.25.1", + "@opentelemetry/sdk-trace-base": "^1.25.1", + "@opentelemetry/semantic-conventions": "^1.25.1", + "@prisma/instrumentation": "5.16.0", + "@sentry/core": "8.13.0", + "@sentry/opentelemetry": "8.13.0", + "@sentry/types": "8.13.0", + "@sentry/utils": "8.13.0" }, "engines": { "node": ">=14.18" @@ -1962,39 +1979,39 @@ } }, "node_modules/@sentry/opentelemetry": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.7.0.tgz", - "integrity": "sha512-I9JEXnqXDBPr5MtgEYRvmcolmpugSgH1QV+SFnfOPc40Mu/npNsJq7oqbGzhlCe4H45XD6LJzFlc7BfoCzwAsQ==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.13.0.tgz", + "integrity": "sha512-NYn/HNE/SxFXe8pfnxJknhrrRzYRMHNssCoi5M1CeR5G7F2BGxxVmaGsd8j0WyTCpUS4i97G4vhYtDGxHvWN6w==", "dependencies": { - "@sentry/core": "8.7.0", - "@sentry/types": "8.7.0", - "@sentry/utils": "8.7.0" + "@sentry/core": "8.13.0", + "@sentry/types": "8.13.0", + "@sentry/utils": "8.13.0" }, "engines": { "node": ">=14.18" }, "peerDependencies": { - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/core": "^1.24.1", - "@opentelemetry/instrumentation": "^0.51.1", - "@opentelemetry/sdk-trace-base": "^1.23.0", - "@opentelemetry/semantic-conventions": "^1.23.0" + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/core": "^1.25.1", + "@opentelemetry/instrumentation": "^0.52.1", + "@opentelemetry/sdk-trace-base": "^1.25.1", + "@opentelemetry/semantic-conventions": "^1.25.1" } }, "node_modules/@sentry/types": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.7.0.tgz", - "integrity": "sha512-11KLOKumP6akugVGLvSoEig+JlP0ZEzW3nN9P+ppgdIx9HAxMIh6UvumbieG4/DWjAh2kh6NPNfUw3gk2Gfq1A==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.13.0.tgz", + "integrity": "sha512-r63s/H5gvQnQM9tTGBXz2xErUbxZALh4e2Lg/1aHj4zIvGLBjA2z5qWsh6TEZYbpmgAyGShLDr6+rWeUVf9yBQ==", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.7.0.tgz", - "integrity": "sha512-aWmcbSoOmrbzll/FkNQFJcCtLAuJLvTYbRKiCSkV3FScA7UaA742HkTZAPFiioALFIESWk/fcGZqtN0s4I281Q==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.13.0.tgz", + "integrity": "sha512-PxV0v9VbGWH9zP37P5w2msLUFDr287nYjoY2XVF+RSolyiTs1CQNI5ZMUO3o4MsSac/dpXxjyrZXQd72t/jRYA==", "dependencies": { - "@sentry/types": "8.7.0" + "@sentry/types": "8.13.0" }, "engines": { "node": ">=14.18" @@ -2152,9 +2169,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.1.tgz", - "integrity": "sha512-ej0phymbFLoCB26dbbq5PGScsf2JAJ4IJHjG10LalgUV36XKTmA4GdA+PVllKvRk0sEKt64X8975qFnkSi0hqA==", + "version": "4.19.5", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", + "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", "dependencies": { "@types/node": "*", "@types/qs": "*", @@ -5913,9 +5930,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.4.tgz", - "integrity": "sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.8.1.tgz", + "integrity": "sha512-yhRwoHtiLGvmSozNOALgjRPFI6uYsds60EoMqqnXyyv+JOIW/BrrLejuTGBt+bq0T5tLzOHrN0T7xYTm4Qt/ng==", "dependencies": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", diff --git a/package.json b/package.json index 532d1b64..18cdd9d6 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^8.7.0", + "@sentry/node": "^8.13.0", "@vscode/vsce": "^2.27.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 696211dc6a90aa45b0751ec624dc829d76eb24ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:40:41 -0700 Subject: [PATCH 76/97] Bump actions/add-to-project from 1.0.1 to 1.0.2 (#644) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/add-issues-to-devx-project.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/add-issues-to-devx-project.yml b/.github/workflows/add-issues-to-devx-project.yml index d00e3014..39c2b962 100644 --- a/.github/workflows/add-issues-to-devx-project.yml +++ b/.github/workflows/add-issues-to-devx-project.yml @@ -10,7 +10,7 @@ jobs: name: Add issue to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v1.0.1 + - uses: actions/add-to-project@v1.0.2 with: project-url: https://github.com/orgs/onflow/projects/13 github-token: ${{ secrets.GH_ACTION_FOR_PROJECTS }} From 5b98fdc07c5df3e3137e26dc14d551e27443355e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:08:11 -0700 Subject: [PATCH 77/97] Bump @types/lodash from 4.17.5 to 4.17.6 (#648) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index e51bb99e..724ea0ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.5", + "@types/lodash": "^4.17.6", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.14.2", @@ -2272,9 +2272,9 @@ } }, "node_modules/@types/lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz", + "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==", "dev": true }, "node_modules/@types/mime": { diff --git a/package.json b/package.json index 18cdd9d6..cc279e1d 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.5", + "@types/lodash": "^4.17.6", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.14.2", From 828a71b9bda2c3ac722b5cf7e87191fb0ba560db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:09:01 -0700 Subject: [PATCH 78/97] Bump uuid from 9.0.1 to 10.0.0 (#639) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 724ea0ad..e43a18b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "rxjs": "^7.8.1", "semver": "^7.6.0", "sleep-synchronously": "^2.0.0", - "uuid": "^9.0.1", + "uuid": "^10.0.0", "vscode-languageclient": "^9.0.1" }, "devDependencies": { @@ -10434,9 +10434,9 @@ "devOptional": true }, "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" diff --git a/package.json b/package.json index cc279e1d..02e34b9f 100644 --- a/package.json +++ b/package.json @@ -228,7 +228,7 @@ "rxjs": "^7.8.1", "semver": "^7.6.0", "sleep-synchronously": "^2.0.0", - "uuid": "^9.0.1", + "uuid": "^10.0.0", "vscode-languageclient": "^9.0.1" }, "__metadata": { From 258468781186ad0b4f483d63bd1aa5c2c3770736 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:09:20 -0700 Subject: [PATCH 79/97] Bump esbuild from 0.21.4 to 0.23.0 (#649) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 257 ++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 138 insertions(+), 121 deletions(-) diff --git a/package-lock.json b/package-lock.json index e43a18b2..0994231b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", - "esbuild": "^0.21.4", + "esbuild": "^0.23.0", "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", @@ -721,9 +721,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.4.tgz", - "integrity": "sha512-Zrm+B33R4LWPLjDEVnEqt2+SLTATlru1q/xYKVn8oVTbiRBGmK2VIMoIYGJDGyftnGaC788IuzGFAlb7IQ0Y8A==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz", + "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==", "cpu": [ "ppc64" ], @@ -733,13 +733,13 @@ "aix" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.4.tgz", - "integrity": "sha512-E7H/yTd8kGQfY4z9t3nRPk/hrhaCajfA3YSQSBrst8B+3uTcgsi8N+ZWYCaeIDsiVs6m65JPCaQN/DxBRclF3A==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz", + "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==", "cpu": [ "arm" ], @@ -749,13 +749,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-arm64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.4.tgz", - "integrity": "sha512-fYFnz+ObClJ3dNiITySBUx+oNalYUT18/AryMxfovLkYWbutXsct3Wz2ZWAcGGppp+RVVX5FiXeLYGi97umisA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz", + "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==", "cpu": [ "arm64" ], @@ -765,13 +765,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/android-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.4.tgz", - "integrity": "sha512-mDqmlge3hFbEPbCWxp4fM6hqq7aZfLEHZAKGP9viq9wMUBVQx202aDIfc3l+d2cKhUJM741VrCXEzRFhPDKH3Q==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz", + "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==", "cpu": [ "x64" ], @@ -781,13 +781,13 @@ "android" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.4.tgz", - "integrity": "sha512-72eaIrDZDSiWqpmCzVaBD58c8ea8cw/U0fq/PPOTqE3c53D0xVMRt2ooIABZ6/wj99Y+h4ksT/+I+srCDLU9TA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz", + "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==", "cpu": [ "arm64" ], @@ -797,13 +797,13 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.4.tgz", - "integrity": "sha512-uBsuwRMehGmw1JC7Vecu/upOjTsMhgahmDkWhGLWxIgUn2x/Y4tIwUZngsmVb6XyPSTXJYS4YiASKPcm9Zitag==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz", + "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==", "cpu": [ "x64" ], @@ -813,13 +813,13 @@ "darwin" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.4.tgz", - "integrity": "sha512-8JfuSC6YMSAEIZIWNL3GtdUT5NhUA/CMUCpZdDRolUXNAXEE/Vbpe6qlGLpfThtY5NwXq8Hi4nJy4YfPh+TwAg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz", + "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==", "cpu": [ "arm64" ], @@ -829,13 +829,13 @@ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.4.tgz", - "integrity": "sha512-8d9y9eQhxv4ef7JmXny7591P/PYsDFc4+STaxC1GBv0tMyCdyWfXu2jBuqRsyhY8uL2HU8uPyscgE2KxCY9imQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz", + "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==", "cpu": [ "x64" ], @@ -845,13 +845,13 @@ "freebsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.4.tgz", - "integrity": "sha512-2rqFFefpYmpMs+FWjkzSgXg5vViocqpq5a1PSRgT0AvSgxoXmGF17qfGAzKedg6wAwyM7UltrKVo9kxaJLMF/g==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz", + "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==", "cpu": [ "arm" ], @@ -861,13 +861,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.4.tgz", - "integrity": "sha512-/GLD2orjNU50v9PcxNpYZi+y8dJ7e7/LhQukN3S4jNDXCKkyyiyAz9zDw3siZ7Eh1tRcnCHAo/WcqKMzmi4eMQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz", + "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==", "cpu": [ "arm64" ], @@ -877,13 +877,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.4.tgz", - "integrity": "sha512-pNftBl7m/tFG3t2m/tSjuYeWIffzwAZT9m08+9DPLizxVOsUl8DdFzn9HvJrTQwe3wvJnwTdl92AonY36w/25g==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz", + "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==", "cpu": [ "ia32" ], @@ -893,13 +893,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.4.tgz", - "integrity": "sha512-cSD2gzCK5LuVX+hszzXQzlWya6c7hilO71L9h4KHwqI4qeqZ57bAtkgcC2YioXjsbfAv4lPn3qe3b00Zt+jIfQ==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz", + "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==", "cpu": [ "loong64" ], @@ -909,13 +909,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.4.tgz", - "integrity": "sha512-qtzAd3BJh7UdbiXCrg6npWLYU0YpufsV9XlufKhMhYMJGJCdfX/G6+PNd0+v877X1JG5VmjBLUiFB0o8EUSicA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz", + "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==", "cpu": [ "mips64el" ], @@ -925,13 +925,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.4.tgz", - "integrity": "sha512-yB8AYzOTaL0D5+2a4xEy7OVvbcypvDR05MsB/VVPVA7nL4hc5w5Dyd/ddnayStDgJE59fAgNEOdLhBxjfx5+dg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz", + "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==", "cpu": [ "ppc64" ], @@ -941,13 +941,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.4.tgz", - "integrity": "sha512-Y5AgOuVzPjQdgU59ramLoqSSiXddu7F3F+LI5hYy/d1UHN7K5oLzYBDZe23QmQJ9PIVUXwOdKJ/jZahPdxzm9w==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz", + "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==", "cpu": [ "riscv64" ], @@ -957,13 +957,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.4.tgz", - "integrity": "sha512-Iqc/l/FFwtt8FoTK9riYv9zQNms7B8u+vAI/rxKuN10HgQIXaPzKZc479lZ0x6+vKVQbu55GdpYpeNWzjOhgbA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz", + "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==", "cpu": [ "s390x" ], @@ -973,13 +973,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/linux-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.4.tgz", - "integrity": "sha512-Td9jv782UMAFsuLZINfUpoF5mZIbAj+jv1YVtE58rFtfvoKRiKSkRGQfHTgKamLVT/fO7203bHa3wU122V/Bdg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz", + "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==", "cpu": [ "x64" ], @@ -989,13 +989,13 @@ "linux" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.4.tgz", - "integrity": "sha512-Awn38oSXxsPMQxaV0Ipb7W/gxZtk5Tx3+W+rAPdZkyEhQ6968r9NvtkjhnhbEgWXYbgV+JEONJ6PcdBS+nlcpA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz", + "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==", "cpu": [ "x64" ], @@ -1005,13 +1005,29 @@ "netbsd" ], "engines": { - "node": ">=12" + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz", + "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.4.tgz", - "integrity": "sha512-IsUmQeCY0aU374R82fxIPu6vkOybWIMc3hVGZ3ChRwL9hA1TwY+tS0lgFWV5+F1+1ssuvvXt3HFqe8roCip8Hg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz", + "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==", "cpu": [ "x64" ], @@ -1021,13 +1037,13 @@ "openbsd" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.4.tgz", - "integrity": "sha512-hsKhgZ4teLUaDA6FG/QIu2q0rI6I36tZVfM4DBZv3BG0mkMIdEnMbhc4xwLvLJSS22uWmaVkFkqWgIS0gPIm+A==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz", + "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==", "cpu": [ "x64" ], @@ -1037,13 +1053,13 @@ "sunos" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.4.tgz", - "integrity": "sha512-UUfMgMoXPoA/bvGUNfUBFLCh0gt9dxZYIx9W4rfJr7+hKe5jxxHmfOK8YSH4qsHLLN4Ck8JZ+v7Q5fIm1huErg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz", + "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==", "cpu": [ "arm64" ], @@ -1053,13 +1069,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.4.tgz", - "integrity": "sha512-yIxbspZb5kGCAHWm8dexALQ9en1IYDfErzjSEq1KzXFniHv019VT3mNtTK7t8qdy4TwT6QYHI9sEZabONHg+aw==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz", + "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==", "cpu": [ "ia32" ], @@ -1069,13 +1085,13 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@esbuild/win32-x64": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.4.tgz", - "integrity": "sha512-sywLRD3UK/qRJt0oBwdpYLBibk7KiRfbswmWRDabuncQYSlf8aLEEUor/oP6KRz8KEG+HoiVLBhPRD5JWjS8Sg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz", + "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==", "cpu": [ "x64" ], @@ -1085,7 +1101,7 @@ "win32" ], "engines": { - "node": ">=12" + "node": ">=18" } }, "node_modules/@eslint/eslintrc": { @@ -4203,41 +4219,42 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.4.tgz", - "integrity": "sha512-sFMcNNrj+Q0ZDolrp5pDhH0nRPN9hLIM3fRPwgbLYJeSHHgnXSnbV3xYgSVuOeLWH9c73VwmEverVzupIv5xuA==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz", + "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==", "dev": true, "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" }, "engines": { - "node": ">=12" + "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.21.4", - "@esbuild/android-arm": "0.21.4", - "@esbuild/android-arm64": "0.21.4", - "@esbuild/android-x64": "0.21.4", - "@esbuild/darwin-arm64": "0.21.4", - "@esbuild/darwin-x64": "0.21.4", - "@esbuild/freebsd-arm64": "0.21.4", - "@esbuild/freebsd-x64": "0.21.4", - "@esbuild/linux-arm": "0.21.4", - "@esbuild/linux-arm64": "0.21.4", - "@esbuild/linux-ia32": "0.21.4", - "@esbuild/linux-loong64": "0.21.4", - "@esbuild/linux-mips64el": "0.21.4", - "@esbuild/linux-ppc64": "0.21.4", - "@esbuild/linux-riscv64": "0.21.4", - "@esbuild/linux-s390x": "0.21.4", - "@esbuild/linux-x64": "0.21.4", - "@esbuild/netbsd-x64": "0.21.4", - "@esbuild/openbsd-x64": "0.21.4", - "@esbuild/sunos-x64": "0.21.4", - "@esbuild/win32-arm64": "0.21.4", - "@esbuild/win32-ia32": "0.21.4", - "@esbuild/win32-x64": "0.21.4" + "@esbuild/aix-ppc64": "0.23.0", + "@esbuild/android-arm": "0.23.0", + "@esbuild/android-arm64": "0.23.0", + "@esbuild/android-x64": "0.23.0", + "@esbuild/darwin-arm64": "0.23.0", + "@esbuild/darwin-x64": "0.23.0", + "@esbuild/freebsd-arm64": "0.23.0", + "@esbuild/freebsd-x64": "0.23.0", + "@esbuild/linux-arm": "0.23.0", + "@esbuild/linux-arm64": "0.23.0", + "@esbuild/linux-ia32": "0.23.0", + "@esbuild/linux-loong64": "0.23.0", + "@esbuild/linux-mips64el": "0.23.0", + "@esbuild/linux-ppc64": "0.23.0", + "@esbuild/linux-riscv64": "0.23.0", + "@esbuild/linux-s390x": "0.23.0", + "@esbuild/linux-x64": "0.23.0", + "@esbuild/netbsd-x64": "0.23.0", + "@esbuild/openbsd-arm64": "0.23.0", + "@esbuild/openbsd-x64": "0.23.0", + "@esbuild/sunos-x64": "0.23.0", + "@esbuild/win32-arm64": "0.23.0", + "@esbuild/win32-ia32": "0.23.0", + "@esbuild/win32-x64": "0.23.0" } }, "node_modules/escalade": { diff --git a/package.json b/package.json index 02e34b9f..dee77104 100644 --- a/package.json +++ b/package.json @@ -198,7 +198,7 @@ "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", - "esbuild": "^0.21.4", + "esbuild": "^0.23.0", "glob": "^10.4.1", "mkdirp": "^3.0.1", "mocha": "^10.4.0", From 42cbf03cefc134cd56b2dc215c5c354221980fa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:03:54 -0700 Subject: [PATCH 80/97] Bump @sentry/node from 8.13.0 to 8.19.0 (#657) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 339 ++++++++++++++-------------------------------- package.json | 2 +- 2 files changed, 103 insertions(+), 238 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0994231b..ed454b31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^8.13.0", + "@sentry/node": "^8.19.0", "@vscode/vsce": "^2.27.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1603,9 +1603,9 @@ } }, "node_modules/@opentelemetry/instrumentation-connect": { - "version": "0.37.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.37.0.tgz", - "integrity": "sha512-SeQktDIH5rNzjiEiazWiJAIXkmnLOnNV7wwHpahrqE0Ph+Z3heqMfxRtoMtbdJSIYLfcNZYO51AjxZ00IXufdw==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.38.0.tgz", + "integrity": "sha512-2/nRnx3pjYEmdPIaBwtgtSviTKHWnDZN3R+TkRUnhIVrvBKVcq+I5B2rtd6mr6Fe9cHlZ9Ojcuh7pkNh/xdWWg==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.52.0", @@ -1620,9 +1620,9 @@ } }, "node_modules/@opentelemetry/instrumentation-express": { - "version": "0.40.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.40.1.tgz", - "integrity": "sha512-+RKMvVe2zw3kIXRup9c1jFu3T4d0fs5aKy015TpiMyoCKX1UMu3Z0lfgYtuyiSTANvg5hZnDbWmQmqSPj9VTvg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.41.0.tgz", + "integrity": "sha512-/B7fbMdaf3SYe5f1P973tkqd6s7XZirjpfkoJ63E7nltU30qmlgm9tY5XwZOzAFI0rHS9tbrFI2HFPAvQUFe/A==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.52.0", @@ -1636,9 +1636,9 @@ } }, "node_modules/@opentelemetry/instrumentation-fastify": { - "version": "0.37.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.37.0.tgz", - "integrity": "sha512-WRjwzNZgupSzbEYvo9s+QuHJRqZJjVdNxSEpGBwWK8RKLlHGwGVAu0gcc2gPamJWUJsGqPGvahAPWM18ZkWj6A==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.38.0.tgz", + "integrity": "sha512-HBVLpTSYpkQZ87/Df3N0gAw7VzYZV3n28THIBrJWfuqw3Or7UqdhnjeuMIPQ04BKk3aZc0cWn2naSQObbh5vXw==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.52.0", @@ -1652,9 +1652,9 @@ } }, "node_modules/@opentelemetry/instrumentation-graphql": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.41.0.tgz", - "integrity": "sha512-R/gXeljgIhaRDKquVkKYT5QHPnFouM8ooyePZEP0kqyaVAedtR1V7NfAUJbxfTG5fBQa5wdmLjvu63+tzRXZCA==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.42.0.tgz", + "integrity": "sha512-N8SOwoKL9KQSX7z3gOaw5UaTeVQcfDO1c21csVHnmnmGUoqsXbArK2B8VuwPWcv6/BC/i3io+xTo7QGRZ/z28Q==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0" }, @@ -1666,9 +1666,9 @@ } }, "node_modules/@opentelemetry/instrumentation-hapi": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.39.0.tgz", - "integrity": "sha512-ik2nA9Yj2s2ay+aNY+tJsKCsEx6Tsc2g/MK0iWBW5tibwrWKTy1pdVt5sB3kd5Gkimqj23UV5+FH2JFcQLeKug==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.40.0.tgz", + "integrity": "sha512-8U/w7Ifumtd2bSN1OLaSwAAFhb9FyqWUki3lMMB0ds+1+HdSxYBe9aspEJEgvxAqOkrQnVniAPTEGf1pGM7SOw==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.52.0", @@ -1699,9 +1699,9 @@ } }, "node_modules/@opentelemetry/instrumentation-ioredis": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.41.0.tgz", - "integrity": "sha512-rxiLloU8VyeJGm5j2fZS8ShVdB82n7VNP8wTwfUQqDwRfHCnkzGr+buKoxuhGD91gtwJ91RHkjHA1Eg6RqsUTg==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.42.0.tgz", + "integrity": "sha512-P11H168EKvBB9TUSasNDOGJCSkpT44XgoM6d3gRIWAa9ghLpYhl0uRkS8//MqPzcJVHr3h3RmfXIpiYLjyIZTw==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/redis-common": "^0.36.2", @@ -1715,15 +1715,13 @@ } }, "node_modules/@opentelemetry/instrumentation-koa": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.41.0.tgz", - "integrity": "sha512-mbPnDt7ELvpM2S0vixYUsde7122lgegLOJQxx8iJQbB8YHal/xnTh9v7IfArSVzIDo+E+080hxZyUZD4boOWkw==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.42.0.tgz", + "integrity": "sha512-H1BEmnMhho8o8HuNRq5zEI4+SIHDIglNB7BPKohZyWG4fWNuR7yM4GTlR01Syq21vODAS7z5omblScJD/eZdKw==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0", - "@types/koa": "2.14.0", - "@types/koa__router": "12.0.3" + "@opentelemetry/semantic-conventions": "^1.22.0" }, "engines": { "node": ">=14" @@ -1733,9 +1731,9 @@ } }, "node_modules/@opentelemetry/instrumentation-mongodb": { - "version": "0.45.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.45.0.tgz", - "integrity": "sha512-xnZP9+ayeB1JJyNE9cIiwhOJTzNEsRhXVdLgfzmrs48Chhhk026mQdM5CITfyXSCfN73FGAIB8d91+pflJEfWQ==", + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.46.0.tgz", + "integrity": "sha512-VF/MicZ5UOBiXrqBslzwxhN7TVqzu1/LN/QDpkskqM0Zm0aZ4CVRbUygL8d7lrjLn15x5kGIe8VsSphMfPJzlA==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/sdk-metrics": "^1.9.1", @@ -1749,9 +1747,9 @@ } }, "node_modules/@opentelemetry/instrumentation-mongoose": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.39.0.tgz", - "integrity": "sha512-J1r66A7zJklPPhMtrFOO7/Ud2p0Pv5u8+r23Cd1JUH6fYPmftNJVsLp2urAt6PHK4jVqpP/YegN8wzjJ2mZNPQ==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.40.0.tgz", + "integrity": "sha512-niRi5ZUnkgzRhIGMOozTyoZIvJKNJyhijQI4nF4iFSb+FUx2v5fngfR+8XLmdQAO7xmsD8E5vEGdDVYVtKbZew==", "dependencies": { "@opentelemetry/core": "^1.8.0", "@opentelemetry/instrumentation": "^0.52.0", @@ -1765,9 +1763,9 @@ } }, "node_modules/@opentelemetry/instrumentation-mysql": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.39.0.tgz", - "integrity": "sha512-8snHPh83rhrDf31v9Kq0Nf+ts8hdr7NguuszRqZomZBHgE0+UyXZSkXHAAFZoBPPRMGyM68uaFE5hVtFl+wOcA==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.40.0.tgz", + "integrity": "sha512-d7ja8yizsOCNMYIJt5PH/fKZXjb/mS48zLROO4BzZTtDfhNCl2UM/9VIomP2qkGIFVouSJrGr/T00EzY7bPtKA==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", @@ -1781,9 +1779,9 @@ } }, "node_modules/@opentelemetry/instrumentation-mysql2": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.39.0.tgz", - "integrity": "sha512-Iypuq2z6TCfriAXCIZjRq8GTFCKhQv5SpXbmI+e60rYdXw8NHtMH4NXcGF0eKTuoCsC59IYSTUvDQYDKReaszA==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.40.0.tgz", + "integrity": "sha512-0xfS1xcqUmY7WE1uWjlmI67Xg3QsSUlNT+AcXHeA4BDUPwZtWqF4ezIwLgpVZfHOnkAEheqGfNSWd1PIu3Wnfg==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", @@ -1797,9 +1795,9 @@ } }, "node_modules/@opentelemetry/instrumentation-nestjs-core": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.38.0.tgz", - "integrity": "sha512-M381Df1dM8aqihZz2yK+ugvMFK5vlHG/835dc67Sx2hH4pQEQYDA2PpFPTgc9AYYOydQaj7ClFQunESimjXDgg==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.39.0.tgz", + "integrity": "sha512-mewVhEXdikyvIZoMIUry8eb8l3HUjuQjSjVbmLVTt4NQi35tkpnHQrG9bTRBrl3403LoWZ2njMPJyg4l6HfKvA==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.23.0" @@ -1812,9 +1810,9 @@ } }, "node_modules/@opentelemetry/instrumentation-pg": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.42.0.tgz", - "integrity": "sha512-sjgcM8CswYy8zxHgXv4RAZ09DlYhQ+9TdlourUs63Df/ek5RrB1ZbjznqW7PB6c3TyJJmX6AVtPTjAsROovEjA==", + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.43.0.tgz", + "integrity": "sha512-og23KLyoxdnAeFs1UWqzSonuCkePUzCX30keSYigIzJe/6WSYA8rnEI5lobcxPEzg+GcU06J7jzokuEHbjVJNw==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/semantic-conventions": "^1.22.0", @@ -1830,9 +1828,9 @@ } }, "node_modules/@opentelemetry/instrumentation-redis-4": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.40.0.tgz", - "integrity": "sha512-0ieQYJb6yl35kXA75LQUPhHtGjtQU9L85KlWa7d4ohBbk/iQKZ3X3CFl5jC5vNMq/GGPB3+w3IxNvALlHtrp7A==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.41.0.tgz", + "integrity": "sha512-H7IfGTqW2reLXqput4yzAe8YpDC0fmVNal95GHMLOrS89W+qWUKIqxolSh63hJyfmwPSFwXASzj7wpSk8Az+Dg==", "dependencies": { "@opentelemetry/instrumentation": "^0.52.0", "@opentelemetry/redis-common": "^0.36.2", @@ -1933,9 +1931,9 @@ } }, "node_modules/@prisma/instrumentation": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.16.0.tgz", - "integrity": "sha512-MVzNRW2ikWvVNnMIEgQMcwWxpFD+XF2U2h0Qz7MjutRqJxrhWexWV2aSi2OXRaU8UL5wzWw7pnjdKUzYhWauLg==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.17.0.tgz", + "integrity": "sha512-c1Sle4ji8aasMcYfBBHFM56We4ljfenVtRmS8aY06BllS7SoU6SmJBwG7vil+GHiR0Yrh+t9iBwt4AY0Jr4KNQ==", "dependencies": { "@opentelemetry/api": "^1.8", "@opentelemetry/instrumentation": "^0.49 || ^0.50 || ^0.51 || ^0.52.0", @@ -1943,65 +1941,65 @@ } }, "node_modules/@sentry/core": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.13.0.tgz", - "integrity": "sha512-N9Qg4ZGxZWp8eb2eUUHVVKgjBLtFIjS805nG92s6yJmkvOpKm6mLtcUaT/iDf3Hta6nG+xRkhbE3r+Z4cbXG8w==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.19.0.tgz", + "integrity": "sha512-MrgjsZCEjOJgQjIznnDSrLEy7qL+4LVpNieAvr49cV1rzBNSwGmWRnt/puVaPsLyCUgupVx/43BPUHB/HtKNUw==", "dependencies": { - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry/types": "8.19.0", + "@sentry/utils": "8.19.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/node": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.13.0.tgz", - "integrity": "sha512-OeZ7K90RhyxfwfreerIi4cszzHrPRRH36STJno2+p3sIGbG5VScOccqXzYEOAqHpByxnti4KQN34BLAT2BFOEA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.19.0.tgz", + "integrity": "sha512-r7AeKxfB9eE/UW0NZT3AMh+hNA65NFEwtsMYO6iI52FPLFZh0DLOvzVOeNsmsJqPpyetooUGTtUYpBdinZldWA==", "dependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/context-async-hooks": "^1.25.1", "@opentelemetry/core": "^1.25.1", "@opentelemetry/instrumentation": "^0.52.1", - "@opentelemetry/instrumentation-connect": "0.37.0", - "@opentelemetry/instrumentation-express": "0.40.1", - "@opentelemetry/instrumentation-fastify": "0.37.0", - "@opentelemetry/instrumentation-graphql": "0.41.0", - "@opentelemetry/instrumentation-hapi": "0.39.0", + "@opentelemetry/instrumentation-connect": "0.38.0", + "@opentelemetry/instrumentation-express": "0.41.0", + "@opentelemetry/instrumentation-fastify": "0.38.0", + "@opentelemetry/instrumentation-graphql": "0.42.0", + "@opentelemetry/instrumentation-hapi": "0.40.0", "@opentelemetry/instrumentation-http": "0.52.1", - "@opentelemetry/instrumentation-ioredis": "0.41.0", - "@opentelemetry/instrumentation-koa": "0.41.0", - "@opentelemetry/instrumentation-mongodb": "0.45.0", - "@opentelemetry/instrumentation-mongoose": "0.39.0", - "@opentelemetry/instrumentation-mysql": "0.39.0", - "@opentelemetry/instrumentation-mysql2": "0.39.0", - "@opentelemetry/instrumentation-nestjs-core": "0.38.0", - "@opentelemetry/instrumentation-pg": "0.42.0", - "@opentelemetry/instrumentation-redis-4": "0.40.0", + "@opentelemetry/instrumentation-ioredis": "0.42.0", + "@opentelemetry/instrumentation-koa": "0.42.0", + "@opentelemetry/instrumentation-mongodb": "0.46.0", + "@opentelemetry/instrumentation-mongoose": "0.40.0", + "@opentelemetry/instrumentation-mysql": "0.40.0", + "@opentelemetry/instrumentation-mysql2": "0.40.0", + "@opentelemetry/instrumentation-nestjs-core": "0.39.0", + "@opentelemetry/instrumentation-pg": "0.43.0", + "@opentelemetry/instrumentation-redis-4": "0.41.0", "@opentelemetry/resources": "^1.25.1", "@opentelemetry/sdk-trace-base": "^1.25.1", "@opentelemetry/semantic-conventions": "^1.25.1", - "@prisma/instrumentation": "5.16.0", - "@sentry/core": "8.13.0", - "@sentry/opentelemetry": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@prisma/instrumentation": "5.17.0", + "@sentry/core": "8.19.0", + "@sentry/opentelemetry": "8.19.0", + "@sentry/types": "8.19.0", + "@sentry/utils": "8.19.0" }, "engines": { "node": ">=14.18" }, "optionalDependencies": { - "opentelemetry-instrumentation-fetch-node": "1.2.0" + "opentelemetry-instrumentation-fetch-node": "1.2.3" } }, "node_modules/@sentry/opentelemetry": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.13.0.tgz", - "integrity": "sha512-NYn/HNE/SxFXe8pfnxJknhrrRzYRMHNssCoi5M1CeR5G7F2BGxxVmaGsd8j0WyTCpUS4i97G4vhYtDGxHvWN6w==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.19.0.tgz", + "integrity": "sha512-L1aSxO/aJJ7D3pIlTaVOgbiZJAnUHXezobTc8j5pqFCQACjxnLMSDrt53QfFV52CcjbliDWCYe4IB8umu4DgpA==", "dependencies": { - "@sentry/core": "8.13.0", - "@sentry/types": "8.13.0", - "@sentry/utils": "8.13.0" + "@sentry/core": "8.19.0", + "@sentry/types": "8.19.0", + "@sentry/utils": "8.19.0" }, "engines": { "node": ">=14.18" @@ -2015,19 +2013,19 @@ } }, "node_modules/@sentry/types": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.13.0.tgz", - "integrity": "sha512-r63s/H5gvQnQM9tTGBXz2xErUbxZALh4e2Lg/1aHj4zIvGLBjA2z5qWsh6TEZYbpmgAyGShLDr6+rWeUVf9yBQ==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.19.0.tgz", + "integrity": "sha512-52C8X5V7mK2KIxMJt8MV5TxXAFHqrQR1RKm1oPTwKVWm8hKr1ZYJXINymNrWvpAc3oVIKLC/sa9WFYgXQh+YlA==", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.13.0.tgz", - "integrity": "sha512-PxV0v9VbGWH9zP37P5w2msLUFDr287nYjoY2XVF+RSolyiTs1CQNI5ZMUO3o4MsSac/dpXxjyrZXQd72t/jRYA==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.19.0.tgz", + "integrity": "sha512-8dWJJKaUN6Hf92Oxw2TBmHchGua2W3ZmonrZTTwLvl06jcAigbiQD0MGuF5ytZP8PHx860orV+SbTGKFzfU3Pg==", "dependencies": { - "@sentry/types": "8.13.0" + "@sentry/types": "8.19.0" }, "engines": { "node": ">=14.18" @@ -2116,23 +2114,6 @@ "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", "dev": true }, - "node_modules/@types/accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/body-parser": { - "version": "1.19.5", - "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", - "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", - "dependencies": { - "@types/connect": "*", - "@types/node": "*" - } - }, "node_modules/@types/chai": { "version": "4.3.16", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", @@ -2147,22 +2128,6 @@ "@types/node": "*" } }, - "node_modules/@types/content-disposition": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.8.tgz", - "integrity": "sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==" - }, - "node_modules/@types/cookies": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.9.0.tgz", - "integrity": "sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==", - "dependencies": { - "@types/connect": "*", - "@types/express": "*", - "@types/keygrip": "*", - "@types/node": "*" - } - }, "node_modules/@types/expect": { "version": "24.3.0", "resolved": "https://registry.npmjs.org/@types/expect/-/expect-24.3.0.tgz", @@ -2173,28 +2138,6 @@ "expect": "*" } }, - "node_modules/@types/express": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", - "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", - "dependencies": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "^4.17.33", - "@types/qs": "*", - "@types/serve-static": "*" - } - }, - "node_modules/@types/express-serve-static-core": { - "version": "4.19.5", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz", - "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==", - "dependencies": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*", - "@types/send": "*" - } - }, "node_modules/@types/glob": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.0.1.tgz", @@ -2205,16 +2148,6 @@ "@types/node": "*" } }, - "node_modules/@types/http-assert": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.5.tgz", - "integrity": "sha512-4+tE/lwdAahgZT1g30Jkdm9PzFRde0xwxBNUyRsCitRvCQB90iuA2uJYdUnhnANRcqGXaWOGY4FEoxeElNAK2g==" - }, - "node_modules/@types/http-errors": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", - "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==" - }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", @@ -2251,53 +2184,12 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, - "node_modules/@types/keygrip": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.6.tgz", - "integrity": "sha512-lZuNAY9xeJt7Bx4t4dx0rYCDqGPW8RXhQZK1td7d4H6E9zYbLoOtjBvfwdTKpsyxQI/2jv+armjX/RW+ZNpXOQ==" - }, - "node_modules/@types/koa": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.14.0.tgz", - "integrity": "sha512-DTDUyznHGNHAl+wd1n0z1jxNajduyTh8R53xoewuerdBzGo6Ogj6F2299BFtrexJw4NtgjsI5SMPCmV9gZwGXA==", - "dependencies": { - "@types/accepts": "*", - "@types/content-disposition": "*", - "@types/cookies": "*", - "@types/http-assert": "*", - "@types/http-errors": "*", - "@types/keygrip": "*", - "@types/koa-compose": "*", - "@types/node": "*" - } - }, - "node_modules/@types/koa__router": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/@types/koa__router/-/koa__router-12.0.3.tgz", - "integrity": "sha512-5YUJVv6NwM1z7m6FuYpKfNLTZ932Z6EF6xy2BbtpJSyn13DKNQEkXVffFVSnJHxvwwWh2SAeumpjAYUELqgjyw==", - "dependencies": { - "@types/koa": "*" - } - }, - "node_modules/@types/koa-compose": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.8.tgz", - "integrity": "sha512-4Olc63RY+MKvxMwVknCUDhRQX1pFQoBZ/lXcRLP69PQkEpze/0cr8LNqJQe5NFb/b19DWi2a5bTi2VAlQzhJuA==", - "dependencies": { - "@types/koa": "*" - } - }, "node_modules/@types/lodash": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz", "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==", "dev": true }, - "node_modules/@types/mime": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", - "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" - }, "node_modules/@types/minimatch": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", @@ -2356,41 +2248,12 @@ "@types/pg": "*" } }, - "node_modules/@types/qs": { - "version": "6.9.15", - "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz", - "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==" - }, - "node_modules/@types/range-parser": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", - "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==" - }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, - "node_modules/@types/send": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", - "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", - "dependencies": { - "@types/mime": "^1", - "@types/node": "*" - } - }, - "node_modules/@types/serve-static": { - "version": "1.15.7", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz", - "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==", - "dependencies": { - "@types/http-errors": "*", - "@types/node": "*", - "@types/send": "*" - } - }, "node_modules/@types/shimmer": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz", @@ -8301,27 +8164,29 @@ } }, "node_modules/opentelemetry-instrumentation-fetch-node": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/opentelemetry-instrumentation-fetch-node/-/opentelemetry-instrumentation-fetch-node-1.2.0.tgz", - "integrity": "sha512-aiSt/4ubOTyb1N5C2ZbGrBvaJOXIZhZvpRPYuUVxQJe27wJZqf/o65iPrqgLcgfeOLaQ8cS2Q+762jrYvniTrA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/opentelemetry-instrumentation-fetch-node/-/opentelemetry-instrumentation-fetch-node-1.2.3.tgz", + "integrity": "sha512-Qb11T7KvoCevMaSeuamcLsAD+pZnavkhDnlVL0kRozfhl42dKG5Q3anUklAFKJZjY3twLR+BnRa6DlwwkIE/+A==", "optional": true, "dependencies": { - "@opentelemetry/api": "^1.6.0", - "@opentelemetry/instrumentation": "^0.43.0", + "@opentelemetry/instrumentation": "^0.46.0", "@opentelemetry/semantic-conventions": "^1.17.0" }, "engines": { "node": ">18.0.0" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.6.0" } }, "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/@opentelemetry/instrumentation": { - "version": "0.43.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.43.0.tgz", - "integrity": "sha512-S1uHE+sxaepgp+t8lvIDuRgyjJWisAb733198kwQTUc9ZtYQ2V2gmyCtR1x21ePGVLoMiX/NWY7WA290hwkjJQ==", + "version": "0.46.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.46.0.tgz", + "integrity": "sha512-a9TijXZZbk0vI5TGLZl+0kxyFfrXHhX6Svtz7Pp2/VBlCSKrazuULEyoJQrOknJyFWNMEmbbJgOciHCCpQcisw==", "optional": true, "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.4.2", + "import-in-the-middle": "1.7.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -8334,9 +8199,9 @@ } }, "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/import-in-the-middle": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz", - "integrity": "sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", + "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", "optional": true, "dependencies": { "acorn": "^8.8.2", diff --git a/package.json b/package.json index dee77104..7f8fed59 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", - "@sentry/node": "^8.13.0", + "@sentry/node": "^8.19.0", "@vscode/vsce": "^2.27.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 768f3e327693a6f96cd2b08101244f18b09452ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:04:07 -0700 Subject: [PATCH 81/97] Bump @types/uuid from 9.0.8 to 10.0.0 (#653) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed454b31..49bb1455 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", - "@types/uuid": "^9.0.8", + "@types/uuid": "^10.0.0", "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", @@ -2281,9 +2281,9 @@ "dev": true }, "node_modules/@types/uuid": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz", - "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", "dev": true }, "node_modules/@types/vscode": { diff --git a/package.json b/package.json index 7f8fed59..3ddd3bda 100644 --- a/package.json +++ b/package.json @@ -194,7 +194,7 @@ "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", - "@types/uuid": "^9.0.8", + "@types/uuid": "^10.0.0", "@types/vscode": "^1.82.0", "@vscode/test-electron": "^2.3.10", "chai": "^5.1.1", From 62b64edb85c24ed29b25802cbc8e1c3543259873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:04:26 -0700 Subject: [PATCH 82/97] Bump @vscode/test-electron from 2.3.10 to 2.4.1 (#652) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 328 ++++++++++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 287 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 49bb1455..ce2ec866 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "@types/sinon": "^17.0.3", "@types/uuid": "^10.0.0", "@types/vscode": "^1.82.0", - "@vscode/test-electron": "^2.3.10", + "@vscode/test-electron": "^2.4.1", "chai": "^5.1.1", "esbuild": "^0.23.0", "glob": "^10.4.1", @@ -200,18 +200,6 @@ "node": ">= 14" } }, - "node_modules/@azure/core-rest-pipeline/node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/@azure/core-rest-pipeline/node_modules/https-proxy-agent": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", @@ -2081,15 +2069,6 @@ "integrity": "sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==", "dev": true }, - "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -2495,20 +2474,46 @@ } }, "node_modules/@vscode/test-electron": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.10.tgz", - "integrity": "sha512-FxMqrvUm6a8S5tP4CymNJ40e6kD+wUTWTc6K32U629yrCCa+kl/rmpkC2gKpN4F4zjg1r+0Hnk9sl0+N2atsYA==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.1.tgz", + "integrity": "sha512-Gc6EdaLANdktQ1t+zozoBVRynfIsMKMc94Svu1QreOBC8y76x4tvaK32TljrLi1LI2+PK58sDVbL7ALdqf3VRQ==", "dev": true, "dependencies": { - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.5", "jszip": "^3.10.1", - "semver": "^7.5.2" + "ora": "^7.0.1", + "semver": "^7.6.2" }, "engines": { "node": ">=16" } }, + "node_modules/@vscode/test-electron/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dev": true, + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/@vscode/test-electron/node_modules/https-proxy-agent": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "dev": true, + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, "node_modules/@vscode/vsce": { "version": "2.27.0", "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.27.0.tgz", @@ -3049,6 +3054,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "devOptional": true, "funding": [ { "type": "github", @@ -3062,8 +3068,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "optional": true + ] }, "node_modules/binary-extensions": { "version": "2.2.0", @@ -3407,6 +3412,33 @@ "node": ">=6" } }, + "node_modules/cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, + "dependencies": { + "restore-cursor": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-spinners": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -5716,17 +5748,26 @@ } }, "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "dependencies": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" + "agent-base": "^7.1.0", + "debug": "^4.3.4" }, "engines": { - "node": ">= 6" + "node": ">= 14" + } + }, + "node_modules/http-proxy-agent/node_modules/agent-base": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", + "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" } }, "node_modules/https-proxy-agent": { @@ -5753,6 +5794,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "devOptional": true, "funding": [ { "type": "github", @@ -5766,8 +5808,7 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "optional": true + ] }, "node_modules/ignore": { "version": "5.2.4", @@ -6020,6 +6061,18 @@ "node": ">=0.10.0" } }, + "node_modules/is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -8227,6 +8280,107 @@ "node": ">= 0.8.0" } }, + "node_modules/ora": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-7.0.1.tgz", + "integrity": "sha512-0TUxTiFJWv+JnjWm4o9yvuskpEJLXTcng8MJuKd+SzAzp2o+OP3HWqNhB4OdJRt1Vsd9/mR0oyaEYlOnL7XIRw==", + "dev": true, + "dependencies": { + "chalk": "^5.3.0", + "cli-cursor": "^4.0.0", + "cli-spinners": "^2.9.0", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^1.3.0", + "log-symbols": "^5.1.0", + "stdin-discarder": "^0.1.0", + "string-width": "^6.1.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/emoji-regex": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "dev": true + }, + "node_modules/ora/node_modules/is-unicode-supported": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", + "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==", + "dev": true, + "dependencies": { + "chalk": "^5.0.0", + "is-unicode-supported": "^1.1.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/string-width": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-6.1.0.tgz", + "integrity": "sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^10.2.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/os-name": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/os-name/-/os-name-6.0.0.tgz", @@ -8922,7 +9076,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "optional": true, + "devOptional": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -9038,6 +9192,46 @@ "node": ">=8" } }, + "node_modules/restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/restore-cursor/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/restore-cursor/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -9550,6 +9744,56 @@ "node": ">=6" } }, + "node_modules/stdin-discarder": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz", + "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==", + "dev": true, + "dependencies": { + "bl": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/stdin-discarder/node_modules/bl": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", + "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", + "dev": true, + "dependencies": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/stdin-discarder/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/stoppable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", @@ -9563,7 +9807,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "optional": true, + "devOptional": true, "dependencies": { "safe-buffer": "~5.2.0" } diff --git a/package.json b/package.json index 3ddd3bda..63658fb6 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "@types/sinon": "^17.0.3", "@types/uuid": "^10.0.0", "@types/vscode": "^1.82.0", - "@vscode/test-electron": "^2.3.10", + "@vscode/test-electron": "^2.4.1", "chai": "^5.1.1", "esbuild": "^0.23.0", "glob": "^10.4.1", From f9090c796273a96100e54adee5ba8771673f3b41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:04:49 -0700 Subject: [PATCH 83/97] Bump @vscode/vsce from 2.27.0 to 2.31.1 (#656) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 220 +++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 129 insertions(+), 93 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce2ec866..334da49b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^8.19.0", - "@vscode/vsce": "^2.27.0", + "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", @@ -1197,7 +1197,6 @@ "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -1213,14 +1212,12 @@ "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -1237,7 +1234,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -1912,7 +1908,6 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, "optional": true, "engines": { "node": ">=14" @@ -2515,9 +2510,9 @@ } }, "node_modules/@vscode/vsce": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.27.0.tgz", - "integrity": "sha512-FFUMBVSyyjjJpWszwqk7d4U3YllY8FdWslbUDMRki1x4ZjA3Z0hmRMfypWrjP9sptbSR9nyPFU4uqjhy2qRB/w==", + "version": "2.31.1", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.31.1.tgz", + "integrity": "sha512-LwEQFKXV21C4/brvGPH/9+7ZOUM5cbK7oJ4fVmy0YG75NIy1HV8eMSoBZrl+u23NxpAhor62Cu1aI+JFtCtjSg==", "dependencies": { "@azure/identity": "^4.1.0", "@vscode/vsce-sign": "^2.0.0", @@ -2527,7 +2522,7 @@ "cockatiel": "^3.1.2", "commander": "^6.2.1", "form-data": "^4.0.0", - "glob": "^7.0.6", + "glob": "^11.0.0", "hosted-git-info": "^4.0.2", "jsonc-parser": "^3.2.0", "leven": "^3.1.0", @@ -2537,7 +2532,7 @@ "parse-semver": "^1.1.1", "read": "^1.0.7", "semver": "^7.5.2", - "tmp": "^0.2.1", + "tmp": "^0.2.3", "typed-rest-client": "^1.8.4", "url-join": "^4.0.1", "xml2js": "^0.5.0", @@ -2679,20 +2674,111 @@ "win32" ] }, + "node_modules/@vscode/vsce/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/@vscode/vsce/node_modules/foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@vscode/vsce/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "foreground-child": "^3.1.0", + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" + }, + "bin": { + "glob": "dist/esm/bin.mjs" }, "engines": { - "node": "*" + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@vscode/vsce/node_modules/jackspeak": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", + "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/@vscode/vsce/node_modules/lru-cache": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/@vscode/vsce/node_modules/path-scurry": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", + "dependencies": { + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" + }, + "engines": { + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@vscode/vsce/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3938,8 +4024,7 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", @@ -3972,8 +4057,7 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/end-of-stream": { "version": "1.4.4", @@ -5180,7 +5264,8 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, "node_modules/fsevents": { "version": "2.3.2", @@ -5883,6 +5968,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -7462,7 +7548,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, "engines": { "node": ">=16 || 14 >=14.17" } @@ -8182,6 +8267,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "devOptional": true, "dependencies": { "wrappy": "1" } @@ -8486,6 +8572,11 @@ "node": ">=8" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", @@ -8559,6 +8650,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -9816,7 +9908,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -9831,7 +9922,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -9845,7 +9935,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -9854,7 +9943,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -9863,7 +9951,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -9875,7 +9962,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -9884,7 +9970,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -9893,7 +9978,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.0" }, @@ -9965,7 +10049,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -9977,7 +10060,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -10117,47 +10199,11 @@ "dev": true }, "node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dependencies": { - "rimraf": "^3.0.0" - }, + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "engines": { - "node": ">=8.17.0" - } - }, - "node_modules/tmp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/tmp/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=14.14" } }, "node_modules/to-fast-properties": { @@ -10728,7 +10774,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -10746,7 +10791,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -10763,7 +10807,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -10772,7 +10815,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -10787,7 +10829,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -10798,14 +10839,12 @@ "node_modules/wrap-ansi-cjs/node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -10817,7 +10856,6 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, "engines": { "node": ">=12" }, @@ -10828,14 +10866,12 @@ "node_modules/wrap-ansi/node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/wrap-ansi/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -10852,7 +10888,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -10866,7 +10901,8 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "devOptional": true }, "node_modules/write-file-atomic": { "version": "3.0.3", diff --git a/package.json b/package.json index 63658fb6..48d190ae 100644 --- a/package.json +++ b/package.json @@ -215,7 +215,7 @@ "@onflow/cadence-parser": "^0.42.1", "@onflow/decode": "0.0.11", "@sentry/node": "^8.19.0", - "@vscode/vsce": "^2.27.0", + "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", From e37245dd0752b5aef17dcf3b85ea813be9025aab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:06:16 -0700 Subject: [PATCH 84/97] Bump @types/node from 20.14.2 to 20.14.11 (#658) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 334da49b..668e65ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/lodash": "^4.17.6", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.14.2", + "@types/node": "^20.14.11", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", @@ -2191,9 +2191,9 @@ } }, "node_modules/@types/node": { - "version": "20.14.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", - "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", + "version": "20.14.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", + "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", "dependencies": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index 48d190ae..247fd960 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/lodash": "^4.17.6", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.14.2", + "@types/node": "^20.14.11", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", From 3216560c5005272e9b977ff031e103cf2e923a14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:11:42 -0700 Subject: [PATCH 85/97] Bump glob from 10.4.1 to 11.0.0 (#663) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 280 ++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 137 insertions(+), 145 deletions(-) diff --git a/package-lock.json b/package-lock.json index 668e65ae..9755f878 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@vscode/test-electron": "^2.4.1", "chai": "^5.1.1", "esbuild": "^0.23.0", - "glob": "^10.4.1", + "glob": "^11.0.0", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^17.0.0", @@ -2674,116 +2674,6 @@ "win32" ] }, - "node_modules/@vscode/vsce/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@vscode/vsce/node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@vscode/vsce/node_modules/glob": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", - "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^4.0.1", - "minimatch": "^10.0.0", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^2.0.0" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@vscode/vsce/node_modules/glob/node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@vscode/vsce/node_modules/jackspeak": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", - "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/@vscode/vsce/node_modules/lru-cache": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", - "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@vscode/vsce/node_modules/path-scurry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", - "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", - "dependencies": { - "lru-cache": "^11.0.0", - "minipass": "^7.1.2" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@vscode/vsce/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@vscode/vsce/node_modules/xml2js": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", @@ -5490,22 +5380,22 @@ "optional": true }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", - "dev": true, + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", + "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", + "jackspeak": "^4.0.1", + "minimatch": "^10.0.0", "minipass": "^7.1.2", - "path-scurry": "^1.11.1" + "package-json-from-dist": "^1.0.0", + "path-scurry": "^2.0.0" }, "bin": { "glob": "dist/esm/bin.mjs" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -5527,7 +5417,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -5536,7 +5425,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dev": true, "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" @@ -5549,15 +5437,14 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dev": true, + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -5567,7 +5454,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz", "integrity": "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==", - "dev": true, "engines": { "node": ">=14" }, @@ -6538,15 +6424,14 @@ } }, "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", - "dev": true, + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz", + "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==", "dependencies": { "@isaacs/cliui": "^8.0.2" }, "engines": { - "node": ">=14" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -8669,28 +8554,26 @@ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz", + "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==", "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "lru-cache": "^11.0.0", + "minipass": "^7.1.2" }, "engines": { - "node": ">=16 || 14 >=14.18" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz", + "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==", "engines": { - "node": "14 || >=16.14" + "node": "20 || >=22" } }, "node_modules/path-to-regexp": { @@ -9352,6 +9235,115 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/rimraf/node_modules/foreground-child": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", + "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/rimraf/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true + }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", diff --git a/package.json b/package.json index 247fd960..306cba10 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,7 @@ "@vscode/test-electron": "^2.4.1", "chai": "^5.1.1", "esbuild": "^0.23.0", - "glob": "^10.4.1", + "glob": "^11.0.0", "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^17.0.0", From 9e9cfd8a2e71aab409fd9f6fa781672ea07b4fd2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:12:14 -0700 Subject: [PATCH 86/97] Bump elliptic from 6.5.5 to 6.5.6 (#661) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9755f878..122154d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", - "elliptic": "^6.5.5", + "elliptic": "^6.5.6", "lodash": "^4.17.21", "mixpanel": "^0.18.0", "node-fetch": "^2.6.1", @@ -3931,9 +3931,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", - "integrity": "sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==", + "version": "6.5.6", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz", + "integrity": "sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", diff --git a/package.json b/package.json index 306cba10..66454660 100644 --- a/package.json +++ b/package.json @@ -219,7 +219,7 @@ "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", - "elliptic": "^6.5.5", + "elliptic": "^6.5.6", "lodash": "^4.17.21", "mixpanel": "^0.18.0", "node-fetch": "^2.6.1", From f0d4ba9995605c6388d55878d44560026de62d4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:12:49 -0700 Subject: [PATCH 87/97] Bump @types/lodash from 4.17.6 to 4.17.7 (#662) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 122154d0..506d4537 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.6", + "@types/lodash": "^4.17.7", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.14.11", @@ -2159,9 +2159,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.6", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.6.tgz", - "integrity": "sha512-OpXEVoCKSS3lQqjx9GGGOapBeuW5eUboYHRlHP9urXPX25IKZ6AnP5ZRxtVf63iieUbsHxLn8NQ5Nlftc6yzAA==", + "version": "4.17.7", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz", + "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==", "dev": true }, "node_modules/@types/minimatch": { diff --git a/package.json b/package.json index 66454660..cef54b9a 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/chai": "^4.3.16", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", - "@types/lodash": "^4.17.6", + "@types/lodash": "^4.17.7", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", "@types/node": "^20.14.11", From 500cd7ae1a96dd3f9747fa34a723579e92fbfd0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:36:19 -0700 Subject: [PATCH 88/97] Bump rimraf from 5.0.7 to 6.0.1 (#666) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 122 +++------------------------------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 116 deletions(-) diff --git a/package-lock.json b/package-lock.json index 506d4537..ad13657b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "mocha": "^10.4.0", "nyc": "^17.0.0", "ovsx": "^0.9.1", - "rimraf": "^5.0.7", + "rimraf": "^6.0.1", "sinon": "^18.0.0", "ts-mocha": "^10.0.0", "ts-node": "^10.9.2", @@ -9218,127 +9218,19 @@ } }, "node_modules/rimraf": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz", - "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz", + "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==", "dev": true, "dependencies": { - "glob": "^10.3.7" + "glob": "^11.0.0", + "package-json-from-dist": "^1.0.0" }, "bin": { "rimraf": "dist/esm/bin.mjs" }, "engines": { - "node": ">=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/rimraf/node_modules/foreground-child": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz", - "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "10.4.5", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", - "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.4", - "minipass": "^7.1.2", - "package-json-from-dist": "^1.0.0", - "path-scurry": "^1.11.1" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/jackspeak": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/rimraf/node_modules/lru-cache": { - "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" + "node": "20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" diff --git a/package.json b/package.json index cef54b9a..b54149e9 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "mocha": "^10.4.0", "nyc": "^17.0.0", "ovsx": "^0.9.1", - "rimraf": "^5.0.7", + "rimraf": "^6.0.1", "sinon": "^18.0.0", "ts-mocha": "^10.0.0", "ts-node": "^10.9.2", From 4d56d3458b64130a1e5ce27ace32b55ba501fe34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:36:31 -0700 Subject: [PATCH 89/97] Bump semver from 7.6.2 to 7.6.3 (#664) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad13657b..a05d7f3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "object-hash": "^3.0.0", "os-name": "^6.0.0", "rxjs": "^7.8.1", - "semver": "^7.6.0", + "semver": "^7.6.3", "sleep-synchronously": "^2.0.0", "uuid": "^10.0.0", "vscode-languageclient": "^9.0.1" @@ -9297,9 +9297,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "bin": { "semver": "bin/semver.js" }, diff --git a/package.json b/package.json index b54149e9..87d55713 100644 --- a/package.json +++ b/package.json @@ -226,7 +226,7 @@ "object-hash": "^3.0.0", "os-name": "^6.0.0", "rxjs": "^7.8.1", - "semver": "^7.6.0", + "semver": "^7.6.3", "sleep-synchronously": "^2.0.0", "uuid": "^10.0.0", "vscode-languageclient": "^9.0.1" From 8763dd6938958949bdadaf311653ecb939b45b39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:37:10 -0700 Subject: [PATCH 90/97] Bump ovsx from 0.9.1 to 0.9.2 (#660) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a05d7f3d..d4acab89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^17.0.0", - "ovsx": "^0.9.1", + "ovsx": "^0.9.2", "rimraf": "^6.0.1", "sinon": "^18.0.0", "ts-mocha": "^10.0.0", @@ -8368,9 +8368,9 @@ } }, "node_modules/ovsx": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.9.1.tgz", - "integrity": "sha512-faORiHeVdRFXVjvwjGvsGdfw49ocUZwUvjrrObZDzhlkKkrUS8L2afeXF8goeuv1YbTV8lmFfBYAt0C4FaoVuQ==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/ovsx/-/ovsx-0.9.2.tgz", + "integrity": "sha512-kh3xdwv7kl715VqaVdn4HZvvnPEePWKhGdd3XtL6Yagiu7JDU0S52ElN4N1asFaG/gzx7nifflD0Azehv+MGHg==", "dev": true, "dependencies": { "@vscode/vsce": "^2.25.0", diff --git a/package.json b/package.json index 87d55713..3cf1873d 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "mkdirp": "^3.0.1", "mocha": "^10.4.0", "nyc": "^17.0.0", - "ovsx": "^0.9.1", + "ovsx": "^0.9.2", "rimraf": "^6.0.1", "sinon": "^18.0.0", "ts-mocha": "^10.0.0", From 42bd63deb5e6d295dabf3db4dfcd2e274dd2e3e5 Mon Sep 17 00:00:00 2001 From: Jordan Ribbink Date: Tue, 17 Sep 2024 11:06:20 -0700 Subject: [PATCH 91/97] Remove Cadence 1.0 Migration Features (#685) --- .metadata/notifications.json | 16 +--------------- extension/index.d.ts | 1 - .../installers/flow-cli-installer.ts | 2 +- extension/src/flow-cli/cli-versions-provider.ts | 1 - extension/test/fixtures/workspace/Error.cdc | 4 ++-- .../test/fixtures/workspace/FooContract.cdc | 2 +- extension/test/fixtures/workspace/Script.cdc | 2 +- extension/test/fixtures/workspace/Tx.cdc | 2 +- .../test/fixtures/workspace/test/bar/test2.cdc | 4 ++-- .../test/fixtures/workspace/test/bar/test3.cdc | 4 ++-- extension/test/fixtures/workspace/test/test1.cdc | 2 +- .../test/integration/6 - test-provider.test.ts | 2 +- package-lock.json | 14 ++++---------- package.json | 3 +-- 14 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.metadata/notifications.json b/.metadata/notifications.json index 6cb767a0..fe51488c 100644 --- a/.metadata/notifications.json +++ b/.metadata/notifications.json @@ -1,15 +1 @@ -[ - { - "_type": "Notification", - "id": "1", - "type": "info", - "text": "Cadence 1.0 pre-release builds are now available! Developers should begin upgrading their projects - see the Cadence 1.0 Migration Guide for more details.", - "buttons": [ - { - "label": "Learn More", - "link": "https://cadence-lang.org/docs/cadence_migration_guide" - } - ], - "suppressable": false - } -] +[] diff --git a/extension/index.d.ts b/extension/index.d.ts index 234a7281..0653b5c2 100644 --- a/extension/index.d.ts +++ b/extension/index.d.ts @@ -1,4 +1,3 @@ -declare module '@onflow/decode' declare module 'portscanner-sync' declare module 'elliptic' declare module 'node-fetch' diff --git a/extension/src/dependency-installer/installers/flow-cli-installer.ts b/extension/src/dependency-installer/installers/flow-cli-installer.ts index 1a8d73c9..ec650af0 100644 --- a/extension/src/dependency-installer/installers/flow-cli-installer.ts +++ b/extension/src/dependency-installer/installers/flow-cli-installer.ts @@ -16,7 +16,7 @@ interface HomebrewVersionInfo { } // Command to check flow-cli -const COMPATIBLE_FLOW_CLI_VERSIONS = '>=1.6.0' +const COMPATIBLE_FLOW_CLI_VERSIONS = '>=2.0.0' // Shell install commands const BREW_INSTALL_FLOW_CLI = 'brew update && brew install flow-cli' diff --git a/extension/src/flow-cli/cli-versions-provider.ts b/extension/src/flow-cli/cli-versions-provider.ts index 035677ac..53b2fd2a 100644 --- a/extension/src/flow-cli/cli-versions-provider.ts +++ b/extension/src/flow-cli/cli-versions-provider.ts @@ -9,7 +9,6 @@ const CHECK_FLOW_CLI_CMD_NO_JSON = (flowCommand: string): string => `${flowComma export enum KNOWN_FLOW_COMMANDS { DEFAULT = 'flow', - CADENCE_V1 = 'flow-c1', } // Matches the version number from the output of the Flow CLI diff --git a/extension/test/fixtures/workspace/Error.cdc b/extension/test/fixtures/workspace/Error.cdc index 403094fd..c76c4372 100644 --- a/extension/test/fixtures/workspace/Error.cdc +++ b/extension/test/fixtures/workspace/Error.cdc @@ -1,9 +1,9 @@ /** Careful: this cadence code is purposely written with errors so we can test error marking */ -pub contract interface Foo { +access(all) contract interface Foo { - pub var bar: UInt6 + access(all) var bar: UInt6 fun zoo() { return 2 diff --git a/extension/test/fixtures/workspace/FooContract.cdc b/extension/test/fixtures/workspace/FooContract.cdc index 7b29879c..3acddebd 100644 --- a/extension/test/fixtures/workspace/FooContract.cdc +++ b/extension/test/fixtures/workspace/FooContract.cdc @@ -1,2 +1,2 @@ -pub contract FooContract {} +access(all) contract FooContract {} \ No newline at end of file diff --git a/extension/test/fixtures/workspace/Script.cdc b/extension/test/fixtures/workspace/Script.cdc index f26d9775..6d5d8f76 100644 --- a/extension/test/fixtures/workspace/Script.cdc +++ b/extension/test/fixtures/workspace/Script.cdc @@ -1,4 +1,4 @@ -pub fun main(): UFix64 { +access(all) fun main(): UFix64 { return 42.0 } \ No newline at end of file diff --git a/extension/test/fixtures/workspace/Tx.cdc b/extension/test/fixtures/workspace/Tx.cdc index 1bc16e44..3e65ee96 100644 --- a/extension/test/fixtures/workspace/Tx.cdc +++ b/extension/test/fixtures/workspace/Tx.cdc @@ -1,7 +1,7 @@ transaction() { let guest: Address - prepare(authorizer: AuthAccount) { + prepare(authorizer: &Account) { self.guest = authorizer.address } diff --git a/extension/test/fixtures/workspace/test/bar/test2.cdc b/extension/test/fixtures/workspace/test/bar/test2.cdc index 045a2f2e..2c4d146b 100644 --- a/extension/test/fixtures/workspace/test/bar/test2.cdc +++ b/extension/test/fixtures/workspace/test/bar/test2.cdc @@ -1,9 +1,9 @@ import Test -pub fun testPassing() { +access(all) fun testPassing() { Test.assert(true) } -pub fun testFailing() { +access(all) fun testFailing() { Test.assert(false) } \ No newline at end of file diff --git a/extension/test/fixtures/workspace/test/bar/test3.cdc b/extension/test/fixtures/workspace/test/bar/test3.cdc index 36fb0e8e..9f4fad4f 100644 --- a/extension/test/fixtures/workspace/test/bar/test3.cdc +++ b/extension/test/fixtures/workspace/test/bar/test3.cdc @@ -1,9 +1,9 @@ import Test -pub fun testFailing() { +access(all) fun testFailing() { Test.assert(false) } -pub fun testPassing() { +access(all) fun testPassing() { Test.assert(true) } \ No newline at end of file diff --git a/extension/test/fixtures/workspace/test/test1.cdc b/extension/test/fixtures/workspace/test/test1.cdc index 1d6e42f1..b76a42c7 100644 --- a/extension/test/fixtures/workspace/test/test1.cdc +++ b/extension/test/fixtures/workspace/test/test1.cdc @@ -1,5 +1,5 @@ import Test -pub fun testPassing() { +access(all) fun testPassing() { Test.assert(true) } \ No newline at end of file diff --git a/extension/test/integration/6 - test-provider.test.ts b/extension/test/integration/6 - test-provider.test.ts index 88fae7f8..f20f790c 100644 --- a/extension/test/integration/6 - test-provider.test.ts +++ b/extension/test/integration/6 - test-provider.test.ts @@ -123,7 +123,7 @@ suite('test provider tests', () => { const testFilePath = path.join(workspacePath, 'test/bar/test4.cdc') const testFileContents = ` import Test - pub fun testPassing() { + access(all) fun testPassing() { Test.assert(true) } ` diff --git a/package-lock.json b/package-lock.json index d4acab89..6130e7a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,7 @@ "name": "cadence", "version": "2.3.5", "dependencies": { - "@onflow/cadence-parser": "^0.42.1", - "@onflow/decode": "0.0.11", + "@onflow/cadence-parser": "^1.0.0-preview.50", "@sentry/node": "^8.19.0", "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", @@ -1511,18 +1510,13 @@ } }, "node_modules/@onflow/cadence-parser": { - "version": "0.42.1", - "resolved": "https://registry.npmjs.org/@onflow/cadence-parser/-/cadence-parser-0.42.1.tgz", - "integrity": "sha512-bFktvPp8OLVA6Xzd/MyjtlQW7OkhzTzp/+N5E6s/8Bs5ebZ2nQRKB79FnL/hChKlZ8e+X+mmoBVflJojiYQO5Q==", + "version": "1.0.0-preview.50", + "resolved": "https://registry.npmjs.org/@onflow/cadence-parser/-/cadence-parser-1.0.0-preview.50.tgz", + "integrity": "sha512-8V7OnyccxrYJioMbSQbHRBC/eRLqH6bf2yEaduD0bYtiR4AsOg5lP52bsC903Qpb28NHcDZtXILwkai4BOzYBQ==", "dependencies": { "get-random-values": "^2.0.0" } }, - "node_modules/@onflow/decode": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/@onflow/decode/-/decode-0.0.11.tgz", - "integrity": "sha512-i4JTznywSpXTyBIwnrzEXqEBJRZu8xYDRS4Q0mTzP1+0GdESm+Wq44qvtN68vEcNNfSLJixKeGs/T0nvkJDh4A==" - }, "node_modules/@opentelemetry/api": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", diff --git a/package.json b/package.json index 3cf1873d..b1e1b0b4 100644 --- a/package.json +++ b/package.json @@ -212,8 +212,7 @@ "typescript": "~5.1.6" }, "dependencies": { - "@onflow/cadence-parser": "^0.42.1", - "@onflow/decode": "0.0.11", + "@onflow/cadence-parser": "^1.0.0-preview.50", "@sentry/node": "^8.19.0", "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", From 988dde28087164a148c24aebbcbb4723be21ba4b Mon Sep 17 00:00:00 2001 From: jribbink2 <146491757+jribbink2@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:28:51 -0700 Subject: [PATCH 92/97] Bump version to v2.4.0 (#687) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1e1b0b4..864e257a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "displayName": "Cadence", "publisher": "onflow", "description": "This extension integrates Cadence, the resource-oriented smart contract programming language of Flow, into Visual Studio Code.", - "version": "2.3.5", + "version": "2.4.0", "repository": { "type": "git", "url": "https://github.com/onflow/vscode-cadence.git" From b548ecd2bb9fed782bea143518d18b8ddf52b445 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:29:38 -0700 Subject: [PATCH 93/97] Bump elliptic from 6.5.6 to 6.5.7 (#672) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6130e7a3..5d34d6e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", - "elliptic": "^6.5.6", + "elliptic": "^6.5.7", "lodash": "^4.17.21", "mixpanel": "^0.18.0", "node-fetch": "^2.6.1", @@ -3925,9 +3925,9 @@ "dev": true }, "node_modules/elliptic": { - "version": "6.5.6", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz", - "integrity": "sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", diff --git a/package.json b/package.json index 864e257a..23829c48 100644 --- a/package.json +++ b/package.json @@ -218,7 +218,7 @@ "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", - "elliptic": "^6.5.6", + "elliptic": "^6.5.7", "lodash": "^4.17.21", "mixpanel": "^0.18.0", "node-fetch": "^2.6.1", From f43671d70f392e0e108cb82f7c1b52b323c11d90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:29:50 -0700 Subject: [PATCH 94/97] Bump @sentry/node from 8.19.0 to 8.30.0 (#684) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 564 +++++++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 313 insertions(+), 253 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5d34d6e9..783e05dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.3.5", "dependencies": { "@onflow/cadence-parser": "^1.0.0-preview.50", - "@sentry/node": "^8.19.0", + "@sentry/node": "^8.30.0", "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", @@ -1526,9 +1526,9 @@ } }, "node_modules/@opentelemetry/api-logs": { - "version": "0.52.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.52.1.tgz", - "integrity": "sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==", + "version": "0.53.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.53.0.tgz", + "integrity": "sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==", "dependencies": { "@opentelemetry/api": "^1.0.0" }, @@ -1548,11 +1548,11 @@ } }, "node_modules/@opentelemetry/core": { - "version": "1.25.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.1.tgz", - "integrity": "sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==", + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.26.0.tgz", + "integrity": "sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==", "dependencies": { - "@opentelemetry/semantic-conventions": "1.25.1" + "@opentelemetry/semantic-conventions": "1.27.0" }, "engines": { "node": ">=14" @@ -1562,12 +1562,12 @@ } }, "node_modules/@opentelemetry/instrumentation": { - "version": "0.52.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.52.1.tgz", - "integrity": "sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==", + "version": "0.53.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.53.0.tgz", + "integrity": "sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==", "dependencies": { - "@opentelemetry/api-logs": "0.52.1", - "@types/shimmer": "^1.0.2", + "@opentelemetry/api-logs": "0.53.0", + "@types/shimmer": "^1.2.0", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", @@ -1581,13 +1581,13 @@ } }, "node_modules/@opentelemetry/instrumentation-connect": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.38.0.tgz", - "integrity": "sha512-2/nRnx3pjYEmdPIaBwtgtSviTKHWnDZN3R+TkRUnhIVrvBKVcq+I5B2rtd6mr6Fe9cHlZ9Ojcuh7pkNh/xdWWg==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.39.0.tgz", + "integrity": "sha512-pGBiKevLq7NNglMgqzmeKczF4XQMTOUOTkK8afRHMZMnrK3fcETyTH7lVaSozwiOM3Ws+SuEmXZT7DYrrhxGlg==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0", + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0", "@types/connect": "3.4.36" }, "engines": { @@ -1598,13 +1598,13 @@ } }, "node_modules/@opentelemetry/instrumentation-express": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.41.0.tgz", - "integrity": "sha512-/B7fbMdaf3SYe5f1P973tkqd6s7XZirjpfkoJ63E7nltU30qmlgm9tY5XwZOzAFI0rHS9tbrFI2HFPAvQUFe/A==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-express/-/instrumentation-express-0.42.0.tgz", + "integrity": "sha512-YNcy7ZfGnLsVEqGXQPT+S0G1AE46N21ORY7i7yUQyfhGAL4RBjnZUqefMI0NwqIl6nGbr1IpF0rZGoN8Q7x12Q==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1614,13 +1614,42 @@ } }, "node_modules/@opentelemetry/instrumentation-fastify": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.38.0.tgz", - "integrity": "sha512-HBVLpTSYpkQZ87/Df3N0gAw7VzYZV3n28THIBrJWfuqw3Or7UqdhnjeuMIPQ04BKk3aZc0cWn2naSQObbh5vXw==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fastify/-/instrumentation-fastify-0.39.0.tgz", + "integrity": "sha512-SS9uSlKcsWZabhBp2szErkeuuBDgxOUlllwkS92dVaWRnMmwysPhcEgHKB8rUe3BHg/GnZC1eo1hbTZv4YhfoA==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-fs": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.15.0.tgz", + "integrity": "sha512-JWVKdNLpu1skqZQA//jKOcKdJC66TWKqa2FUFq70rKohvaSq47pmXlnabNO+B/BvLfmidfiaN35XakT5RyMl2Q==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.53.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-generic-pool": { + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.39.0.tgz", + "integrity": "sha512-y4v8Y+tSfRB3NNBvHjbjrn7rX/7sdARG7FuK6zR8PGb28CTa0kHpEGCJqvL9L8xkTNvTXo+lM36ajFGUaK1aNw==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.53.0" }, "engines": { "node": ">=14" @@ -1630,11 +1659,11 @@ } }, "node_modules/@opentelemetry/instrumentation-graphql": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.42.0.tgz", - "integrity": "sha512-N8SOwoKL9KQSX7z3gOaw5UaTeVQcfDO1c21csVHnmnmGUoqsXbArK2B8VuwPWcv6/BC/i3io+xTo7QGRZ/z28Q==", + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.43.0.tgz", + "integrity": "sha512-aI3YMmC2McGd8KW5du1a2gBA0iOMOGLqg4s9YjzwbjFwjlmMNFSK1P3AIg374GWg823RPUGfVTIgZ/juk9CVOA==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0" + "@opentelemetry/instrumentation": "^0.53.0" }, "engines": { "node": ">=14" @@ -1644,13 +1673,13 @@ } }, "node_modules/@opentelemetry/instrumentation-hapi": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.40.0.tgz", - "integrity": "sha512-8U/w7Ifumtd2bSN1OLaSwAAFhb9FyqWUki3lMMB0ds+1+HdSxYBe9aspEJEgvxAqOkrQnVniAPTEGf1pGM7SOw==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.41.0.tgz", + "integrity": "sha512-jKDrxPNXDByPlYcMdZjNPYCvw0SQJjN+B1A+QH+sx+sAHsKSAf9hwFiJSrI6C4XdOls43V/f/fkp9ITkHhKFbQ==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1660,13 +1689,13 @@ } }, "node_modules/@opentelemetry/instrumentation-http": { - "version": "0.52.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.52.1.tgz", - "integrity": "sha512-dG/aevWhaP+7OLv4BQQSEKMJv8GyeOp3Wxl31NHqE8xo9/fYMfEljiZphUHIfyg4gnZ9swMyWjfOQs5GUQe54Q==", + "version": "0.53.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-http/-/instrumentation-http-0.53.0.tgz", + "integrity": "sha512-H74ErMeDuZfj7KgYCTOFGWF5W9AfaPnqLQQxeFq85+D29wwV2yqHbz2IKLYpkOh7EI6QwDEl7rZCIxjJLyc/CQ==", "dependencies": { - "@opentelemetry/core": "1.25.1", - "@opentelemetry/instrumentation": "0.52.1", - "@opentelemetry/semantic-conventions": "1.25.1", + "@opentelemetry/core": "1.26.0", + "@opentelemetry/instrumentation": "0.53.0", + "@opentelemetry/semantic-conventions": "1.27.0", "semver": "^7.5.2" }, "engines": { @@ -1677,13 +1706,28 @@ } }, "node_modules/@opentelemetry/instrumentation-ioredis": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.42.0.tgz", - "integrity": "sha512-P11H168EKvBB9TUSasNDOGJCSkpT44XgoM6d3gRIWAa9ghLpYhl0uRkS8//MqPzcJVHr3h3RmfXIpiYLjyIZTw==", + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.43.0.tgz", + "integrity": "sha512-i3Dke/LdhZbiUAEImmRG3i7Dimm/BD7t8pDDzwepSvIQ6s2X6FPia7561gw+64w+nx0+G9X14D7rEfaMEmmjig==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation": "^0.53.0", "@opentelemetry/redis-common": "^0.36.2", - "@opentelemetry/semantic-conventions": "^1.23.0" + "@opentelemetry/semantic-conventions": "^1.27.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, + "node_modules/@opentelemetry/instrumentation-kafkajs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.3.0.tgz", + "integrity": "sha512-UnkZueYK1ise8FXQeKlpBd7YYUtC7mM8J0wzUSccEfc/G8UqHQqAzIyYCUOUPUKp8GsjLnWOOK/3hJc4owb7Jg==", + "dependencies": { + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1693,13 +1737,13 @@ } }, "node_modules/@opentelemetry/instrumentation-koa": { - "version": "0.42.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.42.0.tgz", - "integrity": "sha512-H1BEmnMhho8o8HuNRq5zEI4+SIHDIglNB7BPKohZyWG4fWNuR7yM4GTlR01Syq21vODAS7z5omblScJD/eZdKw==", + "version": "0.43.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.43.0.tgz", + "integrity": "sha512-lDAhSnmoTIN6ELKmLJBplXzT/Jqs5jGZehuG22EdSMaTwgjMpxMDI1YtlKEhiWPWkrz5LUsd0aOO0ZRc9vn3AQ==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1709,13 +1753,13 @@ } }, "node_modules/@opentelemetry/instrumentation-mongodb": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.46.0.tgz", - "integrity": "sha512-VF/MicZ5UOBiXrqBslzwxhN7TVqzu1/LN/QDpkskqM0Zm0aZ4CVRbUygL8d7lrjLn15x5kGIe8VsSphMfPJzlA==", + "version": "0.47.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.47.0.tgz", + "integrity": "sha512-yqyXRx2SulEURjgOQyJzhCECSh5i1uM49NUaq9TqLd6fA7g26OahyJfsr9NE38HFqGRHpi4loyrnfYGdrsoVjQ==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation": "^0.53.0", "@opentelemetry/sdk-metrics": "^1.9.1", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1725,13 +1769,13 @@ } }, "node_modules/@opentelemetry/instrumentation-mongoose": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.40.0.tgz", - "integrity": "sha512-niRi5ZUnkgzRhIGMOozTyoZIvJKNJyhijQI4nF4iFSb+FUx2v5fngfR+8XLmdQAO7xmsD8E5vEGdDVYVtKbZew==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.42.0.tgz", + "integrity": "sha512-AnWv+RaR86uG3qNEMwt3plKX1ueRM7AspfszJYVkvkehiicC3bHQA6vWdb6Zvy5HAE14RyFbu9+2hUUjR2NSyg==", "dependencies": { "@opentelemetry/core": "^1.8.0", - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1741,13 +1785,13 @@ } }, "node_modules/@opentelemetry/instrumentation-mysql": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.40.0.tgz", - "integrity": "sha512-d7ja8yizsOCNMYIJt5PH/fKZXjb/mS48zLROO4BzZTtDfhNCl2UM/9VIomP2qkGIFVouSJrGr/T00EzY7bPtKA==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.41.0.tgz", + "integrity": "sha512-jnvrV6BsQWyHS2qb2fkfbfSb1R/lmYwqEZITwufuRl37apTopswu9izc0b1CYRp/34tUG/4k/V39PND6eyiNvw==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0", - "@types/mysql": "2.15.22" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "@types/mysql": "2.15.26" }, "engines": { "node": ">=14" @@ -1757,12 +1801,12 @@ } }, "node_modules/@opentelemetry/instrumentation-mysql2": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.40.0.tgz", - "integrity": "sha512-0xfS1xcqUmY7WE1uWjlmI67Xg3QsSUlNT+AcXHeA4BDUPwZtWqF4ezIwLgpVZfHOnkAEheqGfNSWd1PIu3Wnfg==", + "version": "0.41.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.41.0.tgz", + "integrity": "sha512-REQB0x+IzVTpoNgVmy5b+UnH1/mDByrneimP6sbDHkp1j8QOl1HyWOrBH/6YWR0nrbU3l825Em5PlybjT3232g==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0", + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0", "@opentelemetry/sql-common": "^0.40.1" }, "engines": { @@ -1773,12 +1817,12 @@ } }, "node_modules/@opentelemetry/instrumentation-nestjs-core": { - "version": "0.39.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.39.0.tgz", - "integrity": "sha512-mewVhEXdikyvIZoMIUry8eb8l3HUjuQjSjVbmLVTt4NQi35tkpnHQrG9bTRBrl3403LoWZ2njMPJyg4l6HfKvA==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.40.0.tgz", + "integrity": "sha512-WF1hCUed07vKmf5BzEkL0wSPinqJgH7kGzOjjMAiTGacofNXjb/y4KQ8loj2sNsh5C/NN7s1zxQuCgbWbVTGKg==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.23.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1788,15 +1832,15 @@ } }, "node_modules/@opentelemetry/instrumentation-pg": { - "version": "0.43.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.43.0.tgz", - "integrity": "sha512-og23KLyoxdnAeFs1UWqzSonuCkePUzCX30keSYigIzJe/6WSYA8rnEI5lobcxPEzg+GcU06J7jzokuEHbjVJNw==", + "version": "0.44.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.44.0.tgz", + "integrity": "sha512-oTWVyzKqXud1BYEGX1loo2o4k4vaU1elr3vPO8NZolrBtFvQ34nx4HgUaexUDuEog00qQt+MLR5gws/p+JXMLQ==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", - "@opentelemetry/semantic-conventions": "^1.22.0", + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/semantic-conventions": "^1.27.0", "@opentelemetry/sql-common": "^0.40.1", "@types/pg": "8.6.1", - "@types/pg-pool": "2.0.4" + "@types/pg-pool": "2.0.6" }, "engines": { "node": ">=14" @@ -1806,13 +1850,13 @@ } }, "node_modules/@opentelemetry/instrumentation-redis-4": { - "version": "0.41.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.41.0.tgz", - "integrity": "sha512-H7IfGTqW2reLXqput4yzAe8YpDC0fmVNal95GHMLOrS89W+qWUKIqxolSh63hJyfmwPSFwXASzj7wpSk8Az+Dg==", + "version": "0.42.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-redis-4/-/instrumentation-redis-4-0.42.0.tgz", + "integrity": "sha512-NaD+t2JNcOzX/Qa7kMy68JbmoVIV37fT/fJYzLKu2Wwd+0NCxt+K2OOsOakA8GVg8lSpFdbx4V/suzZZ2Pvdjg==", "dependencies": { - "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation": "^0.53.0", "@opentelemetry/redis-common": "^0.36.2", - "@opentelemetry/semantic-conventions": "^1.22.0" + "@opentelemetry/semantic-conventions": "^1.27.0" }, "engines": { "node": ">=14" @@ -1821,6 +1865,21 @@ "@opentelemetry/api": "^1.3.0" } }, + "node_modules/@opentelemetry/instrumentation-undici": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.6.0.tgz", + "integrity": "sha512-ABJBhm5OdhGmbh0S/fOTE4N69IZ00CsHC5ijMYfzbw3E5NwLgpQk5xsljaECrJ8wz1SfXbO03FiSuu5AyRAkvQ==", + "dependencies": { + "@opentelemetry/core": "^1.8.0", + "@opentelemetry/instrumentation": "^0.53.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.7.0" + } + }, "node_modules/@opentelemetry/redis-common": { "version": "0.36.2", "resolved": "https://registry.npmjs.org/@opentelemetry/redis-common/-/redis-common-0.36.2.tgz", @@ -1830,12 +1889,12 @@ } }, "node_modules/@opentelemetry/resources": { - "version": "1.25.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.1.tgz", - "integrity": "sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==", + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.26.0.tgz", + "integrity": "sha512-CPNYchBE7MBecCSVy0HKpUISEeJOniWqcHaAHpmasZ3j9o6V3AyBzhRc90jdmemq0HOxDr6ylhUbDhBqqPpeNw==", "dependencies": { - "@opentelemetry/core": "1.25.1", - "@opentelemetry/semantic-conventions": "1.25.1" + "@opentelemetry/core": "1.26.0", + "@opentelemetry/semantic-conventions": "1.27.0" }, "engines": { "node": ">=14" @@ -1845,13 +1904,12 @@ } }, "node_modules/@opentelemetry/sdk-metrics": { - "version": "1.25.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.25.1.tgz", - "integrity": "sha512-9Mb7q5ioFL4E4dDrc4wC/A3NTHDat44v4I3p2pLPSxRvqUbDIQyMVr9uK+EU69+HWhlET1VaSrRzwdckWqY15Q==", + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.26.0.tgz", + "integrity": "sha512-0SvDXmou/JjzSDOjUmetAAvcKQW6ZrvosU0rkbDGpXvvZN+pQF6JbK/Kd4hNdK4q/22yeruqvukXEJyySTzyTQ==", "dependencies": { - "@opentelemetry/core": "1.25.1", - "@opentelemetry/resources": "1.25.1", - "lodash.merge": "^4.6.2" + "@opentelemetry/core": "1.26.0", + "@opentelemetry/resources": "1.26.0" }, "engines": { "node": ">=14" @@ -1861,13 +1919,13 @@ } }, "node_modules/@opentelemetry/sdk-trace-base": { - "version": "1.25.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz", - "integrity": "sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==", + "version": "1.26.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.26.0.tgz", + "integrity": "sha512-olWQldtvbK4v22ymrKLbIcBi9L2SpMO84sCPY54IVsJhP9fRsxJT194C/AVaAuJzLE30EdhhM1VmvVYR7az+cw==", "dependencies": { - "@opentelemetry/core": "1.25.1", - "@opentelemetry/resources": "1.25.1", - "@opentelemetry/semantic-conventions": "1.25.1" + "@opentelemetry/core": "1.26.0", + "@opentelemetry/resources": "1.26.0", + "@opentelemetry/semantic-conventions": "1.27.0" }, "engines": { "node": ">=14" @@ -1877,9 +1935,9 @@ } }, "node_modules/@opentelemetry/semantic-conventions": { - "version": "1.25.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz", - "integrity": "sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==", + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz", + "integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==", "engines": { "node": ">=14" } @@ -1908,75 +1966,107 @@ } }, "node_modules/@prisma/instrumentation": { - "version": "5.17.0", - "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.17.0.tgz", - "integrity": "sha512-c1Sle4ji8aasMcYfBBHFM56We4ljfenVtRmS8aY06BllS7SoU6SmJBwG7vil+GHiR0Yrh+t9iBwt4AY0Jr4KNQ==", + "version": "5.19.1", + "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.19.1.tgz", + "integrity": "sha512-VLnzMQq7CWroL5AeaW0Py2huiNKeoMfCH3SUxstdzPrlWQi6UQ9UrfcbUkNHlVFqOMacqy8X/8YtE0kuKDpD9w==", "dependencies": { "@opentelemetry/api": "^1.8", "@opentelemetry/instrumentation": "^0.49 || ^0.50 || ^0.51 || ^0.52.0", "@opentelemetry/sdk-trace-base": "^1.22" } }, + "node_modules/@prisma/instrumentation/node_modules/@opentelemetry/api-logs": { + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.52.1.tgz", + "integrity": "sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==", + "dependencies": { + "@opentelemetry/api": "^1.0.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@prisma/instrumentation/node_modules/@opentelemetry/instrumentation": { + "version": "0.52.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.52.1.tgz", + "integrity": "sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==", + "dependencies": { + "@opentelemetry/api-logs": "0.52.1", + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "^1.8.1", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.2", + "shimmer": "^1.2.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.3.0" + } + }, "node_modules/@sentry/core": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.19.0.tgz", - "integrity": "sha512-MrgjsZCEjOJgQjIznnDSrLEy7qL+4LVpNieAvr49cV1rzBNSwGmWRnt/puVaPsLyCUgupVx/43BPUHB/HtKNUw==", + "version": "8.30.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.30.0.tgz", + "integrity": "sha512-CJ/FuWLw0QEKGKXGL/nm9eaOdajEcmPekLuHAuOCxID7N07R9l9laz3vFbAkUZ97GGDv3sYrJZgywfY3Moropg==", "dependencies": { - "@sentry/types": "8.19.0", - "@sentry/utils": "8.19.0" + "@sentry/types": "8.30.0", + "@sentry/utils": "8.30.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/node": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.19.0.tgz", - "integrity": "sha512-r7AeKxfB9eE/UW0NZT3AMh+hNA65NFEwtsMYO6iI52FPLFZh0DLOvzVOeNsmsJqPpyetooUGTtUYpBdinZldWA==", + "version": "8.30.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-8.30.0.tgz", + "integrity": "sha512-Tog0Ag7sU3lNj4cPUZy1KRJXyYXZlWiwlk34KYNNxAk0vDiK6W0bF8mvS+aaUukgb7FO5A0eu9l+VApdBJOr3Q==", "dependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/context-async-hooks": "^1.25.1", "@opentelemetry/core": "^1.25.1", - "@opentelemetry/instrumentation": "^0.52.1", - "@opentelemetry/instrumentation-connect": "0.38.0", - "@opentelemetry/instrumentation-express": "0.41.0", - "@opentelemetry/instrumentation-fastify": "0.38.0", - "@opentelemetry/instrumentation-graphql": "0.42.0", - "@opentelemetry/instrumentation-hapi": "0.40.0", - "@opentelemetry/instrumentation-http": "0.52.1", - "@opentelemetry/instrumentation-ioredis": "0.42.0", - "@opentelemetry/instrumentation-koa": "0.42.0", - "@opentelemetry/instrumentation-mongodb": "0.46.0", - "@opentelemetry/instrumentation-mongoose": "0.40.0", - "@opentelemetry/instrumentation-mysql": "0.40.0", - "@opentelemetry/instrumentation-mysql2": "0.40.0", - "@opentelemetry/instrumentation-nestjs-core": "0.39.0", - "@opentelemetry/instrumentation-pg": "0.43.0", - "@opentelemetry/instrumentation-redis-4": "0.41.0", - "@opentelemetry/resources": "^1.25.1", - "@opentelemetry/sdk-trace-base": "^1.25.1", - "@opentelemetry/semantic-conventions": "^1.25.1", - "@prisma/instrumentation": "5.17.0", - "@sentry/core": "8.19.0", - "@sentry/opentelemetry": "8.19.0", - "@sentry/types": "8.19.0", - "@sentry/utils": "8.19.0" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/instrumentation-connect": "0.39.0", + "@opentelemetry/instrumentation-express": "0.42.0", + "@opentelemetry/instrumentation-fastify": "0.39.0", + "@opentelemetry/instrumentation-fs": "0.15.0", + "@opentelemetry/instrumentation-generic-pool": "0.39.0", + "@opentelemetry/instrumentation-graphql": "0.43.0", + "@opentelemetry/instrumentation-hapi": "0.41.0", + "@opentelemetry/instrumentation-http": "0.53.0", + "@opentelemetry/instrumentation-ioredis": "0.43.0", + "@opentelemetry/instrumentation-kafkajs": "0.3.0", + "@opentelemetry/instrumentation-koa": "0.43.0", + "@opentelemetry/instrumentation-mongodb": "0.47.0", + "@opentelemetry/instrumentation-mongoose": "0.42.0", + "@opentelemetry/instrumentation-mysql": "0.41.0", + "@opentelemetry/instrumentation-mysql2": "0.41.0", + "@opentelemetry/instrumentation-nestjs-core": "0.40.0", + "@opentelemetry/instrumentation-pg": "0.44.0", + "@opentelemetry/instrumentation-redis-4": "0.42.0", + "@opentelemetry/instrumentation-undici": "0.6.0", + "@opentelemetry/resources": "^1.26.0", + "@opentelemetry/sdk-trace-base": "^1.26.0", + "@opentelemetry/semantic-conventions": "^1.27.0", + "@prisma/instrumentation": "5.19.1", + "@sentry/core": "8.30.0", + "@sentry/opentelemetry": "8.30.0", + "@sentry/types": "8.30.0", + "@sentry/utils": "8.30.0", + "import-in-the-middle": "^1.11.0" }, "engines": { "node": ">=14.18" - }, - "optionalDependencies": { - "opentelemetry-instrumentation-fetch-node": "1.2.3" } }, "node_modules/@sentry/opentelemetry": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.19.0.tgz", - "integrity": "sha512-L1aSxO/aJJ7D3pIlTaVOgbiZJAnUHXezobTc8j5pqFCQACjxnLMSDrt53QfFV52CcjbliDWCYe4IB8umu4DgpA==", + "version": "8.30.0", + "resolved": "https://registry.npmjs.org/@sentry/opentelemetry/-/opentelemetry-8.30.0.tgz", + "integrity": "sha512-6mCIP2zvxAiEsNEoF8kv+UUD4XGWSKJU6RY5BF1U26HLitXv1fNPtzaTR96Ehv9h0zktjLfqfpVUZ7DGkdBvLA==", "dependencies": { - "@sentry/core": "8.19.0", - "@sentry/types": "8.19.0", - "@sentry/utils": "8.19.0" + "@sentry/core": "8.30.0", + "@sentry/types": "8.30.0", + "@sentry/utils": "8.30.0" }, "engines": { "node": ">=14.18" @@ -1984,25 +2074,25 @@ "peerDependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/core": "^1.25.1", - "@opentelemetry/instrumentation": "^0.52.1", - "@opentelemetry/sdk-trace-base": "^1.25.1", - "@opentelemetry/semantic-conventions": "^1.25.1" + "@opentelemetry/instrumentation": "^0.53.0", + "@opentelemetry/sdk-trace-base": "^1.26.0", + "@opentelemetry/semantic-conventions": "^1.27.0" } }, "node_modules/@sentry/types": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.19.0.tgz", - "integrity": "sha512-52C8X5V7mK2KIxMJt8MV5TxXAFHqrQR1RKm1oPTwKVWm8hKr1ZYJXINymNrWvpAc3oVIKLC/sa9WFYgXQh+YlA==", + "version": "8.30.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.30.0.tgz", + "integrity": "sha512-kgWW2BCjBmVlSQRG32GonHEVyeDbys74xf9mLPvynwHTgw3+NUlNAlEdu05xnb2ow4bCTHfbkS5G1zRgyv5k4Q==", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.19.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.19.0.tgz", - "integrity": "sha512-8dWJJKaUN6Hf92Oxw2TBmHchGua2W3ZmonrZTTwLvl06jcAigbiQD0MGuF5ytZP8PHx860orV+SbTGKFzfU3Pg==", + "version": "8.30.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.30.0.tgz", + "integrity": "sha512-wZxU2HWlzsnu8214Xy7S7cRIuD6h8Z5DnnkojJfX0i0NLooepZQk2824el1Q13AakLb7/S8CHSHXOMnCtoSduw==", "dependencies": { - "@sentry/types": "8.19.0" + "@sentry/types": "8.30.0" }, "engines": { "node": ">=14.18" @@ -2177,9 +2267,9 @@ "dev": true }, "node_modules/@types/mysql": { - "version": "2.15.22", - "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.22.tgz", - "integrity": "sha512-wK1pzsJVVAjYCSZWQoWHziQZbNggXFDUEIGf54g4ZM/ERuP86uGdWeKZWMYlqTPMZfHJJvLPyogXGvCOg87yLQ==", + "version": "2.15.26", + "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.26.tgz", + "integrity": "sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==", "dependencies": { "@types/node": "*" } @@ -2209,9 +2299,9 @@ } }, "node_modules/@types/pg-pool": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@types/pg-pool/-/pg-pool-2.0.4.tgz", - "integrity": "sha512-qZAvkv1K3QbmHHFYSNRYPkRjOWRLBYrL4B9c+wG0GSVGBw0NtJwPcgx/DSddeDJvRGMHCEQ4VMEVfuJ/0gZ3XQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/pg-pool/-/pg-pool-2.0.6.tgz", + "integrity": "sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==", "dependencies": { "@types/pg": "*" } @@ -2223,9 +2313,9 @@ "dev": true }, "node_modules/@types/shimmer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz", - "integrity": "sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz", + "integrity": "sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==" }, "node_modules/@types/sinon": { "version": "17.0.3", @@ -2691,15 +2781,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "optional": true, - "peerDependencies": { - "acorn": "^8" - } - }, "node_modules/acorn-import-attributes": { "version": "1.9.5", "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", @@ -3369,9 +3450,9 @@ "dev": true }, "node_modules/cjs-module-lexer": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz", - "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz", + "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==" }, "node_modules/clean-stack": { "version": "2.2.0", @@ -5535,6 +5616,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -5816,9 +5898,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.8.1.tgz", - "integrity": "sha512-yhRwoHtiLGvmSozNOALgjRPFI6uYsds60EoMqqnXyyv+JOIW/BrrLejuTGBt+bq0T5tLzOHrN0T7xYTm4Qt/ng==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.0.tgz", + "integrity": "sha512-5DimNQGoe0pLUHbR9qK84iWaWjjbsxiqXnw6Qz64+azRgleqv9k2kTt5fw7QsOpmaGYtuxxursnPPsnTKEx10Q==", "dependencies": { "acorn": "^8.8.2", "acorn-import-attributes": "^1.9.5", @@ -5958,11 +6040,14 @@ } }, "node_modules/is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -7121,7 +7206,8 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/lodash.once": { "version": "4.1.1", @@ -8181,53 +8267,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/opentelemetry-instrumentation-fetch-node": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/opentelemetry-instrumentation-fetch-node/-/opentelemetry-instrumentation-fetch-node-1.2.3.tgz", - "integrity": "sha512-Qb11T7KvoCevMaSeuamcLsAD+pZnavkhDnlVL0kRozfhl42dKG5Q3anUklAFKJZjY3twLR+BnRa6DlwwkIE/+A==", - "optional": true, - "dependencies": { - "@opentelemetry/instrumentation": "^0.46.0", - "@opentelemetry/semantic-conventions": "^1.17.0" - }, - "engines": { - "node": ">18.0.0" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.6.0" - } - }, - "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/@opentelemetry/instrumentation": { - "version": "0.46.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.46.0.tgz", - "integrity": "sha512-a9TijXZZbk0vI5TGLZl+0kxyFfrXHhX6Svtz7Pp2/VBlCSKrazuULEyoJQrOknJyFWNMEmbbJgOciHCCpQcisw==", - "optional": true, - "dependencies": { - "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.1", - "require-in-the-middle": "^7.1.1", - "semver": "^7.5.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/import-in-the-middle": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", - "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", - "optional": true, - "dependencies": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - } - }, "node_modules/optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -8608,9 +8647,9 @@ } }, "node_modules/pg-protocol": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz", - "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.7.0.tgz", + "integrity": "sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==" }, "node_modules/pg-types": { "version": "2.2.0", @@ -9118,18 +9157,39 @@ } }, "node_modules/require-in-the-middle": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.3.0.tgz", - "integrity": "sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.4.0.tgz", + "integrity": "sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ==", "dependencies": { - "debug": "^4.1.1", + "debug": "^4.3.5", "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" + "resolve": "^1.22.8" }, "engines": { "node": ">=8.6.0" } }, + "node_modules/require-in-the-middle/node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/require-in-the-middle/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -9137,11 +9197,11 @@ "dev": true }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, diff --git a/package.json b/package.json index 23829c48..2387eb64 100644 --- a/package.json +++ b/package.json @@ -213,7 +213,7 @@ }, "dependencies": { "@onflow/cadence-parser": "^1.0.0-preview.50", - "@sentry/node": "^8.19.0", + "@sentry/node": "^8.30.0", "@vscode/vsce": "^2.31.1", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", From 03cd4b05d3961d26daa2b91d1be6dcc1543ebe1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:30:04 -0700 Subject: [PATCH 95/97] Bump @types/node from 20.14.11 to 22.5.5 (#683) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 783e05dc..d9e0100d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "@types/lodash": "^4.17.7", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.14.11", + "@types/node": "^22.5.5", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", @@ -2275,11 +2275,11 @@ } }, "node_modules/@types/node": { - "version": "20.14.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz", - "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==", + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "node_modules/@types/object-hash": { @@ -10489,9 +10489,9 @@ "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" }, "node_modules/update-browserslist-db": { "version": "1.0.16", diff --git a/package.json b/package.json index 2387eb64..9b95ebee 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "@types/lodash": "^4.17.7", "@types/mixpanel": "^2.14.9", "@types/mocha": "^10.0.6", - "@types/node": "^20.14.11", + "@types/node": "^22.5.5", "@types/object-hash": "^3.0.6", "@types/semver": "^7.5.8", "@types/sinon": "^17.0.3", From 2c9e483518ea338a825f5103b00bcf4e0fe5b072 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:30:30 -0700 Subject: [PATCH 96/97] Bump @types/chai from 4.3.16 to 4.3.19 (#677) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d9e0100d..afa1df12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "vscode-languageclient": "^9.0.1" }, "devDependencies": { - "@types/chai": "^4.3.16", + "@types/chai": "^4.3.19", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.7", @@ -2173,9 +2173,9 @@ "dev": true }, "node_modules/@types/chai": { - "version": "4.3.16", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", - "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", + "version": "4.3.19", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.19.tgz", + "integrity": "sha512-2hHHvQBVE2FiSK4eN0Br6snX9MtolHaTo/batnLjlGRhoQzlCL61iVpxoqO7SfFyOw+P/pwv+0zNHzKoGWz9Cw==", "dev": true }, "node_modules/@types/connect": { diff --git a/package.json b/package.json index 9b95ebee..ff7f9054 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ ] }, "devDependencies": { - "@types/chai": "^4.3.16", + "@types/chai": "^4.3.19", "@types/expect": "^24.3.0", "@types/glob": "^8.0.1", "@types/lodash": "^4.17.7", From d7fda1f961f64e0a58a9778258db8eddbdfc61f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:30:40 -0700 Subject: [PATCH 97/97] Bump @vscode/vsce from 2.31.1 to 3.1.0 (#680) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 208 +++++++++++++++++++++++++++++++++++++--------- package.json | 2 +- 2 files changed, 168 insertions(+), 42 deletions(-) diff --git a/package-lock.json b/package-lock.json index afa1df12..c56ab1fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "cadence", - "version": "2.3.5", + "version": "2.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cadence", - "version": "2.3.5", + "version": "2.4.0", "dependencies": { "@onflow/cadence-parser": "^1.0.0-preview.50", "@sentry/node": "^8.30.0", - "@vscode/vsce": "^2.31.1", + "@vscode/vsce": "^3.1.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1", @@ -2594,9 +2594,9 @@ } }, "node_modules/@vscode/vsce": { - "version": "2.31.1", - "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.31.1.tgz", - "integrity": "sha512-LwEQFKXV21C4/brvGPH/9+7ZOUM5cbK7oJ4fVmy0YG75NIy1HV8eMSoBZrl+u23NxpAhor62Cu1aI+JFtCtjSg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.1.0.tgz", + "integrity": "sha512-fwdfp1Ol+bZtlSGkpcd/nztfo6+SVsTOMWjZ/+a88lVtUn7gXNbSu7dbniecl5mz4vINl+oaVDVtVdGbJDApmw==", "dependencies": { "@azure/identity": "^4.1.0", "@vscode/vsce-sign": "^2.0.0", @@ -2610,7 +2610,7 @@ "hosted-git-info": "^4.0.2", "jsonc-parser": "^3.2.0", "leven": "^3.1.0", - "markdown-it": "^12.3.2", + "markdown-it": "^14.1.0", "mime": "^1.3.4", "minimatch": "^3.0.3", "parse-semver": "^1.1.1", @@ -2627,7 +2627,7 @@ "vsce": "vsce" }, "engines": { - "node": ">= 16" + "node": ">= 20" }, "optionalDependencies": { "keytar": "^7.7.0" @@ -2758,18 +2758,6 @@ "win32" ] }, - "node_modules/@vscode/vsce/node_modules/xml2js": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", - "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", - "dependencies": { - "sax": ">=0.6.0", - "xmlbuilder": "~11.0.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/acorn": { "version": "8.11.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", @@ -7122,11 +7110,11 @@ } }, "node_modules/linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dependencies": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "node_modules/load-json-file": { @@ -7374,18 +7362,19 @@ "dev": true }, "node_modules/markdown-it": { - "version": "12.3.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", - "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "dependencies": { "argparse": "^2.0.1", - "entities": "~2.1.0", - "linkify-it": "^3.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" }, "bin": { - "markdown-it": "bin/markdown-it.js" + "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/markdown-it/node_modules/argparse": { @@ -7394,17 +7383,20 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/markdown-it/node_modules/entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==" }, "node_modules/merge-stream": { "version": "2.0.0", @@ -8421,6 +8413,120 @@ "node": ">= 16" } }, + "node_modules/ovsx/node_modules/@vscode/vsce": { + "version": "2.32.0", + "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.32.0.tgz", + "integrity": "sha512-3EFJfsgrSftIqt3EtdRcAygy/OJ3hstyI1cDmIgkU9CFZW5C+3djr6mfosndCUqcVYuyjmxOK1xmFp/Bq7+NIg==", + "dev": true, + "dependencies": { + "@azure/identity": "^4.1.0", + "@vscode/vsce-sign": "^2.0.0", + "azure-devops-node-api": "^12.5.0", + "chalk": "^2.4.2", + "cheerio": "^1.0.0-rc.9", + "cockatiel": "^3.1.2", + "commander": "^6.2.1", + "form-data": "^4.0.0", + "glob": "^7.0.6", + "hosted-git-info": "^4.0.2", + "jsonc-parser": "^3.2.0", + "leven": "^3.1.0", + "markdown-it": "^12.3.2", + "mime": "^1.3.4", + "minimatch": "^3.0.3", + "parse-semver": "^1.1.1", + "read": "^1.0.7", + "semver": "^7.5.2", + "tmp": "^0.2.1", + "typed-rest-client": "^1.8.4", + "url-join": "^4.0.1", + "xml2js": "^0.5.0", + "yauzl": "^2.3.1", + "yazl": "^2.2.2" + }, + "bin": { + "vsce": "vsce" + }, + "engines": { + "node": ">= 16" + }, + "optionalDependencies": { + "keytar": "^7.7.0" + } + }, + "node_modules/ovsx/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/ovsx/node_modules/entities": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "dev": true, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/ovsx/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/ovsx/node_modules/linkify-it": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", + "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", + "dev": true, + "dependencies": { + "uc.micro": "^1.0.1" + } + }, + "node_modules/ovsx/node_modules/markdown-it": { + "version": "12.3.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", + "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1", + "entities": "~2.1.0", + "linkify-it": "^3.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "bin": { + "markdown-it": "bin/markdown-it.js" + } + }, + "node_modules/ovsx/node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "dev": true + }, + "node_modules/ovsx/node_modules/uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "dev": true + }, "node_modules/p-limit": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", @@ -8999,6 +9105,14 @@ "node": ">=6" } }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "engines": { + "node": ">=6" + } + }, "node_modules/qs": { "version": "6.12.1", "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz", @@ -10464,9 +10578,9 @@ } }, "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==" }, "node_modules/unbox-primitive": { "version": "1.0.2", @@ -10863,6 +10977,18 @@ "node": ">=8" } }, + "node_modules/xml2js": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/xmlbuilder": { "version": "11.0.1", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", diff --git a/package.json b/package.json index ff7f9054..879f1191 100644 --- a/package.json +++ b/package.json @@ -214,7 +214,7 @@ "dependencies": { "@onflow/cadence-parser": "^1.0.0-preview.50", "@sentry/node": "^8.30.0", - "@vscode/vsce": "^2.31.1", + "@vscode/vsce": "^3.1.0", "ansi-regex": "^6.0.1", "async-lock": "^1.4.1", "crypto": "^1.0.1",