Merge branch 'next' into 11840

.circleci/config.yml

@@ -1,14 +1,21 @@
 version: 2.1
 
-aliases:
-  - &defaults
+executors:
+  sb_node:
+    parameters:
+        class:
+          description: The Resource class
+          type: enum
+          enum: ["small", "medium", "large", "xlarge"]
+          default: "medium"
     working_directory: /tmp/storybook
     docker:
       - image: circleci/node:10-browsers
+    resource_class: <<parameters.class>>
 
 jobs:
   install:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - restore_cache:
@@ -37,7 +44,7 @@ jobs:
             - app
             - lib
   build:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -54,7 +61,7 @@ jobs:
             - app
             - lib
   chromatic:
-    <<: *defaults
+    executor: sb_node
     parallelism: 11
     steps:
       - checkout
@@ -65,7 +72,7 @@ jobs:
           command: |
             yarn run-chromatics
   packtracker:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -76,7 +83,7 @@ jobs:
             cd examples/official-storybook
             yarn packtracker
   examples:
-    <<: *defaults
+    executor: sb_node
     parallelism: 11
     steps:
       - checkout
@@ -91,7 +98,7 @@ jobs:
           paths:
             - built-storybooks
   publish:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -188,7 +195,7 @@ jobs:
           destination: cypress
 
   smoke-tests:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -254,7 +261,7 @@ jobs:
             cd examples/cra-react15
             yarn storybook --smoke-test --quiet
   frontpage:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - restore_cache:
@@ -267,22 +274,10 @@ jobs:
       - run:
           name: Trigger build
           command: ./scripts/build-frontpage.js
-  docs:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: Install dependencies
-          command: |
-            cd docs
-            yarn install
-      - run:
-          name: Build docs
-          command: |
-            cd docs
-            yarn build
   lint:
-    <<: *defaults
+    executor:
+      class: small
+      name: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -291,7 +286,7 @@ jobs:
           name: Lint
           command: yarn lint
   test:
-    <<: *defaults
+    executor: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -304,7 +299,9 @@ jobs:
           paths:
             - coverage
   coverage:
-    <<: *defaults
+    executor:
+      class: small
+      name: sb_node
     steps:
       - checkout
       - attach_workspace:
@@ -355,5 +352,4 @@ workflows:
             - publish
   deploy:
     jobs:
-      - docs
       - frontpage

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +1,14 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-
 ---
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.
 If applicable, add code samples to help explain your problem.
 
 **System:**
-Please paste the results of `npx -p @storybook/cli@next sb info` here.
+Please paste the results of `npx sb@next info` here.
 
 **Additional context**
 Add any other context about the problem here.

.github/automention.yml

@@ -1,5 +1,5 @@
 'app: angular': ['kroeder', 'igor-dv', 'MaximSagan']
-'app: ember': ['gabrielcsapo']
+'app: ember': ['gabrielcsapo', 'gossi', 'meirish']
 'app: html': ['Hypnosphi']
 'app: marko': ['nm123github']
 'app: preact': ['BartWaardenburg']
@@ -21,3 +21,4 @@ dependencies: ['ndelangen']
 'babel / webpack': ['ndelangen', 'igor-dv', 'shilman']
 'yarn / npm': ['ndelangen', 'tmeasday']
 'source-loader': ['libetl']
+documentation: ['jonniebigodes']

CHANGELOG.md

@@ -1,3 +1,121 @@
+## 6.0.13 (August 19, 2020)
+
+### Bug Fixes
+
+- Source-loader: Fix default exports of type TSAsExpression ([#12099](https://github.com/storybookjs/storybook/pull/12099))
+- Addon-docs: Fix source code for Template.bind({}) in MDX ([#12107](https://github.com/storybookjs/storybook/pull/12107))
+- Addon-A11y: Fix manual run & timeline ([#12003](https://github.com/storybookjs/storybook/pull/12003))
+- Core: Add frameworkPath to options to support custom frameworks ([#12087](https://github.com/storybookjs/storybook/pull/12087))
+
+## 6.0.12 (August 17, 2020)
+
+### Bug Fixes
+
+- Angular: Make CLI templates compatible with TS strict mode ([#12081](https://github.com/storybookjs/storybook/pull/12081))
+- React: Fix CSF component typing ([#12072](https://github.com/storybookjs/storybook/pull/12072))
+- ArgsTable: Fix styles to allow long text to wrap ([#11818](https://github.com/storybookjs/storybook/pull/11818))
+- Addon-docs: Fix main check for absolute config dirs ([#12057](https://github.com/storybookjs/storybook/pull/12057))
+
+## 6.0.11 (August 17, 2020)
+
+NPM publish failed
+
+## 6.0.10 (August 15, 2020)
+
+### Bug Fixes
+
+- Addon-controls: Fix argType inference priority ([#12048](https://github.com/storybookjs/storybook/pull/12048))
+
+## 6.0.9 (August 15, 2020)
+
+### Bug Fixes
+
+- Addon-docs: Fix CSF names importing in MDX ([#12044](https://github.com/storybookjs/storybook/pull/12044))
+
+### Maintenance
+
+- ArgsTable: Error when subcomponents is an array ([#12033](https://github.com/storybookjs/storybook/pull/12033))
+
+## 6.0.8 (August 15, 2020)
+
+Unpublished
+
+## 6.0.7 (August 14, 2020)
+
+### Bug Fixes
+
+- Addon-docs: Fix extractArgTypes for unknown component ([#12012](https://github.com/storybookjs/storybook/pull/12012))
+
+### Maintenance
+
+- UI:pdate upgrade command in about section ([#11934](https://github.com/storybookjs/storybook/pull/11934))
+- Build: Remove documentation scripts and fix README ([#12015](https://github.com/storybookjs/storybook/pull/12015))
+
+### Dependency Upgrades
+
+- Bump jest-specific-snapshot to v4 ([#11939](https://github.com/storybookjs/storybook/pull/11939))
+
+## 6.0.6 (August 14, 2020)
+
+### Bug Fixes
+
+- CLI: Fix upgrade to warn when no packages found ([#11993](https://github.com/storybookjs/storybook/pull/11993))
+- Addon-docs: Fix blocks type export ([#11987](https://github.com/storybookjs/storybook/pull/11987))
+- CLI: Fix RN link ([#11973](https://github.com/storybookjs/storybook/pull/11973))
+
+## 6.0.5 (August 13, 2020)
+
+### Bug Fixes
+
+- CLI: Fix welcome links on Introduction MDX ([#11949](https://github.com/storybookjs/storybook/pull/11949))
+
+## 6.0.4 (August 12, 2020)
+
+### Bug Fixes
+
+- Source-loader: Fix `.add` detection ([#11920](https://github.com/storybookjs/storybook/pull/11920))
+
+## 6.0.3 (August 12, 2020)
+
+### Bug Fixes
+
+- Essentials: Fix missing toolbars addon ([#11910](https://github.com/storybookjs/storybook/pull/11910))
+
+## 6.0.2 (August 11, 2020)
+
+### Bug Fixes
+
+- CLI: Fix csf-hoist-story-annotations codemod for variable default exports ([#11895](https://github.com/storybookjs/storybook/pull/11895))
+
+## 6.0.1 (August 11, 2020)
+
+### Bug Fixes
+
+- Core: Fix support for main.ts/preview.ts files ([#11885](https://github.com/storybookjs/storybook/pull/11885))
+- Addon-docs: Fix ArgsTable regression ([#11889](https://github.com/storybookjs/storybook/pull/11889))
+
+## 6.0.0 (August 10, 2020)
+
+Storybook 6.0 is here!
+
+- 💎 [Essentials: Zero-configuration setup](https://medium.com/storybookjs/zero-config-storybook-66e7c4798e5d)
+- 🧬 [Args: Next-generation, dynamic story format](https://medium.com/storybookjs/introducing-storybook-args-2dadcdb777cc)
+- 🎛 [Controls: Live edit component examples](https://medium.com/storybookjs/storybook-controls-ce82af93e430)
+- 🌐 [Composition: Combine multiple Storybooks](https://medium.com/storybookjs/storybook-composition-af0da9084fba)
+- 📚 [Documentation: Complete project overhaul](https://storybook.js.org/docs/react/get-started/introduction)
+
+  6.0 contains hundreds more fixes, features, and tweaks. Browse the changelogs matching `6.0.0-alpha.*`, `6.0.0-beta.*`, and `6.0.0-rc.*` for the full list of changes. See [MIGRATION.md](https://github.com/storybookjs/storybook/blob/next/MIGRATION.md) to upgrade from `5.3` or earlier.
+
+## 6.0.0-rc.30 (August 10, 2020)
+
+### Bug Fixes
+
+- Storyshots: Don't ship typescript files in dist ([#11792](https://github.com/storybookjs/storybook/pull/11792))
+
+### Maintenance
+
+- 6.0 documentation overhaul ([#11861](https://github.com/storybookjs/storybook/pull/11861))
+
 ## 6.0.0-rc.29 (August 7, 2020)
 
 ### Features

CONTRIBUTING.md

@@ -362,6 +362,12 @@ Save and go to `http://localhost:9011` (or wherever storybook is running)
 
 If you don't see the changes rerun `yarn storybook` again in your sandbox app
 
+### Documentation
+
+The documentation for Storybook is served by the [frontpage](https://github.com/storybookjs/frontpage), but the docs files are in this repository.
+
+To see changes in a development version of the docs, use the "linking" method documented [here](https://github.com/storybookjs/frontpage#docs-content).
+
 ## Release Guide
 
 This section is for Storybook maintainers who will be creating releases. It assumes: