@contember/cli 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/cli",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "license": "Apache-2.0",
   "bin": {
     "contember": "./dist/production/run.js"
@@ -20,18 +20,18 @@
     "tailwindcss": "^3.4.14"
   },
   "dependencies": {
-    "@contember/cli-common": "2.0.1",
-    "@contember/config-loader": "2.0.1",
-    "@contember/database": "2.0.1",
-    "@contember/dic": "2.0.1",
-    "@contember/engine-common": "2.0.1",
-    "@contember/engine-content-api": "2.0.1",
-    "@contember/graphql-client": "2.0.1",
-    "@contember/migrations-client": "2.0.1",
-    "@contember/schema": "2.0.1",
-    "@contember/schema-migrations": "2.0.1",
-    "@contember/schema-utils": "2.0.1",
-    "@contember/typesafe": "2.0.1",
+    "@contember/cli-common": "2.0.3",
+    "@contember/config-loader": "2.0.3",
+    "@contember/database": "2.0.3",
+    "@contember/dic": "2.0.3",
+    "@contember/engine-common": "2.0.3",
+    "@contember/engine-content-api": "2.0.3",
+    "@contember/graphql-client": "2.0.3",
+    "@contember/migrations-client": "2.0.3",
+    "@contember/schema": "2.0.3",
+    "@contember/schema-migrations": "2.0.3",
+    "@contember/schema-utils": "2.0.3",
+    "@contember/typesafe": "2.0.3",
     "@graphql-tools/schema": "^10.0.7",
     "chalk": "^5.3.0",
     "chalk-table": "^1.0.2",

package/src/commands/deploy/DeployCommand.ts

@@ -10,7 +10,7 @@ import { RemoteProjectProvider } from '../../lib/project/RemoteProjectProvider'
 import { RemoteProjectResolver } from '../../lib/project/RemoteProjectResolver'
 
 type Args = {
-	dsn: string
+	dsn?: string
 }
 
 type Options = {
@@ -35,7 +35,7 @@ export class DeployCommand extends Command<Args, Options> {
 
 	protected configure(configuration: CommandConfiguration<Args, Options>): void {
 		configuration.description('Deploy Contember project')
-		configuration.argument('dsn')
+		configuration.argument('dsn').optional()
 
 		configuration.option('admin').valueRequired()
 		configuration.option('root').valueNone()

package/src/lib/VersionChecker.ts

@@ -46,17 +46,13 @@ export class VersionChecker {
 				if (!def.image) {
 					continue
 				}
-				const [image, version] = def.image.split(':')
-				if (!version || !contemberDockerImages.includes(image)) {
+				const [image, tag] = def.image.split(':')
+				if (!tag || !contemberDockerImages.includes(image)) {
 					continue
 				}
-				const versionParts = version.split(/[.-]/)
-				if (versionParts[versionParts.length - 1] === 'debian') {
-					versionParts.pop()
-				}
-				const cliVersionParts = cliVersion.split(/[.-]/).slice(0, versionParts.length)
-				if (versionParts.join('.') !== cliVersionParts.join('.')) {
-					errors.push(`Docker service ${name} with image ${image}:${version} does not match version of CLI ${cliVersion}.`)
+
+				if (extractVersion(tag) !== cliVersion) {
+					errors.push(`Docker service ${name} with image ${image}:${tag} does not match version of CLI ${cliVersion}.`)
 				}
 			}
 		}
@@ -69,3 +65,11 @@ Please make sure all dependencies are up to date.\nIf you are really certain abo
 	}
 
 }
+
+
+const extractVersion = (tag: string) => {
+	// e.g.
+	// 2.1.0-alpha.15-foo-bar => 2.1.0-alpha.15
+	// 2.1.0-debian => 2.1.0
+	return tag.match(/^\d+\.\d+\.\d+(-\w+\.\d+)?/)?.[0] ?? tag
+}