release-please 16.6.0 → 16.7.0

package/build/src/index.d.ts

@@ -14,4 +14,4 @@ export { Logger, setLogger } from './util/logger';
 export { GitHub } from './github';
 export declare const configSchema: any;
 export declare const manifestSchema: any;
-export declare const VERSION = "16.5.1";
+export declare const VERSION = "16.7.0";

package/build/src/index.js

@@ -36,6 +36,6 @@ Object.defineProperty(exports, "GitHub", { enumerable: true, get: function () {
 exports.configSchema = require('../../schemas/config.json');
 exports.manifestSchema = require('../../schemas/manifest.json');
 // x-release-please-start-version
-exports.VERSION = '16.5.1';
+exports.VERSION = '16.7.0';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/plugins/node-workspace.js

@@ -14,6 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeWorkspace = void 0;
+const package_lock_json_1 = require("../updaters/node/package-lock-json");
 const version_1 = require("../version");
 const pull_request_title_1 = require("../util/pull-request-title");
 const pull_request_body_1 = require("../util/pull-request-body");
@@ -120,6 +121,12 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
                 if (update.path === (0, workspace_1.addPath)(existingCandidate.path, 'package.json')) {
                     update.updater = new composite_1.CompositeUpdater(update.updater, updater);
                 }
+                else if (update.path === (0, workspace_1.addPath)(existingCandidate.path, 'package-lock.json')) {
+                    update.updater = new package_lock_json_1.PackageLockJson({
+                        version: newVersion,
+                        versionsMap: updatedVersions,
+                    });
+                }
                 else if (update.updater instanceof changelog_1.Changelog) {
                     if (dependencyNotes) {
                         update.updater.changelogEntry =
@@ -189,6 +196,14 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
                         versionsMap: updatedVersions,
                     }),
                 },
+                {
+                    path: (0, workspace_1.addPath)(updatedPackage.path, 'package-lock.json'),
+                    createIfMissing: false,
+                    updater: new package_json_1.PackageJson({
+                        version: newVersion,
+                        versionsMap: updatedVersions,
+                    }),
+                },
                 {
                     path: (0, workspace_1.addPath)(updatedPackage.path, 'CHANGELOG.md'),
                     createIfMissing: false,
@@ -212,7 +227,32 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
         };
     }
     postProcessCandidates(candidates, _updatedVersions) {
-        // NOP for node workspaces
+        if (candidates.length === 0) {
+            return candidates;
+        }
+        const [candidate] = candidates;
+        // check for root lock file in pull request
+        let hasRootLockFile;
+        for (let i = 0; i < candidate.pullRequest.updates.length; i++) {
+            if (candidate.pullRequest.updates[i].path === '.package-lock.json' ||
+                candidate.pullRequest.updates[i].path === './package-lock.json' ||
+                candidate.pullRequest.updates[i].path === 'package-lock.json' ||
+                candidate.pullRequest.updates[i].path === '/package-lock.json') {
+                hasRootLockFile = true;
+                break;
+            }
+        }
+        // if there is a root lock file, then there is no additional pull request update necessary.
+        if (hasRootLockFile) {
+            return candidates;
+        }
+        candidate.pullRequest.updates.push({
+            path: 'package-lock.json',
+            createIfMissing: false,
+            updater: new package_lock_json_1.PackageLockJson({
+                versionsMap: _updatedVersions,
+            }),
+        });
         return candidates;
     }
     async buildGraph(allPackages) {

package/build/src/strategies/node.js

@@ -27,6 +27,7 @@ class Node extends base_1.BaseStrategy {
         var _a;
         const updates = [];
         const version = options.newVersion;
+        const versionsMap = options.versionsMap;
         const packageName = (_a = (await this.getPackageName())) !== null && _a !== void 0 ? _a : '';
         const lockFiles = ['package-lock.json', 'npm-shrinkwrap.json'];
         lockFiles.forEach(lockFile => {
@@ -35,6 +36,7 @@ class Node extends base_1.BaseStrategy {
                 createIfMissing: false,
                 updater: new package_lock_json_1.PackageLockJson({
                     version,
+                    versionsMap,
                 }),
             });
         });

package/build/src/updaters/node/package-json.d.ts

@@ -1,6 +1,16 @@
 import { Logger } from '../../util/logger';
+import { Version, VersionsMap } from '../../version';
 import { DefaultUpdater } from '../default';
-import { Version } from '../../version';
+export type PackageJsonDescriptor = {
+    name?: string;
+    resolved?: string;
+    link?: boolean;
+    version: string;
+    dependencies?: Record<string, string>;
+    devDependencies?: Record<string, string>;
+    peerDependencies?: Record<string, string>;
+    optionalDependencies?: Record<string, string>;
+};
 /**
  * This updates a Node.js package.json file's main version.
  */
@@ -8,6 +18,7 @@ export declare class PackageJson extends DefaultUpdater {
     /**
      * Given initial file contents, return updated contents.
      * @param {string} content The initial content
+     * @param logger
      * @returns {string} The updated content
      */
     updateContent(content: string, logger?: Logger): string;
@@ -19,3 +30,11 @@ export declare class PackageJson extends DefaultUpdater {
  * @param {Version} newVersion The new version to update with
  */
 export declare function newVersionWithRange(oldVersion: string, newVersion: Version): string;
+/**
+ * Helper function to update dependency versions for all new versions specified
+ * in the updated versions map. Note that this mutates the existing input.
+ * @param {Record<string, string>} dependencies Entries in package.json dependencies
+ *   where the key is the dependency name and the value is the dependency range
+ * @param {VersionsMap} updatedVersions Map of new versions (without dependency range prefixes)
+ */
+export declare function updateDependencies(dependencies: Record<string, string>, updatedVersions: VersionsMap): void;

package/build/src/updaters/node/package-json.js

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newVersionWithRange = exports.PackageJson = void 0;
+exports.updateDependencies = exports.newVersionWithRange = exports.PackageJson = void 0;
 const json_stringify_1 = require("../../util/json-stringify");
 const logger_1 = require("../../util/logger");
 const default_1 = require("../default");
@@ -24,6 +24,7 @@ class PackageJson extends default_1.DefaultUpdater {
     /**
      * Given initial file contents, return updated contents.
      * @param {string} content The initial content
+     * @param logger
      * @returns {string} The updated content
      */
     updateContent(content, logger = logger_1.logger) {
@@ -88,9 +89,9 @@ function updateDependencies(dependencies, updatedVersions) {
         const newVersion = updatedVersions.get(depName);
         if (newVersion) {
             const oldVersion = dependencies[depName];
-            const newVersionString = newVersionWithRange(oldVersion, newVersion);
-            dependencies[depName] = newVersionString;
+            dependencies[depName] = newVersionWithRange(oldVersion, newVersion);
         }
     }
 }
+exports.updateDependencies = updateDependencies;
 //# sourceMappingURL=package-json.js.map

package/build/src/updaters/node/package-lock-json.d.ts

@@ -1,9 +1,14 @@
+import { Updater } from '../../update';
 import { Logger } from '../../util/logger';
-import { DefaultUpdater } from '../default';
+import { Version, VersionsMap } from '../../version';
+import { UpdateOptions } from '../default';
 /**
  * Updates a Node.js package-lock.json file's version and '' package
  * version (for a v2 lock file).
  */
-export declare class PackageLockJson extends DefaultUpdater {
+export declare class PackageLockJson implements Updater {
+    version?: Version;
+    versionsMap?: VersionsMap;
+    constructor(options: Partial<UpdateOptions>);
     updateContent(content: string, logger?: Logger): string;
 }

package/build/src/updaters/node/package-lock-json.js

@@ -16,21 +16,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageLockJson = void 0;
 const json_stringify_1 = require("../../util/json-stringify");
 const logger_1 = require("../../util/logger");
-const default_1 = require("../default");
+const package_json_1 = require("./package-json");
 /**
  * Updates a Node.js package-lock.json file's version and '' package
  * version (for a v2 lock file).
  */
-class PackageLockJson extends default_1.DefaultUpdater {
+class PackageLockJson {
+    constructor(options) {
+        this.version = options.version;
+        this.versionsMap = options.versionsMap;
+    }
     updateContent(content, logger = logger_1.logger) {
         const parsed = JSON.parse(content);
-        logger.info(`updating from ${parsed.version} to ${this.version}`);
-        parsed.version = this.version.toString();
+        if (this.version) {
+            logger.info(`updating from ${parsed.version} to ${this.version}`);
+            parsed.version = this.version.toString();
+        }
         if (parsed.lockfileVersion === 2 || parsed.lockfileVersion === 3) {
-            parsed.packages[''].version = this.version.toString();
+            if (this.version) {
+                parsed.packages[''].version = this.version.toString();
+            }
+            if (this.versionsMap) {
+                this.versionsMap.forEach((version, name) => {
+                    let pkg = parsed.packages['node_modules/' + name];
+                    if (!pkg) {
+                        return;
+                    }
+                    // @see https://docs.npmjs.com/cli/v10/configuring-npm/package-lock-json#packages
+                    if (pkg.link && pkg.resolved) {
+                        pkg = parsed.packages[pkg.resolved];
+                        if (!pkg) {
+                            return;
+                        }
+                    }
+                    pkg.version = version.toString();
+                    if (pkg.dependencies) {
+                        (0, package_json_1.updateDependencies)(pkg.dependencies, this.versionsMap);
+                    }
+                    if (pkg.devDependencies) {
+                        (0, package_json_1.updateDependencies)(pkg.devDependencies, this.versionsMap);
+                    }
+                    if (pkg.peerDependencies) {
+                        (0, package_json_1.updateDependencies)(pkg.peerDependencies, this.versionsMap);
+                    }
+                    if (pkg.optionalDependencies) {
+                        (0, package_json_1.updateDependencies)(pkg.optionalDependencies, this.versionsMap);
+                    }
+                });
+            }
         }
         if (this.versionsMap) {
             for (const [, obj] of Object.entries(parsed.packages)) {
+                if (!obj.name) {
+                    continue;
+                }
                 const ver = this.versionsMap.get(obj.name);
                 if (ver) {
                     obj.version = ver.toString();

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "release-please",
-  "version": "16.6.0",
+  "version": "16.7.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
   "scripts": {
     "test": "cross-env ENVIRONMENT=test LC_ALL=en c8 mocha --node-option no-experimental-fetch --recursive --timeout=5000 build/test",
     "docs": "echo add docs tests",
-    "test:snap": "SNAPSHOT_UPDATE=1 LC_ALL=en npm test",
+    "test:snap": "cross-env SNAPSHOT_UPDATE=1 LC_ALL=en npm test",
     "clean": "gts clean",
     "prepare": "npm run compile",
     "lint": "gts check",