@dotcom-tool-kit/base 2.1.0-beta.1 → 2.1.0-beta.2
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/CHANGELOG.md +2 -0
- package/lib/base.js +2 -2
- package/package.json +4 -4
- package/src/base.ts +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -76,7 +76,9 @@
|
|
|
76
76
|
|
|
77
77
|
### Bug Fixes
|
|
78
78
|
|
|
79
|
+
* consider prereleases of base as compatible ([eb508b1](https://github.com/Financial-Times/dotcom-tool-kit/commit/eb508b1c76f8201478277c487c14e15e097d94ab))
|
|
79
80
|
* it's not a conflict if there's only one child installation lol ([afa7863](https://github.com/Financial-Times/dotcom-tool-kit/commit/afa7863554744a65887507e9fea52b203fbb8cbb))
|
|
81
|
+
* make base's incompatibility error more accurate ([82610b0](https://github.com/Financial-Times/dotcom-tool-kit/commit/82610b0459ccab9ba04e0f0fa7972c9970d5acc2))
|
|
80
82
|
|
|
81
83
|
|
|
82
84
|
### Dependencies
|
package/lib/base.js
CHANGED
|
@@ -37,12 +37,12 @@ class Base {
|
|
|
37
37
|
// this lets e.g. a CLI that includes types@2.2.0 load any plugin
|
|
38
38
|
// that depends on any higher minor version of types.
|
|
39
39
|
const range = `^${this.version}`;
|
|
40
|
-
if (semver_1.default.satisfies(objectToCheck.version, range)) {
|
|
40
|
+
if (semver_1.default.satisfies(objectToCheck.version, range, { includePrerelease: true })) {
|
|
41
41
|
return (0, validated_1.valid)(objectToCheck);
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
44
|
return (0, validated_1.invalid)([
|
|
45
|
-
`object is from
|
|
45
|
+
`object is from version ${logger_1.styles.heading(objectToCheck.version)} of ${logger_1.styles.plugin('@dotcom-tool-kit/base')} which is incompatible with ${logger_1.styles.plugin('dotcom-tool-kit')}'s ${logger_1.styles.heading(range)}.`
|
|
46
46
|
]);
|
|
47
47
|
}
|
|
48
48
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dotcom-tool-kit/base",
|
|
3
|
-
"version": "2.1.0-beta.
|
|
3
|
+
"version": "2.1.0-beta.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib",
|
|
6
6
|
"scripts": {
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"author": "",
|
|
11
11
|
"license": "ISC",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@dotcom-tool-kit/conflict": "^2.0.1-beta.
|
|
13
|
+
"@dotcom-tool-kit/conflict": "^2.0.1-beta.2",
|
|
14
14
|
"@dotcom-tool-kit/logger": "^5.0.0",
|
|
15
15
|
"@dotcom-tool-kit/telemetry": "^1.0.0",
|
|
16
16
|
"@dotcom-tool-kit/validated": "^2.0.0",
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
"winston": "^3.17.0"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@dotcom-tool-kit/config": "^2.0.1-beta.
|
|
22
|
-
"@dotcom-tool-kit/plugin": "^2.1.0-beta.
|
|
21
|
+
"@dotcom-tool-kit/config": "^2.0.1-beta.2",
|
|
22
|
+
"@dotcom-tool-kit/plugin": "^2.1.0-beta.2",
|
|
23
23
|
"type-fest": "^4.41.0",
|
|
24
24
|
"winston": "^3.17.0",
|
|
25
25
|
"zod": "^3.24.4"
|
package/src/base.ts
CHANGED
|
@@ -45,13 +45,13 @@ export abstract class Base {
|
|
|
45
45
|
// this lets e.g. a CLI that includes types@2.2.0 load any plugin
|
|
46
46
|
// that depends on any higher minor version of types.
|
|
47
47
|
const range = `^${this.version}`
|
|
48
|
-
if (semver.satisfies(objectToCheck.version, range)) {
|
|
48
|
+
if (semver.satisfies(objectToCheck.version, range, { includePrerelease: true })) {
|
|
49
49
|
return valid(objectToCheck as T)
|
|
50
50
|
} else {
|
|
51
51
|
return invalid([
|
|
52
|
-
`object is from
|
|
52
|
+
`object is from version ${s.heading(objectToCheck.version)} of ${s.plugin(
|
|
53
53
|
'@dotcom-tool-kit/base'
|
|
54
|
-
)}
|
|
54
|
+
)} which is incompatible with ${s.plugin('dotcom-tool-kit')}'s ${s.heading(range)}.`
|
|
55
55
|
])
|
|
56
56
|
}
|
|
57
57
|
}
|