Merge branch 'next' into pr/Spy-Seth/6655

# Conflicts: # addons/actions/package.json # addons/backgrounds/package.json # addons/cssresources/package.json # addons/events/package.json # addons/google-analytics/package.json # addons/info/package.json # addons/jest/package.json # addons/notes/package.json # addons/ondevice-backgrounds/package.json # addons/ondevice-knobs/package.json # addons/ondevice-notes/package.json # addons/options/package.json # addons/storyshots/storyshots-core/package.json # addons/storyshots/storyshots-puppeteer/package.json # addons/storysource/package.json # addons/viewport/package.json # lib/addons/package.json # lib/api/package.json # lib/channel-postmessage/package.json # lib/channel-websocket/package.json # lib/components/package.json # lib/router/package.json # lib/ui/package.json # yarn.lock
ppalmeida · May 6, 2019 · a2f9242 · a2f9242
2 parents 6b19049 + 57e8528
commit a2f9242
Show file tree

Hide file tree

Showing 184 changed files with 1,494 additions and 950 deletions.
diff --git a/.github/automention.yml b/.github/automention.yml
@@ -1,4 +1,4 @@
-'app: angular': ['kroeder', 'igor-dv']
+'app: angular': ['kroeder', 'igor-dv', 'MaximSagan']
 'app: ember': ['gabrielcsapo']
 'app: html': ['Hypnosphi']
 'app: marko': ['nm123github']

diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -23,7 +23,6 @@ object Project : Project({
     buildType(OpenSourceProjects_Storybook_Examples)
     buildType(OpenSourceProjects_Storybook_Docs)
     buildType(OpenSourceProjects_Storybook_Build_2)
-    buildType(OpenSourceProjects_Storybook_CliTest)
     buildType(OpenSourceProjects_Storybook_Test)
     buildType(OpenSourceProjects_Storybook_Lint)
     buildType(OpenSourceProjects_Storybook_Lint_Warnings)

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
@@ -111,10 +111,5 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }
         }
-        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_CliTest) {
-            snapshot {
-                onDependencyCancel = FailureAction.ADD_PROBLEM
-            }
-        }
     }
 })
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/StorybookApp.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/StorybookApp.kt
@@ -9,6 +9,7 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetr
 enum class StorybookApp(val appName: String, val exampleDir: String, val merged: Boolean = true) {
     CRA("CRA", "cra-kitchen-sink"),
     CRA_TS("CRA TS", "cra-ts-kitchen-sink"),
+    CRA_REACT15("CRA REACT15", "cra-react15", false),
     VUE("Vue", "vue-kitchen-sink"),
     ANGULAR("Angular", "angular-cli"),
     POLYMER("Polymer", "polymer-cli"),

diff --git a/.../OpenSourceProjects_Storybook/patches/buildTypes/b1db1a3a-a4cf-46ea-8f55-98b86611f92e.kts b/.../OpenSourceProjects_Storybook/patches/buildTypes/b1db1a3a-a4cf-46ea-8f55-98b86611f92e.kts
diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -2,8 +2,8 @@
 
 | | [React](app/react)|[React Native](app/react-native)|[Vue](app/vue)|[Angular](app/angular)| [Polymer](app/polymer)| [Mithril](app/mithril)| [HTML](app/html)| [Marko](app/marko)| [Svelte](app/svelte)| [Riot](app/riot)| [Ember](app/ember)| [Preact](app/preact)|
 | ----------- |:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|:-------:|
-|[a11y](addons/a11y)                         |+| |+|+|+|+|+|+| | |+|+|
-|[actions](addons/actions)                   |+|+|+|+|+|+|+|+|+|+|+|+|
+|[a11y](addons/a11y)                         |+| |+|+|+|+|+|+|+|+|+|+|
+|[actions](addons/actions)                   |+|+*|+|+|+|+|+|+|+|+|+|+|
 |[backgrounds](addons/backgrounds)           |+|*|+|+|+|+|+|+|+|+|+|+|
 |[centered](addons/centered)                 |+| |+|+| |+|+| |+| |+|+|
 |[contexts](addons/contexts)                 |+| |+| | | | | | | | |+|

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,45 +1,84 @@
+## 5.1.0-alpha.39 (May 2, 2019)
+
+### Features
+
+- React-native: Ondevice actions ([#6594](https://github.com/storybooks/storybook/pull/6594))
+- React-native: Use emotion to style RN UI ([#6603](https://github.com/storybooks/storybook/pull/6603))
+
+### Bug Fixes
+
+- API: Mimic PureComponent behavior for Consumer children ([#6412](https://github.com/storybooks/storybook/pull/6412))
+
+## 5.1.0-alpha.38 (May 2, 2019)
+
+Failed publish
+
+## 5.1.0-alpha.37 (May 1, 2019)
+
+### Bug Fixes
+
+- Core: Fix regression with deep linking ([#6688](https://github.com/storybooks/storybook/pull/6688))
+- Addon-contexts: No cancel option in UI if the context have no param ([#6669](https://github.com/storybooks/storybook/pull/6669))
+- CLI: Fix `sb init` for projects with frozen lock files ([#6629](https://github.com/storybooks/storybook/pull/6629))
+
+### Maintenance
+
+- CLI: Refactor how we install dev dependencies in cli ([#6695](https://github.com/storybooks/storybook/pull/6695))
+
+## 5.0.11 (April 28, 2019)
+
+### Bug Fixes
+
+- Polymer: Fix re-rendering lit-html elements after non-lit-html element ([#5868](https://github.com/storybooks/storybook/pull/5868))
+- Addon-knobs: Check color knob value before applying uppercase ([#6598](https://github.com/storybooks/storybook/pull/6598))
+- Angular: Fix sourceMap property of angulars webpack config ([#6535](https://github.com/storybooks/storybook/pull/6535))
+
+### Maintenance
+
+- UI: Add missing props in stories ([#6353](https://github.com/storybooks/storybook/pull/6353))
+
 ## 5.1.0-alpha.36 (April 27, 2019)
 
 ### Features
 
-* Addon-contexts: Preact support ([#6660](https://github.com/storybooks/storybook/pull/6660))
-* Angular: Allow optional component declaration ([#6346](https://github.com/storybooks/storybook/pull/6346))
+- Addon-contexts: Preact support ([#6660](https://github.com/storybooks/storybook/pull/6660))
+- Angular: Allow optional component declaration ([#6346](https://github.com/storybooks/storybook/pull/6346))
 
 ### Bug Fixes
 
-* CLI: Fix `sb init` for projects with frozen lock files ([#6629](https://github.com/storybooks/storybook/pull/6629))
+- CLI: Fix `sb init` for projects with frozen lock files ([#6629](https://github.com/storybooks/storybook/pull/6629))
 
 ### Dependency Upgrades
 
-* [Snyk] Fix for 1 vulnerable dependencies ([#6647](https://github.com/storybooks/storybook/pull/6647))
+- [Snyk] Fix for 1 vulnerable dependencies ([#6647](https://github.com/storybooks/storybook/pull/6647))
 
 ## 5.1.0-alpha.35 (April 27, 2019)
 
 ### Features
 
-* Addon-notes: use @storybook/router <Link> to render links in notes ([#6398](https://github.com/storybooks/storybook/pull/6398))
-* Angular: Support default `storybook` project configuration ([#6484](https://github.com/storybooks/storybook/pull/6484))
-* Addon-contexts: Improve Vue integration ([#6632](https://github.com/storybooks/storybook/pull/6632))
-* Addon-a11y: Design enhancements ([#6563](https://github.com/storybooks/storybook/pull/6563))
+- Addon-notes: use @storybook/router <Link> to render links in notes ([#6398](https://github.com/storybooks/storybook/pull/6398))
+- Angular: Support default `storybook` project configuration ([#6484](https://github.com/storybooks/storybook/pull/6484))
+- Addon-contexts: Improve Vue integration ([#6632](https://github.com/storybooks/storybook/pull/6632))
+- Addon-a11y: Design enhancements ([#6563](https://github.com/storybooks/storybook/pull/6563))
 
 ### Bug Fixes
 
-* UI: `active` PropTypes on MobileLayout ([#6241](https://github.com/storybooks/storybook/pull/6241))
-* Core: Fix css import when sideEffects is false ([#6650](https://github.com/storybooks/storybook/pull/6650))
-* Core: Fix infinite loop with special characters in kind names ([#6607](https://github.com/storybooks/storybook/pull/6607))
-* UI: Fix 'Escape' onKeyUp event doesn't work ([#6578](https://github.com/storybooks/storybook/pull/6578))
+- UI: `active` PropTypes on MobileLayout ([#6241](https://github.com/storybooks/storybook/pull/6241))
+- Core: Fix css import when sideEffects is false ([#6650](https://github.com/storybooks/storybook/pull/6650))
+- Core: Fix infinite loop with special characters in kind names ([#6607](https://github.com/storybooks/storybook/pull/6607))
+- UI: Fix 'Escape' onKeyUp event doesn't work ([#6578](https://github.com/storybooks/storybook/pull/6578))
 
 ### Maintenance
 
-* UI: Add missing props in stories ([#6353](https://github.com/storybooks/storybook/pull/6353))
-* Build: tslint, and use eslint for everything ([#6621](https://github.com/storybooks/storybook/pull/6621))
-* Build: deploy to local registry ([#6619](https://github.com/storybooks/storybook/pull/6619))
+- UI: Add missing props in stories ([#6353](https://github.com/storybooks/storybook/pull/6353))
+- Build: tslint, and use eslint for everything ([#6621](https://github.com/storybooks/storybook/pull/6621))
+- Build: deploy to local registry ([#6619](https://github.com/storybooks/storybook/pull/6619))
 
 ### Dependency Upgrades
 
-* Bump ts-node from 8.0.3 to 8.1.0 ([#6585](https://github.com/storybooks/storybook/pull/6585))
-* Bump semver from 5.7.0 to 6.0.0 ([#6580](https://github.com/storybooks/storybook/pull/6580))
-* Bump react-color from 2.17.0 to 2.17.1 ([#6583](https://github.com/storybooks/storybook/pull/6583))
+- Bump ts-node from 8.0.3 to 8.1.0 ([#6585](https://github.com/storybooks/storybook/pull/6585))
+- Bump semver from 5.7.0 to 6.0.0 ([#6580](https://github.com/storybooks/storybook/pull/6580))
+- Bump react-color from 2.17.0 to 2.17.1 ([#6583](https://github.com/storybooks/storybook/pull/6583))
 
 ## 5.1.0-alpha.34 (April 24, 2019)
 

diff --git a/addons/a11y/README.md b/addons/a11y/README.md
@@ -4,7 +4,7 @@ This storybook addon can be helpful to make your UI components more accessible.
 
 [Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
-![](docs/screenshot.png)
+![Screenshot](https://raw.githubusercontent.com/storybooks/storybook/HEAD/addons/a11y/docs/screenshot.png)
 
 ## Getting started
 

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "5.1.0-alpha.36",
+  "version": "5.1.0-alpha.39",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -26,12 +26,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.1.0-alpha.36",
-    "@storybook/api": "5.1.0-alpha.36",
-    "@storybook/client-logger": "5.1.0-alpha.36",
-    "@storybook/components": "5.1.0-alpha.36",
-    "@storybook/core-events": "5.1.0-alpha.36",
-    "@storybook/theming": "5.1.0-alpha.36",
+    "@storybook/addons": "5.1.0-alpha.39",
+    "@storybook/api": "5.1.0-alpha.39",
+    "@storybook/client-logger": "5.1.0-alpha.39",
+    "@storybook/components": "5.1.0-alpha.39",
+    "@storybook/core-events": "5.1.0-alpha.39",
+    "@storybook/theming": "5.1.0-alpha.39",
     "axe-core": "^3.2.2",
     "common-tags": "^1.8.0",
     "core-js": "^3.0.1",

diff --git a/addons/a11y/src/components/A11YPanel.tsx b/addons/a11y/src/components/A11YPanel.tsx
@@ -48,7 +48,8 @@ const Incomplete = styled.span(({ theme }) => ({
 
 const Loader = styled(({ className }) => (
   <div className={className}>
-    <Icon inline icon="sync" status="running" /> Please wait while a11y scan is running ...
+    <Icon inline icon="sync" status="running" /> Please wait while the accessibility scan is running
+    ...
   </div>
 ))({
   display: 'flex',

diff --git a/addons/a11y/src/components/__snapshots__/A11YPanel.test.js.snap b/addons/a11y/src/components/__snapshots__/A11YPanel.test.js.snap
@@ -96,7 +96,7 @@ exports[`A11YPanel should render loader when it's running 1`] = `
           </Svg>
         </Icons>
       </Styled(Icons)>
-       Please wait while a11y scan is running ...
+       Please wait while the accessibility scan is running ...
     </div>
   </Component>
 </Loader>

diff --git a/addons/actions/README.md b/addons/actions/README.md
@@ -4,7 +4,7 @@ Storybook Addon Actions can be used to display data received by event handlers i
 
 [Framework Support](https://github.com/storybooks/storybook/blob/master/ADDONS_SUPPORT.md)
 
-![Screenshot](docs/screenshot.png)
+![Screenshot](https://raw.githubusercontent.com/storybooks/storybook/HEAD/addons/actions/docs/screenshot.png)
 
 ## Getting Started
 

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "5.1.0-alpha.36",
+  "version": "5.1.0-alpha.39",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -21,11 +21,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.1.0-alpha.36",
-    "@storybook/api": "5.1.0-alpha.36",
-    "@storybook/components": "5.1.0-alpha.36",
-    "@storybook/core-events": "5.1.0-alpha.36",
-    "@storybook/theming": "5.1.0-alpha.36",
+    "@storybook/addons": "5.1.0-alpha.39",
+    "@storybook/api": "5.1.0-alpha.39",
+    "@storybook/components": "5.1.0-alpha.39",
+    "@storybook/core-events": "5.1.0-alpha.39",
+    "@storybook/theming": "5.1.0-alpha.39",
     "core-js": "^3.0.1",
     "fast-deep-equal": "^2.0.1",
     "global": "^4.3.2",

diff --git a/addons/actions/src/index.ts b/addons/actions/src/index.ts
@@ -1,4 +1,5 @@
 export * from './constants';
+export * from './models';
 export * from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "5.1.0-alpha.36",
+  "version": "5.1.0-alpha.39",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -25,12 +25,12 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "5.1.0-alpha.36",
-    "@storybook/api": "5.1.0-alpha.36",
-    "@storybook/client-logger": "5.1.0-alpha.36",
-    "@storybook/components": "5.1.0-alpha.36",
-    "@storybook/core-events": "5.1.0-alpha.36",
-    "@storybook/theming": "5.1.0-alpha.36",
+    "@storybook/addons": "5.1.0-alpha.39",
+    "@storybook/api": "5.1.0-alpha.39",
+    "@storybook/client-logger": "5.1.0-alpha.39",
+    "@storybook/components": "5.1.0-alpha.39",
+    "@storybook/core-events": "5.1.0-alpha.39",
+    "@storybook/theming": "5.1.0-alpha.39",
     "core-js": "^3.0.1",
     "memoizerific": "^1.11.3",
     "react": "^16.8.4",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "5.1.0-alpha.36",
+  "version": "5.1.0-alpha.39",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",

diff --git a/addons/contexts/package.json b/addons/contexts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-contexts",
-  "version": "5.1.0-alpha.36",
+  "version": "5.1.0-alpha.39",
   "description": "Storybook Addon Contexts",
   "keywords": [
     "storybook",
@@ -28,10 +28,10 @@
     "dev:check-types": "tsc --noEmit"
   },
   "dependencies": {
-    "@storybook/addons": "5.1.0-alpha.36",
-    "@storybook/api": "5.1.0-alpha.36",
-    "@storybook/components": "5.1.0-alpha.36",
-    "@storybook/core-events": "5.1.0-alpha.36"
+    "@storybook/addons": "5.1.0-alpha.39",
+    "@storybook/api": "5.1.0-alpha.39",
+    "@storybook/components": "5.1.0-alpha.39",
+    "@storybook/core-events": "5.1.0-alpha.39"
   },
   "peerDependencies": {
     "global": "*",