Merge pull request #28610 from storybookjs/version-patch-from-8.2.3

Release: Patch 8.2.4
storybookjs · Jul 16, 2024 · 4c5a2a1 · 4c5a2a1
2 parents 7067b33 + de22531
commit 4c5a2a1
Show file tree

Hide file tree

Showing 27 changed files with 1,427 additions and 316 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 8.2.4
+
+- CLI: Add diagnostic when the `storybook` package is missing - [#28604](https://github.com/storybookjs/storybook/pull/28604), thanks @kasperpeulen!
+- CLI: Make a few automigrations run on all version upgrades - [#28601](https://github.com/storybookjs/storybook/pull/28601), thanks @yannbf!
+- CPC: Direct dependencies on shim packages in renderers - [#28599](https://github.com/storybookjs/storybook/pull/28599), thanks @ndelangen!
+
 ## 8.2.3
 
 - Bug: Fix invalid docs links in Configure.mdx template page - [#28560](https://github.com/storybookjs/storybook/pull/28560), thanks @kylegach!

diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json
@@ -38,8 +38,12 @@
  },
  "dependencies": {
  "@storybook/builder-webpack5": "workspace:*",
+ "@storybook/components": "workspace:^",
  "@storybook/core-webpack": "workspace:*",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "@types/node": "^18.0.0",
  "@types/react": "^18.0.37",
  "@types/react-dom": "^18.0.11",

diff --git a/code/lib/cli/src/automigrate/fixes/addon-postcss.ts b/code/lib/cli/src/automigrate/fixes/addon-postcss.ts
@@ -10,7 +10,7 @@ interface AddonPostcssRunOptions {
 export const addonPostCSS: Fix<AddonPostcssRunOptions> = {
  id: 'addon-postcss',
 
- versionRange: ['<7', '>=7'],
+ versionRange: ['*', '*'],
 
  promptType: 'notification',
 

diff --git a/code/lib/cli/src/automigrate/fixes/addons-api.ts b/code/lib/cli/src/automigrate/fixes/addons-api.ts
@@ -9,7 +9,7 @@ interface AddonsAPIRunOptions {
 export const addonsAPI: Fix<AddonsAPIRunOptions> = {
  id: 'addons-api',
 
- versionRange: ['<8', '>=8'],
+ versionRange: ['*', '*'],
 
  promptType: 'notification',
 

diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts b/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts
@@ -18,32 +18,12 @@ const checkStorybookBinary = async ({
 
 describe('storybook-binary fix', () => {
  describe('sb >= 7.0', () => {
- it('should no-op in NX projects', async () => {
+ it('should add storybook dependency if not present', async () => {
  const packageManager = {
  getPackageVersion: (packageName) => {
  switch (packageName) {
- case '@storybook/react':
- return Promise.resolve('7.0.0');
  case '@nrwl/storybook':
  return Promise.resolve('15.7.1');
- default:
- return null;
- }
- },
- retrievePackageJson: () => Promise.resolve({}),
- } as Partial<JsPackageManager>;
-
- await expect(
- checkStorybookBinary({
- packageManager,
- })
- ).resolves.toBeFalsy();
- });
-
- it('should add storybook dependency if not present', async () => {
- const packageManager = {
- getPackageVersion: (packageName) => {
- switch (packageName) {
  case '@storybook/react':
  return Promise.resolve('7.0.0-alpha.0');
  default:

diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.ts b/code/lib/cli/src/automigrate/fixes/sb-binary.ts
@@ -23,20 +23,14 @@ const logger = console;
 export const sbBinary: Fix<SbBinaryRunOptions> = {
  id: 'storybook-binary',
 
- versionRange: ['<7', '>=7'],
+ versionRange: ['*', '*'],
 
  async check({ packageManager, storybookVersion }) {
  const packageJson = await packageManager.retrievePackageJson();
 
- const nrwlStorybookVersion = await packageManager.getPackageVersion('@nrwl/storybook');
  const sbBinaryVersion = await packageManager.getPackageVersion('sb');
  const storybookBinaryVersion = await packageManager.getPackageVersion('storybook');
 
- // Nx provides their own binary, so we don't need to do anything
- if (nrwlStorybookVersion) {
- return null;
- }
-
  const hasSbBinary = !!sbBinaryVersion;
  const hasStorybookBinary = !!storybookBinaryVersion;
 

diff --git a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts
@@ -78,7 +78,7 @@ export const getStorybookScripts = (allScripts: NonNullable<PackageJson['scripts
 export const sbScripts: Fix<SbScriptsRunOptions> = {
  id: 'sb-scripts',
 
- versionRange: ['<7', '>=7'],
+ versionRange: ['*', '*'],
 
  async check({ packageManager, storybookVersion }) {
  const packageJson = await packageManager.retrievePackageJson();

diff --git a/code/lib/cli/src/automigrate/fixes/wrap-require.ts b/code/lib/cli/src/automigrate/fixes/wrap-require.ts
@@ -22,7 +22,7 @@ interface WrapRequireRunOptions {
 export const wrapRequire: Fix<WrapRequireRunOptions> = {
  id: 'wrap-require',
 
- versionRange: ['<7.2.0-rc.0', '>=7.2.0-rc.0'],
+ versionRange: ['*', '*'],
 
  async check({ packageManager, storybookVersion, mainConfigPath }) {
  const isStorybookInMonorepo = await packageManager.isStorybookInMonorepo();

diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/cli/src/doctor/index.ts
@@ -105,6 +105,15 @@ export const doctor = async ({
 
  const allDependencies = (await packageManager.getAllDependencies()) as Record<string, string>;
 
+ if (!('storybook' in allDependencies)) {
+ logDiagnostic(
+ `Package ${chalk.cyan('storybook')} not found`,
+ dedent`
+ The ${chalk.cyan('storybook')} package was not found in your package.json.
+ Installing ${chalk.cyan('storybook')} as a direct dev dependency in your package.json is required. 
+ `
+ );
+ }
  const incompatibleStorybookPackagesList = await getIncompatibleStorybookPackages({
  currentStorybookVersion: storybookVersion,
  });

diff --git a/code/package.json b/code/package.json
@@ -278,5 +278,6 @@
  "Dependency Upgrades"
  ]
  ]
- }
+ },
+ "deferredNextVersion": "8.2.4"
 }
diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json
@@ -47,7 +47,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "ts-dedent": "^2.0.0"
  },
  "devDependencies": {

diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json
@@ -47,7 +47,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "ts-dedent": "^2.0.0"
  },
  "devDependencies": {

diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json
@@ -64,8 +64,12 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
  "@storybook/react-dom-shim": "workspace:*",
+ "@storybook/theming": "workspace:^",
  "@types/escodegen": "^0.0.6",
  "@types/estree": "^0.0.51",
  "@types/node": "^18.0.0",

diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json
@@ -46,8 +46,12 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/csf": "0.1.11",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "@types/fs-extra": "^11.0.1",
  "fs-extra": "^11.1.0",
  "ts-dedent": "^2.0.0",

diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json
@@ -57,7 +57,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "sveltedoc-parser": "^4.2.1",
  "ts-dedent": "^2.0.0",
  "type-fest": "~2.19"

diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json
@@ -63,7 +63,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "@vue/compiler-core": "^3.0.0",
  "lodash": "^4.17.21",
  "ts-dedent": "^2.0.0",

diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json
@@ -50,7 +50,11 @@
  "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
+ "@storybook/components": "workspace:^",
  "@storybook/global": "^5.0.0",
+ "@storybook/manager-api": "workspace:^",
+ "@storybook/preview-api": "workspace:^",
+ "@storybook/theming": "workspace:^",
  "tiny-invariant": "^1.3.1",
  "ts-dedent": "^2.0.0"
  },