Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 9.0.15

- CLI: Do not fail incompatible package check in doctor if only core packages used - [#31886](https://github.com/storybookjs/storybook/pull/31886), thanks @mrginglymus!
- React: Bump @joshwooding/vite-plugin-react-docgen-typescript to 0.6.1 - [#31899](https://github.com/storybookjs/storybook/pull/31899), thanks @mrginglymus!

## 9.0.14

- CLI: Prebundle more in cli-storybook package - [#31746](https://github.com/storybookjs/storybook/pull/31746), thanks @ndelangen!
Expand Down
2 changes: 1 addition & 1 deletion code/frameworks/react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"prep": "jiti ../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@joshwooding/vite-plugin-react-docgen-typescript": "0.6.0",
"@joshwooding/vite-plugin-react-docgen-typescript": "0.6.1",
"@rollup/pluginutils": "^5.0.2",
"@storybook/builder-vite": "workspace:*",
"@storybook/react": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,19 @@ describe('getIncompatibleStorybookPackages', () => {
vi.mocked(packageManagerMock.getModulePackageJSON).mockReturnValue({ version: '9.0.0' });
});

it('succeeds if only core storybook packages used', async () => {
vi.mocked(packageManagerMock.getAllDependencies).mockReturnValueOnce({
storybook: '9.0.0',
});

const result = await getIncompatibleStorybookPackages({
currentStorybookVersion: '9.0.0',
packageManager: packageManagerMock as JsPackageManager,
});

expect(result).toHaveLength(0);
});

it('returns an array of incompatible packages', async () => {
// Mock a non-core storybook package that would be found
vi.mocked(packageManagerMock.getAllDependencies).mockReturnValueOnce({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable local-rules/no-uncategorized-errors */
import type { JsPackageManager } from 'storybook/internal/common';
import { versions as storybookCorePackages, versions } from 'storybook/internal/common';
import { versions as storybookCorePackages } from 'storybook/internal/common';
import { logger } from 'storybook/internal/node-logger';

import picocolors from 'picocolors';
Expand Down Expand Up @@ -102,13 +102,15 @@ export const getIncompatibleStorybookPackages = async (
context: Context
): Promise<AnalysedPackage[]> => {
const allDeps = context.packageManager.getAllDependencies();
const storybookLikeDeps = Object.keys(allDeps).filter(
(dep) => dep.includes('storybook') && !versions[dep as keyof typeof versions]
);
const storybookLikeDeps = Object.keys(allDeps).filter((dep) => dep.includes('storybook'));
if (storybookLikeDeps.length === 0 && !context.skipErrors) {
throw new Error('No Storybook dependencies found in the package.json');
}
Comment on lines +105 to 108

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: This check will incorrectly fail when only core packages are present, since it runs before filtering out core packages. Consider moving the error check after line 111's filter.

return Promise.all(storybookLikeDeps.map((dep) => checkPackageCompatibility(dep, context)));
return Promise.all(
storybookLikeDeps
.filter((dep) => !storybookCorePackages[dep as keyof typeof storybookCorePackages])
.map((dep) => checkPackageCompatibility(dep, context))
);
};

export const getIncompatiblePackagesSummary = (
Expand Down
3 changes: 2 additions & 1 deletion code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,5 +283,6 @@
"Dependency Upgrades"
]
]
}
},
"deferredNextVersion": "9.0.15"
}
12 changes: 6 additions & 6 deletions code/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3351,20 +3351,20 @@ __metadata:
languageName: node
linkType: hard

"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.0":
version: 0.6.0
resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.0"
"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.1":
version: 0.6.1
resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.1"
dependencies:
glob: "npm:^10.0.0"
magic-string: "npm:^0.30.0"
react-docgen-typescript: "npm:^2.2.2"
peerDependencies:
typescript: ">= 4.3.x"
vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0
vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/cbb76545214929e628de661985f69f9b79f324ad8db0aa19b2937c52730be57eb37848a7b7d5986ccc00f09d8bc0623ec16f83c9c13aaca3ef5afd0bc322da2e
checksum: 10c0/0bcc2adbb49158018102bd9d84cd8572c770daee3d46733157933ef0330953bd5b9e102c26f2338ee7dfb8f21a7bb937134d23f8a7935d5dc88525a253557467
languageName: node
linkType: hard

Expand Down Expand Up @@ -6739,7 +6739,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@storybook/react-vite@workspace:frameworks/react-vite"
dependencies:
"@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.6.0"
"@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.6.1"
"@rollup/pluginutils": "npm:^5.0.2"
"@storybook/builder-vite": "workspace:*"
"@storybook/react": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion docs/versions/latest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"9.0.14","info":{"plain":"- CLI: Prebundle more in cli-storybook package - [#31746](https://github.com/storybookjs/storybook/pull/31746), thanks @ndelangen!\n- Core: Fix FIPS compliance - [#31806](https://github.com/storybookjs/storybook/pull/31806), thanks @JReinhold!\n- Core: Fix addon scrollbars and align scrollbar colors with toolbars - [#31844](https://github.com/storybookjs/storybook/pull/31844), thanks @Sidnioulz!\n- Deps: Extend `vite` peerDependencies range to include `7.0.0` - [#31859](https://github.com/storybookjs/storybook/pull/31859), thanks @ghengeveld!\n- Deps: Update vite-plugin-babel to 1.3.2 to fix vite 7.0.0 peerDependency issue - [#31888](https://github.com/storybookjs/storybook/pull/31888), thanks @ghengeveld!\n- UI: Hide keyboard shortcuts entry from menu when shortcuts are disabled - [#23411](https://github.com/storybookjs/storybook/pull/23411), thanks @Spielboerg!"}}
{"version":"9.0.15","info":{"plain":"- CLI: Do not fail incompatible package check in doctor if only core packages used - [#31886](https://github.com/storybookjs/storybook/pull/31886), thanks @mrginglymus!\n- React: Bump @joshwooding/vite-plugin-react-docgen-typescript to 0.6.1 - [#31899](https://github.com/storybookjs/storybook/pull/31899), thanks @mrginglymus!"}}