release-please 13.19.5 → 13.19.8

package/CHANGELOG.md

@@ -4,6 +4,27 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [13.19.8](https://github.com/googleapis/release-please/compare/v13.19.7...v13.19.8) (2022-08-03)
+
+
+### Bug Fixes
+
+* convert ReleaserConfig JSON keys when bootstrapping ([#1535](https://github.com/googleapis/release-please/issues/1535)) ([64c267e](https://github.com/googleapis/release-please/commit/64c267e1c986029b6c483b924950135c138c510f)), closes [#1522](https://github.com/googleapis/release-please/issues/1522)
+
+## [13.19.7](https://github.com/googleapis/release-please/compare/v13.19.6...v13.19.7) (2022-08-03)
+
+
+### Bug Fixes
+
+* handles pull request iterator when graphQL returns no files ([#1544](https://github.com/googleapis/release-please/issues/1544)) ([7d0f873](https://github.com/googleapis/release-please/commit/7d0f87361f9ddd3f55eb2f40ef7150c9b7f39f34))
+
+## [13.19.6](https://github.com/googleapis/release-please/compare/v13.19.5...v13.19.6) (2022-07-27)
+
+
+### Bug Fixes
+
+* skip component when manifest release does not include component ([#1537](https://github.com/googleapis/release-please/issues/1537)) ([8f1a3a8](https://github.com/googleapis/release-please/commit/8f1a3a84a7abc81c47d8cac9295e58bc37cc92c5)), closes [#1536](https://github.com/googleapis/release-please/issues/1536)
+
 ## [13.19.5](https://github.com/googleapis/release-please/compare/v13.19.4...v13.19.5) (2022-07-26)
 
 

package/build/src/github.js

@@ -697,16 +697,16 @@ class GitHub {
         return {
             pageInfo: response.repository.pullRequests.pageInfo,
             data: pullRequests.map(pullRequest => {
-                var _a;
+                var _a, _b, _c;
                 return {
                     sha: (_a = pullRequest.mergeCommit) === null || _a === void 0 ? void 0 : _a.oid,
                     number: pullRequest.number,
                     baseBranchName: pullRequest.baseRefName,
                     headBranchName: pullRequest.headRefName,
-                    labels: (pullRequest.labels.nodes || []).map(l => l.name),
+                    labels: (((_b = pullRequest.labels) === null || _b === void 0 ? void 0 : _b.nodes) || []).map(l => l.name),
                     title: pullRequest.title,
                     body: pullRequest.body + '',
-                    files: pullRequest.files.nodes.map(node => node.path),
+                    files: (((_c = pullRequest.files) === null || _c === void 0 ? void 0 : _c.nodes) || []).map(node => node.path),
                 };
             }),
         };

package/build/src/manifest.d.ts

@@ -45,6 +45,8 @@ export interface ReleaserConfig {
     pullRequestTitlePattern?: string;
     tagSeparator?: string;
     separatePullRequests?: boolean;
+    labels?: string[];
+    releaseLabels?: string[];
     changelogSections?: ChangelogSection[];
     changelogPath?: string;
     changelogType?: ChangelogNotesType;
@@ -83,7 +85,7 @@ interface ReleaserConfigJson {
     'pull-request-title-pattern'?: string;
     'separate-pull-requests'?: boolean;
     'tag-separator'?: string;
-    'extra-files'?: string[];
+    'extra-files'?: ExtraFile[];
     'version-file'?: string;
     'snapshot-label'?: string;
 }
@@ -108,7 +110,7 @@ export interface ManifestOptions {
     releaseSearchDepth?: number;
     commitSearchDepth?: number;
 }
-interface ReleaserPackageConfig extends ReleaserConfigJson {
+export interface ReleaserPackageConfig extends ReleaserConfigJson {
     'package-name'?: string;
     component?: string;
     'changelog-path'?: string;

package/build/src/manifest.js

@@ -707,6 +707,7 @@ exports.Manifest = Manifest;
  * @returns {ReleaserConfig}
  */
 function extractReleaserConfig(config) {
+    var _a, _b;
     return {
         releaseType: config['release-type'],
         bumpMinorPreMajor: config['bump-minor-pre-major'],
@@ -729,6 +730,8 @@ function extractReleaserConfig(config) {
         pullRequestTitlePattern: config['pull-request-title-pattern'],
         tagSeparator: config['tag-separator'],
         separatePullRequests: config['separate-pull-requests'],
+        labels: (_a = config['label']) === null || _a === void 0 ? void 0 : _a.split(','),
+        releaseLabels: (_b = config['release-label']) === null || _b === void 0 ? void 0 : _b.split(','),
     };
 }
 /**
@@ -763,9 +766,9 @@ async function parseConfig(github, configFile, branch, onlyPath, releaseAs) {
         separatePullRequests: config['separate-pull-requests'],
         groupPullRequestTitlePattern: config['group-pull-request-title-pattern'],
         plugins: config['plugins'],
-        labels: configLabel === undefined ? undefined : [configLabel],
-        releaseLabels: configReleaseLabel === undefined ? undefined : [configReleaseLabel],
-        snapshotLabels: configSnapshotLabel === undefined ? undefined : [configSnapshotLabel],
+        labels: configLabel === null || configLabel === void 0 ? void 0 : configLabel.split(','),
+        releaseLabels: configReleaseLabel === null || configReleaseLabel === void 0 ? void 0 : configReleaseLabel.split(','),
+        snapshotLabels: configSnapshotLabel === null || configSnapshotLabel === void 0 ? void 0 : configSnapshotLabel.split(','),
         releaseSearchDepth: config['release-search-depth'],
         commitSearchDepth: config['commit-search-depth'],
         sequentialCalls: config['sequential-calls'],

package/build/src/strategies/base.js

@@ -289,11 +289,17 @@ class BaseStrategy {
             releaseData = pullRequestBody.releaseData[0];
         }
         else {
-            // manifest release with multiple components
-            releaseData = pullRequestBody.releaseData.find(releaseData => {
-                return (this.normalizeComponent(releaseData.component) ===
+            // manifest release with multiple components - find the release notes
+            // for the component to see if it was included in this release (parsed
+            // from the release pull request body)
+            releaseData = pullRequestBody.releaseData.find(datum => {
+                return (this.normalizeComponent(datum.component) ===
                     this.normalizeComponent(component));
             });
+            if (!releaseData && pullRequestBody.releaseData.length > 0) {
+                logger_1.logger.info(`Pull request contains releases, but not for component: ${component}`);
+                return;
+            }
         }
         const notes = releaseData === null || releaseData === void 0 ? void 0 : releaseData.notes;
         if (notes === undefined) {

package/build/src/updaters/release-please-config.js

@@ -28,7 +28,7 @@ class ReleasePleaseConfig {
         else {
             parsed = { packages: {} };
         }
-        parsed.packages[this.path] = this.config;
+        parsed.packages[this.path] = releaserConfigToJsonConfig(this.config);
         if (content) {
             return (0, json_stringify_1.jsonStringify)(parsed, content);
         }
@@ -38,4 +38,34 @@ class ReleasePleaseConfig {
     }
 }
 exports.ReleasePleaseConfig = ReleasePleaseConfig;
+function releaserConfigToJsonConfig(config) {
+    var _a, _b, _c;
+    const jsonConfig = {
+        'package-name': config.packageName,
+        component: config.component,
+        'changelog-path': config.changelogPath,
+        'release-type': config.releaseType,
+        'bump-minor-pre-major': config.bumpMinorPreMajor,
+        'bump-patch-for-minor-pre-major': config.bumpPatchForMinorPreMajor,
+        'changelog-sections': config.changelogSections,
+        'release-as': config.releaseAs,
+        'skip-github-release': config.skipGithubRelease,
+        draft: config.draft,
+        prerelease: config.prerelease,
+        'draft-pull-request': config.draftPullRequest,
+        label: (_a = config.labels) === null || _a === void 0 ? void 0 : _a.join(','),
+        'release-label': (_b = config.releaseLabels) === null || _b === void 0 ? void 0 : _b.join(','),
+        'include-component-in-tag': config.includeComponentInTag,
+        'include-v-in-tag': config.includeVInTag,
+        'changelog-type': config.changelogType,
+        'changelog-host': config.changelogHost,
+        'pull-request-title-pattern': config.pullRequestTitlePattern,
+        'separate-pull-requests': config.separatePullRequests,
+        'tag-separator': config.tagSeparator,
+        'extra-files': config.extraFiles,
+        'version-file': config.versionFile,
+        'snapshot-label': (_c = config.snapshotLabels) === null || _c === void 0 ? void 0 : _c.join(','), // Java-only
+    };
+    return jsonConfig;
+}
 //# sourceMappingURL=release-please-config.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "13.19.5",
+  "version": "13.19.8",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",