Skip to content

Commit

Permalink
Merge branch 'future/base' into future/drop-emotion-10-types
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/blocks/src/blocks/DocsContainer.tsx
#	lib/blocks/src/blocks/SourceContainer.tsx
#	lib/blocks/src/blocks/Subtitle.tsx
#	lib/blocks/src/blocks/Title.tsx
#	lib/blocks/src/components/ColorPalette.tsx
#	lib/blocks/src/components/IconGallery.tsx
#	lib/blocks/src/components/Source.tsx
#	lib/blocks/src/components/Story.tsx
#	lib/components/src/placeholder/placeholder.tsx
#	lib/ui/src/components/preview/toolbar.tsx
#	lib/ui/src/components/preview/utils/types.tsx
#	lib/ui/src/components/sidebar/Sidebar.tsx
#	lib/ui/src/components/sidebar/TreeNode.tsx
  • Loading branch information
ndelangen committed Jul 19, 2022
2 parents 23e5c2e + a800400 commit 057c401
Show file tree
Hide file tree
Showing 921 changed files with 12,903 additions and 10,914 deletions.
48 changes: 24 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,27 +223,30 @@ jobs:
- store_artifacts:
path: /tmp/storybook-e2e-testing-out.zip
destination: e2e
e2e-tests-sb-docs:
executor:
class: large
name: sb_cypress_8_node_14
parallelism: 2
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
- attach_workspace:
at: .
- run:
name: Running local registry
command: yarn local-registry --port 6000 --open
background: true
- run:
name: Wait for registry
command: yarn wait-on http://localhost:6000
- run:
name: Run smoke tests
command: yarn test:e2e-framework angular_modern_inline_rendering --test-runner --docs-mode
no_output_timeout: 5m
# NOTE: this currently tests each story in docs mode, which doesn't make sense any more as stories
# can no longer run in docs mode. Instead we should probably change the test runner to test each
# docs entry if you run it in `VIEW_MODE=docs`
# e2e-tests-sb-docs:
# executor:
# class: large
# name: sb_cypress_8_node_14
# parallelism: 2
# steps:
# - git-shallow-clone/checkout_advanced:
# clone_options: '--depth 1 --verbose'
# - attach_workspace:
# at: .
# - run:
# name: Running local registry
# command: yarn local-registry --port 6000 --open
# background: true
# - run:
# name: Wait for registry
# command: yarn wait-on http://localhost:6000
# - run:
# name: Run smoke tests
# command: yarn test:e2e-framework angular_modern_inline_rendering --test-runner --docs-mode
# no_output_timeout: 5m
cra-bench:
executor:
class: medium
Expand Down Expand Up @@ -420,9 +423,6 @@ workflows:
- e2e-tests-core:
requires:
- publish
- e2e-tests-sb-docs:
requires:
- publish
- e2e-tests-pnp:
requires:
- publish
Expand Down
56 changes: 56 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,59 @@
## 7.0.0-alpha.13 (July 11, 2022)

### Features

- UI: Remove docs tab ([#18677](https:/storybookjs/storybook/pull/18677))

### Bug Fixes

- Index: Don't prepend `titlePrefix` to a docs entry that references a CSF file's title ([#18634](https:/storybookjs/storybook/pull/18634))

### Maintenance

- Addon-dcos: Refactor DocsRender/Context ([#18635](https:/storybookjs/storybook/pull/18635))
- Instrumenter: `SyncPayload` type for `sync` event ([#18674](https:/storybookjs/storybook/pull/18674))

## 7.0.0-alpha.12 (July 7, 2022)

### Features

- Addon-docs: Produce docs page entries in the index ([#18574](https:/storybookjs/storybook/pull/18574))
- Svelte: Supports action auto configuration ([#18174](https:/storybookjs/storybook/pull/18174))
- Addon-docs: Add docs index configuration via main.js ([#18573](https:/storybookjs/storybook/pull/18573))
- Preview: Handle new docs-page index entries ([#18595](https:/storybookjs/storybook/pull/18595))

### Bug Fixes

- CLI: Remove addon-actions install from `sb init` ([#18255](https:/storybookjs/storybook/pull/18255))
- Angular: Fix compodoc with spaces in workspace root ([#18140](https:/storybookjs/storybook/pull/18140))
- Core: Add type guard for globalWindow ([#18251](https:/storybookjs/storybook/pull/18251))
- Core: Fix builder stats typings to be optional ([#18377](https:/storybookjs/storybook/pull/18377))

### Maintenance

- Core: Async load presets, replace interpret with esbuild-register ([#18619](https:/storybookjs/storybook/pull/18619))
- Build: Improve linting a bit ([#18642](https:/storybookjs/storybook/pull/18642))

### Dependency Upgrades

- Deps: Use `dequal` for equality checks ([#18608](https:/storybookjs/storybook/pull/18608))

## 7.0.0-alpha.11 (July 6, 2022)

### Features

- Interactions: Show exceptions by non-instrumented code in panel ([#16592](https:/storybookjs/storybook/pull/16592))

### Maintenance

- Build: Add linter for ejs ([#18637](https:/storybookjs/storybook/pull/18637))
- Core: Improve interopRequireDefault ([#18638](https:/storybookjs/storybook/pull/18638))
- Core: Pre-built manager using esbuild ([#18550](https:/storybookjs/storybook/pull/18550))
- Build: Add check-packages script plus misc improvements ([#18633](https:/storybookjs/storybook/pull/18633))
- Core: Typing useArgs ([#17735](https:/storybookjs/storybook/pull/17735))
- Build: Add a check script to each package ([#18603](https:/storybookjs/storybook/pull/18603))
- Build: Use playwright in benchmark ([#18606](https:/storybookjs/storybook/pull/18606))

## 7.0.0-alpha.10 (July 2, 2022)

### Features
Expand Down
5 changes: 5 additions & 0 deletions MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- [Docs modern inline rendering by default](#docs-modern-inline-rendering-by-default)
- [Babel mode v7 by default](#babel-mode-v7-by-default)
- [7.0 feature flags removed](#70-feature-flags-removed)
- [Removed docs.getContainer and getPage parameters](#removed-docs-getcontainer-and-getpage-parameters)
- [From version 6.4.x to 6.5.0](#from-version-64x-to-650)
- [Vue 3 upgrade](#vue-3-upgrade)
- [React18 new root API](#react18-new-root-api)
Expand Down Expand Up @@ -393,6 +394,10 @@ In 7.0 we've removed the following feature flags:
| `emotionAlias` | This flag is no longer needed and should be deleted. |
| `breakingChangesV7` | This flag is no longer needed and should be deleted. |

#### Removed docs.getContainer and getPage parameters

It is no longer possible to set `parameters.docs.getContainer()` and `getPage()`. Instead use `parameters.docs.container` or `parameters.docs.page` directly.

## From version 6.4.x to 6.5.0

### Vue 3 upgrade
Expand Down
20 changes: 10 additions & 10 deletions addons/a11y/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "7.0.0-alpha.10",
"version": "7.0.0-alpha.13",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -39,15 +39,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-highlight": "7.0.0-alpha.10",
"@storybook/addons": "7.0.0-alpha.10",
"@storybook/api": "7.0.0-alpha.10",
"@storybook/channels": "7.0.0-alpha.10",
"@storybook/client-logger": "7.0.0-alpha.10",
"@storybook/components": "7.0.0-alpha.10",
"@storybook/core-events": "7.0.0-alpha.10",
"@storybook/addon-highlight": "7.0.0-alpha.13",
"@storybook/addons": "7.0.0-alpha.13",
"@storybook/api": "7.0.0-alpha.13",
"@storybook/channels": "7.0.0-alpha.13",
"@storybook/client-logger": "7.0.0-alpha.13",
"@storybook/components": "7.0.0-alpha.13",
"@storybook/core-events": "7.0.0-alpha.13",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "7.0.0-alpha.10",
"@storybook/theming": "7.0.0-alpha.13",
"axe-core": "^4.2.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
Expand Down Expand Up @@ -75,7 +75,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75",
"gitHead": "9ac4d2e0a05eb945713a0e6689abc3b12359e181",
"storybook": {
"displayName": "Accessibility",
"icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",
Expand Down
18 changes: 9 additions & 9 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "7.0.0-alpha.10",
"version": "7.0.0-alpha.13",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -35,15 +35,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.10",
"@storybook/api": "7.0.0-alpha.10",
"@storybook/client-logger": "7.0.0-alpha.10",
"@storybook/components": "7.0.0-alpha.10",
"@storybook/core-events": "7.0.0-alpha.10",
"@storybook/addons": "7.0.0-alpha.13",
"@storybook/api": "7.0.0-alpha.13",
"@storybook/client-logger": "7.0.0-alpha.13",
"@storybook/components": "7.0.0-alpha.13",
"@storybook/core-events": "7.0.0-alpha.13",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "7.0.0-alpha.10",
"@storybook/theming": "7.0.0-alpha.13",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"dequal": "^2.0.2",
"global": "^4.4.0",
"lodash": "^4.17.21",
"polished": "^4.2.2",
Expand Down Expand Up @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75",
"gitHead": "9ac4d2e0a05eb945713a0e6689abc3b12359e181",
"storybook": {
"displayName": "Actions",
"unsupportedFrameworks": [
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/src/containers/ActionLogger/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import deepEqual from 'fast-deep-equal';
import { dequal as deepEqual } from 'dequal';

import type { API } from '@storybook/api';
import { STORY_CHANGED } from '@storybook/core-events';
Expand Down
16 changes: 8 additions & 8 deletions addons/backgrounds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "7.0.0-alpha.10",
"version": "7.0.0-alpha.13",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -39,13 +39,13 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.10",
"@storybook/api": "7.0.0-alpha.10",
"@storybook/client-logger": "7.0.0-alpha.10",
"@storybook/components": "7.0.0-alpha.10",
"@storybook/core-events": "7.0.0-alpha.10",
"@storybook/addons": "7.0.0-alpha.13",
"@storybook/api": "7.0.0-alpha.13",
"@storybook/client-logger": "7.0.0-alpha.13",
"@storybook/components": "7.0.0-alpha.13",
"@storybook/core-events": "7.0.0-alpha.13",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "7.0.0-alpha.10",
"@storybook/theming": "7.0.0-alpha.13",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -70,7 +70,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75",
"gitHead": "9ac4d2e0a05eb945713a0e6689abc3b12359e181",
"storybook": {
"displayName": "Backgrounds",
"icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",
Expand Down
22 changes: 11 additions & 11 deletions addons/controls/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "7.0.0-alpha.10",
"version": "7.0.0-alpha.13",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -39,16 +39,16 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "7.0.0-alpha.10",
"@storybook/api": "7.0.0-alpha.10",
"@storybook/blocks": "7.0.0-alpha.10",
"@storybook/client-logger": "7.0.0-alpha.10",
"@storybook/components": "7.0.0-alpha.10",
"@storybook/core-common": "7.0.0-alpha.10",
"@storybook/addons": "7.0.0-alpha.13",
"@storybook/api": "7.0.0-alpha.13",
"@storybook/blocks": "7.0.0-alpha.13",
"@storybook/client-logger": "7.0.0-alpha.13",
"@storybook/components": "7.0.0-alpha.13",
"@storybook/core-common": "7.0.0-alpha.13",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/node-logger": "7.0.0-alpha.10",
"@storybook/store": "7.0.0-alpha.10",
"@storybook/theming": "7.0.0-alpha.10",
"@storybook/node-logger": "7.0.0-alpha.13",
"@storybook/store": "7.0.0-alpha.13",
"@storybook/theming": "7.0.0-alpha.13",
"core-js": "^3.8.2",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
Expand All @@ -68,7 +68,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75",
"gitHead": "9ac4d2e0a05eb945713a0e6689abc3b12359e181",
"storybook": {
"displayName": "Controls",
"icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",
Expand Down
1 change: 0 additions & 1 deletion addons/docs/manager.js

This file was deleted.

40 changes: 20 additions & 20 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "7.0.0-alpha.10",
"version": "7.0.0-alpha.13",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -53,25 +53,25 @@
"@babel/preset-env": "^7.12.11",
"@jest/transform": "^26.6.2",
"@mdx-js/react": "^1.6.22",
"@storybook/addons": "7.0.0-alpha.10",
"@storybook/api": "7.0.0-alpha.10",
"@storybook/blocks": "7.0.0-alpha.10",
"@storybook/components": "7.0.0-alpha.10",
"@storybook/core-common": "7.0.0-alpha.10",
"@storybook/core-events": "7.0.0-alpha.10",
"@storybook/addons": "7.0.0-alpha.13",
"@storybook/api": "7.0.0-alpha.13",
"@storybook/blocks": "7.0.0-alpha.13",
"@storybook/components": "7.0.0-alpha.13",
"@storybook/core-common": "7.0.0-alpha.13",
"@storybook/core-events": "7.0.0-alpha.13",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/csf-tools": "7.0.0-alpha.10",
"@storybook/docs-tools": "7.0.0-alpha.10",
"@storybook/mdx1-csf": "^0.0.1",
"@storybook/node-logger": "7.0.0-alpha.10",
"@storybook/postinstall": "7.0.0-alpha.10",
"@storybook/preview-web": "7.0.0-alpha.10",
"@storybook/source-loader": "7.0.0-alpha.10",
"@storybook/store": "7.0.0-alpha.10",
"@storybook/theming": "7.0.0-alpha.10",
"@storybook/csf-tools": "7.0.0-alpha.13",
"@storybook/docs-tools": "7.0.0-alpha.13",
"@storybook/mdx1-csf": "0.0.5-canary.13.9ce928a.0",
"@storybook/node-logger": "7.0.0-alpha.13",
"@storybook/postinstall": "7.0.0-alpha.13",
"@storybook/preview-web": "7.0.0-alpha.13",
"@storybook/source-loader": "7.0.0-alpha.13",
"@storybook/store": "7.0.0-alpha.13",
"@storybook/theming": "7.0.0-alpha.13",
"babel-loader": "^8.2.5",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"dequal": "^2.0.2",
"global": "^4.4.0",
"lodash": "^4.17.21",
"remark-external-links": "^8.0.0",
Expand All @@ -81,12 +81,12 @@
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@storybook/mdx2-csf": "^0.0.3",
"@storybook/mdx2-csf": "0.0.4-canary.14.04ffbe8.0",
"@types/util-deprecate": "^1.0.0",
"typescript": "~4.6.3"
},
"peerDependencies": {
"@storybook/mdx2-csf": "^0.0.3",
"@storybook/mdx2-csf": "0.0.4-canary.14.04ffbe8.0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
Expand All @@ -104,7 +104,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75",
"gitHead": "9ac4d2e0a05eb945713a0e6689abc3b12359e181",
"storybook": {
"displayName": "Docs",
"icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",
Expand Down
6 changes: 0 additions & 6 deletions addons/docs/register.js

This file was deleted.

Loading

0 comments on commit 057c401

Please sign in to comment.