Merge branch 'next' into pr/mrmckeb/4712

.circleci/config.yml

@@ -120,52 +120,52 @@ jobs:
           name: Run react kitchen-sink (smoke test)
           command: |
             cd examples/cra-kitchen-sink
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run vue kitchen-sink (smoke test)
           command: |
             cd examples/vue-kitchen-sink
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run svelte kitchen-sink (smoke test)
           command: |
             cd examples/svelte-kitchen-sink
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run angular-cli (smoke test)
           command: |
             cd examples/angular-cli
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run ember-cli (smoke test)
           command: |
             cd examples/ember-cli
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run polymer-cli (smoke test)
           command: |
             cd examples/polymer-cli
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run marko-cli (smoke test)
           command: |
             cd examples/marko-cli
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run official-storybook (smoke test)
           command: |
             cd examples/official-storybook
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run mithril kitchen-sink (smoke test)
           command: |
             cd examples/mithril-kitchen-sink
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
       - run:
           name: Run riot kitchen-sink (smoke test)
           command: |
             cd examples/riot-kitchen-sink
-            yarn storybook --smoke-test
+            yarn storybook --smoke-test --quiet
   native-smoke-tests:
     <<: *defaults
     steps:

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,11 +4,17 @@ Issue:
 
 ## How to test
 
-Is this testable with Jest or Chromatic screenshots?
-Does this need a new example in the kitchen sink apps?
-Does this need an update to the documentation?
+- Is this testable with Jest or Chromatic screenshots?
+- Does this need a new example in the kitchen sink apps?
+- Does this need an update to the documentation?
 
 If your answer is yes to any of these, please make sure to include it in your PR.
 
-For maintainers only: Please tag your pull request with at least one of the following:
+<!--
+
+Everybody: Please submit all PRs to the `next` branch unless they are specific to current release. Storybook maintainers cherry-pick bug and documentation fixes into the `master` branch as part of the release process, so you shouldn't need to worry about this.
+
+Maintainers: Please tag your pull request with at least one of the following:
 `["cleanup", "BREAKING CHANGE", "feature request", "bug", "documentation", "maintenance", "dependencies", "other"]`
+
+-->

.teamcity/OpenSourceProjects_Storybook/Project.kt

@@ -195,6 +195,6 @@ object Project : Project({
     }
 
     params {
-        param("docker.node.version", "latest")
+        param("docker.node.version", "dubnium")
     }
 })

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt

@@ -46,6 +46,7 @@ object OpenSourceProjects_Storybook_Bootstrap : BuildType({
                 +:pull/*
                 +:release/*
                 +:master
+                +:next
                 +:snyk-fix-*
             """.trimIndent()
             enabled = false

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt

@@ -33,6 +33,7 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 +:pull/*
                 +:release/*
                 +:master
+                +:next
                 +:snyk-fix-*
             """.trimIndent()
         }

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTestLatestCra.kt

@@ -40,6 +40,7 @@ object OpenSourceProjects_Storybook_CliTestLatestCra : BuildType({
                 +:pull/*
                 +:release/*
                 +:master
+                +:next
             """.trimIndent()
         }
         retryBuild {}

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Danger.kt

@@ -13,8 +13,8 @@ object OpenSourceProjects_Storybook_Danger : BuildType({
     name = "Danger"
 
     params {
-        password("env.DANGER_GITHUB_API_TOKEN", "credentialsJSON:7f0943ab-dfca-49dd-b926-03062007bfd0")
-        param("env.PULL_REQUEST_URL", "https://github.com/storybooks/storybook/pull/%teamcity.build.branch%")
+        password("env.DANGER_GITHUB_API_TOKEN", "credentialsJSON:9ac87388-d267-4def-a10e-3e596369f644")
+        param("env.PULL_REQUEST_URL", "https://github.com/storybooks/storybook/%teamcity.build.branch%")
     }
 
     vcs {

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Docs.kt

@@ -12,7 +12,7 @@ object OpenSourceProjects_Storybook_Docs : BuildType({
     artifactRules = "docs/public => docs.zip"
 
     params {
-        param("Deploy branch", "release/4.0")
+        param("Deploy branch", "master")
     }
 
     vcs {

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Lint_Warnings.kt

@@ -42,6 +42,7 @@ object OpenSourceProjects_Storybook_Lint_Warnings : BuildType({
                 +:pull/*
                 +:release/*
                 +:master
+                +:next
             """.trimIndent()
         }
     }

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SmokeTests.kt

@@ -30,7 +30,7 @@ object OpenSourceProjects_Storybook_SmokeTests : BuildType({
                         set -e -x
 
                         cd examples/$exampleDir
-                        yarn storybook --smoke-test
+                        yarn storybook --smoke-test --quiet
                     """.trimIndent()
                     dockerImage = "node:%docker.node.version%"
                 }
@@ -44,7 +44,7 @@ object OpenSourceProjects_Storybook_SmokeTests : BuildType({
                 set -e -x
 
                 cd examples/official-storybook
-                yarn storybook --smoke-test
+                yarn storybook --smoke-test --quiet
             """.trimIndent()
             dockerImage = "node:%docker.node.version%"
         }

.teamcity/OpenSourceProjects_Storybook/patches/buildTypes/b1db1a3a-a4cf-46ea-8f55-98b86611f92e.kts

@@ -0,0 +1,17 @@
+package OpenSourceProjects_Storybook.patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2017_2.*
+import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with uuid = 'b1db1a3a-a4cf-46ea-8f55-98b86611f92e' (id = 'OpenSourceProjects_Storybook_CliTest')
+accordingly, and delete the patch script.
+*/
+changeBuildType("b1db1a3a-a4cf-46ea-8f55-98b86611f92e") {
+    params {
+        add {
+            param("docker.node.version", "latest")
+        }
+    }
+}

.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt

@@ -6,8 +6,9 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot
 object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster : GitVcsRoot({
     uuid = "cec03c4b-d52c-42a0-8e9e-53bde85d6b33"
     id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster"
-    name = "https://github.com/storybooks/storybook#refs/heads/master"
+    name = "Main root"
     url = "[email protected]:storybooks/storybook.git"
+    branch = "refs/heads/next"
     branchSpec = """
         +:refs/(pull/*)/head
         +:refs/heads/*

.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1.kt

@@ -8,6 +8,7 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
     id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1"
     name = "https://github.com/storybooks/storybook#refs/heads/master (1)"
     url = "[email protected]:storybooks/storybook.git"
+    branch = "refs/heads/next"
     authMethod = uploadedKey {
         userName = "git"
         uploadedKey = "Storybook bot"

CHANGELOG.md

@@ -1,3 +1,100 @@
+# 4.1.0-alpha.1
+
+2018-November-06
+
+#### Features
+
+-   Core: add cursor images to webpack loader [#4498](https://github.com/storybooks/storybook/pull/4498)
+-   Storyshots-puppeteer: Allow specifying an existing browser [#4721](https://github.com/storybooks/storybook/pull/4721)
+-   React-native: close StoryListView after tap again in the current story [#4714](https://github.com/storybooks/storybook/pull/4714)
+
+#### Dependency Upgrades
+
+-   Bump @angular/compiler from 7.0.1 to 7.0.2 [#4677](https://github.com/storybooks/storybook/pull/4677)
+-   Bump @types/jest from 23.3.8 to 23.3.9 [#4658](https://github.com/storybooks/storybook/pull/4658)
+-   Bump copy-webpack-plugin from 4.5.4 to 4.6.0 [#4674](https://github.com/storybooks/storybook/pull/4674)
+-   Bump @ngrx/store from 6.1.1 to 6.1.2 [#4678](https://github.com/storybooks/storybook/pull/4678)
+-   [Security] Bump merge from 1.2.0 to 1.2.1 [#4686](https://github.com/storybooks/storybook/pull/4686)
+
+# 4.1.0-alpha.0
+
+Publish failed
+
+# 4.0.4
+
+2018-November-06
+
+#### Bug Fixes
+
+-   Core: Change extensions ordering in webpack config [#4708](https://github.com/storybooks/storybook/pull/4708)
+-   Addon-Knobs: Fix PropTypes in NumberType [#4669](https://github.com/storybooks/storybook/pull/4669)
+-   Addon-Viewport: Fix "defaultViewport" configuration [#4683](https://github.com/storybooks/storybook/pull/4683)
+-   Addon-Jest: Fix test matching [#4689](https://github.com/storybooks/storybook/pull/4689)
+-   Fix tests in node 11 by using `Array#sort` correctly [#4720](https://github.com/storybooks/storybook/pull/4720)
+
+#### Dependency Upgrades
+
+-   Bump react-syntax-highlighter from 9.0.1 to 10.0.0 [#4654](https://github.com/storybooks/storybook/pull/4654)
+-   Remove SB deps from cli tests [#4705](https://github.com/storybooks/storybook/pull/4705)
+
+# 4.0.3
+
+2018-November-06
+
+#### Bug Fixes
+
+-   React: Fix css relative asset urls [#4695](https://github.com/storybooks/storybook/pull/4695)
+-   Core: Fix a bug with buildStaticStandalone resolving too early [#4649](https://github.com/storybooks/storybook/pull/4649)
+-   Angular: Fixes component imports from dist  [#4682](https://github.com/storybooks/storybook/pull/4682)
+-   Addon-info: Improve accessibility with contrast [#4698](https://github.com/storybooks/storybook/pull/4698)
+-   Ember: update ergonomics to not require any manual setup [#4594](https://github.com/storybooks/storybook/pull/4594)
+-   React-native: fix accessibility for component preview (iOS+VoiceOver) [#4601](https://github.com/storybooks/storybook/pull/4601)
+
+#### Maintenance
+
+-   Update release process and `master` becomes the stable branch [#4719](https://github.com/storybooks/storybook/pull/4719)
+-   Report CLI tests to teamcity [#4671](https://github.com/storybooks/storybook/pull/4671)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+30 PRs
+</summary>
+
+-   Bump @angular/core from 7.0.1 to 7.0.2 [#4675](https://github.com/storybooks/storybook/pull/4675)
+-   [Security] Bump merge from 1.2.0 to 1.2.1 in /docs [#4687](https://github.com/storybooks/storybook/pull/4687)
+-   Bump typescript from 3.1.4 to 3.1.6 [#4699](https://github.com/storybooks/storybook/pull/4699)
+-   Set zone.js as a peer and dev dependency [#4663](https://github.com/storybooks/storybook/pull/4663)
+-   chore(core): update css-loader to latest [#4619](https://github.com/storybooks/storybook/pull/4619)
+-   Bump css-loader from 1.0.0 to 1.0.1 [#4655](https://github.com/storybooks/storybook/pull/4655)
+-   Bump @ngrx/store from 6.1.0 to 6.1.1 [#4653](https://github.com/storybooks/storybook/pull/4653)
+-   Allow for angular-devkit/core version aligned with Angular v7 [#4652](https://github.com/storybooks/storybook/pull/4652)
+-   Bump ember-load-initializers from 1.1.0 to 2.0.0 [#4634](https://github.com/storybooks/storybook/pull/4634)
+-   Bump @ember/test-helpers from 0.7.27 to 1.0.0 [#4630](https://github.com/storybooks/storybook/pull/4630)
+-   Bump @storybook/addon-actions from 3.4.11 to 4.0.0 in /docs [#4626](https://github.com/storybooks/storybook/pull/4626)
+-   Bump gatsby-plugin-sharp from 2.0.7 to 2.0.10 in /docs [#4627](https://github.com/storybooks/storybook/pull/4627)
+-   Bump typescript from 3.1.3 to 3.1.4 [#4629](https://github.com/storybooks/storybook/pull/4629)
+-   Bump react-scripts from 2.0.5 to 2.1.0 [#4631](https://github.com/storybooks/storybook/pull/4631)
+-   Bump ember-source from 3.5.0 to 3.5.1 [#4633](https://github.com/storybooks/storybook/pull/4633)
+-   Bump @types/node from 10.12.0 to 10.12.1 [#4635](https://github.com/storybooks/storybook/pull/4635)
+-   Bump react-dev-utils from 6.0.5 to 6.1.0 [#4636](https://github.com/storybooks/storybook/pull/4636)
+-   Bump eslint from 5.7.0 to 5.8.0 [#4613](https://github.com/storybooks/storybook/pull/4613)
+-   Bump express-graphql from 0.6.12 to 0.7.1 [#4610](https://github.com/storybooks/storybook/pull/4610)
+-   Bump tslint-plugin-prettier from 2.0.0 to 2.0.1 [#4609](https://github.com/storybooks/storybook/pull/4609)
+-   Bump eslint-plugin-jest from 21.26.1 to 21.26.2 [#4606](https://github.com/storybooks/storybook/pull/4606)
+-   Bump @types/jest from 23.3.7 to 23.3.8 [#4611](https://github.com/storybooks/storybook/pull/4611)
+-   Bump fork-ts-checker-webpack-plugin from 0.4.10 to 0.4.14 [#4607](https://github.com/storybooks/storybook/pull/4607)
+-   Bump autoprefixer from 9.2.1 to 9.3.1 [#4605](https://github.com/storybooks/storybook/pull/4605)
+-   Bump jasmine-core from 3.2.1 to 3.3.0 [#4581](https://github.com/storybooks/storybook/pull/4581)
+-   Bump react-dom from 16.5.2 to 16.6.0 [#4580](https://github.com/storybooks/storybook/pull/4580)
+-   Bump eslint-plugin-jest from 21.25.1 to 21.26.1 [#4583](https://github.com/storybooks/storybook/pull/4583)
+-   Bump react from 16.5.2 to 16.6.0 [#4584](https://github.com/storybooks/storybook/pull/4584)
+-   Bump react-syntax-highlighter from 9.0.0 to 9.0.1 [#4585](https://github.com/storybooks/storybook/pull/4585)
+-   Bump remark-cli from 5.0.0 to 6.0.0 [#4551](https://github.com/storybooks/storybook/pull/4551)
+
+</details>
+
 # 4.0.2
 
 2018-October-31