syncpack 6.1.0 → 6.2.0
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.
|
@@ -7,7 +7,9 @@ var get_workspace_version_1 = require("./get-workspace-version");
|
|
|
7
7
|
function getExpectedVersion(name, versionGroup, input) {
|
|
8
8
|
return ((0, get_pinned_version_1.getPinnedVersion)(versionGroup) ||
|
|
9
9
|
(0, get_workspace_version_1.getWorkspaceVersion)(name, input.wrappers) ||
|
|
10
|
-
(0, get_highest_version_1.getHighestVersion)(versionGroup.instances
|
|
10
|
+
(0, get_highest_version_1.getHighestVersion)(versionGroup.instances
|
|
11
|
+
.filter(function (instance) { return instance.name === name; })
|
|
12
|
+
.map(function (_a) {
|
|
11
13
|
var version = _a.version;
|
|
12
14
|
return version;
|
|
13
15
|
})));
|
|
@@ -20,20 +20,24 @@ function listMismatches(input) {
|
|
|
20
20
|
*/
|
|
21
21
|
input.instances.versionGroups.reverse().forEach(function (versionGroup, i) {
|
|
22
22
|
var isVersionGroup = i > 0;
|
|
23
|
-
var groups = (0, list_version_groups_1.listVersionGroups)(versionGroup)
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
var groups = (0, list_version_groups_1.listVersionGroups)(versionGroup).filter(function (_a) {
|
|
24
|
+
var hasMismatches = _a.hasMismatches;
|
|
25
|
+
return hasMismatches;
|
|
26
|
+
});
|
|
27
|
+
if (groups.length > 0) {
|
|
28
|
+
isInvalid = true;
|
|
29
|
+
if (isVersionGroup) {
|
|
30
|
+
console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Version Group ", " ", "}"], ["{dim = Version Group ", " ", "}"])), i, '='.repeat(63)));
|
|
31
|
+
}
|
|
26
32
|
}
|
|
27
33
|
groups.forEach(function (_a) {
|
|
28
|
-
var
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
});
|
|
36
|
-
}
|
|
34
|
+
var instances = _a.instances, name = _a.name;
|
|
35
|
+
var expectedVersion = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
|
|
36
|
+
console.log((0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{dim -} ", " {green.dim ", "}"], ["{dim -} ", " {green.dim ", "}"])), name, expectedVersion));
|
|
37
|
+
instances.forEach(function (_a) {
|
|
38
|
+
var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
|
|
39
|
+
console.log((0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{red ", " {dim in ", " of ", "}}"], ["{red ", " {dim in ", " of ", "}}"])), version, dependencyType, wrapper.contents.name));
|
|
40
|
+
});
|
|
37
41
|
});
|
|
38
42
|
});
|
|
39
43
|
if (isInvalid) {
|
package/dist/constants.d.ts
CHANGED
|
@@ -15,6 +15,10 @@ export interface SemverGroup {
|
|
|
15
15
|
* the semver range which dependencies in this group should use
|
|
16
16
|
*/
|
|
17
17
|
range: ValidRange;
|
|
18
|
+
/**
|
|
19
|
+
* optionally only apply this group to dependencies of the provided types
|
|
20
|
+
*/
|
|
21
|
+
dependencyTypes?: DependencyType[];
|
|
18
22
|
}
|
|
19
23
|
export interface VersionGroup {
|
|
20
24
|
/**
|
|
@@ -30,6 +34,10 @@ export interface VersionGroup {
|
|
|
30
34
|
* optionally force all dependencies in this group to have this version
|
|
31
35
|
*/
|
|
32
36
|
pinVersion?: string;
|
|
37
|
+
/**
|
|
38
|
+
* optionally only apply this group to dependencies of the provided types
|
|
39
|
+
*/
|
|
40
|
+
dependencyTypes?: DependencyType[];
|
|
33
41
|
}
|
|
34
42
|
export declare type SyncpackConfig = Readonly<{
|
|
35
43
|
/**
|
|
@@ -74,8 +74,8 @@ function getInstances(options, wrappers) {
|
|
|
74
74
|
continue;
|
|
75
75
|
var instance = { dependencyType: dependencyType, name: name, version: version, wrapper: wrapper };
|
|
76
76
|
allInstances.all.push(instance);
|
|
77
|
-
groupInstancesBy('semverGroups', pkgName, instance);
|
|
78
|
-
groupInstancesBy('versionGroups', pkgName, instance);
|
|
77
|
+
groupInstancesBy('semverGroups', dependencyType, pkgName, instance);
|
|
78
|
+
groupInstancesBy('versionGroups', dependencyType, pkgName, instance);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
@@ -109,14 +109,14 @@ function getInstances(options, wrappers) {
|
|
|
109
109
|
var instancesByName = {};
|
|
110
110
|
return __assign(__assign({}, group), { instances: instances, instancesByName: instancesByName });
|
|
111
111
|
}
|
|
112
|
-
function groupInstancesBy(groupName, pkgName, instance) {
|
|
112
|
+
function groupInstancesBy(groupName, dependencyType, pkgName, instance) {
|
|
113
113
|
var name = instance.name;
|
|
114
114
|
var groups = allInstances[groupName];
|
|
115
115
|
if (!groups.length)
|
|
116
116
|
return;
|
|
117
117
|
for (var i in groups) {
|
|
118
118
|
var group = groups[i];
|
|
119
|
-
if (matchesGroup(pkgName, name, group)) {
|
|
119
|
+
if (matchesGroup(dependencyType, pkgName, name, group)) {
|
|
120
120
|
if (!group.instancesByName[name]) {
|
|
121
121
|
group.instancesByName[name] = [];
|
|
122
122
|
}
|
|
@@ -127,8 +127,10 @@ function getInstances(options, wrappers) {
|
|
|
127
127
|
}
|
|
128
128
|
throw new Error("".concat(name, " in ").concat(pkgName, " did not match any ").concat(groupName));
|
|
129
129
|
}
|
|
130
|
-
function matchesGroup(pkgName, dependencyName, group) {
|
|
131
|
-
return (
|
|
130
|
+
function matchesGroup(dependencyType, pkgName, dependencyName, group) {
|
|
131
|
+
return ((!(0, expect_more_1.isNonEmptyArray)(group.dependencyTypes) ||
|
|
132
|
+
group.dependencyTypes.includes(dependencyType)) &&
|
|
133
|
+
group.packages.some(function (pattern) { return (0, minimatch_1["default"])(pkgName, pattern); }) &&
|
|
132
134
|
group.dependencies.some(function (pattern) { return (0, minimatch_1["default"])(dependencyName, pattern); }));
|
|
133
135
|
}
|
|
134
136
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "syncpack",
|
|
3
3
|
"description": "Manage multiple package.json files, such as in Lerna Monorepos and Yarn/Pnpm Workspaces",
|
|
4
|
-
"version": "6.
|
|
4
|
+
"version": "6.2.0",
|
|
5
5
|
"author": "Jamie Mason <jamie@foldleft.io> (https://github.com/JamieMason)",
|
|
6
6
|
"bin": {
|
|
7
7
|
"syncpack": "dist/bin.js",
|