diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml index 3d60b139e858..95151155ebbc 100644 --- a/.github/workflows/prepare-patch-release.yml +++ b/.github/workflows/prepare-patch-release.yml @@ -144,8 +144,8 @@ jobs: gh pr create \ --repo "${{github.repository }}" \ --title "Release: Patch ${{ steps.versions.outputs.next }}" \ + --label "maintenance" \ --base latest-release \ - --label "maintenance" --head version-patch-from-${{ steps.versions.outputs.current }} \ --body "${{ steps.description.outputs.description }}" fi @@ -164,8 +164,8 @@ jobs: gh pr create \ --repo "${{github.repository }}"\ --title "Release: Merge patches to \`main\` (without version bump)" \ - --base latest-release \ --label "build" \ + --base latest-release \ --head version-patch-from-${{ steps.versions.outputs.current }} \ --body "${{ steps.description.outputs.description }}" fi diff --git a/.github/workflows/prepare-prerelease.yml b/.github/workflows/prepare-prerelease.yml index e1d250575832..84bb8eaeca73 100644 --- a/.github/workflows/prepare-prerelease.yml +++ b/.github/workflows/prepare-prerelease.yml @@ -138,15 +138,18 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | + RELEASE_TYPE=${{ inputs.release-type || 'prerelease' }} + CAPITALIZED_RELEASE_TYPE=${RELEASE_TYPE^} if PR_STATE=$(gh pr view --json state --jq .state 2>/dev/null) && [[ -n "$PR_STATE" && "$PR_STATE" == *"OPEN"* ]]; then gh pr edit \ --repo "${{github.repository }}" \ - --title "Bump version on \`next\`: ${{ inputs.release-type || 'prerelease' }} ${{ inputs.pre-id && format('({0})', inputs.pre-id) }} from ${{ steps.bump-version.outputs.current-version }} to ${{ steps.bump-version.outputs.next-version }}" \ + --title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \ --body "${{ steps.description.outputs.description }}" else gh pr create \ --repo "${{github.repository }}"\ - --title "Bump version on \`next\`: ${{ inputs.release-type || 'prerelease' }} ${{ inputs.pre-id && format('({0})', inputs.pre-id) }} from ${{ steps.bump-version.outputs.current-version }} to ${{ steps.bump-version.outputs.next-version }}" \ + --title "Release: $CAPITALIZED_RELEASE_TYPE ${{ inputs.pre-id && format('{0} ', inputs.pre-id) }}${{ steps.bump-version.outputs.next-version }}" \ + --label "maintenance" \ --base next-release \ --head version-prerelease-from-${{ steps.bump-version.outputs.current-version }} \ --body "${{ steps.description.outputs.description }}" diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md index 1071ead4c05c..933aef14c663 100644 --- a/CHANGELOG.prerelease.md +++ b/CHANGELOG.prerelease.md @@ -1,3 +1,10 @@ +## 7.1.0-alpha.37 + +- Ecosystem: Prebundle node-logger and make it CJS only - [#23109](https://github.com/storybookjs/storybook/pull/23109), thanks [@ndelangen](https://github.com/ndelangen)! +- NextJS: Fix `useParams` support - [#22946](https://github.com/storybookjs/storybook/pull/22946), thanks [@gitstart-storybook](https://github.com/gitstart-storybook)! +- NextJS: Fix fonts not loading with 3+ words in name - [#23121](https://github.com/storybookjs/storybook/pull/23121), thanks [@ygkn](https://github.com/ygkn)! +- Webpack: Fix channel format for loading status - [#23139](https://github.com/storybookjs/storybook/pull/23139), thanks [@ndelangen](https://github.com/ndelangen)! + ## 7.1.0-alpha.36 - CLI: Fix "Invalid version null" issues by improved version detection - [#22642](https://github.com/storybookjs/storybook/pull/22642), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)! diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index 3a5665ec8602..06d723db6352 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Test component compliance with web accessibility standards", "keywords": [ "a11y", @@ -63,16 +63,16 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-highlight": "7.1.0-alpha.36", - "@storybook/channels": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/addon-highlight": "7.1.0-alpha.37", + "@storybook/channels": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "axe-core": "^4.2.0", "lodash": "^4.17.21", "react-resize-detector": "^7.1.2" @@ -104,7 +104,7 @@ "./src/preview.tsx" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Accessibility", "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index e1c8462b1e0e..891482ab4a9d 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Get UI feedback when an action is performed on an interactive element", "keywords": [ "storybook", @@ -80,14 +80,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "dequal": "^2.0.2", "lodash": "^4.17.21", "polished": "^4.2.2", @@ -125,7 +125,7 @@ "./src/preview.ts" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Actions", "unsupportedFrameworks": [ diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index e0ac0673d88e..0960a6ba0228 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Switch backgrounds to view components in different settings", "keywords": [ "addon", @@ -76,14 +76,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "memoizerific": "^1.11.3", "ts-dedent": "^2.0.0" }, @@ -112,7 +112,7 @@ "./src/preview.tsx" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Backgrounds", "icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png", diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 81012f2c3c8c..87c1704ec194 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Interact with component inputs dynamically in the Storybook UI", "keywords": [ "addon", @@ -68,15 +68,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/blocks": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/blocks": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "lodash": "^4.17.21", "ts-dedent": "^2.0.0" }, @@ -102,7 +102,7 @@ ], "platform": "browser" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Controls", "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index cdd686524647..57d26ce3f286 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Document component usage and properties in Markdown", "keywords": [ "addon", @@ -99,19 +99,19 @@ "dependencies": { "@jest/transform": "^29.3.1", "@mdx-js/react": "^2.1.5", - "@storybook/blocks": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/csf-plugin": "7.1.0-alpha.36", - "@storybook/csf-tools": "7.1.0-alpha.36", + "@storybook/blocks": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/csf-plugin": "7.1.0-alpha.37", + "@storybook/csf-tools": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", "@storybook/mdx2-csf": "^1.0.0", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/postinstall": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/react-dom-shim": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/postinstall": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/react-dom-shim": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "fs-extra": "^11.1.0", "remark-external-links": "^8.0.0", "remark-slug": "^6.0.0", @@ -141,7 +141,7 @@ "@storybook/mdx1-csf" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Docs", "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index a8cbde041461..b6c242dbb3ba 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", @@ -119,23 +119,23 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-actions": "7.1.0-alpha.36", - "@storybook/addon-backgrounds": "7.1.0-alpha.36", - "@storybook/addon-controls": "7.1.0-alpha.36", - "@storybook/addon-docs": "7.1.0-alpha.36", - "@storybook/addon-highlight": "7.1.0-alpha.36", - "@storybook/addon-measure": "7.1.0-alpha.36", - "@storybook/addon-outline": "7.1.0-alpha.36", - "@storybook/addon-toolbars": "7.1.0-alpha.36", - "@storybook/addon-viewport": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", + "@storybook/addon-actions": "7.1.0-alpha.37", + "@storybook/addon-backgrounds": "7.1.0-alpha.37", + "@storybook/addon-controls": "7.1.0-alpha.37", + "@storybook/addon-docs": "7.1.0-alpha.37", + "@storybook/addon-highlight": "7.1.0-alpha.37", + "@storybook/addon-measure": "7.1.0-alpha.37", + "@storybook/addon-outline": "7.1.0-alpha.37", + "@storybook/addon-toolbars": "7.1.0-alpha.37", + "@storybook/addon-viewport": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", "ts-dedent": "^2.0.0" }, "devDependencies": { - "@storybook/vue": "7.1.0-alpha.36", + "@storybook/vue": "7.1.0-alpha.37", "typescript": "^4.9.3" }, "peerDependencies": { @@ -166,5 +166,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json index bb779e0daa01..e5b3a11170b6 100644 --- a/code/addons/gfm/package.json +++ b/code/addons/gfm/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-mdx-gfm", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "GitHub Flavored Markdown in Storybook", "keywords": [ "addon", @@ -51,7 +51,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/node-logger": "7.1.0-alpha.36", + "@storybook/node-logger": "7.1.0-alpha.37", "remark-gfm": "^3.0.1", "ts-dedent": "^2.0.0" }, @@ -69,5 +69,5 @@ "cjs" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 68a527fea47b..75173ecf8a42 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-highlight", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Highlight DOM nodes within your stories", "keywords": [ "storybook-addons", @@ -61,9 +61,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.36" + "@storybook/preview-api": "7.1.0-alpha.37" }, "devDependencies": { "@types/webpack-env": "^1.16.0", @@ -78,7 +78,7 @@ "./src/preview.ts" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "sbmodern": "dist/modern/index.js", "storybook": { "displayName": "Highlight", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 22947391e884..2ba5ed1f7826 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-interactions", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Automate, test and debug user interactions", "keywords": [ "storybook-addons", @@ -72,16 +72,16 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/instrumenter": "7.1.0-alpha.36", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/instrumenter": "7.1.0-alpha.37", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "jest-mock": "^29.5.0", "polished": "^4.2.2", "ts-dedent": "^2.2.0" @@ -117,7 +117,7 @@ "./src/preset.ts" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Interactions", "unsupportedFrameworks": [ diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index 395e82c77df3..d5fe04272685 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -70,13 +70,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", "react-resize-detector": "^7.1.2", "tiny-invariant": "^1.3.1", "upath": "^2.0.1" @@ -106,7 +106,7 @@ ], "platform": "browser" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Jest", "icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index 7f82bdc64046..d8660c85aade 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Link stories together to build demos and prototypes with your UI components", "keywords": [ "addon", @@ -80,14 +80,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/csf": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/router": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/router": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "prop-types": "^15.7.2", "ts-dedent": "^2.0.0" }, @@ -119,7 +119,7 @@ ], "post": "./scripts/fix-preview-api-reference.ts" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Links", "icon": "https://user-images.githubusercontent.com/263385/101991673-48355c80-3c7c-11eb-9b6e-b627c96a75f6.png", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index 6d08e4fcb178..0677d2da0e42 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-measure", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Inspect layouts by visualizing the box model", "keywords": [ "storybook-addons", @@ -75,13 +75,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "tiny-invariant": "^1.3.1" }, "devDependencies": { @@ -109,7 +109,7 @@ "./src/preview.tsx" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Measure", "unsupportedFrameworks": [ diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index f369a2b18723..a53f417e719a 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-outline", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Outline all elements with CSS to help with layout placement and alignment", "keywords": [ "storybook-addons", @@ -78,13 +78,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "ts-dedent": "^2.0.0" }, "devDependencies": { @@ -112,7 +112,7 @@ "./src/preview.tsx" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Outline", "unsupportedFrameworks": [ diff --git a/code/addons/storyshots-core/package.json b/code/addons/storyshots-core/package.json index e90c5141197b..722d1e28b8ab 100644 --- a/code/addons/storyshots-core/package.json +++ b/code/addons/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Take a code snapshot of every story automatically with Jest", "keywords": [ "addon", @@ -38,12 +38,12 @@ "dependencies": { "@jest/transform": "^29.3.1", "@storybook/babel-plugin-require-context-hook": "1.0.1", - "@storybook/client-api": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/core-webpack": "7.1.0-alpha.36", + "@storybook/client-api": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/core-webpack": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "@types/jest-specific-snapshot": "^0.5.6", "glob": "^10.0.0", "jest-specific-snapshot": "^8.0.0", @@ -57,11 +57,11 @@ "@angular/core": "^16.0.0-rc.4", "@angular/platform-browser-dynamic": "^16.0.0-rc.4", "@emotion/jest": "^11.8.0", - "@storybook/addon-docs": "7.1.0-alpha.36", - "@storybook/angular": "7.1.0-alpha.36", - "@storybook/react": "7.1.0-alpha.36", - "@storybook/vue": "7.1.0-alpha.36", - "@storybook/vue3": "7.1.0-alpha.36", + "@storybook/addon-docs": "7.1.0-alpha.37", + "@storybook/angular": "7.1.0-alpha.37", + "@storybook/react": "7.1.0-alpha.37", + "@storybook/vue": "7.1.0-alpha.37", + "@storybook/vue3": "7.1.0-alpha.37", "babel-loader": "^9.1.2", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", @@ -141,7 +141,7 @@ "access": "public" }, "bundler": {}, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Storyshots", "icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png", diff --git a/code/addons/storyshots-puppeteer/package.json b/code/addons/storyshots-puppeteer/package.json index 990289d11315..5756feca754c 100644 --- a/code/addons/storyshots-puppeteer/package.json +++ b/code/addons/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Image snapshots addition to StoryShots based on puppeteer", "keywords": [ "addon", @@ -37,8 +37,8 @@ "dependencies": { "@axe-core/puppeteer": "^4.2.0", "@storybook/csf": "^0.1.0", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "@types/jest-image-snapshot": "^6.0.0", "jest-image-snapshot": "^6.0.0" }, @@ -49,7 +49,7 @@ "puppeteer": "^2.0.0 || ^3.0.0" }, "peerDependencies": { - "@storybook/addon-storyshots": "7.1.0-alpha.36", + "@storybook/addon-storyshots": "7.1.0-alpha.37", "puppeteer": ">=2.0.0" }, "peerDependenciesMeta": { @@ -61,5 +61,5 @@ "access": "public" }, "bundler": {}, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index cc6c8ffef446..9a0863ea79a4 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "View a story’s source code to see how it works and paste into your app", "keywords": [ "addon", @@ -53,13 +53,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/router": "7.1.0-alpha.36", - "@storybook/source-loader": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/router": "7.1.0-alpha.37", + "@storybook/source-loader": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", "estraverse": "^5.2.0", "prop-types": "^15.7.2", "react-syntax-highlighter": "^15.5.0", @@ -92,7 +92,7 @@ "./src/preset.ts" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Storysource", "icon": "https://user-images.githubusercontent.com/263385/101991675-48cdf300-3c7c-11eb-9400-58de5ac6daa7.png", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index 8a609a808d0f..c06aba374218 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Create your own toolbar items that control story rendering", "keywords": [ "addon", @@ -68,11 +68,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36" + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37" }, "devDependencies": { "typescript": "~4.9.3" @@ -99,7 +99,7 @@ ], "platform": "browser" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Toolbars", "icon": "https://user-images.githubusercontent.com/263385/101991677-48cdf300-3c7c-11eb-93b4-19b0e3366959.png", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index abe22b56ddfc..0fe9f9dc96a0 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Build responsive components by adjusting Storybook’s viewport size and orientation", "keywords": [ "addon", @@ -73,13 +73,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", "memoizerific": "^1.11.3", "prop-types": "^15.7.2" }, @@ -109,7 +109,7 @@ "./src/preview.ts" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16", + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17", "storybook": { "displayName": "Viewport", "icon": "https://user-images.githubusercontent.com/263385/101991678-48cdf300-3c7c-11eb-9764-f8af293c1b28.png", diff --git a/code/builders/builder-manager/package.json b/code/builders/builder-manager/package.json index 6a3aae476b05..b857ca9c3199 100644 --- a/code/builders/builder-manager/package.json +++ b/code/builders/builder-manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-manager", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook manager builder", "keywords": [ "storybook" @@ -44,9 +44,9 @@ }, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/manager": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/manager": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", "@types/ejs": "^3.1.1", "@types/find-cache-dir": "^3.2.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", @@ -73,5 +73,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json index 5d2da72ab56f..3a6ee9d4f9bf 100644 --- a/code/builders/builder-vite/package.json +++ b/code/builders/builder-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-vite", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "A plugin to run and build Storybooks with Vite", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme", "bugs": { @@ -42,15 +42,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/csf-plugin": "7.1.0-alpha.36", + "@storybook/channels": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/csf-plugin": "7.1.0-alpha.37", "@storybook/mdx2-csf": "^1.0.0", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preview": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preview": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "@types/find-cache-dir": "^3.2.1", "browser-assert": "^1.2.1", "es-module-lexer": "^0.9.3", @@ -100,5 +100,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json index b2c1cf809ae3..ef76a1f3e1b5 100644 --- a/code/builders/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-webpack5", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -56,24 +56,24 @@ }, "dependencies": { "@babel/core": "^7.22.0", - "@storybook/addons": "7.1.0-alpha.36", - "@storybook/api": "7.1.0-alpha.36", - "@storybook/channel-postmessage": "7.1.0-alpha.36", - "@storybook/channels": "7.1.0-alpha.36", - "@storybook/client-api": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/components": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", - "@storybook/core-webpack": "7.1.0-alpha.36", + "@storybook/addons": "7.1.0-alpha.37", + "@storybook/api": "7.1.0-alpha.37", + "@storybook/channel-postmessage": "7.1.0-alpha.37", + "@storybook/channels": "7.1.0-alpha.37", + "@storybook/client-api": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/components": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", + "@storybook/core-webpack": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preview": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/router": "7.1.0-alpha.36", - "@storybook/store": "7.1.0-alpha.36", - "@storybook/theming": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preview": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/router": "7.1.0-alpha.37", + "@storybook/store": "7.1.0-alpha.37", + "@storybook/theming": "7.1.0-alpha.37", "@swc/core": "^1.3.49", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", @@ -131,5 +131,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/builders/builder-webpack5/src/index.ts b/code/builders/builder-webpack5/src/index.ts index 3ae9c53e9a99..35f1fea6c81f 100644 --- a/code/builders/builder-webpack5/src/index.ts +++ b/code/builders/builder-webpack5/src/index.ts @@ -163,7 +163,7 @@ const starter: StarterFunction = async function* starterGeneratorFn({ } } - channel.emit(PREVIEW_BUILDER_PROGRESS, [progress]); + channel.emit(PREVIEW_BUILDER_PROGRESS, progress); }, modulesCount, }).apply(compiler); diff --git a/code/deprecated/addons/package.json b/code/deprecated/addons/package.json index f6214ab4b14f..004c1cbbba83 100644 --- a/code/deprecated/addons/package.json +++ b/code/deprecated/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook addons store", "keywords": [ "storybook" @@ -44,9 +44,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36" + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -60,5 +60,5 @@ "./src/index.ts" ] }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/channel-postmessage/package.json b/code/deprecated/channel-postmessage/package.json index f9277d9a0078..2d3227fe8a36 100644 --- a/code/deprecated/channel-postmessage/package.json +++ b/code/deprecated/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "", "keywords": [ "storybook" @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36" + "@storybook/channels": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37" }, "devDependencies": { "typescript": "~4.9.3" @@ -58,5 +58,5 @@ ], "shim": "@storybook/channels/dist/postmessage/index" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/channel-websocket/package.json b/code/deprecated/channel-websocket/package.json index 1670c5932e0f..3c929c1f43a3 100644 --- a/code/deprecated/channel-websocket/package.json +++ b/code/deprecated/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "", "keywords": [ "storybook" @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36" + "@storybook/channels": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37" }, "devDependencies": { "typescript": "~4.9.3" @@ -58,5 +58,5 @@ ], "shim": "@storybook/channels/dist/websocket/index" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/client-api/package.json b/code/deprecated/client-api/package.json index 062bf82f636a..8956c6112ed2 100644 --- a/code/deprecated/client-api/package.json +++ b/code/deprecated/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-api", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook Client API", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36" + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37" }, "publishConfig": { "access": "public" @@ -54,5 +54,5 @@ ], "shim": "@storybook/preview-api/dist/client-api" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/core-client/package.json b/code/deprecated/core-client/package.json index 32f64788ed31..877a0b1e457a 100644 --- a/code/deprecated/core-client/package.json +++ b/code/deprecated/core-client/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-client", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -35,8 +35,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36" + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37" }, "publishConfig": { "access": "public" @@ -47,5 +47,5 @@ ], "shim": "@storybook/preview-api/dist/core-client" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/manager-api-shim/package.json b/code/deprecated/manager-api-shim/package.json index ec91b7bece3e..a992fd508bfe 100644 --- a/code/deprecated/manager-api-shim/package.json +++ b/code/deprecated/manager-api-shim/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/api", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook Manager API (facade)", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/manager-api": "7.1.0-alpha.36" + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/manager-api": "7.1.0-alpha.37" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -66,5 +66,5 @@ ], "shim": "@storybook/manager-api" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/preview-web/package.json b/code/deprecated/preview-web/package.json index 5212af1811a3..78e1e7c1e3b6 100644 --- a/code/deprecated/preview-web/package.json +++ b/code/deprecated/preview-web/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-web", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36" + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37" }, "publishConfig": { "access": "public" @@ -54,5 +54,5 @@ ], "shim": "@storybook/preview-api/dist/preview-web" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/deprecated/store/package.json b/code/deprecated/store/package.json index 683eb9d464e9..424b0c53f9e1 100644 --- a/code/deprecated/store/package.json +++ b/code/deprecated/store/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/store", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36" + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37" }, "publishConfig": { "access": "public" @@ -55,5 +55,5 @@ "platform": "node", "shim": "@storybook/preview-api/dist/store" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 3a4224c52e8f..8652c6c18f02 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.", "keywords": [ "storybook", @@ -36,20 +36,20 @@ "prep": "../../../scripts/prepare/tsc.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.36", - "@storybook/cli": "7.1.0-alpha.36", - "@storybook/client-logger": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/core-events": "7.1.0-alpha.36", - "@storybook/core-server": "7.1.0-alpha.36", - "@storybook/core-webpack": "7.1.0-alpha.36", - "@storybook/docs-tools": "7.1.0-alpha.36", + "@storybook/builder-webpack5": "7.1.0-alpha.37", + "@storybook/cli": "7.1.0-alpha.37", + "@storybook/client-logger": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/core-events": "7.1.0-alpha.37", + "@storybook/core-server": "7.1.0-alpha.37", + "@storybook/core-webpack": "7.1.0-alpha.37", + "@storybook/docs-tools": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/telemetry": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/manager-api": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/telemetry": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "@types/node": "^16.0.0", "@types/react": "^16.14.34", "@types/react-dom": "^16.9.14", @@ -122,5 +122,5 @@ "bundler": { "tsConfig": "tsconfig.build.json" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index 740fc21852c9..a771cf04321c 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember", "bugs": { @@ -31,12 +31,12 @@ "prep": "../../../scripts/prepare/tsc.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/docs-tools": "7.1.0-alpha.36", + "@storybook/builder-webpack5": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/docs-tools": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/types": "7.1.0-alpha.36", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/types": "7.1.0-alpha.37", "ts-dedent": "^2.0.0" }, "devDependencies": { @@ -59,5 +59,5 @@ "access": "public" }, "bundler": {}, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index c0c14a2a9440..65df55e50bf1 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,14 +47,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.1.0-alpha.36", - "@storybook/builder-vite": "7.1.0-alpha.36", - "@storybook/channel-postmessage": "7.1.0-alpha.36", - "@storybook/client-api": "7.1.0-alpha.36", - "@storybook/core-server": "7.1.0-alpha.36", - "@storybook/html": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preview-web": "7.1.0-alpha.36", + "@storybook/addons": "7.1.0-alpha.37", + "@storybook/builder-vite": "7.1.0-alpha.37", + "@storybook/channel-postmessage": "7.1.0-alpha.37", + "@storybook/client-api": "7.1.0-alpha.37", + "@storybook/core-server": "7.1.0-alpha.37", + "@storybook/html": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preview-web": "7.1.0-alpha.37", "magic-string": "^0.30.0" }, "devDependencies": { @@ -74,5 +74,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index e9825d35b282..b3b50536f425 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-webpack5", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,11 +47,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", + "@storybook/builder-webpack5": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", "@storybook/global": "^5.0.0", - "@storybook/html": "7.1.0-alpha.36", - "@storybook/preset-html-webpack": "7.1.0-alpha.36", + "@storybook/html": "7.1.0-alpha.37", + "@storybook/preset-html-webpack": "7.1.0-alpha.37", "@types/node": "^16.0.0" }, "devDependencies": { @@ -75,5 +75,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/frameworks/nextjs/README.md b/code/frameworks/nextjs/README.md index 1989da90c05e..d15ad4d4a98a 100644 --- a/code/frameworks/nextjs/README.md +++ b/code/frameworks/nextjs/README.md @@ -28,7 +28,7 @@ - [Set `nextjs.appDirectory` to `true`](#set-nextjsappdirectory-to-true) - [Overriding defaults](#overriding-defaults-1) - [Global Defaults](#global-defaults-1) - - [`useSelectedLayoutSegment` and `useSelectedLayoutSegments` hook](#useselectedlayoutsegment-and-useselectedlayoutsegments-hook) + - [`useSelectedLayoutSegment` `useSelectedLayoutSegments` and `useParams` hook](#useselectedlayoutsegment-useselectedlayoutsegments-and-useparams-hook) - [Default Navigation Context](#default-navigation-context) - [Actions Integration Caveats](#actions-integration-caveats-1) - [Next.js Head](#nextjs-head) @@ -503,9 +503,9 @@ export const parameters = { }; ``` -#### `useSelectedLayoutSegment` and `useSelectedLayoutSegments` hook +#### `useSelectedLayoutSegment` `useSelectedLayoutSegments` and `useParams` hook -The `useSelectedLayoutSegment` and `useSelectedLayoutSegments` hooks are supported in Storybook. You have to set the `nextjs.navigation.segments` parameter to return the segments you want to use. +The `useSelectedLayoutSegment` `useSelectedLayoutSegments` and `useParams` hooks are supported in Storybook. You have to set the `nextjs.navigation.segments` parameter to return the segments or the params you want to use. ```js // SomeComponentThatUsesTheNavigation.stories.js @@ -526,11 +526,46 @@ export default { export const Example = {}; // SomeComponentThatUsesTheNavigation.js -import { useSelectedLayoutSegment, useSelectedLayoutSegments } from 'next/navigation'; +import { useSelectedLayoutSegment, useSelectedLayoutSegments, useParams } from 'next/navigation'; export default function SomeComponentThatUsesTheNavigation() { const segment = useSelectedLayoutSegment(); // dashboard const segments = useSelectedLayoutSegments(); // ["dashboard", "analytics"] + const params = useParams(); // {} + ... +} +``` + +To use `useParams`, you have to use a two string elements array for a segment, the first array element is the param key and the second array element is the param value. + +```js +// SomeComponentThatUsesParams.stories.js +import SomeComponentThatUsesParams from './SomeComponentThatUsesParams'; + +export default { + component: SomeComponentThatUsesParams, + parameters: { + nextjs: { + appDirectory: true, + navigation: { + segments: [ + ['slug', 'hello'], + ['framework', 'nextjs'], + ] + }, + }, + }, +}; + +export const Example = {}; + +// SomeComponentThatUsesParams.js +import { useSelectedLayoutSegment, useSelectedLayoutSegments, useParams } from 'next/navigation'; + +export default function SomeComponentThatUsesParams() { + const segment = useSelectedLayoutSegment(); // hello + const segments = useSelectedLayoutSegments(); // ["hello", "nextjs"] + const params = useParams(); // { slug: "hello", framework: "nextjs" } ... } ``` diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index c087138f3ec6..2546ff76d45c 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/nextjs", - "version": "7.1.0-alpha.36", + "version": "7.1.0-alpha.37", "description": "Storybook for Next.js", "keywords": [ "storybook", @@ -70,13 +70,13 @@ "@babel/preset-react": "^7.22.0", "@babel/preset-typescript": "^7.21.0", "@babel/runtime": "^7.22.0", - "@storybook/addon-actions": "7.1.0-alpha.36", - "@storybook/builder-webpack5": "7.1.0-alpha.36", - "@storybook/core-common": "7.1.0-alpha.36", - "@storybook/node-logger": "7.1.0-alpha.36", - "@storybook/preset-react-webpack": "7.1.0-alpha.36", - "@storybook/preview-api": "7.1.0-alpha.36", - "@storybook/react": "7.1.0-alpha.36", + "@storybook/addon-actions": "7.1.0-alpha.37", + "@storybook/builder-webpack5": "7.1.0-alpha.37", + "@storybook/core-common": "7.1.0-alpha.37", + "@storybook/node-logger": "7.1.0-alpha.37", + "@storybook/preset-react-webpack": "7.1.0-alpha.37", + "@storybook/preview-api": "7.1.0-alpha.37", + "@storybook/react": "7.1.0-alpha.37", "@types/node": "^16.0.0", "css-loader": "^6.7.3", "find-up": "^5.0.0", @@ -147,5 +147,5 @@ ], "platform": "node" }, - "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16" + "gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17" } diff --git a/code/frameworks/nextjs/src/font/webpack/loader/utils/get-css-meta.ts b/code/frameworks/nextjs/src/font/webpack/loader/utils/get-css-meta.ts index aa816e05faf4..7be59c01c486 100644 --- a/code/frameworks/nextjs/src/font/webpack/loader/utils/get-css-meta.ts +++ b/code/frameworks/nextjs/src/font/webpack/loader/utils/get-css-meta.ts @@ -37,7 +37,7 @@ export function getCSSMeta(options: Options) { } function getClassName({ styles, weights, fontFamily }: Options) { - const font = fontFamily.replace(' ', '-').toLowerCase(); + const font = fontFamily.replaceAll(' ', '-').toLowerCase(); const style = isNextCSSPropertyValid(styles) ? styles[0] : null; const weight = isNextCSSPropertyValid(weights) ? weights[0] : null; diff --git a/code/frameworks/nextjs/src/routing/app-router-provider.tsx b/code/frameworks/nextjs/src/routing/app-router-provider.tsx index e285d5dbe2a1..ab09406a14d6 100644 --- a/code/frameworks/nextjs/src/routing/app-router-provider.tsx +++ b/code/frameworks/nextjs/src/routing/app-router-provider.tsx @@ -2,6 +2,7 @@ import React from 'react'; import type { LayoutRouterContext as TLayoutRouterContext, AppRouterContext as TAppRouterContext, + GlobalLayoutRouterContext as TGlobalLayoutRouterContext, } from 'next/dist/shared/lib/app-router-context'; import type { PathnameContext as TPathnameContext, @@ -21,17 +22,21 @@ let AppRouterContext: typeof TAppRouterContext; let LayoutRouterContext: typeof TLayoutRouterContext; let PathnameContext: typeof TPathnameContext; let SearchParamsContext: typeof TSearchParamsContext; +let GlobalLayoutRouterContext: typeof TGlobalLayoutRouterContext; try { AppRouterContext = require('next/dist/shared/lib/app-router-context').AppRouterContext; LayoutRouterContext = require('next/dist/shared/lib/app-router-context').LayoutRouterContext; PathnameContext = require('next/dist/shared/lib/hooks-client-context').PathnameContext; SearchParamsContext = require('next/dist/shared/lib/hooks-client-context').SearchParamsContext; + GlobalLayoutRouterContext = + require('next/dist/shared/lib/app-router-context').GlobalLayoutRouterContext; } catch { AppRouterContext = React.Fragment as any; LayoutRouterContext = React.Fragment as any; PathnameContext = React.Fragment as any; SearchParamsContext = React.Fragment as any; + GlobalLayoutRouterContext = React.Fragment as any; } type AppRouterProviderProps = { @@ -52,44 +57,62 @@ const getParallelRoutes = (segmentsList: Array): FlightRouterState => { const AppRouterProvider: React.FC = ({ children, action, routeParams }) => { const { pathname, query, segments = [], ...restRouteParams } = routeParams; + const tree: FlightRouterState = [pathname, { children: getParallelRoutes([...segments]) }]; + + // https://github.com/vercel/next.js/blob/canary/packages/next/src/client/components/app-router.tsx#L436 return ( - { - action('nextNavigation.refresh')(); - }, - ...restRouteParams, - }} - > + - - {children} - + { + action('nextNavigation.refresh')(); + }, + ...restRouteParams, + }} + > + + {children} + + + - + ); }; diff --git a/code/frameworks/nextjs/template/stories_nextjs-default-js/Navigation.stories.jsx b/code/frameworks/nextjs/template/stories_nextjs-default-js/Navigation.stories.jsx index 12b66e3205d2..166567aa456c 100644 --- a/code/frameworks/nextjs/template/stories_nextjs-default-js/Navigation.stories.jsx +++ b/code/frameworks/nextjs/template/stories_nextjs-default-js/Navigation.stories.jsx @@ -2,6 +2,7 @@ import { useRouter, usePathname, useSearchParams, + useParams, useSelectedLayoutSegment, useSelectedLayoutSegments, } from 'next/navigation'; @@ -11,6 +12,7 @@ function Component() { const router = useRouter(); const pathname = usePathname(); const searchParams = useSearchParams(); + const params = useParams(); const segment = useSelectedLayoutSegment(); const segments = useSelectedLayoutSegments(); @@ -58,6 +60,16 @@ function Component() { ))} +
+ params:{' '} +
    + {Object.entries(params).map(([key, value]) => ( +
  • + {key}: {value} +
  • + ))} +
+
{routerActions.map(({ cb, name }) => (