chore: build dist (#673)

Build dist PR
googleapis · Dec 8, 2022 · e6d565f · e6d565f
1 parent 9963ea2
commit e6d565f
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 113 deletions.
diff --git a/dist/commit.hbs b/dist/commit.hbs
@@ -1,23 +1,16 @@
-* {{header}}
-
-{{~!-- commit link --}} {{#if @root.linkReferences~}}
-  ([{{hash}}](
-  {{~#if @root.repository}}
-    {{~#if @root.host}}
-      {{~@root.host}}/
-    {{~/if}}
-    {{~#if @root.owner}}
-      {{~@root.owner}}/
-    {{~/if}}
-    {{~@root.repository}}
-  {{~else}}
-    {{~@root.repoUrl}}
-  {{~/if}}/
-  {{~@root.commit}}/{{hash}}))
+*{{#if scope}} **{{scope}}:**
+{{~/if}} {{#if subject}}
+  {{~subject}}
 {{~else}}
-  {{~hash}}
+  {{~header}}
 {{~/if}}
 
+{{~!-- commit link --}}{{~#if hash}} {{#if @root.linkReferences~}}
+  ([{{shortHash}}]({{commitUrlFormat}}))
+{{~else}}
+  {{~shortHash}}
+{{~/if}}{{~/if}}
+
 {{~!-- commit references --}}
 {{~#if references~}}
   , closes
@@ -26,31 +19,12 @@
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}#{{this.issue}}](
-    {{~#if @root.repository}}
-      {{~#if @root.host}}
-        {{~@root.host}}/
-      {{~/if}}
-      {{~#if this.repository}}
-        {{~#if this.owner}}
-          {{~this.owner}}/
-        {{~/if}}
-        {{~this.repository}}
-      {{~else}}
-        {{~#if @root.owner}}
-          {{~@root.owner}}/
-        {{~/if}}
-          {{~@root.repository}}
-        {{~/if}}
-    {{~else}}
-      {{~@root.repoUrl}}
-    {{~/if}}/
-    {{~@root.issue}}/{{this.issue}})
+    {{~this.repository}}{{this.prefix}}{{this.issue}}]({{issueUrlFormat}})
   {{~else}}
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}#{{this.issue}}
+    {{~this.repository}}{{this.prefix}}{{this.issue}}
   {{~/if}}{{/each}}
 {{~/if}}
 
diff --git a/dist/commit1.hbs b/dist/commit1.hbs
@@ -1,15 +1,22 @@
-*{{#if scope}} **{{scope}}:**
-{{~/if}} {{#if subject}}
-  {{~subject}}
-{{~else}}
-  {{~header}}
-{{~/if}}
+* {{header}}
 
-{{~!-- commit link --}}{{~#if hash}} {{#if @root.linkReferences~}}
-  ([{{shortHash}}]({{commitUrlFormat}}))
+{{~!-- commit link --}} {{#if @root.linkReferences~}}
+  ([{{hash}}](
+  {{~#if @root.repository}}
+    {{~#if @root.host}}
+      {{~@root.host}}/
+    {{~/if}}
+    {{~#if @root.owner}}
+      {{~@root.owner}}/
+    {{~/if}}
+    {{~@root.repository}}
+  {{~else}}
+    {{~@root.repoUrl}}
+  {{~/if}}/
+  {{~@root.commit}}/{{hash}}))
 {{~else}}
-  {{~shortHash}}
-{{~/if}}{{~/if}}
+  {{~hash}}
+{{~/if}}
 
 {{~!-- commit references --}}
 {{~#if references~}}
@@ -19,12 +26,31 @@
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}{{this.prefix}}{{this.issue}}]({{issueUrlFormat}})
+    {{~this.repository}}#{{this.issue}}](
+    {{~#if @root.repository}}
+      {{~#if @root.host}}
+        {{~@root.host}}/
+      {{~/if}}
+      {{~#if this.repository}}
+        {{~#if this.owner}}
+          {{~this.owner}}/
+        {{~/if}}
+        {{~this.repository}}
+      {{~else}}
+        {{~#if @root.owner}}
+          {{~@root.owner}}/
+        {{~/if}}
+          {{~@root.repository}}
+        {{~/if}}
+    {{~else}}
+      {{~@root.repoUrl}}
+    {{~/if}}/
+    {{~@root.issue}}/{{this.issue}})
   {{~else}}
     {{~#if this.owner}}
       {{~this.owner}}/
     {{~/if}}
-    {{~this.repository}}{{this.prefix}}{{this.issue}}
+    {{~this.repository}}#{{this.issue}}
   {{~/if}}{{/each}}
 {{~/if}}
 
diff --git a/dist/footer.hbs b/dist/footer.hbs
@@ -1,10 +0,0 @@
-{{#if noteGroups}}
-{{#each noteGroups}}
-
-### {{title}}
-
-{{#each notes}}
-* {{text}}
-{{/each}}
-{{/each}}
-{{/if}}

diff --git a/dist/footer1.hbs b/dist/footer1.hbs
@@ -0,0 +1,10 @@
+{{#if noteGroups}}
+{{#each noteGroups}}
+
+### {{title}}
+
+{{#each notes}}
+* {{text}}
+{{/each}}
+{{/each}}
+{{/if}}
diff --git a/dist/header.hbs b/dist/header.hbs
@@ -1,9 +1,9 @@
-## {{#if isPatch~}} <small>
-  {{~/if~}} {{version}}
-  {{~#if title}} "{{title}}"
-  {{~/if~}}
-  {{~#if date}} ({{date}})
-  {{~/if~}}
-  {{~#if isPatch~}} </small>
-  {{~/if}}
-
+## {{#if @root.linkCompare~}}
+  [{{version}}]({{compareUrlFormat}})
+{{~else}}
+  {{~version}}
+{{~/if}}
+{{~#if title}} "{{title}}"
+{{~/if}}
+{{~#if date}} ({{date}})
+{{/if}}
diff --git a/dist/header1.hbs b/dist/header1.hbs
@@ -1,9 +1,9 @@
-## {{#if @root.linkCompare~}}
-  [{{version}}]({{compareUrlFormat}})
-{{~else}}
-  {{~version}}
-{{~/if}}
-{{~#if title}} "{{title}}"
-{{~/if}}
-{{~#if date}} ({{date}})
-{{/if}}
+## {{#if isPatch~}} <small>
+  {{~/if~}} {{version}}
+  {{~#if title}} "{{title}}"
+  {{~/if~}}
+  {{~#if date}} ({{date}})
+  {{~/if~}}
+  {{~#if isPatch~}} </small>
+  {{~/if}}
+
diff --git a/dist/index.js b/dist/index.js
@@ -148,6 +148,7 @@ async function manifestInstance (github) {
   const versionFile = core.getInput('version-file') || undefined
   const extraFiles = core.getMultilineInput('extra-files') || undefined
   const pullRequestTitlePattern = core.getInput('pull-request-title-pattern') || undefined
+  const pullRequestHeader = core.getInput('pull-request-header') || undefined
   const draft = getOptionalBooleanInput('draft')
   const draftPullRequest = getOptionalBooleanInput('draft-pull-request')
   const changelogType = core.getInput('changelog-notes-type') || undefined
@@ -186,6 +187,7 @@ async function manifestInstance (github) {
       extraFiles,
       includeComponentInTag: monorepoTags,
       pullRequestTitlePattern,
+      pullRequestHeader,
       draftPullRequest,
       versioning,
       releaseAs,
@@ -24766,10 +24768,10 @@ module.exports = function (config) {
   })
 
   return Q.all([
-    readFile(__nccwpck_require__.ab + "template1.hbs", 'utf-8'),
-    readFile(__nccwpck_require__.ab + "header1.hbs", 'utf-8'),
-    readFile(__nccwpck_require__.ab + "commit1.hbs", 'utf-8'),
-    readFile(__nccwpck_require__.ab + "footer1.hbs", 'utf-8')
+    readFile(__nccwpck_require__.ab + "template.hbs", 'utf-8'),
+    readFile(__nccwpck_require__.ab + "header.hbs", 'utf-8'),
+    readFile(__nccwpck_require__.ab + "commit.hbs", 'utf-8'),
+    readFile(__nccwpck_require__.ab + "footer.hbs", 'utf-8')
   ])
     .spread((template, header, commit, footer) => {
       const writerOpts = getWriterOpts(config)
@@ -24988,10 +24990,10 @@ function conventionalChangelogWriterInit (context, options) {
     includeDetails: false,
     ignoreReverted: true,
     doFlush: true,
-    mainTemplate: readFileSync(__nccwpck_require__.ab + "template.hbs", 'utf-8'),
-    headerPartial: readFileSync(__nccwpck_require__.ab + "header.hbs", 'utf-8'),
-    commitPartial: readFileSync(__nccwpck_require__.ab + "commit.hbs", 'utf-8'),
-    footerPartial: readFileSync(__nccwpck_require__.ab + "footer.hbs", 'utf-8')
+    mainTemplate: readFileSync(__nccwpck_require__.ab + "template1.hbs", 'utf-8'),
+    headerPartial: readFileSync(__nccwpck_require__.ab + "header1.hbs", 'utf-8'),
+    commitPartial: readFileSync(__nccwpck_require__.ab + "commit1.hbs", 'utf-8'),
+    footerPartial: readFileSync(__nccwpck_require__.ab + "footer1.hbs", 'utf-8')
   }, options)
 
   if ((!_.isFunction(options.transform) && _.isObject(options.transform)) || _.isUndefined(options.transform)) {
@@ -87137,7 +87139,9 @@ class Manifest {
                 this.logger.debug(`type: ${config.releaseType}`);
                 this.logger.debug(`targetBranch: ${this.targetBranch}`);
                 const strategy = strategiesByPath[path];
-                const release = await strategy.buildRelease(pullRequest);
+                const release = await strategy.buildRelease(pullRequest, {
+                    groupPullRequestTitlePattern: this.groupPullRequestTitlePattern,
+                });
                 if (release) {
                     releases.push({
                         ...release,
@@ -88186,9 +88190,10 @@ class LinkedVersions extends plugin_1.ManifestPlugin {
             }
             return collection;
         }, [[], []]);
+        this.logger.info(`found ${inScopeCandidates.length} linked-versions candidates`);
         // delegate to the merge plugin and add merged pull request
         if (inScopeCandidates.length > 0) {
-            const merge = new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig, `chore\${branch}: release ${this.groupName} libraries`);
+            const merge = new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig, `chore\${scope}: release ${this.groupName} libraries`);
             const merged = await merge.run(inScopeCandidates);
             outOfScopeCandidates.push(...merged);
         }
@@ -89731,7 +89736,8 @@ class BaseStrategy {
      * @param {PullRequest} mergedPullRequest The merged release pull request.
      * @returns {Release} The candidate release.
      */
-    async buildRelease(mergedPullRequest) {
+    async buildRelease(mergedPullRequest, options) {
+        var _a;
         if (this.skipGitHubRelease) {
             this.logger.info('Release skipped from strategy config');
             return;
@@ -89740,8 +89746,9 @@ class BaseStrategy {
             this.logger.error('Pull request should have been merged');
             return;
         }
+        const mergedTitlePattern = (_a = options === null || options === void 0 ? void 0 : options.groupPullRequestTitlePattern) !== null && _a !== void 0 ? _a : manifest_1.MANIFEST_PULL_REQUEST_TITLE_PATTERN;
         const pullRequestTitle = pull_request_title_1.PullRequestTitle.parse(mergedPullRequest.title, this.pullRequestTitlePattern, this.logger) ||
-            pull_request_title_1.PullRequestTitle.parse(mergedPullRequest.title, manifest_1.MANIFEST_PULL_REQUEST_TITLE_PATTERN, this.logger);
+            pull_request_title_1.PullRequestTitle.parse(mergedPullRequest.title, mergedTitlePattern, this.logger);
         if (!pullRequestTitle) {
             this.logger.error(`Bad pull request title: '${mergedPullRequest.title}'`);
             return;
@@ -92530,7 +92537,7 @@ class AppJson extends default_1.DefaultUpdater {
                 this.version.minor * 100 +
                 this.version.patch;
             logger.info(`updating Android version from ${parsed.expo.android.versionCode} to ${versionCode}`);
-            parsed.expo.android.versionCode = versionCode.toString();
+            parsed.expo.android.versionCode = versionCode;
         }
         return (0, json_stringify_1.jsonStringify)(parsed, content);
     }
@@ -94074,7 +94081,7 @@ class VersionRB extends default_1.DefaultUpdater {
      * @returns {string} The updated content
      */
     updateContent(content) {
-        return content.replace(/(["'])[0-9]+\.[0-9]+\.[0-9](-\w+)?["']/, `$1${this.version}$1`);
+        return content.replace(/(["'])[0-9]+\.[0-9]+\.[0-9]+(-\w+)?["']/, `$1${this.version}$1`);
     }
 }
 exports.VersionRB = VersionRB;
@@ -120753,7 +120760,7 @@ module.exports = {};
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"14.17.2"};
+module.exports = {"i8":"14.17.5"};
 
 /***/ }),
 

diff --git a/dist/template.hbs b/dist/template.hbs
@@ -1,11 +1,23 @@
 {{> header}}
 
-{{#each commitGroups}}
-{{#each commits}}
-{{> commit root=@root}}
+{{#if noteGroups}}
+{{#each noteGroups}}
+
+### ⚠ {{title}}
+
+{{#each notes}}
+* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
 {{/each}}
 {{/each}}
+{{/if}}
+{{#each commitGroups}}
 
-{{> footer}}
+{{#if title}}
+### {{title}}
 
+{{/if}}
+{{#each commits}}
+{{> commit root=@root}}
+{{/each}}
 
+{{/each}}
diff --git a/dist/template1.hbs b/dist/template1.hbs
@@ -1,23 +1,11 @@
 {{> header}}
 
-{{#if noteGroups}}
-{{#each noteGroups}}
-
-### ⚠ {{title}}
-
-{{#each notes}}
-* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
-{{/each}}
-{{/each}}
-{{/if}}
 {{#each commitGroups}}
-
-{{#if title}}
-### {{title}}
-
-{{/if}}
 {{#each commits}}
 {{> commit root=@root}}
 {{/each}}
-
 {{/each}}
+
+{{> footer}}
+
+