Merge remote-tracking branch 'origin/master' into tmeasday/refactor-j…

…est-addon
storybookjs · Jul 4, 2018 · a10c19a · a10c19a
2 parents 1270509 + 759d741
commit a10c19a
Show file tree

Hide file tree

Showing 366 changed files with 8,782 additions and 5,660 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,9 @@
 {
   "presets": ["env", "stage-0", "react"],
   "env": {
+    "test": {
+      "plugins": ["require-context-hook"]
+    },
     "plugins": [
       "emotion",
       "babel-plugin-macros",

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -30,7 +30,7 @@ jobs:
             yarn bootstrap --core
       - save_cache:
           name: "Cache core dependencies"
-          key: core-dependencies-{{ checksum "yarn.lock" }}
+          key: core-dependencies-v2-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
             - examples/angular-cli/node_modules
@@ -39,9 +39,10 @@ jobs:
             - examples/official-storybook/node_modules
             - examples/polymer-cli/node_modules
             - examples/vue-kitchen-sink/node_modules
+            - examples/marko-cli/node_modules
       - save_cache:
           name: "Cache core dist"
-          key: core-dist-{{ .Revision }}
+          key: core-dist-v2-{{ .Revision }}
           paths:
             - addons
             - app
@@ -53,11 +54,11 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
       - run:
           name: Workaround for https://github.com/GoogleChrome/puppeteer/issues/290
           command: sh ./scripts/workaround-puppeteer-issue-290.sh
@@ -81,6 +82,11 @@ jobs:
           command: |
             cd examples/polymer-cli
             yarn build-storybook
+      - run:
+          name: "Build marko-cli"
+          command: |
+            cd examples/marko-cli
+            yarn build-storybook
       - run:
           name: "Build official-storybook"
           command: |
@@ -104,11 +110,11 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
 
       - run:
           name: "Run react kitchen-sink (smoke test)"
@@ -147,11 +153,11 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
       - run:
           name: "Bootstrap"
           command: |
@@ -206,15 +212,15 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore docs dependencies cache"
           keys:
             - docs-dependencies-{{ checksum "docs/yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
       - run:
           name: "Lint"
           command: |
@@ -226,11 +232,11 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
       - run:
           name: "Run unit tests"
           command: |
@@ -247,11 +253,11 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
       - run:
           name: "Test CLI"
           command: |
@@ -267,11 +273,11 @@ jobs:
       - restore_cache:
           name: "Restore core dependencies cache"
           keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
+            - core-dependencies-v2-{{ checksum "yarn.lock" }}
       - restore_cache:
           name: "Restore core dist cache"
           keys:
-            - core-dist-{{ .Revision }}
+            - core-dist-v2-{{ .Revision }}
       - run:
           name: "Test CLI with latest CR(N)A"
           command: |

diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -157,9 +157,21 @@ feature {
             param("title", "New chart title")
             param("seriesTitle", "Serie")
         }
+        feature {
+            type = "Invitation"
+            id = "PROJECT_EXT_209"
+            param("createdByUserId", "1702")
+            param("invitationType", "joinProjectInvitation")
+            param("secure:token", "credentialsJSON:07400f1b-a51d-46ae-b056-2e24a653f4d1")
+            param("name", "Join Storybook project")
+            param("welcomeText", "Filipp Riabchun invites you to join the Storybook project")
+            param("disabled", "false")
+            param("groupKey", "STORYBOOK_DEVELO")
+            param("multi", "true")
+        }
     }
 
     params {
-        param("docker.node.version", "10.1")
+        param("docker.node.version", "latest")
     }
 })
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Build_2.kt
@@ -6,6 +6,7 @@ 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.triggers.retryBuild
 import jetbrains.buildServer.configs.kotlin.v2017_2.buildFeatures.merge
 import jetbrains.buildServer.configs.kotlin.v2017_2.ui.*
 
@@ -27,6 +28,15 @@ object OpenSourceProjects_Storybook_Build_2 : BuildType({
         vcs {
             quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
             triggerRules = "-:comment=^TeamCity change:**"
+            branchFilter = """
+                +:pull/*
+                +:release/*
+                +:master
+                +:dependencies.io-*
+            """.trimIndent()
+        }
+        retryBuild {
+            delaySeconds = 60
         }
     }
 

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Danger.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Danger.kt
@@ -4,6 +4,7 @@ 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_Danger : BuildType({
@@ -44,6 +45,9 @@ object OpenSourceProjects_Storybook_Danger : BuildType({
                 -:master
             """.trimIndent()
         }
+        retryBuild {
+            delaySeconds = 3600
+        }
     }
 
     features {

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
@@ -61,14 +61,14 @@ examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapsho
                   ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
                 yarn test --image --teamcity
             """.trimIndent()
-            dockerImage = "node:8"
+            dockerImage = "node:%docker.node.version%"
         }
     }
 
     failureConditions {
         failOnMetricChange {
             metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
-            threshold = 50
+            threshold = 60
             units = BuildFailureOnMetric.MetricUnit.PERCENTS
             comparison = BuildFailureOnMetric.MetricComparison.LESS
             compareTo = build {

diff --git a/...mcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt b/...mcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt
@@ -28,31 +28,31 @@ object OpenSourceProjects_Storybook_ReactNative : BuildType({
                 yarn
                 yarn bootstrap --core --reactnative --reactnativeapp
             """.trimIndent()
-            dockerImage = "node:9"
+            dockerImage = "node:%docker.node.version%"
         }
         script {
             name = "react-native-vanilla"
             scriptContent = """
                 cd examples/react-native-vanilla
                 yarn storybook --smoke-test
             """.trimIndent()
-            dockerImage = "node:9"
+            dockerImage = "node:%docker.node.version%"
         }
         script {
             name = "crna-kitchen-sink"
             scriptContent = """
                 cd examples/crna-kitchen-sink
                 yarn storybook --smoke-test
             """.trimIndent()
-            dockerImage = "node:9"
+            dockerImage = "node:%docker.node.version%"
         }
         script {
             name = "Test"
             scriptContent = """
                 yarn test --reactnative --coverage --runInBand --teamcity
                 yarn coverage
             """.trimIndent()
-            dockerImage = "node:9"
+            dockerImage = "node:%docker.node.version%"
         }
     }
 

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/StotybookApp.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/StotybookApp.kt
@@ -13,7 +13,9 @@ enum class StorybookApp(val appName: String, val exampleDir: String, val merged:
     POLYMER("Polymer", "polymer-cli"),
     MITHRIL("Mithril", "mithril-kitchen-sink"),
     HTML("HTML", "html-kitchen-sink"),
-    MARKO("Marko", "marko-cli");
+    MARKO("Marko", "marko-cli"),
+    HYPERAPP("Hyperapp", "hyperapp-kitchen-sink", false),
+    SVELTE("Svelte", "svelte-kitchen-sink", false);
 
     val lowerName = appName.toLowerCase()
 

diff --git a/.../OpenSourceProjects_Storybook/patches/buildTypes/2b9c73e2-0a6e-47ca-95ae-729cac42be2b.kts b/.../OpenSourceProjects_Storybook/patches/buildTypes/2b9c73e2-0a6e-47ca-95ae-729cac42be2b.kts
@@ -0,0 +1,24 @@
+package OpenSourceProjects_Storybook.patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2017_2.*
+import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.RetryBuildTrigger
+import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.retryBuild
+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 = '2b9c73e2-0a6e-47ca-95ae-729cac42be2b' (id = 'OpenSourceProjects_Storybook_Build_2')
+accordingly, and delete the patch script.
+*/
+changeBuildType("2b9c73e2-0a6e-47ca-95ae-729cac42be2b") {
+    triggers {
+        val trigger1 = find<RetryBuildTrigger> {
+            retryBuild {
+                delaySeconds = 60
+            }
+        }
+        trigger1.apply {
+            enabled = false
+        }
+    }
+}
diff --git a/...vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt b/...vcsRoots/OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster.kt
@@ -10,9 +10,7 @@ object OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMa
     url = "[email protected]:storybooks/storybook.git"
     branchSpec = """
         +:refs/(pull/*)/head
-        +:refs/heads/(release/3.4)
-        +:refs/heads/(master)
-        +:refs/heads/(dependencies.io-*)
+        +:refs/heads/*
     """.trimIndent()
     authMethod = uploadedKey {
         userName = "git"