Merge branch 'force-render-button-knob' of https://github.com/Keraito/storybook into force-render-button-knob

2025-03-18 05:02:24 +08:00 · 2018-05-27 15:53:06 +02:00 · 2018-05-27 15:53:06 +02:00 · 3a513faf4a
commit 3a513faf4a
parent 5b2154b934 403251521c
17 changed files with 103 additions and 26 deletions
--- a/.teamcity/OpenSourceProjects_Storybook/Project.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@ -104,5 +104,62 @@ object Project : Project({
            param("title", "Demo")
            param("type", "BuildReportTab")
        }
+        feature {
+            type = "project-graphs"
+            id = "PROJECT_EXT_306"
+            param("series", """
+                [
+                  {
+                    "type": "valueType",
+                    "title": "Build Duration (all stages)",
+                    "sourceBuildTypeId": "OpenSourceProjects_Storybook_Build_2",
+                    "key": "BuildDuration"
+                  }
+                ]
+            """.trimIndent())
+            param("format", "duration")
+            param("title", "New chart title")
+            param("seriesTitle", "Serie")
+        }
+        feature {
+            type = "project-graphs"
+            id = "PROJECT_EXT_307"
+            param("series", """
+                [
+                  {
+                    "type": "valueType",
+                    "title": "Covered Percentage of JS Lines",
+                    "sourceBuildTypeId": "OpenSourceProjects_Storybook_Test",
+                    "key": "Covered Percentage of JS Lines"
+                  }
+                ]
+            """.trimIndent())
+            param("format", "percent")
+            param("hideFilters", "")
+            param("title", "New chart title")
+            param("defaultFilters", "")
+            param("seriesTitle", "Serie")
+        }
+feature {
+            type = "project-graphs"
+            id = "PROJECT_EXT_308"
+            param("series", """
+                [
+                  {
+                    "type": "valueType",
+                    "title": "Total Number of JS Statements",
+                    "sourceBuildTypeId": "OpenSourceProjects_Storybook_Test",
+                    "key": "Total Number of JS Statements"
+                  }
+                ]
+            """.trimIndent())
+            param("format", "integer")
+            param("title", "New chart title")
+            param("seriesTitle", "Serie")
+        }
+    }
+
+    params {
+        param("docker.node.version", "10.1")
    }
 })
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Chromatic.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Chromatic.kt
@ -27,12 +27,12 @@ object OpenSourceProjects_Storybook_Chromatic : BuildType({
                yarn
                yarn bootstrap --core
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Chromatic"
            scriptContent = "yarn chromatic"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Danger.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Danger.kt
@ -26,12 +26,12 @@ object OpenSourceProjects_Storybook_Danger : BuildType({
        script {
            name = "Install"
            scriptContent = "yarn"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Danger"
            scriptContent = "yarn danger ci"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Docs.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Docs.kt
@ -26,13 +26,13 @@ object OpenSourceProjects_Storybook_Docs : BuildType({
            name = "Install"
            workingDir = "docs"
            scriptContent = "yarn install --frozen-lockfile"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Build"
            workingDir = "docs"
            scriptContent = "yarn build"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
@ -29,7 +29,7 @@ examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapsho
                yarn
                yarn bootstrap --core
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "official-storybook"
@ -42,7 +42,7 @@ examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapsho
                rm -rf storybook-static
                yarn build-storybook
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Image storyshots"
--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Lint.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Lint.kt
@ -22,12 +22,12 @@ object OpenSourceProjects_Storybook_Lint : BuildType({
                yarn
                yarn bootstrap --core --docs
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Lint"
            scriptContent = "yarn lint:ci"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SBNext.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SBNext.kt
@ -24,30 +24,30 @@ object OpenSourceProjects_Storybook_SBNext : BuildType({
        script {
            name = "Install"
            scriptContent = "yarn"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Lint"
            scriptContent = "yarn lint"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Test"
            enabled = false
            scriptContent = "yarn test"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Build"
            workingDir = "server"
            scriptContent = "yarn build"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Export"
            workingDir = "demo"
            scriptContent = "yarn export"
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SmokeTests.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_SmokeTests.kt
@ -21,7 +21,7 @@ object OpenSourceProjects_Storybook_SmokeTests : BuildType({
                yarn
                yarn bootstrap --core
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        allApps {
            if (merged) {
@ -35,7 +35,7 @@ object OpenSourceProjects_Storybook_SmokeTests : BuildType({
                        cd examples/$exampleDir
                        yarn storybook --smoke-test
                    """.trimIndent()
-                    dockerImage = "node:latest"
+                    dockerImage = "node:%docker.node.version%"
                }
            }
        }
@ -49,7 +49,7 @@ object OpenSourceProjects_Storybook_SmokeTests : BuildType({
                cd examples/official-storybook
                yarn storybook --smoke-test
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Test.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Test.kt
@ -24,7 +24,7 @@ object OpenSourceProjects_Storybook_Test : BuildType({
                yarn
                yarn bootstrap --core
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
        script {
            name = "Test"
@ -32,7 +32,7 @@ object OpenSourceProjects_Storybook_Test : BuildType({
                yarn test --core --coverage --runInBand --teamcity
                yarn coverage
            """.trimIndent()
-            dockerImage = "node:latest"
+            dockerImage = "node:%docker.node.version%"
        }
    }

--- a/.teamcity/OpenSourceProjects_Storybook/buildTypes/StotybookApp.kt
+++ b/.teamcity/OpenSourceProjects_Storybook/buildTypes/StotybookApp.kt
@ -39,7 +39,7 @@ enum class StorybookApp(val appName: String, val exampleDir: String, val merged:
                    yarn
                    yarn bootstrap --core
                """.trimIndent()
-                dockerImage = "node:latest"
+                dockerImage = "node:%docker.node.version%"
            }
            script {
                name = "build"
@ -51,7 +51,7 @@ enum class StorybookApp(val appName: String, val exampleDir: String, val merged:
                    cd examples/$exampleDir
                    yarn build-storybook
                """.trimIndent()
-                dockerImage = "node:latest"
+                dockerImage = "node:%docker.node.version%"
            }
        }

--- a/addons/notes/src/register.js
+++ b/addons/notes/src/register.js
@ -47,7 +47,12 @@ export class Notes extends React.Component {
    const { text } = this.state;
    const textAfterFormatted = text ? text.trim().replace(/\n/g, '<br />') : '';

-    return <Panel dangerouslySetInnerHTML={{ __html: textAfterFormatted }} />;
+    return (
+      <Panel
+        className="addon-notes-container"
+        dangerouslySetInnerHTML={{ __html: textAfterFormatted }}
+      />
+    );
  }
 }

--- a/addons/viewport/src/preview/withViewport.js
+++ b/addons/viewport/src/preview/withViewport.js
@ -11,7 +11,7 @@ import {
 function noop() {}
 let handler = noop;

-const callHandler = (...args) => handler(...args)
+const callHandler = (...args) => handler(...args);

 const subscription = () => {
  const channel = addons.getChannel();
--- a/examples/official-storybook/built-storybooks/marko-cli
+++ b/examples/official-storybook/built-storybooks/marko-cli
@ -0,0 +1 @@
+../../marko-cli/storybook-static
--- a/examples/official-storybook/stories/addon-knobs.stories.js
+++ b/examples/official-storybook/stories/addon-knobs.stories.js
@ -176,6 +176,7 @@ storiesOf('Addons|Knobs.withKnobs', module)
  })
  .add('XSS safety', () => (
    <div
+      // eslint-disable-next-line react/no-danger
      dangerouslySetInnerHTML={{
        __html: text('Rendered string', '<img src="x" onerror="alert(\'XSS Attack\')" >'),
      }}
--- a/lib/cli/test/snapshots/meteor/package.json
+++ b/lib/cli/test/snapshots/meteor/package.json
@ -10,8 +10,8 @@
  "dependencies": {
    "babel-runtime": "^6.20.0",
    "meteor-node-stubs": "~0.2.4",
-    "react": "^16.3.2",
-    "react-dom": "^16.3.2"
+    "react": "^16.4.0",
+    "react-dom": "^16.4.0"
  },
  "devDependencies": {
    "babel-core": "^6.26.3",
--- a/package.json
+++ b/package.json
@ -12,6 +12,7 @@
    "bootstrap:react-native-vanilla": "npm --prefix examples/react-native-vanilla install",
    "bootstrap:react-native-typescript": "npm --prefix examples/react-native-typescript install",
    "build-packs": "lerna exec --scope '@storybook/*' --parallel -- ../../scripts/build-pack.sh ../../packs",
+    "build-storybooks": "./scripts/build-storybooks.sh",
    "changelog": "pr-log --sloppy",
    "precommit": "lint-staged",
    "coverage": "codecov",
--- a/scripts/build-storybooks.sh
+++ b/scripts/build-storybooks.sh
@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# This builds all the example storybooks for running chromatic on your dev machine
+
+examples=(angular-cli cra-kitchen-sink html-kitchen-sink marko-cli mithril-kitchen-sink polymer-cli vue-kitchen-sink official-storybook)
+
+for example in "${examples[@]}"
+do
+    pushd examples/$example
+    yarn build-storybook
+    popd
+done