From a68e0573f077147204d34e59d5ceb13e32871115 Mon Sep 17 00:00:00 2001 From: Jared Collier Date: Wed, 29 Mar 2023 21:01:44 -0400 Subject: [PATCH 1/4] chore: update snippet pnpx references to pnpm dlx `pnpx` is deprecated as of pnpm 7, `pnpm dlx` should be used instead. --- .../common/preview-storybook-production-mode.pnpm.js.mdx | 2 +- docs/snippets/common/storybook-msw-generate.msw-pnpm.js.mdx | 2 +- docs/snippets/common/storybook-upgrade-prerelease.pnpm.js.mdx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/snippets/common/preview-storybook-production-mode.pnpm.js.mdx b/docs/snippets/common/preview-storybook-production-mode.pnpm.js.mdx index 61d73769f476..fd1f1512f9f1 100644 --- a/docs/snippets/common/preview-storybook-production-mode.pnpm.js.mdx +++ b/docs/snippets/common/preview-storybook-production-mode.pnpm.js.mdx @@ -1,3 +1,3 @@ ```shell -pnpx http-server ./path/to/build +pnpm dlx http-server ./path/to/build ``` diff --git a/docs/snippets/common/storybook-msw-generate.msw-pnpm.js.mdx b/docs/snippets/common/storybook-msw-generate.msw-pnpm.js.mdx index daec2bb6da32..a8e0c77e483a 100644 --- a/docs/snippets/common/storybook-msw-generate.msw-pnpm.js.mdx +++ b/docs/snippets/common/storybook-msw-generate.msw-pnpm.js.mdx @@ -1,3 +1,3 @@ ```shell -pnpx msw init public/ +pnpm dlx msw init public/ ``` diff --git a/docs/snippets/common/storybook-upgrade-prerelease.pnpm.js.mdx b/docs/snippets/common/storybook-upgrade-prerelease.pnpm.js.mdx index 47d087049d14..566c9dafb3a7 100644 --- a/docs/snippets/common/storybook-upgrade-prerelease.pnpm.js.mdx +++ b/docs/snippets/common/storybook-upgrade-prerelease.pnpm.js.mdx @@ -1,3 +1,3 @@ ```shell -pnpx storybook@next upgrade --prerelease +pnpm dlx storybook@next upgrade --prerelease ``` From 661c7c93212a1ef1f75a18b419a663252a38f648 Mon Sep 17 00:00:00 2001 From: Jared Collier Date: Wed, 29 Mar 2023 21:07:53 -0400 Subject: [PATCH 2/4] chore: update sb-scripts pnpx references to pnpm dlx `pnpx` is deprecated as of pnpm 7, `pnpm dlx` should be used instead. This will ensure Storybook scripts prefixed with `pnpm dlx` will also be found in calls to `getStorybookScripts()`. --- code/lib/cli/src/automigrate/fixes/sb-scripts.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts index 478a5b8c33ce..c7de3fa49629 100644 --- a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts +++ b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts @@ -35,7 +35,7 @@ export const getStorybookScripts = (allScripts: Record) => { // in case people have scripts like `yarn start-storybook` const isPrependedByPkgManager = - previousWord && ['npx', 'run', 'yarn', 'pnpx'].some((cmd) => previousWord.includes(cmd)); + previousWord && ['npx', 'run', 'yarn', 'pnpx', 'pnpm dlx'].some((cmd) => previousWord.includes(cmd)); if (isSbBinary && !isPrependedByPkgManager) { isStorybookScript = true; From b713c27cbf6756d488d711f034a832d3e00c9a7b Mon Sep 17 00:00:00 2001 From: Jared Collier Date: Wed, 29 Mar 2023 21:08:23 -0400 Subject: [PATCH 3/4] chore: update migration guide with updated pnpm dlx syntax `pnpx` is deprecated as of pnpm 7, `pnpm dlx` should be used instead. --- MIGRATION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MIGRATION.md b/MIGRATION.md index 5690bc1afac4..c073c8c8576e 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -291,7 +291,7 @@ ## From version 6.5.x to 7.0.0 -A number of these changes can be made automatically by the Storybook CLI. To take advantage of these "automigrations", run `npx storybook@next upgrade --prerelease` or `pnpx storybook@next upgrade --prerelease`. +A number of these changes can be made automatically by the Storybook CLI. To take advantage of these "automigrations", run `npx storybook@next upgrade --prerelease` or `pnpm dlx storybook@next upgrade --prerelease`. ### 7.0 breaking changes From 6a7ecf211801435c57f8d6f4c261c8b528ad101b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 3 Apr 2023 16:37:18 +0200 Subject: [PATCH 4/4] fix linting --- code/lib/cli/src/automigrate/fixes/sb-scripts.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts index c7de3fa49629..9c84d7b75062 100644 --- a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts +++ b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts @@ -35,7 +35,8 @@ export const getStorybookScripts = (allScripts: Record) => { // in case people have scripts like `yarn start-storybook` const isPrependedByPkgManager = - previousWord && ['npx', 'run', 'yarn', 'pnpx', 'pnpm dlx'].some((cmd) => previousWord.includes(cmd)); + previousWord && + ['npx', 'run', 'yarn', 'pnpx', 'pnpm dlx'].some((cmd) => previousWord.includes(cmd)); if (isSbBinary && !isPrependedByPkgManager) { isStorybookScript = true;