Merge branch 'next' into pr/lonyele/6970

# Conflicts: # lib/ui/src/settings/__snapshots__/about.stories.storyshot
storybookjs · Jun 6, 2019 · 6d2cb40 · 6d2cb40
2 parents ddad046 + ca2c82e
commit 6d2cb40
Show file tree

Hide file tree

Showing 308 changed files with 10,168 additions and 5,500 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -44,6 +44,13 @@ module.exports = {
         test: withTests,
       },
     },
+    {
+      test: './examples/rax-kitchen-sink',
+      presets: [
+        ['@babel/preset-env', { shippedProposals: true, useBuiltIns: 'usage', corejs: '3' }],
+        ['babel-preset-rax', { development: process.env.BABEL_ENV === 'development' }],
+      ],
+    },
     {
       test: './lib',
       presets: [

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,6 +38,7 @@ jobs:
             - node_modules
             - examples
             - addons
+            - dev-kits
             - app
             - lib
   chromatic:

diff --git a/.spelling b/.spelling
@@ -67,7 +67,7 @@ react-komposer
 serializable
 params
 README.md
-storybooks.js.org
+storybook.js.org
 YuzuJS
 setImmediate
 Malte

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt
@@ -0,0 +1,81 @@
+package OpenSourceProjects_Storybook.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2017_2.*
+import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.retryBuild
+import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.VcsTrigger
+
+object OpenSourceProjects_Storybook_Bootstrap : BuildType({
+    uuid = "9f9177e7-9ec9-4e2e-aabb-d304fd667712"
+    id = "OpenSourceProjects_Storybook_Bootstrap"
+    name = "Bootstrap"
+
+    artifactRules = """
+        addons/*/dist/** => dist.zip/addons
+        addons/storyshots/*/dist/** => dist.zip/addons/storyshots
+        app/*/dist/** => dist.zip/app
+        dev-kits/*/dist/** => dist.zip/dev-kits
+        lib/*/dist/** => dist.zip/lib
+        lib/core/dll/** => dist.zip/lib/core/dll
+    """.trimIndent()
+
+    vcs {
+        root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
+    }
+
+    steps {
+        script {
+            name = "Bootstrap"
+            scriptContent = """
+                #!/bin/sh
+
+                set -e -x
+
+                yarn
+                yarn bootstrap --core
+            """.trimIndent()
+            dockerImage = "node:%docker.node.version%"
+        }
+    }
+
+    triggers {
+        vcs {
+            quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
+            triggerRules = "-:comment=^TeamCity change:**"
+            branchFilter = """
+                +:pull/*
+                +:release/*
+                +:master
+                +:next
+                +:snyk-fix-*
+            """.trimIndent()
+            enabled = false
+        }
+        retryBuild {
+            delaySeconds = 60
+            enabled = false
+        }
+    }
+
+    features {
+        commitStatusPublisher {
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:5ffe2d7e-531e-4f6f-b1fc-a41bfea26eaa"
+                }
+            }
+            param("github_oauth_user", "Hypnosphi")
+        }
+    }
+
+    requirements {
+        doesNotContain("env.OS", "Windows")
+    }
+
+    cleanup {
+        artifacts(days = 1)
+    }
+})
diff --git a/...vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt b/...vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt
@@ -7,7 +7,7 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
     uuid = "cec03c4b-d52c-42a0-8e9e-53bde85d6b33"
     id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster"
     name = "Main root"
-    url = "git@github.com:storybooks/storybook.git"
+    url = "git@github.com:storybookjs/storybook.git"
     branch = "refs/heads/next"
     branchSpec = """
         +:refs/(pull/*)/head

diff --git a/...csRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1.kt b/...csRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1.kt
@@ -6,8 +6,8 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot
 object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1 : GitVcsRoot({
     uuid = "5cacf90a-381a-4c73-9aa3-57f6439b545e"
     id = "OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1"
-    name = "https://github.com/storybooks/storybook#refs/heads/master (1)"
-    url = "git@github.com:storybooks/storybook.git"
+    name = "https://github.com/storybookjs/storybook#refs/heads/master (1)"
+    url = "git@github.com:storybookjs/storybook.git"
     branch = "refs/heads/next"
     authMethod = uploadedKey {
         userName = "git"

diff --git a/ADDONS_SUPPORT.md b/ADDONS_SUPPORT.md
@@ -8,6 +8,7 @@
 |[centered](addons/centered)                 |+| |+|+| |+|+| |+| |+|+|
 |[contexts](addons/contexts)                 |+| |+| | | | | | | | |+|
 |[events](addons/events)                     |+| |+|+|+|+|+|+| | |+|+|
+|[design assets](addons/design-assets)       |+| |+|+|+|+|+|+|+|+|+|+|
 |[graphql](addons/graphql)                   |+| | | | | | | | | | | |
 |[google-analytics](addons/google-analytics) |+|+|+|+|+|+|+|+|+|+|+|+|
 |[info](addons/info)                         |+| | | | | | | | | | | |