From 618f7840da8a666c92a34b79f6fad23961dd57d7 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Mon, 24 Apr 2023 16:29:19 -0500 Subject: [PATCH] always use * as for semver imports The imported names are very short, so it is helpful to always include semver. --- src/ble/sagas.ts | 6 +++--- src/utils/version.test.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ble/sagas.ts b/src/ble/sagas.ts index 82b1b4cd..3b7a7348 100644 --- a/src/ble/sagas.ts +++ b/src/ble/sagas.ts @@ -8,7 +8,7 @@ import { firmwareVersion } from '@pybricks/firmware'; import { Task, buffers, eventChannel } from 'redux-saga'; -import { lt, satisfies } from 'semver'; +import * as semver from 'semver'; import { call, cancel, @@ -229,7 +229,7 @@ function* handleBleConnectPybricks(): Generator { // notify user if old firmware if ( - lt( + semver.lt( pythonVersionToSemver(firmwareRevision), pythonVersionToSemver(firmwareVersion), ) @@ -346,7 +346,7 @@ function* handleBleConnectPybricks(): Generator { ); // hub capabilities characteristic was introduced in Pybricks Profile v1.2.0 - if (satisfies(softwareRevision, '^1.2.0')) { + if (semver.satisfies(softwareRevision, '^1.2.0')) { const pybricksHubCapabilitiesChar = yield* call(() => pybricksService.getCharacteristic( pybricksHubCapabilitiesCharacteristicUUID, diff --git a/src/utils/version.test.ts b/src/utils/version.test.ts index f5f62bef..89fe04e9 100644 --- a/src/utils/version.test.ts +++ b/src/utils/version.test.ts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT -// Copyright (c) 2021-2022 The Pybricks Authors +// Copyright (c) 2021-2023 The Pybricks Authors -import { lt } from 'semver'; +import * as semver from 'semver'; import { pythonVersionToSemver } from './version'; describe('pythonVersionToSemver', () => { @@ -21,7 +21,7 @@ describe('pythonVersionToSemver', () => { ['v1.0.0c1', 'v1.0.0'], ])('%s < %s', (first, second) => { expect( - lt(pythonVersionToSemver(first), pythonVersionToSemver(second)), + semver.lt(pythonVersionToSemver(first), pythonVersionToSemver(second)), ).toBeTruthy(); });