diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md index 8266aa3fd22e..872738a0d76c 100644 --- a/CHANGELOG.prerelease.md +++ b/CHANGELOG.prerelease.md @@ -1,3 +1,15 @@ +## 10.2.0-alpha.6 + +- Automigrate: Fix missing await - [#33333](https://github.com/storybookjs/storybook/pull/33333), thanks @valentinpalkovic! +- CLI: Remove REACT_PROJECT projectType - [#33334](https://github.com/storybookjs/storybook/pull/33334), thanks @valentinpalkovic! +- Controls: Fix displaying as object instead of select for optional union types - [#33200](https://github.com/storybookjs/storybook/pull/33200), thanks @tanujbhaud! +- Controls: Force object control JSON mode to reset - [#33330](https://github.com/storybookjs/storybook/pull/33330), thanks @Sidnioulz! +- Core: Exclude open from pre-bundling to make local xdg-open reachable - [#33325](https://github.com/storybookjs/storybook/pull/33325), thanks @Sidnioulz! +- Docs-Blocks: Fix broken tooltip in ArgValue details - [#33264](https://github.com/storybookjs/storybook/pull/33264), thanks @Sidnioulz! +- Manager: Ensure reset item only appears in globals toolbar when specified - [#33276](https://github.com/storybookjs/storybook/pull/33276), thanks @mrginglymus! +- Nextjs-Vite: Install `vite` during migration if not installed yet - [#33316](https://github.com/storybookjs/storybook/pull/33316), thanks @ghengeveld! +- UI: Make vertical alignment of TestStatusIcon more robust - [#33305](https://github.com/storybookjs/storybook/pull/33305), thanks @Sidnioulz! + ## 10.2.0-alpha.5 - Addon-Vitest: Added timeout for fetching localhost 6006 during global setup. - [#33232](https://github.com/storybookjs/storybook/pull/33232), thanks @snippy4! diff --git a/code/core/package.json b/code/core/package.json index f8e5c503c9fd..2e5dbdada77b 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -201,6 +201,7 @@ "@vitest/expect": "3.2.4", "@vitest/spy": "3.2.4", "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.26.0 || ^0.27.0", + "open": "^10.2.0", "recast": "^0.23.5", "semver": "^7.6.2", "use-sync-external-store": "^1.5.0", @@ -294,7 +295,6 @@ "modern-tar": "^0.5.5", "nanoid": "^4.0.2", "npmlog": "^7.0.0", - "open": "^10.2.0", "p-limit": "^6.2.0", "package-manager-detector": "^1.1.0", "picocolors": "^1.1.0", diff --git a/code/core/src/cli/projectTypes.ts b/code/core/src/cli/projectTypes.ts index b91f16460c86..2c35cdfa9347 100644 --- a/code/core/src/cli/projectTypes.ts +++ b/code/core/src/cli/projectTypes.ts @@ -11,7 +11,6 @@ export enum ProjectType { REACT_NATIVE = 'react_native', REACT_NATIVE_AND_RNW = 'react_native_and_rnw', REACT_NATIVE_WEB = 'react_native_web', - REACT_PROJECT = 'react_project', REACT_SCRIPTS = 'react_scripts', SERVER = 'server', SOLID = 'solid', diff --git a/code/lib/cli-storybook/src/automigrate/index.ts b/code/lib/cli-storybook/src/automigrate/index.ts index 9078efc00d7c..040f427ba5ec 100644 --- a/code/lib/cli-storybook/src/automigrate/index.ts +++ b/code/lib/cli-storybook/src/automigrate/index.ts @@ -84,7 +84,7 @@ export const doAutomigrate = async (options: AutofixOptionsFromCLI) => { ); if (hasAppliedFixes && !options.skipInstall) { - packageManager.installDependencies(); + await packageManager.installDependencies(); } if (outcome && !options.skipDoctor) { diff --git a/code/lib/create-storybook/src/services/FeatureCompatibilityService.ts b/code/lib/create-storybook/src/services/FeatureCompatibilityService.ts index b8c52c0cbba8..032d73bcaecf 100644 --- a/code/lib/create-storybook/src/services/FeatureCompatibilityService.ts +++ b/code/lib/create-storybook/src/services/FeatureCompatibilityService.ts @@ -7,7 +7,6 @@ const ONBOARDING_PROJECT_TYPES: ProjectType[] = [ ProjectType.REACT, ProjectType.REACT_SCRIPTS, ProjectType.REACT_NATIVE_WEB, - ProjectType.REACT_PROJECT, ProjectType.NEXTJS, ProjectType.VUE3, ProjectType.ANGULAR, diff --git a/code/lib/create-storybook/src/services/ProjectTypeService.test.ts b/code/lib/create-storybook/src/services/ProjectTypeService.test.ts index 1d0609a95b14..5c15dcc1b9db 100644 --- a/code/lib/create-storybook/src/services/ProjectTypeService.test.ts +++ b/code/lib/create-storybook/src/services/ProjectTypeService.test.ts @@ -68,17 +68,6 @@ describe('ProjectTypeService', () => { expect(result).toBe(ProjectType.NEXTJS); }); - it('detects REACT_PROJECT via peerDependencies', async () => { - (pm as any).primaryPackageJson.packageJson = { - peerDependencies: { react: '^18.0.0' }, - }; - const service = new ProjectTypeService(pm); - // @ts-expect-error private method spy - vi.spyOn(service, 'isNxProject').mockReturnValue(false); - const result = await service.autoDetectProjectType({ html: false } as CommandOptions); - expect(result).toBe(ProjectType.REACT_PROJECT); - }); - it('detects VUE3 when vue major is 3', async () => { (pm as any).primaryPackageJson.packageJson = { dependencies: { vue: '^3.2.0' }, diff --git a/code/lib/create-storybook/src/services/ProjectTypeService.ts b/code/lib/create-storybook/src/services/ProjectTypeService.ts index fe25cb5fda2a..87514b976ad0 100644 --- a/code/lib/create-storybook/src/services/ProjectTypeService.ts +++ b/code/lib/create-storybook/src/services/ProjectTypeService.ts @@ -74,13 +74,6 @@ export class ProjectTypeService { return dependencies?.every(Boolean) ?? true; }, }, - { - preset: ProjectType.REACT_PROJECT, - peerDependencies: ['react'], - matcherFunction: ({ peerDependencies }) => { - return peerDependencies?.every(Boolean) ?? true; - }, - }, { preset: ProjectType.REACT_NATIVE, dependencies: ['react-native', 'react-native-scripts'], diff --git a/code/package.json b/code/package.json index 559c4b2f8f9c..86e26541f93e 100644 --- a/code/package.json +++ b/code/package.json @@ -248,5 +248,6 @@ "Dependency Upgrades" ] ] - } + }, + "deferredNextVersion": "10.2.0-alpha.6" } diff --git a/docs/versions/next.json b/docs/versions/next.json index abcaef56e4d8..a85d29dee045 100644 --- a/docs/versions/next.json +++ b/docs/versions/next.json @@ -1 +1 @@ -{"version":"10.2.0-alpha.5","info":{"plain":"- Addon-Vitest: Added timeout for fetching localhost 6006 during global setup. - [#33232](https://github.com/storybookjs/storybook/pull/33232), thanks @snippy4!\n- CLI: Skip vitest transform for CSF Factories in a11y-addon-test automigration - [#31941](https://github.com/storybookjs/storybook/pull/31941), thanks @mrginglymus!\n- Controls: Allow resetting the Select control - [#33289](https://github.com/storybookjs/storybook/pull/33289), thanks @Sidnioulz!\n- Core: Ensure /project.json route is up before builders serve local FS - [#33303](https://github.com/storybookjs/storybook/pull/33303), thanks @Sidnioulz!\n- Docs: Ensure CodePanel hooks are called within component - [#33162](https://github.com/storybookjs/storybook/pull/33162), thanks @mrginglymus!\n- Manager: Do not display non-existing shortcuts in the settings page - [#32711](https://github.com/storybookjs/storybook/pull/32711), thanks @DKER2!\n- Preview: Enforce inert body if manager is focus-trapped - [#33186](https://github.com/storybookjs/storybook/pull/33186), thanks @Sidnioulz!\n- Telemetry: Await pending operations in getLastEvents to prevent race conditions - [#33285](https://github.com/storybookjs/storybook/pull/33285), thanks @valentinpalkovic!\n- UI: Fix keyboard navigation bug for \\\"reset\\\" option in `Select` - [#33268](https://github.com/storybookjs/storybook/pull/33268), thanks @Sidnioulz!\n- Vue3: Update renderer's setup function to allow passing generic HostElement type - [#32029](https://github.com/storybookjs/storybook/pull/32029), thanks @DamianGlowala!"}} \ No newline at end of file +{"version":"10.2.0-alpha.6","info":{"plain":"- Automigrate: Fix missing await - [#33333](https://github.com/storybookjs/storybook/pull/33333), thanks @valentinpalkovic!\n- CLI: Remove REACT_PROJECT projectType - [#33334](https://github.com/storybookjs/storybook/pull/33334), thanks @valentinpalkovic!\n- Controls: Fix displaying as object instead of select for optional union types - [#33200](https://github.com/storybookjs/storybook/pull/33200), thanks @tanujbhaud!\n- Controls: Force object control JSON mode to reset - [#33330](https://github.com/storybookjs/storybook/pull/33330), thanks @Sidnioulz!\n- Core: Exclude open from pre-bundling to make local xdg-open reachable - [#33325](https://github.com/storybookjs/storybook/pull/33325), thanks @Sidnioulz!\n- Docs-Blocks: Fix broken tooltip in ArgValue details - [#33264](https://github.com/storybookjs/storybook/pull/33264), thanks @Sidnioulz!\n- Manager: Ensure reset item only appears in globals toolbar when specified - [#33276](https://github.com/storybookjs/storybook/pull/33276), thanks @mrginglymus!\n- Nextjs-Vite: Install `vite` during migration if not installed yet - [#33316](https://github.com/storybookjs/storybook/pull/33316), thanks @ghengeveld!\n- UI: Make vertical alignment of TestStatusIcon more robust - [#33305](https://github.com/storybookjs/storybook/pull/33305), thanks @Sidnioulz!"}} \ No newline at end of file