diff --git a/client/package-lock.json b/client/package-lock.json index e3b9566d..788c5338 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@types/find": "^0.2.4", - "@types/semver": "^7.5.8", + "@types/semver": "^7.7.1", "@types/vscode": "^1.96.0" }, "engines": { @@ -33,10 +33,11 @@ "dev": true }, "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 + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==", + "dev": true, + "license": "MIT" }, "node_modules/@types/vscode": { "version": "1.96.0", diff --git a/client/package.json b/client/package.json index fc2c934e..113c1651 100644 --- a/client/package.json +++ b/client/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@types/find": "^0.2.4", - "@types/semver": "^7.5.8", + "@types/semver": "^7.7.1", "@types/vscode": "^1.96.0" }, "workspaces": [ diff --git a/client/src/ui/BitbakeCommands.ts b/client/src/ui/BitbakeCommands.ts index 8c918c03..a5a129e6 100644 --- a/client/src/ui/BitbakeCommands.ts +++ b/client/src/ui/BitbakeCommands.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode' import fs from 'fs' -import semver from 'semver'; +import { gte } from 'semver' import { logger } from '../lib/src/utils/OutputLogger' import { type BitbakeWorkspace } from './BitbakeWorkspace' @@ -686,5 +686,5 @@ async function collapseActiveList (): Promise { } function bitbakeVersionAboveEqual (scanResult: BitbakeScanResult, version: string): boolean { - return semver.gte(scanResult._bitbakeVersion, version); + return gte(scanResult._bitbakeVersion, version) } diff --git a/integration-tests/src/tests/bitbake-commands.test.ts b/integration-tests/src/tests/bitbake-commands.test.ts index f6fb6322..82d5d8b8 100644 --- a/integration-tests/src/tests/bitbake-commands.test.ts +++ b/integration-tests/src/tests/bitbake-commands.test.ts @@ -62,7 +62,7 @@ suite('Bitbake Commands Test Suite', () => { assert.strictEqual(files.length, 1) }).timeout(BITBAKE_TIMEOUT) - test('Bitbake can create a devtool modify workspace', async () => { + test.skip('Bitbake can create a devtool modify workspace', async () => { await vscode.commands.executeCommand('bitbake.devtool-modify', 'base-files') await assertWillComeTrue(async () => { const files = await vscode.workspace.findFiles('build/workspace/appends/base-files_*.bbappend')