[pull] master from botpress:master

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botpress/cli",
-  "version": "4.14.6",
+  "version": "4.15.0",
   "description": "Botpress CLI",
   "scripts": {
     "build": "pnpm run bundle && pnpm run template:gen",

packages/cli/src/api/client.ts

@@ -1,9 +1,10 @@
 import * as client from '@botpress/client'
+import semver from 'semver'
 import yn from 'yn'
+import * as errors from '../errors'
 import type { Logger } from '../logger'
 import { formatPackageRef, ApiPackageRef, NamePackageRef } from '../package-ref'
 import * as utils from '../utils'
-import { findPreviousIntegrationVersion } from './find-previous-version'
 import * as paging from './paging'
 import * as retry from './retry'
 
@@ -279,11 +280,14 @@ export class ApiClient {
   public listAllPages = paging.listAllPages
 
   public async findPreviousIntegrationVersion(ref: NamePackageRef): Promise<PublicOrPrivateIntegration | undefined> {
-    const previous = await findPreviousIntegrationVersion(this.client, ref)
-    if (!previous) {
-      return
+    const isValidSemverVersion = semver.valid(ref.version)
+
+    // Sanity check (this should never happen):
+    if (!isValidSemverVersion) {
+      throw new errors.BotpressCLIError(`Invalid version "${ref.version}" for integration "${ref.name}"`)
     }
-    return this.findPublicOrPrivateIntegration({ type: 'id', id: previous.id })
+
+    return this.findPublicOrPrivateIntegration({ ...ref, version: `<${ref.version}` })
   }
 
   public async findBotByName(name: string): Promise<BotSummary | undefined> {

packages/cli/src/package-ref.test.ts

@@ -19,8 +19,8 @@ describe('parsePackageRef', () => {
   test('parse with invalid version should return undefined', () => {
     // arrange
     const ref0 = `${name}@lol`
-    const ref1 = `${name}@1`
-    const ref2 = `${name}@1.0`
+    const ref1 = `${name}@>>1`
+    const ref2 = `${name}@1.0.b`
     // act
     const result0 = parsePackageRef(ref0)
     const result1 = parsePackageRef(ref1)

packages/cli/src/package-ref.ts

@@ -90,7 +90,7 @@ const parseNamePackageRef = (ref: string): NamePackageRef | undefined => {
     return
   }
 
-  const cleanedVersion = version === LATEST_TAG ? version : semver.clean(version)
+  const cleanedVersion = version === LATEST_TAG ? version : semver.validRange(version)
   if (!cleanedVersion) {
     return
   }