@contember/cli 2.0.2 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contember/cli",
3
- "version": "2.0.2",
3
+ "version": "2.0.4",
4
4
  "license": "Apache-2.0",
5
5
  "bin": {
6
6
  "contember": "./dist/production/run.js"
@@ -20,18 +20,18 @@
20
20
  "tailwindcss": "^3.4.14"
21
21
  },
22
22
  "dependencies": {
23
- "@contember/cli-common": "2.0.2",
24
- "@contember/config-loader": "2.0.2",
25
- "@contember/database": "2.0.2",
26
- "@contember/dic": "2.0.2",
27
- "@contember/engine-common": "2.0.2",
28
- "@contember/engine-content-api": "2.0.2",
29
- "@contember/graphql-client": "2.0.2",
30
- "@contember/migrations-client": "2.0.2",
31
- "@contember/schema": "2.0.2",
32
- "@contember/schema-migrations": "2.0.2",
33
- "@contember/schema-utils": "2.0.2",
34
- "@contember/typesafe": "2.0.2",
23
+ "@contember/cli-common": "2.0.4",
24
+ "@contember/config-loader": "2.0.4",
25
+ "@contember/database": "2.0.4",
26
+ "@contember/dic": "2.0.4",
27
+ "@contember/engine-common": "2.0.4",
28
+ "@contember/engine-content-api": "2.0.4",
29
+ "@contember/graphql-client": "2.0.4",
30
+ "@contember/migrations-client": "2.0.4",
31
+ "@contember/schema": "2.0.4",
32
+ "@contember/schema-migrations": "2.0.4",
33
+ "@contember/schema-utils": "2.0.4",
34
+ "@contember/typesafe": "2.0.4",
35
35
  "@graphql-tools/schema": "^10.0.7",
36
36
  "chalk": "^5.3.0",
37
37
  "chalk-table": "^1.0.2",
@@ -46,17 +46,13 @@ export class VersionChecker {
46
46
  if (!def.image) {
47
47
  continue
48
48
  }
49
- const [image, version] = def.image.split(':')
50
- if (!version || !contemberDockerImages.includes(image)) {
49
+ const [image, tag] = def.image.split(':')
50
+ if (!tag || !contemberDockerImages.includes(image)) {
51
51
  continue
52
52
  }
53
- const versionParts = version.split(/[.-]/)
54
- if (versionParts[versionParts.length - 1] === 'debian') {
55
- versionParts.pop()
56
- }
57
- const cliVersionParts = cliVersion.split(/[.-]/).slice(0, versionParts.length)
58
- if (versionParts.join('.') !== cliVersionParts.join('.')) {
59
- errors.push(`Docker service ${name} with image ${image}:${version} does not match version of CLI ${cliVersion}.`)
53
+
54
+ if (extractVersion(tag) !== cliVersion) {
55
+ errors.push(`Docker service ${name} with image ${image}:${tag} does not match version of CLI ${cliVersion}.`)
60
56
  }
61
57
  }
62
58
  }
@@ -69,3 +65,11 @@ Please make sure all dependencies are up to date.\nIf you are really certain abo
69
65
  }
70
66
 
71
67
  }
68
+
69
+
70
+ const extractVersion = (tag: string) => {
71
+ // e.g.
72
+ // 2.1.0-alpha.15-foo-bar => 2.1.0-alpha.15
73
+ // 2.1.0-debian => 2.1.0
74
+ return tag.match(/^\d+\.\d+\.\d+(-\w+\.\d+)?/)?.[0] ?? tag
75
+ }