Skip to content

Commit

Permalink
Merge branch 'next' into fix/theme-fontCode-mdx
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen committed Jul 10, 2023
2 parents 2531277 + 4292d59 commit 3ed791f
Show file tree
Hide file tree
Showing 161 changed files with 2,078 additions and 1,352 deletions.
20 changes: 10 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -593,27 +593,27 @@ workflows:
requires:
- unit-tests
- create-sandboxes:
parallelism: 20
parallelism: 19
requires:
- build
- build-sandboxes:
parallelism: 20
parallelism: 19
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 18
parallelism: 17
requires:
- build-sandboxes
- e2e-production:
parallelism: 18
parallelism: 17
requires:
- build-sandboxes
- e2e-dev:
parallelism: 4
requires:
- create-sandboxes
- test-runner-production:
parallelism: 18
parallelism: 17
requires:
- build-sandboxes
- bench:
Expand Down Expand Up @@ -647,30 +647,30 @@ workflows:
requires:
- build
- create-sandboxes:
parallelism: 34
parallelism: 33
requires:
- build
# - smoke-test-sandboxes: # disabled for now
# requires:
# - create-sandboxes
- build-sandboxes:
parallelism: 34
parallelism: 33
requires:
- create-sandboxes
- chromatic-sandboxes:
parallelism: 32
parallelism: 31
requires:
- build-sandboxes
- e2e-production:
parallelism: 32
parallelism: 31
requires:
- build-sandboxes
- e2e-dev:
parallelism: 4
requires:
- create-sandboxes
- test-runner-production:
parallelism: 32
parallelism: 31
requires:
- build-sandboxes
# TODO: reenable once we find out the source of flakyness
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
name: Feature request 💡
description: Suggest an idea for this project
title: '[Feature Request]:'
labels:
- needs triage
- feature request
body:
- type: textarea
id: problem
attributes:
label: Is your feature request related to a problem? Please describe
label: Is your feature request related to a problem? Please describe.
description: >-
A clear and concise description of the problem. E.g. I'm always
frustrated when [...]
Expand Down
10 changes: 8 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ blank_issues_enabled: false
contact_links:
- name: View documentation 📚
url: https://storybook.js.org/docs/
about: Check out the official docs for answers to common questions
about: Check out the official docs for answers to common questions.
- name: Feature Requests 💡
url: https://github.com/storybookjs/storybook/discussions/new?category=ideas
about: Suggest a feature idea for this project.
- name: Open an RFC 🦄
url: https://github.com/storybookjs/storybook/discussions/new?category=rfc
about: Do you want to propose a more involved change to Storybook? Open an RFC (Request for Comments) to start a discussion.
- name: Questions & discussions 🤔
url: https://github.com/storybookjs/storybook/discussions
about: Ask questions, request features & discuss RFCs
about: Ask questions, show off your Storybook, etc.
- name: Community Discord 💬
url: https://discord.gg/storybook
about: Community discussions, interactive support, contributor help
8 changes: 4 additions & 4 deletions .github/workflows/prepare-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git config --global user.name 'storybook-bot'
git config --global user.email '32066757+storybook-[email protected]'
yarn release:pick-patches
- name: Bump version
Expand Down Expand Up @@ -117,8 +117,8 @@ jobs:
- name: 'Commit changes to branch: version-patch-from-${{ steps.versions.outputs.current }}'
working-directory: .
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git config --global user.name 'storybook-bot'
git config --global user.email '32066757+storybook-[email protected]'
git checkout -b version-patch-from-${{ steps.versions.outputs.current }}
git add .
git commit -m "Bump version from ${{ steps.versions.outputs.current }} to ${{ steps.versions.outputs.next }}" || true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prepare-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ jobs:
- name: 'Commit changes to branch: version-prerelease-from-${{ steps.bump-version.outputs.current-version }}'
working-directory: .
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git config --global user.name 'storybook-bot'
git config --global user.email '32066757+storybook-[email protected]'
git checkout -b version-prerelease-from-${{ steps.bump-version.outputs.current-version }}
git add .
git commit -m "Bump version from ${{ steps.bump-version.outputs.current-version }} to ${{ steps.bump-version.outputs.next-version }}" || true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ jobs:
- name: Merge ${{ github.ref_name }} into ${{ steps.target.outputs.target }}
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "storybook-bot"
git config --global user.email "32066757+storybook-[email protected]"
git fetch origin ${{ steps.target.outputs.target }}
git checkout ${{ steps.target.outputs.target }}
git merge ${{ github.ref_name }}
Expand Down
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
## 7.0.26

- Next.js: Fix next/image usage in latest Next.js release - [#23296](https://github.com/storybookjs/storybook/pull/23296), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- NextJS: Fix `useParams` support - [#22946](https://github.com/storybookjs/storybook/pull/22946), thanks [@gitstart-storybook](https://github.com/gitstart-storybook)!
- NextJS: Allow disabling next/image lazy loading - [#21909](https://github.com/storybookjs/storybook/pull/21909), thanks [@martinnabhan](https://github.com/martinnabhan)

## 7.0.25

- CLI: Fix pnp paths logic in storybook metadata - [#23259](https://github.com/storybookjs/storybook/pull/23259), thanks [@yannbf](https://github.com/yannbf)!
- Controls: Fix UI to add array items - [#22993](https://github.com/storybookjs/storybook/pull/22993), thanks [@sookmax](https://github.com/sookmax)!
- Next.js: Support disableStaticImages setting - [#23167](https://github.com/storybookjs/storybook/pull/23167), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- React: Fix decorators to conditionally render children - [#22336](https://github.com/storybookjs/storybook/pull/22336), thanks [@redbugz](https://github.com/redbugz)!

## 7.0.24

- CLI: Parse pnp paths in storybook metadata - [#23199](https://github.com/storybookjs/storybook/pull/23199), thanks [@yannbf](https://github.com/yannbf)!
- Dependencies: Pin `file-system-cache` to 2.3.0 - [#23221](https://github.com/storybookjs/storybook/pull/23221), thanks [@JReinhold](https://github.com/JReinhold)!
- Svelte: Support v4 - [#22905](https://github.com/storybookjs/storybook/pull/22905), thanks [@JReinhold](https://github.com/JReinhold)!

## 7.0.23

- Core: Fix compat by disabling name mangling in `esbuild` require - [#22486](https://github.com/storybookjs/storybook/pull/22486), thanks [@youngboy](https://github.com/youngboy)!
- Core: Prebundle node-logger and make it CJS only - [#23109](https://github.com/storybookjs/storybook/pull/23109), thanks [@ndelangen](https://github.com/ndelangen)!
- NextJS: Fix fonts not loading with 3+ words in name - [#23121](https://github.com/storybookjs/storybook/pull/23121), thanks [@ygkn](https://github.com/ygkn)!
- Telemetry: Count onboarding stories - [#23092](https://github.com/storybookjs/storybook/pull/23092), thanks [@shilman](https://github.com/shilman)!

## 7.0.22

- CLI: Prebundle boxen to resolve a ESM/CJS incompatibility - [#23080](https://github.com/storybookjs/storybook/pull/23080), thanks [@ndelangen](https://github.com/ndelangen)!
- Core: Fix core-common to use node-fetch - [#23077](https://github.com/storybookjs/storybook/pull/23077), thanks [@ndelangen](https://github.com/ndelangen)!
- Telemetry: Count onboarding stories - [#23092](https://github.com/storybookjs/storybook/pull/23092), thanks [@shilman](https://github.com/shilman)!

## 7.0.21

- Angular: Fix 16.1 compatibility - [#23064](https://github.com/storybookjs/storybook/pull/23064), thanks [@ndelangen](https://github.com/ndelangen)!
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.prerelease.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## 7.1.0-beta.2

- Next.js: Fix for @nx/react/plugin/storybook with stories containing SVGs - [#23210](https://github.com/storybookjs/storybook/pull/23210), thanks [@daves28](https://github.com/daves28)!
- Yarn: Downgrade yarnpkg packages and support virtual files properly - [#23354](https://github.com/storybookjs/storybook/pull/23354), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!

## 7.1.0-beta.1

- Addon-docs: Add opt-in table of contents - [#23142](https://github.com/storybookjs/storybook/pull/23142), thanks [@shilman](https://github.com/shilman)!
- SyntaxHighlighter: Expose registerLanguage - [#23166](https://github.com/storybookjs/storybook/pull/23166), thanks [@ndelangen](https://github.com/ndelangen)!
- Yarn: Fix pnp package resolution on Windows - [#23274](https://github.com/storybookjs/storybook/pull/23274), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- Yarn: Pin version of @yarnpkg packages to support Node 16 - [#23330](https://github.com/storybookjs/storybook/pull/23330), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!

## 7.1.0-beta.0

- Settings: Add what's new page, remove release notes - [#23202](https://github.com/storybookjs/storybook/pull/23202), thanks [@kasperpeulen](https://github.com/kasperpeulen)!

## 7.1.0-alpha.44

- Next.js: Fix next/image usage in latest Next.js release - [#23296](https://github.com/storybookjs/storybook/pull/23296), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
Expand Down
20 changes: 10 additions & 10 deletions code/addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "7.1.0-alpha.44",
"version": "7.1.0-beta.2",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -63,16 +63,16 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/addon-highlight": "7.1.0-alpha.44",
"@storybook/channels": "7.1.0-alpha.44",
"@storybook/client-logger": "7.1.0-alpha.44",
"@storybook/components": "7.1.0-alpha.44",
"@storybook/core-events": "7.1.0-alpha.44",
"@storybook/addon-highlight": "7.1.0-beta.2",
"@storybook/channels": "7.1.0-beta.2",
"@storybook/client-logger": "7.1.0-beta.2",
"@storybook/components": "7.1.0-beta.2",
"@storybook/core-events": "7.1.0-beta.2",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.44",
"@storybook/preview-api": "7.1.0-alpha.44",
"@storybook/theming": "7.1.0-alpha.44",
"@storybook/types": "7.1.0-alpha.44",
"@storybook/manager-api": "7.1.0-beta.2",
"@storybook/preview-api": "7.1.0-beta.2",
"@storybook/theming": "7.1.0-beta.2",
"@storybook/types": "7.1.0-beta.2",
"axe-core": "^4.2.0",
"lodash": "^4.17.21",
"react-resize-detector": "^7.1.2"
Expand Down
16 changes: 8 additions & 8 deletions code/addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "7.1.0-alpha.44",
"version": "7.1.0-beta.2",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -80,14 +80,14 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.44",
"@storybook/components": "7.1.0-alpha.44",
"@storybook/core-events": "7.1.0-alpha.44",
"@storybook/client-logger": "7.1.0-beta.2",
"@storybook/components": "7.1.0-beta.2",
"@storybook/core-events": "7.1.0-beta.2",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.44",
"@storybook/preview-api": "7.1.0-alpha.44",
"@storybook/theming": "7.1.0-alpha.44",
"@storybook/types": "7.1.0-alpha.44",
"@storybook/manager-api": "7.1.0-beta.2",
"@storybook/preview-api": "7.1.0-beta.2",
"@storybook/theming": "7.1.0-beta.2",
"@storybook/types": "7.1.0-beta.2",
"dequal": "^2.0.2",
"lodash": "^4.17.21",
"polished": "^4.2.2",
Expand Down
16 changes: 8 additions & 8 deletions code/addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "7.1.0-alpha.44",
"version": "7.1.0-beta.2",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -76,14 +76,14 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/client-logger": "7.1.0-alpha.44",
"@storybook/components": "7.1.0-alpha.44",
"@storybook/core-events": "7.1.0-alpha.44",
"@storybook/client-logger": "7.1.0-beta.2",
"@storybook/components": "7.1.0-beta.2",
"@storybook/core-events": "7.1.0-beta.2",
"@storybook/global": "^5.0.0",
"@storybook/manager-api": "7.1.0-alpha.44",
"@storybook/preview-api": "7.1.0-alpha.44",
"@storybook/theming": "7.1.0-alpha.44",
"@storybook/types": "7.1.0-alpha.44",
"@storybook/manager-api": "7.1.0-beta.2",
"@storybook/preview-api": "7.1.0-beta.2",
"@storybook/theming": "7.1.0-beta.2",
"@storybook/types": "7.1.0-beta.2",
"memoizerific": "^1.11.3",
"ts-dedent": "^2.0.0"
},
Expand Down
20 changes: 10 additions & 10 deletions code/addons/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "7.1.0-alpha.44",
"version": "7.1.0-beta.2",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -68,15 +68,15 @@
"prep": "../../../scripts/prepare/bundle.ts"
},
"dependencies": {
"@storybook/blocks": "7.1.0-alpha.44",
"@storybook/client-logger": "7.1.0-alpha.44",
"@storybook/components": "7.1.0-alpha.44",
"@storybook/core-common": "7.1.0-alpha.44",
"@storybook/manager-api": "7.1.0-alpha.44",
"@storybook/node-logger": "7.1.0-alpha.44",
"@storybook/preview-api": "7.1.0-alpha.44",
"@storybook/theming": "7.1.0-alpha.44",
"@storybook/types": "7.1.0-alpha.44",
"@storybook/blocks": "7.1.0-beta.2",
"@storybook/client-logger": "7.1.0-beta.2",
"@storybook/components": "7.1.0-beta.2",
"@storybook/core-common": "7.1.0-beta.2",
"@storybook/manager-api": "7.1.0-beta.2",
"@storybook/node-logger": "7.1.0-beta.2",
"@storybook/preview-api": "7.1.0-beta.2",
"@storybook/theming": "7.1.0-beta.2",
"@storybook/types": "7.1.0-beta.2",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
},
Expand Down
24 changes: 12 additions & 12 deletions code/addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "7.1.0-alpha.44",
"version": "7.1.0-beta.2",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -99,19 +99,19 @@
"dependencies": {
"@jest/transform": "^29.3.1",
"@mdx-js/react": "^2.1.5",
"@storybook/blocks": "7.1.0-alpha.44",
"@storybook/client-logger": "7.1.0-alpha.44",
"@storybook/components": "7.1.0-alpha.44",
"@storybook/csf-plugin": "7.1.0-alpha.44",
"@storybook/csf-tools": "7.1.0-alpha.44",
"@storybook/blocks": "7.1.0-beta.2",
"@storybook/client-logger": "7.1.0-beta.2",
"@storybook/components": "7.1.0-beta.2",
"@storybook/csf-plugin": "7.1.0-beta.2",
"@storybook/csf-tools": "7.1.0-beta.2",
"@storybook/global": "^5.0.0",
"@storybook/mdx2-csf": "^1.0.0",
"@storybook/node-logger": "7.1.0-alpha.44",
"@storybook/postinstall": "7.1.0-alpha.44",
"@storybook/preview-api": "7.1.0-alpha.44",
"@storybook/react-dom-shim": "7.1.0-alpha.44",
"@storybook/theming": "7.1.0-alpha.44",
"@storybook/types": "7.1.0-alpha.44",
"@storybook/node-logger": "7.1.0-beta.2",
"@storybook/postinstall": "7.1.0-beta.2",
"@storybook/preview-api": "7.1.0-beta.2",
"@storybook/react-dom-shim": "7.1.0-beta.2",
"@storybook/theming": "7.1.0-beta.2",
"@storybook/types": "7.1.0-beta.2",
"fs-extra": "^11.1.0",
"remark-external-links": "^8.0.0",
"remark-slug": "^6.0.0",
Expand Down
14 changes: 14 additions & 0 deletions code/addons/docs/template/stories/toc/basic.stories.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { global as globalThis } from '@storybook/global';

export default {
component: globalThis.Components.Button,
tags: ['autodocs'],
parameters: {
chromatic: { disable: true },
docs: { toc: {} },
},
};

export const One = { args: { label: 'One' } };
export const Two = { args: { label: 'Two' } };
export const Three = { args: { label: 'Three' } };
Loading

0 comments on commit 3ed791f

Please sign in to comment.