Merge branch 'master' into import-external-md

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Apps.kt

@@ -23,14 +23,14 @@ enum class StorybookApp(val appName: String, val exampleDir: String, val merged:
  id = "OpenSourceProjects_Storybook_$appName"
  name = appName
 
- if (!merged) return@init
-
- artifactRules = artifactPath
-
  vcs {
  root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
  }
 
+ if (!merged) return@init
+
+ artifactRules = artifactPath
+
  steps {
  script {
  name = "Bootstrap"

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt

@@ -6,6 +6,8 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailu
 import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.failOnMetricChange
 import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.VcsTrigger
 import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.merge
+import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
 
 object OpenSourceProjects_Storybook_Build_2 : BuildType({
  uuid = "2b9c73e2-0a6e-47ca-95ae-729cac42be2b"
@@ -50,42 +52,47 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
  }
  param("github_oauth_user", "Hypnosphi")
  }
+ merge {
+ branchFilter = "+:dependencies.io-*"
+ destinationBranch = "<default>"
+ commitMessage = "Merge branch '%teamcity.build.branch%'"
+ }
  }
 
  dependencies {
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Docs) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Examples) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Lint) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_ReactNative) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_SmokeTests) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Test) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Chromatic) {
  snapshot {
- onDependencyCancel = FailureAction.CANCEL
+ onDependencyCancel = FailureAction.ADD_PROBLEM
  }
  }
  }

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Chromatic.kt

@@ -11,6 +11,10 @@ object OpenSourceProjects_Storybook_Chromatic : BuildType({
  id = "OpenSourceProjects_Storybook_Chromatic"
  name = "Chromatic"
 
+ params {
+ param("env.CI_BRANCH", "%teamcity.build.branch%")
+ }
+
  vcs {
  root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
 
@@ -47,9 +51,7 @@ object OpenSourceProjects_Storybook_Chromatic : BuildType({
  dependencies {
  allApps {
  dependency(config) {
- snapshot {
- onDependencyCancel = FailureAction.CANCEL
- }
+ snapshot {}
 
  if (merged) {
  artifacts {

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt

@@ -92,9 +92,7 @@ examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapsho
  dependencies {
  allApps {
  dependency(config) {
- snapshot {
- onDependencyCancel = FailureAction.CANCEL
- }
+ snapshot {}
 
  if (merged) {
  artifacts {

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SmokeTests.kt

@@ -23,65 +23,21 @@ object OpenSourceProjects_Storybook_SmokeTests : BuildType({
  """.trimIndent()
  dockerImage = "node:latest"
  }
- script {
- name = "angular-cli"
- scriptContent = """
- #!/bin/sh
-
- set -e -x
-
- cd examples/angular-cli
- yarn storybook --smoke-test
- """.trimIndent()
- dockerImage = "node:latest"
- }
- script {
- name = "polymer-cli"
- scriptContent = """
- #!/bin/sh
-
- set -e -x
-
- cd examples/polymer-cli
- yarn storybook --smoke-test
- """.trimIndent()
- dockerImage = "node:latest"
- }
- script {
- name = "cra-kitchen-sink"
- scriptContent = """
- #!/bin/sh
-
- set -e -x
-
- cd examples/cra-kitchen-sink
- yarn storybook --smoke-test
- """.trimIndent()
- dockerImage = "node:latest"
- }
- script {
- name = "mithril-kitchen-sink"
- scriptContent = """
- #!/bin/sh
-
- set -e -x
-
- cd examples/mithril-kitchen-sink
- yarn storybook --smoke-test
- """.trimIndent()
- dockerImage = "node:latest"
- }
- script {
- name = "vue-kitchen-sink"
- scriptContent = """
- #!/bin/sh
-
- set -e -x
-
- cd examples/vue-kitchen-sink
- yarn storybook --smoke-test
- """.trimIndent()
- dockerImage = "node:latest"
+ allApps {
+ if (merged) {
+ script {
+ name = appName
+ scriptContent = """
+ #!/bin/sh
+
+ set -e -x
+
+ cd examples/$exampleDir
+ yarn storybook --smoke-test
+ """.trimIndent()
+ dockerImage = "node:latest"
+ }
+ }
  }
  script {
  name = "official-storybook"

.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt

@@ -12,8 +12,8 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
  +:refs/(pull/*)/head
  +:refs/heads/(release/3.4)
  +:refs/heads/(master)
+ +:refs/heads/(dependencies.io-*)
  """.trimIndent()
- agentCleanPolicy = GitVcsRoot.AgentCleanPolicy.NEVER
  authMethod = uploadedKey {
  userName = "git"
  uploadedKey = "Storybook bot"

.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1.kt

@@ -9,7 +9,6 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
  name = "https://github.com/storybooks/storybook#refs/heads/master (1)"
  url = "[email protected]:storybooks/storybook.git"
  branchSpec = "+:refs/(pull/*)/head"
- agentCleanPolicy = GitVcsRoot.AgentCleanPolicy.NEVER
  authMethod = uploadedKey {
  userName = "git"
  uploadedKey = "Storybook bot"

.teamcity/OpenSourceProjects_Storybook/vcsRoots/OpenSourceProjects_Storybook_SBNext.kt

@@ -9,7 +9,6 @@ object OpenSourceProjects_Storybook_SBNext : GitVcsRoot({
  name = "SBNext"
  url = "[email protected]:storybooks/SBNext.git"
  branch = "refs/heads/POC-bundler"
- agentCleanPolicy = GitVcsRoot.AgentCleanPolicy.NEVER
  authMethod = uploadedKey {
  userName = "git"
  uploadedKey = "Storybook bot"

CHANGELOG.md

@@ -1,3 +1,74 @@
+# 4.0.0-alpha.4
+
+2018-April-27
+
+#### Breaking Changes
+
+- Knobs: add escapeHTML option; use it by default in Vue, Angular, and Polymer [#3473](https://github.com/storybooks/storybook/pull/3473)
+
+#### Features
+
+- Added `actions` to addon-actions to create multiple actions [#3352](https://github.com/storybooks/storybook/pull/3352)
+- Add excludedPropTypes as an option to info addon [#3468](https://github.com/storybooks/storybook/pull/3468)
+- Addon-background: add Vue support [#3488](https://github.com/storybooks/storybook/pull/3488)
+- Suppress verbose build output [#3487](https://github.com/storybooks/storybook/pull/3487)
+- Provide a configuration option to limit the number of actions logged [#3447](https://github.com/storybooks/storybook/pull/3447)
+- Add IStory interface. [#3482](https://github.com/storybooks/storybook/pull/3482)
+- Add option to clear action logger [#3459](https://github.com/storybooks/storybook/pull/3459)
+
+#### Bug Fixes
+
+- Fix auto focus of searchbox [#3494](https://github.com/storybooks/storybook/pull/3494)
+- Don't try to access the devtools hook if we are cross-origin [#3485](https://github.com/storybooks/storybook/pull/3485)
+- Improve yarn detection [#3453](https://github.com/storybooks/storybook/pull/3453)
+
+#### Maintenance
+
+- Refactor error and "no preview" views into core [#3457](https://github.com/storybooks/storybook/pull/3457)
+- Refactor templates into core [#3422](https://github.com/storybooks/storybook/pull/3422)
+
+#### Dependency Upgrades
+
+<details>
+<summary>
+15 Upgrades
+</summary>
+
+- Upgraded `@storybook/addon-actions` in `/docs` from "3.4.1" to "3.4.2" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `@storybook/addon-links` in `/docs` from "3.4.1" to "3.4.2" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `@storybook/addons` in `/docs` from "3.4.1" to "3.4.2" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `@storybook/react` in `/docs` from "3.4.1" to "3.4.2" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `gatsby-link` in `/docs` from "1.6.40" to "1.6.41" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `gatsby-plugin-sharp` in `/docs` from "1.6.42" to "1.6.43" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `gatsby-remark-autolink-headers` in `/docs` from "1.4.16" to "1.4.17" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `gatsby-remark-copy-linked-files` in `/docs` from "1.5.31" to "1.5.32" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `gatsby-remark-images` in `/docs` from "1.5.61" to "1.5.62" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgraded `gatsby` in `/docs` from "1.9.252" to "1.9.253" [#3478](https://github.com/storybooks/storybook/pull/3478)
+- Upgrade redux to 4.0.0 [#3470](https://github.com/storybooks/storybook/pull/3470)
+- Upgrade sass-loader to 7.0.1 & stop bringing node-sass bin to each user [#3467](https://github.com/storybooks/storybook/pull/3467)
+- Upgrate ts-node to 6.0.0 [#3460](https://github.com/storybooks/storybook/pull/3460)
+- Upgrade to [email protected] [#3466](https://github.com/storybooks/storybook/pull/3466)
+- Update webpack-hot-middleware to fix HMR [#3463](https://github.com/storybooks/storybook/pull/3463)
+
+</details>
+
+# 3.4.3
+
+2018-April-27
+
+#### Features
+
+- Suppress verbose build output [#3487](https://github.com/storybooks/storybook/pull/3487)
+
+#### Bug Fixes
+
+- Improve yarn detection [#3453](https://github.com/storybooks/storybook/pull/3453)
+- Don't try to access the devtools hook if we are cross-origin [#3485](https://github.com/storybooks/storybook/pull/3485)
+
+#### Dependency Upgrades
+
+- Update webpack-hot-middleware to fix HMR [#3463](https://github.com/storybooks/storybook/pull/3463)
+
 # 4.0.0-alpha.3
 
 2018-April-17

addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-a11y",
- "version": "4.0.0-alpha.3",
+ "version": "4.0.0-alpha.4",
  "description": "a11y addon for storybook",
  "keywords": [
  "a11y",
@@ -25,13 +25,13 @@
  "prepare": "node ../../scripts/prepare.js"
  },
  "dependencies": {
- "@storybook/addons": "4.0.0-alpha.3",
- "@storybook/client-logger": "4.0.0-alpha.3",
- "@storybook/components": "4.0.0-alpha.3",
+ "@storybook/addons": "4.0.0-alpha.4",
+ "@storybook/client-logger": "4.0.0-alpha.4",
+ "@storybook/components": "4.0.0-alpha.4",
  "axe-core": "^3.0.1",
  "babel-runtime": "^6.26.0",
  "glamor": "^2.20.40",
- "glamorous": "^4.12.3",
+ "glamorous": "^4.12.4",
  "prop-types": "^15.6.1"
  },
  "peerDependencies": {