Merge branch 'next' into shilman/bench-task

storybookjs · Jun 23, 2023 · 6ad0c47 · 6ad0c47
2 parents e310832 + 3fb9ab3
commit 6ad0c47
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/code/lib/cli/src/js-package-manager/PNPMProxy.ts b/code/lib/cli/src/js-package-manager/PNPMProxy.ts
@@ -135,7 +135,9 @@ export class PNPMProxy extends JsPackageManager {
 
         return packageJSON;
       } catch (error) {
-        console.error('Error while fetching package version in PNPM PnP mode:', error);
+        if (error.code !== 'MODULE_NOT_FOUND') {
+          console.error('Error while fetching package version in PNPM PnP mode:', error);
+        }
         return null;
       }
     }

diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts
@@ -3,6 +3,7 @@ import chalk from 'chalk';
 import program from 'commander';
 import { z } from 'zod';
 import dedent from 'ts-dedent';
+import semver from 'semver';
 import { setOutput } from '@actions/core';
 import type { Change } from './utils/get-changes';
 import { getChanges, LABELS_BY_IMPORTANCE, RELEASED_LABELS } from './utils/get-changes';
@@ -140,6 +141,9 @@ export const generateReleaseDescription = ({
   changelogText: string;
   manualCherryPicks?: string;
 }): string => {
+  const workflow = semver.prerelease(nextVersion) ? 'prepare-prerelease' : 'prepare-patch-release';
+  const workflowUrl = `https://github.com/storybookjs/storybook/actions/workflows/${workflow}.yml`;
+
   return (
     dedent`This is an automated pull request that bumps the version from \`${currentVersion}\` to \`${nextVersion}\`.
   Once this pull request is merged, it will trigger a new release of version \`${nextVersion}\`.
@@ -168,7 +172,7 @@ export const generateReleaseDescription = ({
 
   ${manualCherryPicks || ''}
 
-  If you've made any changes doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. It will wipe your progress in this to do, which is expected.
+  If you've made any changes doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](${workflowUrl}) and wait for it to finish. It will wipe your progress in this to do, which is expected.
 
   When everything above is done:
   - Merge this PR