@dotcom-tool-kit/conflict 2.0.0-beta.0 → 2.0.1-beta.1
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 +41 -0
- package/lib/index.js +4 -5
- package/package.json +6 -3
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
### Dependencies
|
|
4
|
+
|
|
5
|
+
* The following workspace dependencies were updated
|
|
6
|
+
* dependencies
|
|
7
|
+
* @dotcom-tool-kit/plugin bumped from ^1.0.0 to ^1.1.0
|
|
8
|
+
|
|
9
|
+
## [2.0.1](https://github.com/Financial-Times/dotcom-tool-kit/compare/conflict-v2.0.0...conflict-v2.0.1) (2026-01-13)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Dependencies
|
|
13
|
+
|
|
14
|
+
* The following workspace dependencies were updated
|
|
15
|
+
* dependencies
|
|
16
|
+
* @dotcom-tool-kit/plugin bumped from ^2.0.0 to ^2.1.0
|
|
17
|
+
|
|
18
|
+
## [2.0.0](https://github.com/Financial-Times/dotcom-tool-kit/compare/conflict-v1.0.1...conflict-v2.0.0) (2025-10-28)
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### ⚠ BREAKING CHANGES
|
|
22
|
+
|
|
23
|
+
* declare Node engines in all libraries
|
|
24
|
+
|
|
25
|
+
### Features
|
|
26
|
+
|
|
27
|
+
* declare Node engines in all libraries ([648d4d0](https://github.com/Financial-Times/dotcom-tool-kit/commit/648d4d0267d329655056ad38614b6659c80f5409))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
### Dependencies
|
|
31
|
+
|
|
32
|
+
* The following workspace dependencies were updated
|
|
33
|
+
* dependencies
|
|
34
|
+
* @dotcom-tool-kit/plugin bumped from ^1.1.0 to ^2.0.0
|
|
35
|
+
|
|
36
|
+
## 1.0.0 (2024-09-10)
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
### Features
|
|
40
|
+
|
|
41
|
+
* move conflict into its own package ([8ab46a0](https://github.com/Financial-Times/dotcom-tool-kit/commit/8ab46a06370d32fd19300fd6a58a775e04a96717))
|
package/lib/index.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isConflict = isConflict;
|
|
4
|
+
exports.findConflictingEntries = findConflictingEntries;
|
|
5
|
+
exports.findConflicts = findConflicts;
|
|
6
|
+
exports.withoutConflicts = withoutConflicts;
|
|
4
7
|
function isConflict(thing) {
|
|
5
8
|
return Boolean(thing.conflicting);
|
|
6
9
|
}
|
|
7
|
-
exports.isConflict = isConflict;
|
|
8
10
|
function findConflictingEntries(items) {
|
|
9
11
|
return Object.entries(items).filter((entry) => isConflict(entry[1]));
|
|
10
12
|
}
|
|
11
|
-
exports.findConflictingEntries = findConflictingEntries;
|
|
12
13
|
function findConflicts(items) {
|
|
13
14
|
const conflicts = [];
|
|
14
15
|
for (const item of items) {
|
|
@@ -18,7 +19,6 @@ function findConflicts(items) {
|
|
|
18
19
|
}
|
|
19
20
|
return conflicts;
|
|
20
21
|
}
|
|
21
|
-
exports.findConflicts = findConflicts;
|
|
22
22
|
function withoutConflicts(items) {
|
|
23
23
|
const nonConflicts = [];
|
|
24
24
|
for (const item of items) {
|
|
@@ -28,4 +28,3 @@ function withoutConflicts(items) {
|
|
|
28
28
|
}
|
|
29
29
|
return nonConflicts;
|
|
30
30
|
}
|
|
31
|
-
exports.withoutConflicts = withoutConflicts;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dotcom-tool-kit/conflict",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.1-beta.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib",
|
|
6
6
|
"scripts": {
|
|
@@ -10,6 +10,9 @@
|
|
|
10
10
|
"author": "",
|
|
11
11
|
"license": "ISC",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@dotcom-tool-kit/plugin": "2.
|
|
13
|
+
"@dotcom-tool-kit/plugin": "^2.1.0-beta.1"
|
|
14
|
+
},
|
|
15
|
+
"engines": {
|
|
16
|
+
"node": ">=20.x"
|
|
14
17
|
}
|
|
15
|
-
}
|
|
18
|
+
}
|