Merge branch 'future/docs2-core' into tom/sb-337-manager-side-type-ba…

…ck-compat
storybookjs · Jun 18, 2022 · fcec058 · fcec058
2 parents 4e3f6d3 + 3e8f024
commit fcec058
Show file tree

Hide file tree

Showing 203 changed files with 5,855 additions and 14,163 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -18,7 +18,7 @@ const modules = process.env.BABEL_MODE === 'cjs' ? 'auto' : false;
 
 // FIXME: optional chaining introduced in chrome 80, not supported by wepback4
 // https://github.com/webpack/webpack/issues/10227#issuecomment-642734920
-const targets = process.env.BABEL_MODE === 'esm' ? { chrome: '100' } : 'defaults';
+const targets = process.env.BABEL_MODE === 'esm' ? { chrome: '100' } : { node: 'current' };
 
 module.exports = {
   compact: false,

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -192,7 +192,7 @@ jobs:
     executor:
       class: large
       name: sb_cypress_8_node_14
-    parallelism: 9
+    parallelism: 8
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
@@ -209,7 +209,7 @@ jobs:
           name: Run E2E (core) tests
           # Do not test CRA here because it's done in PnP part
           # TODO: Remove `web_components_typescript` as soon as Lit 2 stable is released
-          command: yarn test:e2e-framework vue3 angular130 angular13 angular12 web_components_typescript web_components_lit2 react react_legacy_root_api vite_react
+          command: yarn test:e2e-framework vue3 angular130 angular13 angular12 web_components_typescript web_components_lit2 react react_legacy_root_api
           no_output_timeout: 5m
       - run:
           name: prep artifacts
@@ -252,6 +252,9 @@ jobs:
           clone_options: '--depth 1 --verbose'
       - attach_workspace:
           at: .
+      - run:
+          name: install playright
+          command: npx playwright install
       - run:
           name: Running local registry
           command: yarn local-registry --port 6000 --open
@@ -260,12 +263,13 @@ jobs:
           name: Wait for registry
           command: yarn wait-on http://localhost:6000
       - run:
-          name: Run @storybook/bench on a CRA project
+          name: set up cra repro, skip tests
+          command: node ./lib/cli/bin/index.js repro -t cra --e2e ../cra-bench
+      - run:
+          name: Run @storybook/bench on repro
           command: |
-            cd ..
-            npx create-react-app cra-bench
-            cd cra-bench
-            npx @storybook/bench@latest 'npx sb init' --label cra
+            cd ../cra-bench
+            npx @storybook/bench@0.8.0--canary.11.edeef38.0 'echo noop' --label cra
   e2e-tests-pnp:
     executor:
       class: medium
@@ -274,32 +278,31 @@ jobs:
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'
-      # TODO: we disabled this one because it keeps failing, we should fix it, and enable it again!
-      # - 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 e2e tests cra
-      #     command: yarn test:e2e-framework --pnp cra
+      - 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 e2e tests cra
+          command: yarn test:e2e-framework --pnp cra
       # - run:
       #     name: run e2e tests vue
       #     command: yarn test:e2e-framework --pnp sfcVue
-      # - run:
-      #     name: prep artifacts
-      #     when: always
-      #     command: zip -r /tmp/storybook-e2e-testing-out.zip /tmp/storybook-e2e-testing
-      # - store_artifacts:
-      #     path: /tmp/cypress-record
-      #     destination: cypress
-      # - store_artifacts:
-      #     path: /tmp/storybook-e2e-testing-out.zip
-      #     destination: e2e
+      - run:
+          name: prep artifacts
+          when: always
+          command: zip -r /tmp/storybook-e2e-testing-out.zip /tmp/storybook-e2e-testing
+      - store_artifacts:
+          path: /tmp/cypress-record
+          destination: cypress
+      - store_artifacts:
+          path: /tmp/storybook-e2e-testing-out.zip
+          destination: e2e
   e2e-tests-examples:
     executor:
       class: small

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,42 @@
+## 7.0.0-alpha.3 (June 17, 2022)
+
+### Features
+
+- Interactions: Collapse child interactions ([#18484](https://github.com/storybookjs/storybook/pull/18484))
+
+### Bug Fixes
+
+- Interactions: Fix `waitFor` behavior while debugging ([#18460](https://github.com/storybookjs/storybook/pull/18460))
+- UI: Fix display skip to sidebar button ([#18479](https://github.com/storybookjs/storybook/pull/18479))
+
+### Maintenance
+
+- CLI: Use `storybook` instead of `sb` ([#18430](https://github.com/storybookjs/storybook/pull/18430))
+- Components: Re-bundle the syntax highlighter ([#18425](https://github.com/storybookjs/storybook/pull/18425))
+
+## 7.0.0-alpha.2 (June 15, 2022)
+
+### Features
+
+- UI: Update manager to respect `parameters.docsOnly` in `stories.json` ([#18433](https://github.com/storybookjs/storybook/pull/18433))
+- CLI: Add additional files api to sb repro ([#18389](https://github.com/storybookjs/storybook/pull/18389))
+
+### Bug Fixes
+
+- Core: Fix process is not defined when using components ([#18469](https://github.com/storybookjs/storybook/pull/18469))
+- Story index: Warn on `storyName` in CSF3 exports ([#18464](https://github.com/storybookjs/storybook/pull/18464))
+- Telemetry: Strip out preset from addon name ([#18442](https://github.com/storybookjs/storybook/pull/18442))
+
+### Maintenance
+
+- CLI: Improve to be more async & cleanup ([#18475](https://github.com/storybookjs/storybook/pull/18475))
+- 7.0.0 pnp support ([#18461](https://github.com/storybookjs/storybook/pull/18461))
+- Build: Use playright version of sb-bench ([#18458](https://github.com/storybookjs/storybook/pull/18458))
+- Angular: Support Angular 14 standalone components ([#18272](https://github.com/storybookjs/storybook/pull/18272))
+- Build: Fix prebundle script on Windows ([#18365](https://github.com/storybookjs/storybook/pull/18365))
+- Scripts: Clean verdaccio cache when running locally ([#18359](https://github.com/storybookjs/storybook/pull/18359))
+- Core: fix PnP compatibility for @storybook/ui and @storybook/router packages ([#18412](https://github.com/storybookjs/storybook/pull/18412))
+
 ## 7.0.0-alpha.1 (June 7, 2022)
 
 ### Bug Fixes

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -245,11 +245,11 @@ To convert this project to 7.0:
 ```json
 {
   "scripts": {
-    "storybook": "sb dev <some flags>",
-    "build-storybook": "sb build <some flags>"
+    "storybook": "storybook dev <some flags>",
+    "build-storybook": "storybook build <some flags>"
   },
   "devDependencies": {
-    "sb": "next"
+    "storybook": "future"
   }
 }
 ```
@@ -367,9 +367,9 @@ module.exports = {
 
 In 7.0 we've removed the following feature flags:
 
-| flag           | migration instructions                               |
-| -------------- | ---------------------------------------------------- |
-| `emotionAlias` | This flag is no longer needed and should be deleted. |
+| flag                | migration instructions                               |
+| ------------------- | ---------------------------------------------------- |
+| `emotionAlias`      | This flag is no longer needed and should be deleted. |
 | `breakingChangesV7` | This flag is no longer needed and should be deleted. |
 
 ## From version 6.4.x to 6.5.0

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.3",
   "description": "Test component compliance with web accessibility standards",
   "keywords": [
     "a11y",
@@ -38,14 +38,14 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.1",
-    "@storybook/api": "7.0.0-alpha.1",
-    "@storybook/channels": "7.0.0-alpha.1",
-    "@storybook/client-logger": "7.0.0-alpha.1",
-    "@storybook/components": "7.0.0-alpha.1",
-    "@storybook/core-events": "7.0.0-alpha.1",
+    "@storybook/addons": "7.0.0-alpha.3",
+    "@storybook/api": "7.0.0-alpha.3",
+    "@storybook/channels": "7.0.0-alpha.3",
+    "@storybook/client-logger": "7.0.0-alpha.3",
+    "@storybook/components": "7.0.0-alpha.3",
+    "@storybook/core-events": "7.0.0-alpha.3",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/theming": "7.0.0-alpha.1",
+    "@storybook/theming": "7.0.0-alpha.3",
     "axe-core": "^4.2.0",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea",
+  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9",
   "storybook": {
     "displayName": "Accessibility",
     "icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.3",
   "description": "Get UI feedback when an action is performed on an interactive element",
   "keywords": [
     "storybook",
@@ -34,13 +34,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.1",
-    "@storybook/api": "7.0.0-alpha.1",
-    "@storybook/client-logger": "7.0.0-alpha.1",
-    "@storybook/components": "7.0.0-alpha.1",
-    "@storybook/core-events": "7.0.0-alpha.1",
+    "@storybook/addons": "7.0.0-alpha.3",
+    "@storybook/api": "7.0.0-alpha.3",
+    "@storybook/client-logger": "7.0.0-alpha.3",
+    "@storybook/components": "7.0.0-alpha.3",
+    "@storybook/core-events": "7.0.0-alpha.3",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/theming": "7.0.0-alpha.1",
+    "@storybook/theming": "7.0.0-alpha.3",
     "core-js": "^3.8.2",
     "fast-deep-equal": "^3.1.3",
     "global": "^4.4.0",
@@ -72,7 +72,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea",
+  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9",
   "storybook": {
     "displayName": "Actions",
     "unsupportedFrameworks": [

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.3",
   "description": "Switch backgrounds to view components in different settings",
   "keywords": [
     "addon",
@@ -38,13 +38,13 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.1",
-    "@storybook/api": "7.0.0-alpha.1",
-    "@storybook/client-logger": "7.0.0-alpha.1",
-    "@storybook/components": "7.0.0-alpha.1",
-    "@storybook/core-events": "7.0.0-alpha.1",
+    "@storybook/addons": "7.0.0-alpha.3",
+    "@storybook/api": "7.0.0-alpha.3",
+    "@storybook/client-logger": "7.0.0-alpha.3",
+    "@storybook/components": "7.0.0-alpha.3",
+    "@storybook/core-events": "7.0.0-alpha.3",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/theming": "7.0.0-alpha.1",
+    "@storybook/theming": "7.0.0-alpha.3",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
     "memoizerific": "^1.11.3",
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea",
+  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9",
   "storybook": {
     "displayName": "Backgrounds",
     "icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",

diff --git a/addons/controls/package.json b/addons/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-controls",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.3",
   "description": "Interact with component inputs dynamically in the Storybook UI",
   "keywords": [
     "addon",
@@ -38,15 +38,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.1",
-    "@storybook/api": "7.0.0-alpha.1",
-    "@storybook/client-logger": "7.0.0-alpha.1",
-    "@storybook/components": "7.0.0-alpha.1",
-    "@storybook/core-common": "7.0.0-alpha.1",
+    "@storybook/addons": "7.0.0-alpha.3",
+    "@storybook/api": "7.0.0-alpha.3",
+    "@storybook/client-logger": "7.0.0-alpha.3",
+    "@storybook/components": "7.0.0-alpha.3",
+    "@storybook/core-common": "7.0.0-alpha.3",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/node-logger": "7.0.0-alpha.1",
-    "@storybook/store": "7.0.0-alpha.1",
-    "@storybook/theming": "7.0.0-alpha.1",
+    "@storybook/node-logger": "7.0.0-alpha.3",
+    "@storybook/store": "7.0.0-alpha.3",
+    "@storybook/theming": "7.0.0-alpha.3",
     "core-js": "^3.8.2",
     "lodash": "^4.17.21",
     "ts-dedent": "^2.0.0"
@@ -66,7 +66,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea",
+  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9",
   "storybook": {
     "displayName": "Controls",
     "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",

diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.3",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -52,20 +52,21 @@
     "@babel/preset-env": "^7.12.11",
     "@jest/transform": "^26.6.2",
     "@mdx-js/react": "^1.6.22",
-    "@storybook/addons": "7.0.0-alpha.1",
-    "@storybook/api": "7.0.0-alpha.1",
-    "@storybook/components": "7.0.0-alpha.1",
-    "@storybook/core-common": "7.0.0-alpha.1",
-    "@storybook/core-events": "7.0.0-alpha.1",
+    "@storybook/addons": "7.0.0-alpha.3",
+    "@storybook/api": "7.0.0-alpha.3",
+    "@storybook/components": "7.0.0-alpha.3",
+    "@storybook/core-common": "7.0.0-alpha.3",
+    "@storybook/core-events": "7.0.0-alpha.3",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/docs-tools": "7.0.0-alpha.1",
+    "@storybook/csf-tools": "7.0.0-alpha.3",
+    "@storybook/docs-tools": "7.0.0-alpha.3",
     "@storybook/mdx1-csf": "^0.0.1",
-    "@storybook/node-logger": "7.0.0-alpha.1",
-    "@storybook/postinstall": "7.0.0-alpha.1",
-    "@storybook/preview-web": "7.0.0-alpha.1",
-    "@storybook/source-loader": "7.0.0-alpha.1",
-    "@storybook/store": "7.0.0-alpha.1",
-    "@storybook/theming": "7.0.0-alpha.1",
+    "@storybook/node-logger": "7.0.0-alpha.3",
+    "@storybook/postinstall": "7.0.0-alpha.3",
+    "@storybook/preview-web": "7.0.0-alpha.3",
+    "@storybook/source-loader": "7.0.0-alpha.3",
+    "@storybook/store": "7.0.0-alpha.3",
+    "@storybook/theming": "7.0.0-alpha.3",
     "babel-loader": "^8.2.5",
     "core-js": "^3.8.2",
     "fast-deep-equal": "^3.1.3",
@@ -101,7 +102,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b90b85210f66da59656c2ef58b0910b156256bea",
+  "gitHead": "629b056190993bcee6445471b8cb27208eb401a9",
   "storybook": {
     "displayName": "Docs",
     "icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",