dotcom-tool-kit 4.0.0 → 4.0.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/lib/config.d.ts.map +1 -1
- package/lib/config.js +3 -6
- package/package.json +3 -3
package/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAUrC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAiBpF,eAAO,MAAM,YAAY,QAAO,SAgB9B,CAAA;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAUrC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAiBpF,eAAO,MAAM,YAAY,QAAO,SAgB9B,CAAA;AAEF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CA6FtE;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAC/F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA"}
|
package/lib/config.js
CHANGED
|
@@ -35,9 +35,6 @@ function validateConfig(config) {
|
|
|
35
35
|
const taskConflicts = (0, conflict_1.findConflictingEntries)(config.tasks);
|
|
36
36
|
const pluginOptionConflicts = (0, conflict_1.findConflicts)(Object.values(config.pluginOptions));
|
|
37
37
|
const taskOptionConflicts = (0, conflict_1.findConflicts)(Object.values(config.taskOptions));
|
|
38
|
-
const definedCommandTaskConflicts = commandTaskConflicts.filter((conflict) => {
|
|
39
|
-
return conflict.conflicting[0].id in config.hooks;
|
|
40
|
-
});
|
|
41
38
|
let shouldThrow = false;
|
|
42
39
|
const error = new error_1.ToolKitConflictError('There are problems with your Tool Kit configuration.', commandTaskConflicts.map((conflict) => ({
|
|
43
40
|
command: conflict.conflicting[0].id,
|
|
@@ -45,7 +42,7 @@ function validateConfig(config) {
|
|
|
45
42
|
})));
|
|
46
43
|
error.details = '';
|
|
47
44
|
if (hookConflicts.length > 0 ||
|
|
48
|
-
|
|
45
|
+
commandTaskConflicts.length > 0 ||
|
|
49
46
|
taskConflicts.length > 0 ||
|
|
50
47
|
pluginOptionConflicts.length > 0 ||
|
|
51
48
|
taskOptionConflicts.length > 0) {
|
|
@@ -53,8 +50,8 @@ function validateConfig(config) {
|
|
|
53
50
|
if (hookConflicts.length) {
|
|
54
51
|
error.details += (0, messages_1.formatHookConflicts)(hookConflicts);
|
|
55
52
|
}
|
|
56
|
-
if (
|
|
57
|
-
error.details += (0, messages_1.formatCommandTaskConflicts)(
|
|
53
|
+
if (commandTaskConflicts.length) {
|
|
54
|
+
error.details += (0, messages_1.formatCommandTaskConflicts)(commandTaskConflicts);
|
|
58
55
|
}
|
|
59
56
|
if (taskConflicts.length) {
|
|
60
57
|
error.details += (0, messages_1.formatTaskConflicts)(taskConflicts);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dotcom-tool-kit",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"description": "modern, maintainable, modular developer tooling for FT.com projects",
|
|
5
5
|
"author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@dotcom-tool-kit/base": "^1.0.0",
|
|
34
|
-
"@dotcom-tool-kit/config": "^1.0.
|
|
34
|
+
"@dotcom-tool-kit/config": "^1.0.1",
|
|
35
35
|
"@dotcom-tool-kit/conflict": "^1.0.0",
|
|
36
36
|
"@dotcom-tool-kit/error": "^4.0.0",
|
|
37
37
|
"@dotcom-tool-kit/logger": "^4.0.0",
|
|
38
|
-
"@dotcom-tool-kit/options": "^4.0.
|
|
38
|
+
"@dotcom-tool-kit/options": "^4.0.1",
|
|
39
39
|
"@dotcom-tool-kit/plugin": "^1.0.0",
|
|
40
40
|
"@dotcom-tool-kit/validated": "^1.0.0",
|
|
41
41
|
"@dotcom-tool-kit/wait-for-ok": "^4.0.0",
|