syncpack 7.1.0 → 8.0.0

package/README.md

@@ -14,6 +14,10 @@
 npm install --global syncpack
 ```
 
+## 🤖 GitHub Action
+
+As of May 2022 there is now a [Syncpack GitHub Action](https://github.com/marketplace/actions/syncpack-synchronise-monorepo-dependency-versions). It is new and less stable than syncpack itself, but please give it a try and [give your feedback](https://github.com/JamieMason/syncpack-github-action/issues/new).
+
 ## 📝 Commands
 
 ### fix-mismatches
@@ -34,7 +38,8 @@ See [`versionGroups`](#versiongroups) if you have advanced requirements.
 -d, --dev               include devDependencies
 -P, --peer              include peerDependencies
 -R, --resolutions       include resolutions (yarn)
--o, --overrides         include overrides (pnpm)
+-o, --overrides         include overrides (npm)
+-O, --pnpmOverrides     include overrides (pnpm)
 -w, --workspace         include locally developed package versions
 -i, --indent [value]    override indentation. defaults to "  "
 -c, --config <path>     path to a syncpack config file
@@ -116,7 +121,8 @@ See [`semverGroups`](#semvergroups) if you have advanced requirements.
 -d, --dev                   include devDependencies
 -P, --peer                  include peerDependencies
 -R, --resolutions           include resolutions (yarn)
--o, --overrides             include overrides (pnpm)
+-o, --overrides             include overrides (npm)
+-O, --pnpmOverrides         include overrides (pnpm)
 -f, --filter [pattern]      only include dependencies whose name matches this regex
 -r, --semver-range <range>  see supported ranges below. defaults to ""
 -c, --config <path>         path to a syncpack config file
@@ -161,7 +167,8 @@ List all dependencies required by your packages.
 -d, --dev               include devDependencies
 -P, --peer              include peerDependencies
 -R, --resolutions       include resolutions (yarn)
--o, --overrides         include overrides (pnpm)
+-o, --overrides         include overrides (npm)
+-O, --pnpmOverrides     include overrides (pnpm)
 -f, --filter [pattern]  only include dependencies whose name matches this regex
 -c, --config <path>     path to a syncpack config file
 -w, --workspace         include locally developed package versions
@@ -206,7 +213,8 @@ See [`versionGroups`](#versiongroups) if you have advanced requirements.
 -d, --dev               include devDependencies
 -P, --peer              include peerDependencies
 -R, --resolutions       include resolutions (yarn)
--o, --overrides         include overrides (pnpm)
+-o, --overrides         include overrides (npm)
+-O, --pnpmOverrides     include overrides (pnpm)
 -f, --filter [pattern]  only include dependencies whose name matches this regex
 -c, --config <path>     path to a syncpack config file
 -w, --workspace         include locally developed package versions
@@ -253,7 +261,8 @@ See [`semverGroups`](#semvergroups) if you have advanced requirements.
 -d, --dev                   include devDependencies
 -P, --peer                  include peerDependencies
 -R, --resolutions           include resolutions (yarn)
--o, --overrides             include overrides (pnpm)
+-o, --overrides             include overrides (npm)
+-O, --pnpmOverrides         include overrides (pnpm)
 -w, --workspace             include locally developed package versions
 -i, --indent [value]        override indentation. defaults to "  "
 -r, --semver-range <range>  see supported ranges below. defaults to ""
@@ -311,6 +320,7 @@ configuration file (if present), you can use the `--config` option.
   "indent": "  ",
   "overrides": true,
   "peer": true,
+  "pnpmOverrides": true,
   "prod": true,
   "resolutions": true,
   "workspace": true,
@@ -325,28 +335,23 @@ configuration file (if present), you can use the `--config` option.
     "resolutions",
     "scripts"
   ],
-  "sortFirst": [
-    "name",
-    "description",
-    "version",
-    "author"
-  ],
+  "sortFirst": ["name", "description", "version", "author"],
   "source": [],
   "versionGroups": []
 }
 ```
 
-### `dev`, `peer`, `prod`, `resolutions`, `overrides`, and `workspace`
+### `dev`, `peer`, `prod`, `resolutions`, `overrides`, `pnpmOverrides`, and `workspace`
 
 Whether to search within `devDependencies`, `peerDependencies`, `dependencies`,
-`resolutions` (Yarn), `overrides` (Pnpm), and the `version` property of the
-package.json files of your own packages developed within your `workspace`
-respectively.
+`resolutions` (Yarn), `overrides` (npm), `pnpmOverrides` (pnpm), and the
+`version` property of the package.json files of your own packages developed
+within your `workspace` respectively.
 
 All of these locations are searched by default but they can be disabled
 individually in your config file. If any are set via the command line options
-`--dev`, `--peer`, `--prod`, `--resolutions`, `--overrides`, or `--workspace`
-then only the options you provide will be searched.
+`--dev`, `--peer`, `--prod`, `--resolutions`, `--overrides`, `--pnpmOverrides`,
+or `--workspace` then only the options you provide will be searched.
 
 ### `filter`
 
@@ -409,7 +414,7 @@ rest of the repo might need to remain on stable versions.
 
 You don't want mismatches within your alpha packages, you don't want mismatches
 within the other packages, but you _do_ want those groups to use different
-versions *to each other* and not have `syncpack` make them all the same.
+versions _to each other_ and not have `syncpack` make them all the same.
 
 In the following example, 2 of our packages are using different versions of
 `react` and `react-dom` to the rest of the project.
@@ -450,7 +455,40 @@ to apply to an entire package:
 - A specific dependency in some specific packages only.
 - Any dependency who name matches a pattern such as `@aws-sdk/**`.
 
-See [`semverGroups`](#semverGroups) for some examples, they work the same way.
+See [`semverGroups`](#semverGroups) for more examples, they work the same way.
+
+#### `versionGroup.isBanned`
+
+Remove dependencies which you've decided should never be allowed.
+
+```json
+{
+  "versionGroups": [
+    {
+      "isBanned": true,
+      "dependencies": ["never-gonna"],
+      "packages": ["**"]
+    }
+  ]
+}
+```
+
+#### `versionGroup.pinVersion`
+
+Pin the version of all dependencies in this group to match this specific version
+you've defined.
+
+```json
+{
+  "versionGroups": [
+    {
+      "pinVersion": "3.55.0",
+      "dependencies": ["@aws-sdk/**"],
+      "packages": ["**"]
+    }
+  ]
+}
+```
 
 ### `semverGroups`
 

package/dist/bin-fix-mismatches/fix-mismatches.js

@@ -9,6 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.fixMismatches = void 0;
 var chalk_1 = __importDefault(require("chalk"));
+var expect_more_1 = require("expect-more");
 var list_version_groups_1 = require("../bin-list/list-version-groups");
 var write_if_changed_1 = require("../lib/write-if-changed");
 var get_expected_version_1 = require("./get-expected-version");
@@ -32,13 +33,19 @@ function fixMismatches(input, disk) {
                     var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
                     var root = wrapper.contents;
                     if (version !== nextVersion_1) {
-                        root[dependencyType][name] = nextVersion_1;
+                        if (dependencyType === 'pnpmOverrides') {
+                            root.pnpm.overrides[name] = nextVersion_1;
+                        }
+                        else {
+                            root[dependencyType][name] = nextVersion_1;
+                        }
                     }
                 });
             }
         });
     });
     input.wrappers.forEach(function (wrapper) {
+        removeEmptyIndexes(wrapper);
         (0, write_if_changed_1.writeIfChanged)(disk, {
             contents: wrapper.contents,
             filePath: wrapper.filePath,
@@ -46,6 +53,17 @@ function fixMismatches(input, disk) {
             json: wrapper.json
         });
     });
+    /**
+     * Remove eg `{"dependencies": {}, "devDependencies": {}}`
+     */
+    function removeEmptyIndexes(wrapper) {
+        input.dependencyTypes.forEach(function (dependencyType) {
+            var deps = wrapper.contents[dependencyType];
+            if (deps && Object.values(deps).every(expect_more_1.isUndefined)) {
+                delete wrapper.contents[dependencyType];
+            }
+        });
+    }
 }
 exports.fixMismatches = fixMismatches;
 var templateObject_1;

package/dist/bin-fix-mismatches/get-expected-version/index.d.ts

@@ -1,3 +1,3 @@
 import type { ProgramInput } from '../../lib/get-input';
 import type { IndexedVersionGroup } from '../../lib/get-input/get-instances';
-export declare function getExpectedVersion(name: string, versionGroup: Pick<IndexedVersionGroup, 'instances' | 'pinVersion'>, input: Pick<ProgramInput, 'workspace' | 'wrappers'>): string;
+export declare function getExpectedVersion(name: string, versionGroup: Pick<IndexedVersionGroup, 'isBanned' | 'instances' | 'pinVersion'>, input: Pick<ProgramInput, 'workspace' | 'wrappers'>): string | undefined;

package/dist/bin-fix-mismatches/get-expected-version/index.js

@@ -5,13 +5,17 @@ var get_highest_version_1 = require("./get-highest-version");
 var get_pinned_version_1 = require("./get-pinned-version");
 var get_workspace_version_1 = require("./get-workspace-version");
 function getExpectedVersion(name, versionGroup, input) {
-    return ((0, get_pinned_version_1.getPinnedVersion)(versionGroup) ||
-        (input.workspace === true && (0, get_workspace_version_1.getWorkspaceVersion)(name, input.wrappers)) ||
-        (0, get_highest_version_1.getHighestVersion)(versionGroup.instances
-            .filter(function (instance) { return instance.name === name; })
-            .map(function (_a) {
-            var version = _a.version;
-            return version;
-        })));
+    return versionGroup.isBanned === true
+        ? // remove this dependency
+            undefined
+        : (0, get_pinned_version_1.getPinnedVersion)(versionGroup) ||
+            (input.workspace === true &&
+                (0, get_workspace_version_1.getWorkspaceVersion)(name, input.wrappers)) ||
+            (0, get_highest_version_1.getHighestVersion)(versionGroup.instances
+                .filter(function (instance) { return instance.name === name; })
+                .map(function (_a) {
+                var version = _a.version;
+                return version;
+            }));
 }
 exports.getExpectedVersion = getExpectedVersion;

package/dist/bin-fix-mismatches/index.js

@@ -62,6 +62,7 @@ commander_1.program.on('--help', function () {
     indent: commander_1.program.opts().indent,
     overrides: commander_1.program.opts().overrides,
     peer: commander_1.program.opts().peer,
+    pnpmOverrides: commander_1.program.opts().pnpmOverrides,
     prod: commander_1.program.opts().prod,
     resolutions: commander_1.program.opts().resolutions,
     source: commander_1.program.opts().source,

package/dist/bin-lint-semver-ranges/index.js

@@ -61,10 +61,11 @@ commander_1.program.on('--help', function () {
     filter: commander_1.program.opts().filter,
     overrides: commander_1.program.opts().overrides,
     peer: commander_1.program.opts().peer,
+    pnpmOverrides: commander_1.program.opts().pnpmOverrides,
     prod: commander_1.program.opts().prod,
     resolutions: commander_1.program.opts().resolutions,
     semverRange: commander_1.program.opts().semverRange,
     source: commander_1.program.opts().source,
     workspace: commander_1.program.opts().workspace
-}));
+}), disk_1.disk);
 var templateObject_1, templateObject_2;

package/dist/bin-lint-semver-ranges/lint-semver-ranges.d.ts

@@ -1,2 +1,3 @@
+import type { Disk } from '../lib/disk';
 import type { ProgramInput } from '../lib/get-input';
-export declare function lintSemverRanges(input: ProgramInput): void;
+export declare function lintSemverRanges(input: ProgramInput, disk: Disk): void;

package/dist/bin-lint-semver-ranges/lint-semver-ranges.js

@@ -11,7 +11,7 @@ exports.lintSemverRanges = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var set_semver_range_1 = require("../lib/set-semver-range");
 var list_semver_group_mismatches_1 = require("./list-semver-group-mismatches");
-function lintSemverRanges(input) {
+function lintSemverRanges(input, disk) {
     var isInvalid = false;
     /**
      * Reverse the list so the default/ungrouped semver group is rendered first
@@ -33,7 +33,7 @@ function lintSemverRanges(input) {
         }
     });
     if (isInvalid) {
-        process.exit(1);
+        disk.process.exit(1);
     }
 }
 exports.lintSemverRanges = lintSemverRanges;

package/dist/bin-list/index.js

@@ -60,9 +60,10 @@ commander_1.program.on('--help', function () {
     filter: commander_1.program.opts().filter,
     overrides: commander_1.program.opts().overrides,
     peer: commander_1.program.opts().peer,
+    pnpmOverrides: commander_1.program.opts().pnpmOverrides,
     prod: commander_1.program.opts().prod,
     resolutions: commander_1.program.opts().resolutions,
     source: commander_1.program.opts().source,
     workspace: commander_1.program.opts().workspace
-}));
+}), disk_1.disk);
 var templateObject_1;

package/dist/bin-list/list-version-groups.d.ts

@@ -2,6 +2,7 @@ import type { IndexedVersionGroup, Instance } from '../lib/get-input/get-instanc
 export interface ListItem {
     hasMismatches: boolean;
     instances: Instance[];
+    isBanned: boolean;
     name: string;
     uniques: string[];
 }

package/dist/bin-list/list-version-groups.js

@@ -21,7 +21,8 @@ var expect_more_1 = require("expect-more");
 var group_by_1 = require("../lib/group-by");
 var sort_by_name_1 = require("../lib/sort-by-name");
 function listVersionGroups(versionGroup) {
-    var instancesByName = (0, group_by_1.groupBy)('name', versionGroup.instances.sort(sort_by_name_1.sortByName));
+    var instances = versionGroup.instances;
+    var instancesByName = (0, group_by_1.groupBy)('name', instances.sort(sort_by_name_1.sortByName));
     return Object.entries(instancesByName).map(function (_a) {
         var _b = __read(_a, 2), name = _b[0], instances = _b[1];
         var pinnedVersion = versionGroup.pinVersion;
@@ -31,13 +32,16 @@ function listVersionGroups(versionGroup) {
             return version;
         });
         var uniques = Array.from(new Set(versions));
-        var hasMismatches = versions.some(function (version, i) {
-            return (hasPinnedVersion && version !== pinnedVersion) ||
-                (i > 0 && version !== versions[i - 1]);
-        });
+        var isBanned = versionGroup.isBanned === true;
+        var hasMismatches = isBanned ||
+            versions.some(function (version, i) {
+                return (hasPinnedVersion && version !== pinnedVersion) ||
+                    (i > 0 && version !== versions[i - 1]);
+            });
         return {
             hasMismatches: hasMismatches,
             instances: instances,
+            isBanned: isBanned,
             name: name,
             uniques: uniques
         };

package/dist/bin-list/list.d.ts

@@ -1,2 +1,3 @@
+import type { Disk } from '../lib/disk';
 import type { ProgramInput } from '../lib/get-input';
-export declare function list(input: ProgramInput): void;
+export declare function list(input: ProgramInput, disk: Disk): void;

package/dist/bin-list/list.js

@@ -10,7 +10,7 @@ exports.__esModule = true;
 exports.list = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var list_version_groups_1 = require("./list-version-groups");
-function list(input) {
+function list(input, disk) {
     var isInvalid = false;
     /**
      * Reverse the list so the default/ungrouped version group is rendered first
@@ -24,10 +24,11 @@ function list(input) {
             console.log((0, chalk_1["default"])(templateObject_1 || (templateObject_1 = __makeTemplateObject(["{dim = Version Group ", " ", "}"], ["{dim = Version Group ", " ", "}"])), i, '='.repeat(63)));
         }
         groups.forEach(function (_a) {
-            var hasMismatches = _a.hasMismatches, name = _a.name, uniques = _a.uniques;
+            var hasMismatches = _a.hasMismatches, isBanned = _a.isBanned, name = _a.name, uniques = _a.uniques;
             var versionList = uniques.sort().join(', ');
-            console.log(hasMismatches
-                ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "} {dim.red ", "}"], ["{red \u2715 ", "} {dim.red ", "}"])), name, versionList) : (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{dim -} {white ", "} {dim ", "}"], ["{dim -} {white ", "} {dim ", "}"])), name, versionList));
+            console.log(isBanned
+                ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "} {dim.red remove this dependency}"], ["{red \u2715 ", "} {dim.red remove this dependency}"])), name) : hasMismatches
+                ? (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{red \u2715 ", "} {dim.red ", "}"], ["{red \u2715 ", "} {dim.red ", "}"])), name, versionList) : (0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{dim -} {white ", "} {dim ", "}"], ["{dim -} {white ", "} {dim ", "}"])), name, versionList));
         });
         if (groups.some(function (_a) {
             var hasMismatches = _a.hasMismatches;
@@ -37,8 +38,8 @@ function list(input) {
         }
     });
     if (isInvalid) {
-        process.exit(1);
+        disk.process.exit(1);
     }
 }
 exports.list = list;
-var templateObject_1, templateObject_2, templateObject_3;
+var templateObject_1, templateObject_2, templateObject_3, templateObject_4;

package/dist/bin-list-mismatches/index.js

@@ -60,9 +60,10 @@ commander_1.program.on('--help', function () {
     filter: commander_1.program.opts().filter,
     overrides: commander_1.program.opts().overrides,
     peer: commander_1.program.opts().peer,
+    pnpmOverrides: commander_1.program.opts().pnpmOverrides,
     prod: commander_1.program.opts().prod,
     resolutions: commander_1.program.opts().resolutions,
     source: commander_1.program.opts().source,
     workspace: commander_1.program.opts().workspace
-}));
+}), disk_1.disk);
 var templateObject_1;

package/dist/bin-list-mismatches/list-mismatches.d.ts

@@ -1,2 +1,3 @@
+import type { Disk } from '../lib/disk';
 import type { ProgramInput } from '../lib/get-input';
-export declare function listMismatches(input: ProgramInput): void;
+export declare function listMismatches(input: ProgramInput, disk: Disk): void;

package/dist/bin-list-mismatches/list-mismatches.js

@@ -13,7 +13,7 @@ var path_1 = require("path");
 var get_expected_version_1 = require("../bin-fix-mismatches/get-expected-version");
 var list_version_groups_1 = require("../bin-list/list-version-groups");
 var constants_1 = require("../constants");
-function listMismatches(input) {
+function listMismatches(input, disk) {
     var isInvalid = false;
     /**
      * Reverse the list so the default/ungrouped version group is rendered first
@@ -33,24 +33,25 @@ function listMismatches(input) {
             }
         }
         groups.forEach(function (_a) {
-            var instances = _a.instances, name = _a.name;
+            var instances = _a.instances, isBanned = _a.isBanned, name = _a.name;
             var expectedVersion = (0, get_expected_version_1.getExpectedVersion)(name, versionGroup, input);
-            console.log((0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{dim -} ", " {green.dim ", "}"], ["{dim -} ", " {green.dim ", "}"])), name, expectedVersion));
+            console.log(isBanned
+                ? (0, chalk_1["default"])(templateObject_2 || (templateObject_2 = __makeTemplateObject(["{red \u2715 ", "} {dim.red remove this dependency}"], ["{red \u2715 ", "} {dim.red remove this dependency}"])), name) : (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{dim -} ", " {green.dim ", "}"], ["{dim -} ", " {green.dim ", "}"])), name, expectedVersion));
             instances.forEach(function (_a) {
                 var dependencyType = _a.dependencyType, version = _a.version, wrapper = _a.wrapper;
                 if (dependencyType === 'workspace') {
                     var shortPath = (0, path_1.relative)(constants_1.CWD, wrapper.filePath);
-                    console.log((0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["{red   ", " {dim at ", "}}"], ["{red   ", " {dim at ", "}}"])), version, shortPath));
+                    console.log((0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{red   ", " {dim at ", "}}"], ["{red   ", " {dim at ", "}}"])), version, shortPath));
                 }
                 else {
-                    console.log((0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["{red   ", " {dim in ", " of ", "}}"], ["{red   ", " {dim in ", " of ", "}}"])), version, dependencyType, wrapper.contents.name));
+                    console.log((0, chalk_1["default"])(templateObject_5 || (templateObject_5 = __makeTemplateObject(["{red   ", " {dim in ", " of ", "}}"], ["{red   ", " {dim in ", " of ", "}}"])), version, dependencyType, wrapper.contents.name));
                 }
             });
         });
     });
     if (isInvalid) {
-        process.exit(1);
+        disk.process.exit(1);
     }
 }
 exports.listMismatches = listMismatches;
-var templateObject_1, templateObject_2, templateObject_3, templateObject_4;
+var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5;

package/dist/bin-set-semver-ranges/index.js

@@ -63,6 +63,7 @@ commander_1.program.on('--help', function () {
     indent: commander_1.program.opts().indent,
     overrides: commander_1.program.opts().overrides,
     peer: commander_1.program.opts().peer,
+    pnpmOverrides: commander_1.program.opts().pnpmOverrides,
     prod: commander_1.program.opts().prod,
     resolutions: commander_1.program.opts().resolutions,
     semverRange: commander_1.program.opts().semverRange,

package/dist/bin-set-semver-ranges/set-semver-ranges.js

@@ -10,7 +10,13 @@ var setSemverRanges = function (input, disk) {
         mismatches.forEach(function (_a) {
             var dependencyType = _a.dependencyType, name = _a.name, version = _a.version, wrapper = _a.wrapper;
             var root = wrapper.contents;
-            root[dependencyType][name] = (0, set_semver_range_1.setSemverRange)(semverGroup.range, version);
+            var nextVersion = (0, set_semver_range_1.setSemverRange)(semverGroup.range, version);
+            if (dependencyType === 'pnpmOverrides') {
+                root.pnpm.overrides[name] = nextVersion;
+            }
+            else {
+                root[dependencyType][name] = nextVersion;
+            }
         });
     });
     input.wrappers.forEach(function (wrapper) {

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
-export declare type DependencyType = 'dependencies' | 'devDependencies' | 'overrides' | 'peerDependencies' | 'resolutions' | 'workspace';
+export declare type DependencyType = 'dependencies' | 'devDependencies' | 'overrides' | 'peerDependencies' | 'pnpmOverrides' | 'resolutions' | 'workspace';
 export declare type DependencyOption = Pick<SyncpackConfig, 'dev' | 'workspace' | 'overrides' | 'peer' | 'prod' | 'resolutions'>;
 export declare type ValidRange = typeof RANGE_ANY | typeof RANGE_EXACT | typeof RANGE_GT | typeof RANGE_GTE | typeof RANGE_LOOSE | typeof RANGE_LT | typeof RANGE_LTE | typeof RANGE_MINOR | typeof RANGE_PATCH;
 export interface SemverGroup {
@@ -30,6 +30,10 @@ export interface VersionGroup {
      * the names of the dependencies (eg. "lodash") which belong to this group
      */
     dependencies: string[];
+    /**
+     * optionally force all dependencies in this group to be removed
+     */
+    isBanned?: true;
     /**
      * optionally force all dependencies in this group to have this version
      */
@@ -59,13 +63,17 @@ export declare type SyncpackConfig = Readonly<{
      */
     indent: string;
     /**
-     * whether to search within pnpm overrides
+     * whether to search within npm overrides
      */
     overrides: boolean;
     /**
      * whether to search within peerDependencies
      */
     peer: boolean;
+    /**
+     * whether to search within pnpm overrides
+     */
+    pnpmOverrides: boolean;
     /**
      * whether to search within dependencies
      */

package/dist/constants.js

@@ -7,6 +7,7 @@ exports.DEPENDENCY_TYPES = [
     'devDependencies',
     'overrides',
     'peerDependencies',
+    'pnpmOverrides',
     'resolutions',
     'workspace',
 ];
@@ -40,6 +41,7 @@ exports.DEFAULT_CONFIG = {
     indent: '  ',
     overrides: true,
     peer: true,
+    pnpmOverrides: true,
     prod: true,
     resolutions: true,
     workspace: true,

package/dist/lib/disk.d.ts

@@ -1,6 +1,9 @@
 import type { SyncpackConfig } from '../constants';
 export declare type Disk = typeof disk;
 export declare const disk: {
+    readonly process: {
+        readonly exit: (code: number) => void;
+    };
     readonly globSync: (pattern: string) => string[];
     readonly readConfigFileSync: (configPath?: string | undefined) => Partial<SyncpackConfig>;
     readonly readFileSync: (filePath: string) => string;

package/dist/lib/disk.js

@@ -2,7 +2,6 @@
 exports.__esModule = true;
 exports.disk = void 0;
 var cosmiconfig_1 = require("cosmiconfig");
-var expect_more_1 = require("expect-more");
 var fs_extra_1 = require("fs-extra");
 var glob_1 = require("glob");
 var read_yaml_file_1 = require("read-yaml-file");
@@ -10,7 +9,14 @@ var constants_1 = require("../constants");
 var log_1 = require("./log");
 var client = (0, cosmiconfig_1.cosmiconfigSync)('syncpack');
 exports.disk = {
+    process: {
+        exit: function (code) {
+            (0, log_1.verbose)('exit(', code, ')');
+            process.exit(code);
+        }
+    },
     globSync: function (pattern) {
+        (0, log_1.verbose)('globSync(', pattern, ')');
         return (0, glob_1.sync)(pattern, {
             ignore: '**/node_modules/**',
             absolute: true,
@@ -18,29 +24,38 @@ exports.disk = {
         });
     },
     readConfigFileSync: function (configPath) {
+        (0, log_1.verbose)('readConfigFileSync(', configPath, ')');
         try {
             var result = configPath ? client.load(configPath) : client.search();
-            var rcConfig = result !== null ? result.config : {};
-            var rcFile = (0, expect_more_1.isObject)(rcConfig)
-                ? rcConfig
-                : {};
-            return rcFile;
+            if (result === null) {
+                (0, log_1.verbose)('no config file found');
+                return {};
+            }
+            var rcPath = result.filepath;
+            var rcConfig = result.config;
+            (0, log_1.verbose)('.syncpackrc path:', rcPath);
+            (0, log_1.verbose)('.syncpackrc contents:', rcConfig);
+            return rcConfig;
         }
         catch (err) {
-            (0, log_1.verbose)("no config file found at ".concat(configPath));
+            (0, log_1.verbose)('no config file found at:', configPath);
             return {};
         }
     },
     readFileSync: function (filePath) {
+        (0, log_1.verbose)('readFileSync(', filePath, ')');
         return (0, fs_extra_1.readFileSync)(filePath, { encoding: 'utf8' });
     },
     readYamlFileSync: function (filePath) {
+        (0, log_1.verbose)('readYamlFileSync(', filePath, ')');
         return (0, read_yaml_file_1.sync)(filePath);
     },
     removeSync: function (filePath) {
+        (0, log_1.verbose)('removeSync(', filePath, ')');
         (0, fs_extra_1.removeSync)(filePath);
     },
     writeFileSync: function (filePath, contents) {
+        (0, log_1.verbose)('writeFileSync(', filePath, contents, ')');
         (0, fs_extra_1.writeFileSync)(filePath, contents);
     }
 };

package/dist/lib/get-input/get-config.d.ts

@@ -8,5 +8,5 @@ import type { Disk } from '../disk';
  * @param  program  Optional command line options
  */
 export declare const getConfig: (disk: Disk, program: Partial<SyncpackConfig & {
-    configPath: string;
+    configPath: string | undefined;
 }>) => SyncpackConfig;

package/dist/lib/get-input/get-config.js

@@ -4,6 +4,7 @@ exports.getConfig = void 0;
 var expect_more_1 = require("expect-more");
 var constants_1 = require("../../constants");
 var is_semver_1 = require("../../lib/is-semver");
+var log_1 = require("../log");
 /**
  * Take all configuration from the command line and config file, combine it, and
  * set defaults for anything which hasn't been defined.
@@ -12,11 +13,13 @@ var is_semver_1 = require("../../lib/is-semver");
  * @param  program  Optional command line options
  */
 var getConfig = function (disk, program) {
+    (0, log_1.verbose)('cli arguments:', program);
     var rcFile = disk.readConfigFileSync(program.configPath);
     var hasTypeOverride = (0, expect_more_1.isBoolean)(program.dev) ||
         (0, expect_more_1.isBoolean)(program.workspace) ||
         (0, expect_more_1.isBoolean)(program.overrides) ||
         (0, expect_more_1.isBoolean)(program.peer) ||
+        (0, expect_more_1.isBoolean)(program.pnpmOverrides) ||
         (0, expect_more_1.isBoolean)(program.prod) ||
         (0, expect_more_1.isBoolean)(program.resolutions);
     var dev = hasTypeOverride
@@ -31,19 +34,28 @@ var getConfig = function (disk, program) {
     var peer = hasTypeOverride
         ? Boolean(program.peer)
         : getOption('peer', expect_more_1.isBoolean);
+    var pnpmOverrides = hasTypeOverride
+        ? Boolean(program.pnpmOverrides)
+        : getOption('pnpmOverrides', expect_more_1.isBoolean);
     var prod = hasTypeOverride
         ? Boolean(program.prod)
         : getOption('prod', expect_more_1.isBoolean);
     var resolutions = hasTypeOverride
         ? Boolean(program.resolutions)
         : getOption('resolutions', expect_more_1.isBoolean);
-    var dependencyTypes = dev || workspace || overrides || peer || prod || resolutions
+    var dependencyTypes = dev ||
+        overrides ||
+        peer ||
+        pnpmOverrides ||
+        prod ||
+        resolutions ||
+        workspace
         ? constants_1.DEPENDENCY_TYPES.filter(function (type) {
-            return (type === 'devDependencies' && dev) ||
-                (type === 'workspace' && workspace) ||
+            return (type === 'dependencies' && prod) ||
+                (type === 'devDependencies' && dev) ||
                 (type === 'overrides' && overrides) ||
                 (type === 'peerDependencies' && peer) ||
-                (type === 'dependencies' && prod) ||
+                (type === 'pnpmOverrides' && pnpmOverrides) ||
                 (type === 'resolutions' && resolutions);
         })
         : constants_1.DEPENDENCY_TYPES;
@@ -72,7 +84,7 @@ var getConfig = function (disk, program) {
         dependencies: ['**']
     };
     var versionGroups = getOption('versionGroups', isArrayOfVersionGroups).concat(defaultVersionGroup);
-    return {
+    var finalConfig = {
         dependencyTypes: dependencyTypes,
         dev: dev,
         filter: filter,
@@ -80,6 +92,7 @@ var getConfig = function (disk, program) {
         workspace: workspace,
         overrides: overrides,
         peer: peer,
+        pnpmOverrides: pnpmOverrides,
         prod: prod,
         resolutions: resolutions,
         semverGroups: semverGroups,
@@ -89,6 +102,8 @@ var getConfig = function (disk, program) {
         source: source,
         versionGroups: versionGroups
     };
+    (0, log_1.verbose)('final config:', finalConfig);
+    return finalConfig;
     function getOption(name, isValid) {
         var cliOption = program[name];
         if (isValid(cliOption))

package/dist/lib/get-input/get-instances.js

@@ -45,8 +45,8 @@ exports.getInstances = void 0;
 var expect_more_1 = require("expect-more");
 var minimatch_1 = __importDefault(require("minimatch"));
 function getInstances(options, wrappers) {
-    var e_1, _a, e_2, _b, e_3, _c;
-    var _d, _e, _f;
+    var e_1, _a, e_2, _b, e_3, _c, e_4, _d;
+    var _e, _f, _g, _h, _j;
     var allInstances = {
         all: [],
         semverGroups: options.semverGroups.map(withInstances),
@@ -57,40 +57,22 @@ function getInstances(options, wrappers) {
             var wrapper = wrappers_1_1.value;
             var pkgName = wrapper.contents.name || 'packagewithoutaname';
             try {
-                for (var _g = (e_2 = void 0, __values(options.dependencyTypes)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var dependencyType = _h.value;
+                for (var _k = (e_2 = void 0, __values(options.dependencyTypes)), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var dependencyType = _l.value;
                     if (dependencyType === 'workspace') {
-                        var name = (_d = wrapper.contents) === null || _d === void 0 ? void 0 : _d.name;
-                        var version = (_e = wrapper.contents) === null || _e === void 0 ? void 0 : _e.version;
-                        if (!(0, expect_more_1.isNonEmptyString)(name))
-                            continue;
-                        if (name.search(new RegExp(options.filter)) === -1)
-                            continue;
-                        if (!(0, expect_more_1.isNonEmptyString)(version))
-                            continue;
-                        var instance = { dependencyType: dependencyType, name: name, version: version, wrapper: wrapper };
-                        allInstances.all.push(instance);
-                        groupInstancesBy('semverGroups', dependencyType, pkgName, instance);
-                        groupInstancesBy('versionGroups', dependencyType, pkgName, instance);
+                        var name = (_e = wrapper.contents) === null || _e === void 0 ? void 0 : _e.name;
+                        var version = (_f = wrapper.contents) === null || _f === void 0 ? void 0 : _f.version;
+                        addInstance(wrapper, dependencyType, pkgName, name, version);
                     }
-                    else {
-                        var versionsByName = (_f = wrapper.contents) === null || _f === void 0 ? void 0 : _f[dependencyType];
+                    else if (dependencyType === 'pnpmOverrides') {
+                        var versionsByName = (_h = (_g = wrapper.contents) === null || _g === void 0 ? void 0 : _g.pnpm) === null || _h === void 0 ? void 0 : _h.overrides;
                         if (!(0, expect_more_1.isObject)(versionsByName))
                             continue;
                         var pkgs = Object.entries(versionsByName);
                         try {
                             for (var pkgs_1 = (e_3 = void 0, __values(pkgs)), pkgs_1_1 = pkgs_1.next(); !pkgs_1_1.done; pkgs_1_1 = pkgs_1.next()) {
-                                var _j = __read(pkgs_1_1.value, 2), name = _j[0], version = _j[1];
-                                if (!(0, expect_more_1.isNonEmptyString)(name))
-                                    continue;
-                                if (name.search(new RegExp(options.filter)) === -1)
-                                    continue;
-                                if (!(0, expect_more_1.isNonEmptyString)(version))
-                                    continue;
-                                var instance = { dependencyType: dependencyType, name: name, version: version, wrapper: wrapper };
-                                allInstances.all.push(instance);
-                                groupInstancesBy('semverGroups', dependencyType, pkgName, instance);
-                                groupInstancesBy('versionGroups', dependencyType, pkgName, instance);
+                                var _m = __read(pkgs_1_1.value, 2), name = _m[0], version = _m[1];
+                                addInstance(wrapper, dependencyType, pkgName, name, version);
                             }
                         }
                         catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -101,12 +83,31 @@ function getInstances(options, wrappers) {
                             finally { if (e_3) throw e_3.error; }
                         }
                     }
+                    else {
+                        var versionsByName = (_j = wrapper.contents) === null || _j === void 0 ? void 0 : _j[dependencyType];
+                        if (!(0, expect_more_1.isObject)(versionsByName))
+                            continue;
+                        var pkgs = Object.entries(versionsByName);
+                        try {
+                            for (var pkgs_2 = (e_4 = void 0, __values(pkgs)), pkgs_2_1 = pkgs_2.next(); !pkgs_2_1.done; pkgs_2_1 = pkgs_2.next()) {
+                                var _o = __read(pkgs_2_1.value, 2), name = _o[0], version = _o[1];
+                                addInstance(wrapper, dependencyType, pkgName, name, version);
+                            }
+                        }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        finally {
+                            try {
+                                if (pkgs_2_1 && !pkgs_2_1.done && (_d = pkgs_2["return"])) _d.call(pkgs_2);
+                            }
+                            finally { if (e_4) throw e_4.error; }
+                        }
+                    }
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_b = _g["return"])) _b.call(_g);
+                    if (_l && !_l.done && (_b = _k["return"])) _b.call(_k);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
@@ -120,6 +121,18 @@ function getInstances(options, wrappers) {
         finally { if (e_1) throw e_1.error; }
     }
     return allInstances;
+    function addInstance(wrapper, dependencyType, pkgName, name, version) {
+        if (!(0, expect_more_1.isNonEmptyString)(name))
+            return;
+        if (name.search(new RegExp(options.filter)) === -1)
+            return;
+        if (!(0, expect_more_1.isNonEmptyString)(version))
+            return;
+        var instance = { dependencyType: dependencyType, name: name, version: version, wrapper: wrapper };
+        allInstances.all.push(instance);
+        groupInstancesBy('semverGroups', dependencyType, pkgName, instance);
+        groupInstancesBy('versionGroups', dependencyType, pkgName, instance);
+    }
     function withInstances(group) {
         var instances = [];
         var instancesByName = {};

package/dist/lib/get-input/get-wrappers/get-patterns/index.js

@@ -52,7 +52,6 @@ exports.getPatterns = void 0;
 var expect_more_1 = require("expect-more");
 var function_1 = require("fp-ts/lib/function");
 var O = __importStar(require("fp-ts/lib/Option"));
-var path_1 = require("path");
 var constants_1 = require("../../../../constants");
 var tap_1 = require("../tap");
 var get_lerna_patterns_1 = require("./get-lerna-patterns");
@@ -70,7 +69,9 @@ function getPatterns(disk, program) {
         return __spreadArray(['.'], __read(patterns), false);
     }
     function limitToPackageJson(patterns) {
-        return patterns.map(function (pattern) { return (0, path_1.join)(pattern, 'package.json'); });
+        return patterns.map(function (pattern) {
+            return pattern.includes('package.json') ? pattern : "".concat(pattern, "/package.json");
+        });
     }
 }
 exports.getPatterns = getPatterns;

package/dist/lib/get-input/get-wrappers/index.d.ts

@@ -10,6 +10,9 @@ export interface Source {
     keywords?: string[];
     name?: string;
     peerDependencies?: Record<string, string>;
+    pnpm?: {
+        overrides?: Record<string, string>;
+    };
     repository?: {
         type: string;
         url: string;
@@ -18,7 +21,7 @@ export interface Source {
     scripts?: Record<string, string>;
     version?: string;
     workspaces?: Record<string, string[]> | string[];
-    [otherProps: string]: Record<string, string | string[]> | string | string[] | undefined;
+    [otherProps: string]: Record<string, string | string[] | Record<string, string | string[]>> | string | string[] | undefined;
 }
 export interface SourceWrapper {
     /** the absolute path on disk to this package.json file */

package/dist/lib/get-input/index.d.ts

@@ -16,5 +16,5 @@ export declare type ProgramInput = SyncpackConfig & {
  * @param  program     Options received from CLI arguments
  */
 export declare function getInput(disk: Disk, program: Partial<SyncpackConfig & {
-    configPath: string;
+    configPath: string | undefined;
 }>): ProgramInput;

package/dist/lib/log.d.ts

@@ -1 +1 @@
-export declare function verbose(message: string): void;
+export declare function verbose(...values: any[]): void;

package/dist/lib/log.js

@@ -1,13 +1,48 @@
 "use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
 exports.verbose = void 0;
 var chalk_1 = __importDefault(require("chalk"));
-function verbose(message) {
+var expect_more_1 = require("expect-more");
+var util_1 = require("util");
+function verbose() {
+    var values = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        values[_i] = arguments[_i];
+    }
     if (process.env.SYNCPACK_VERBOSE) {
-        console.log(chalk_1["default"].yellow("? ".concat(message)));
+        console.info.apply(console, __spreadArray([chalk_1["default"].yellow('?')], __read(values.map(function (value) {
+            return (0, expect_more_1.isString)(value)
+                ? chalk_1["default"].yellow(value)
+                : (0, util_1.inspect)(value, false, null, true);
+        })), false));
     }
 }
 exports.verbose = verbose;

package/dist/option.d.ts

@@ -6,6 +6,7 @@ export declare const option: {
     readonly indent: readonly ["-i, --indent [value]", `override indentation. defaults to "${string}"`];
     readonly overrides: readonly ["-o, --overrides", string];
     readonly peer: readonly ["-P, --peer", string];
+    readonly pnpmOverrides: readonly ["-O, --overrides", string];
     readonly prod: readonly ["-p, --prod", string];
     readonly resolutions: readonly ["-R, --resolutions", string];
     readonly semverRange: readonly ["-r, --semver-range <range>", "see supported ranges below. defaults to \"\"" | "see supported ranges below. defaults to \"*\"" | "see supported ranges below. defaults to \">\"" | "see supported ranges below. defaults to \">=\"" | "see supported ranges below. defaults to \".x\"" | "see supported ranges below. defaults to \"<\"" | "see supported ranges below. defaults to \"<=\"" | "see supported ranges below. defaults to \"^\"" | "see supported ranges below. defaults to \"~\""];

package/dist/option.js

@@ -22,12 +22,13 @@ exports.option = {
         '-i, --indent [value]',
         "override indentation. defaults to \"".concat(constants_1.DEFAULT_CONFIG.indent, "\""),
     ],
-    overrides: ['-o, --overrides', (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["include {yellow overrides} (pnpm)"], ["include {yellow overrides} (pnpm)"])))],
+    overrides: ['-o, --overrides', (0, chalk_1["default"])(templateObject_3 || (templateObject_3 = __makeTemplateObject(["include {yellow overrides} (npm)"], ["include {yellow overrides} (npm)"])))],
     peer: ['-P, --peer', (0, chalk_1["default"])(templateObject_4 || (templateObject_4 = __makeTemplateObject(["include {yellow peerDependencies}"], ["include {yellow peerDependencies}"])))],
-    prod: ['-p, --prod', (0, chalk_1["default"])(templateObject_5 || (templateObject_5 = __makeTemplateObject(["include {yellow dependencies}"], ["include {yellow dependencies}"])))],
+    pnpmOverrides: ['-O, --overrides', (0, chalk_1["default"])(templateObject_5 || (templateObject_5 = __makeTemplateObject(["include {yellow overrides} (pnpm)"], ["include {yellow overrides} (pnpm)"])))],
+    prod: ['-p, --prod', (0, chalk_1["default"])(templateObject_6 || (templateObject_6 = __makeTemplateObject(["include {yellow dependencies}"], ["include {yellow dependencies}"])))],
     resolutions: [
         '-R, --resolutions',
-        (0, chalk_1["default"])(templateObject_6 || (templateObject_6 = __makeTemplateObject(["include {yellow resolutions} (yarn)"], ["include {yellow resolutions} (yarn)"]))),
+        (0, chalk_1["default"])(templateObject_7 || (templateObject_7 = __makeTemplateObject(["include {yellow resolutions} (yarn)"], ["include {yellow resolutions} (yarn)"]))),
     ],
     semverRange: [
         '-r, --semver-range <range>',
@@ -41,4 +42,4 @@ exports.option = {
     ],
     workspace: ['-w, --workspace', 'include locally developed package versions']
 };
-var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6;
+var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "syncpack",
   "description": "Manage multiple package.json files, such as in Lerna Monorepos and Yarn/Pnpm Workspaces",
-  "version": "7.1.0",
+  "version": "8.0.0",
   "author": "Jamie Mason <jamie@foldleft.io> (https://github.com/JamieMason)",
   "bin": {
     "syncpack": "dist/bin.js",
@@ -28,7 +28,7 @@
     "commander": "9.2.0",
     "cosmiconfig": "7.0.1",
     "expect-more": "1.2.0",
-    "fp-ts": "2.12.0",
+    "fp-ts": "2.12.1",
     "fs-extra": "10.1.0",
     "glob": "8.0.1",
     "minimatch": "5.0.1",
@@ -39,10 +39,10 @@
     "@types/fs-extra": "9.0.13",
     "@types/glob": "7.2.0",
     "@types/jest": "27.4.1",
-    "@types/node": "17.0.25",
+    "@types/node": "17.0.31",
     "@types/semver": "7.3.9",
-    "@typescript-eslint/eslint-plugin": "5.20.0",
-    "@typescript-eslint/parser": "5.20.0",
+    "@typescript-eslint/eslint-plugin": "5.21.0",
+    "@typescript-eslint/parser": "5.21.0",
     "eslint": "8.14.0",
     "eslint-plugin-import": "2.26.0",
     "expect-more-jest": "5.4.0",
@@ -50,7 +50,7 @@
     "prettier": "2.6.2",
     "rimraf": "3.0.2",
     "ts-jest": "27.1.4",
-    "typescript": "4.6.3"
+    "typescript": "4.6.4"
   },
   "engines": {
     "node": ">=10"
@@ -88,6 +88,6 @@
     "format:source": "prettier --write .",
     "lint": "eslint --ext .ts .",
     "prepack": "yarn build",
-    "test": "jest"
+    "test": "jest src"
   }
 }