syncpack 7.2.2 → 8.0.0

package/README.md

@@ -38,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
@@ -120,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
@@ -165,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
@@ -210,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
@@ -257,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 ""
@@ -315,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,
@@ -335,17 +341,17 @@ configuration file (if present), you can use the `--config` option.
 }
 ```
 
-### `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`
 

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

@@ -33,7 +33,12 @@ 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;
+                        }
                     }
                 });
             }

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,6 +61,7 @@ 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,

package/dist/bin-list/index.js

@@ -60,6 +60,7 @@ 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,

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

@@ -60,6 +60,7 @@ 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,

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 {
@@ -63,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/get-input/get-config.js

@@ -19,6 +19,7 @@ var getConfig = function (disk, program) {
         (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
@@ -33,18 +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) ||
+            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;
@@ -81,6 +92,7 @@ var getConfig = function (disk, program) {
         workspace: workspace,
         overrides: overrides,
         peer: peer,
+        pnpmOverrides: pnpmOverrides,
         prod: prod,
         resolutions: resolutions,
         semverGroups: semverGroups,

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/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/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.2.2",
+  "version": "8.0.0",
   "author": "Jamie Mason <jamie@foldleft.io> (https://github.com/JamieMason)",
   "bin": {
     "syncpack": "dist/bin.js",