Merge pull request #3 from storybooks/master

Get latest from storybook
storybookjs · Oct 16, 2018 · 0533d5a · 0533d5a
2 parents a16d4bf + b98c994
commit 0533d5a
Show file tree

Hide file tree

Showing 316 changed files with 14,082 additions and 9,506 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,21 +36,11 @@ jobs:
           root: .
           paths:
             - node_modules
-            - examples/angular-cli/node_modules
-            - examples/ember-cli/node_modules
-            - examples/cra-kitchen-sink/node_modules
-            - examples/mithril-kitchen-sink/node_modules
-            - examples/official-storybook/node_modules
-            - examples/polymer-cli/node_modules
-            - examples/vue-kitchen-sink/node_modules
-            - examples/svelte-kitchen-sink/node_modules
-            - examples/marko-cli/node_modules
-            - examples/html-kitchen-sink/node_modules
-            - examples/riot-kitchen-sink/node_modules
+            - examples
             - addons
             - app
             - lib
-  example-kitchen-sinks:
+  examples:
     <<: *defaults
     steps:
       - checkout
@@ -176,7 +166,7 @@ jobs:
           command: |
             cd examples/riot-kitchen-sink
             yarn storybook --smoke-test
-  react-native:
+  native-smoke-tests:
     <<: *defaults
     steps:
       - checkout
@@ -188,7 +178,7 @@ jobs:
       - run:
           name: Run React-Native-App example
           command: |
-            cd examples/crna-kitchen-sink
+            cd examples-native/crna-kitchen-sink
             yarn storybook --smoke-test
   docs:
     <<: *defaults
@@ -227,7 +217,7 @@ jobs:
       - run:
           name: Lint
           command: yarn lint
-  unit-test:
+  test:
     <<: *defaults
     steps:
       - checkout
@@ -249,7 +239,7 @@ jobs:
       - run:
           name: Upload coverage
           command: yarn coverage
-  cli:
+  cli-test:
     <<: *defaults
     environment:
       BASH_ENV: ~/.bashrc
@@ -261,7 +251,7 @@ jobs:
           name: Test
           command: yarn test --cli
           no_output_timeout: 1800
-  cli-latest-cra:
+  cli-test-latest-cra:
     <<: *defaults
     environment:
       BASH_ENV: ~/.bashrc
@@ -282,24 +272,24 @@ workflows:
           requires:
             - docs
             - build
-      - example-kitchen-sinks:
+      - examples:
           requires:
             - build
       - smoke-tests:
           requires:
             - build
-      - react-native:
+      - native-smoke-tests:
           requires:
             - build
-      - unit-test:
+      - test:
           requires:
             - build
       - coverage:
           requires:
-            - unit-test
-      - cli:
+            - test
+      - cli-test:
           requires:
             - build
-      - cli-latest-cra:
+      - cli-test-latest-cra:
           requires:
             - build
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -57,6 +57,7 @@ module.exports = {
       {
         devDependencies: [
           'examples/**',
+          'examples-native/**',
           '**/example/**',
           '*.js',
           '**/*.test.js',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -28,12 +28,13 @@
 
 /examples/angular-cli/ @igor-dv @alterx
 /examples/cra-kitchen-sink/ @ndelangen @UsulPro @hypnosphi
-/examples/crna-kitchen-sink/ @Gongreg @danielduan
 /examples/official-storybook/ @hypnosphi @danielduan @UsulPro
 /examples/polymer-cli/ @naipath @igor-dv
 /examples/vue-kitchen-sink/ @igor-dv @alexandrebodin
 /examples/svelte-kitchen-sink/ @plumpNation
 
+/examples-native/crna-kitchen-sink/ @Gongreg @danielduan
+
 /lib/addons/ @ndelangen @theinterned
 /lib/channel-postmessage/ @mnmtanish @ndelangen
 /lib/channel-websocket/ @mnmtanish @ndelangen

diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -18,10 +18,11 @@ object Project : Project({
     vcsRoot(OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster1)
     vcsRoot(OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)
 
+    buildType(OpenSourceProjects_Storybook_Bootstrap)
     buildType(OpenSourceProjects_Storybook_CliTestLatestCra)
     buildType(OpenSourceProjects_Storybook_Examples)
     buildType(OpenSourceProjects_Storybook_Danger)
-    buildType(OpenSourceProjects_Storybook_ReactNative)
+    buildType(OpenSourceProjects_Storybook_NativeSmokeTests)
     buildType(OpenSourceProjects_Storybook_Docs)
     buildType(OpenSourceProjects_Storybook_Build_2)
     buildType(OpenSourceProjects_Storybook_CliTest)

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt
@@ -0,0 +1,78 @@
+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
+        lib/*/dist/** => dist.zip/lib
+    """.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
+                +: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/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
@@ -4,8 +4,9 @@ import jetbrains.buildServer.configs.kotlin.v2017_2.*
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.commitStatusPublisher
 import jetbrains.buildServer.configs.kotlin.v2017_2.failureConditions.BuildFailureOnMetric
 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.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.finishBuildTrigger
 import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.retryBuild
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.merge
 import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
@@ -32,12 +33,18 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 +:pull/*
                 +:release/*
                 +:master
-                +:dependencies.io-*
+                +:snyk-fix-*
             """.trimIndent()
         }
         retryBuild {
             delaySeconds = 60
         }
+        finishBuildTrigger {
+            enabled = false
+            buildTypeExtId = "OpenSourceProjects_Storybook_Bootstrap"
+            successfulOnly = true
+            branchFilter = ""
+        }
     }
 
     failureConditions {
@@ -63,7 +70,9 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
             param("github_oauth_user", "Hypnosphi")
         }
         merge {
-            branchFilter = "+:dependencies.io-*"
+            branchFilter = """
+                +:snyk-fix-*
+            """.trimIndent()
             destinationBranch = "<default>"
             commitMessage = "Merge branch '%teamcity.build.branch%'"
         }
@@ -85,7 +94,7 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }
         }
-        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_ReactNative) {
+        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_NativeSmokeTests) {
             snapshot {
                 onDependencyCancel = FailureAction.ADD_PROBLEM
             }

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Chromatic.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Chromatic.kt
@@ -22,18 +22,17 @@ object OpenSourceProjects_Storybook_Chromatic : BuildType({
 
     steps {
         script {
-            name = "Bootstrap"
+            name = "Chromatic"
             scriptContent = """
+                #!/bin/sh
+
+                set -e -x
+
                 yarn
-                yarn bootstrap --core
+                yarn chromatic
             """.trimIndent()
             dockerImage = "node:%docker.node.version%"
         }
-        script {
-            name = "Chromatic"
-            scriptContent = "yarn chromatic"
-            dockerImage = "node:%docker.node.version%"
-        }
     }
 
     features {
@@ -49,6 +48,15 @@ object OpenSourceProjects_Storybook_Chromatic : BuildType({
     }
 
     dependencies {
+        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Bootstrap) {
+            snapshot {
+                onDependencyFailure = FailureAction.FAIL_TO_START
+            }
+
+            artifacts {
+                artifactRules = "dist.zip!**"
+            }
+        }
         allApps {
             dependency(config) {
                 snapshot {}

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_CliTest.kt
@@ -3,9 +3,6 @@ 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_CliTest : BuildType({
     uuid = "b1db1a3a-a4cf-46ea-8f55-98b86611f92e"
@@ -19,20 +16,17 @@ object OpenSourceProjects_Storybook_CliTest : BuildType({
 
     steps {
         script {
-            name = "Bootstrap"
+            name = "Test"
             scriptContent = """
+                #!/bin/sh
+
                 set -e -x
 
                 yarn
-                yarn bootstrap --core
+                yarn test --cli
             """.trimIndent()
             dockerImage = "node:%docker.node.version%"
         }
-        script {
-            name = "Test"
-            scriptContent = "yarn test --cli"
-            dockerImage = "node:%docker.node.version%"
-        }
     }
 
     features {
@@ -47,6 +41,18 @@ object OpenSourceProjects_Storybook_CliTest : BuildType({
         }
     }
 
+    dependencies {
+        dependency(OpenSourceProjects_Storybook.buildTypes.OpenSourceProjects_Storybook_Bootstrap) {
+            snapshot {
+                onDependencyFailure = FailureAction.FAIL_TO_START
+            }
+
+            artifacts {
+                artifactRules = "dist.zip!**"
+            }
+        }
+    }
+
     requirements {
         doesNotContain("env.OS", "Windows")
     }