Merge branch 'master' into pksunkara/lerna

storybookjs · Aug 26, 2018 · ed1bdf7 · ed1bdf7
2 parents 922c91d + b71117d
commit ed1bdf7
Show file tree

Hide file tree

Showing 73 changed files with 1,318 additions and 963 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.teamcity/OpenSourceProjects_Storybook/Project.kt b/.teamcity/OpenSourceProjects_Storybook/Project.kt
@@ -140,7 +140,7 @@ object Project : Project({
             param("defaultFilters", "")
             param("seriesTitle", "Serie")
         }
-feature {
+        feature {
             type = "project-graphs"
             id = "PROJECT_EXT_308"
             param("series", """

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,47 @@
+# 4.0.0-alpha.18
+
+2018-August-25
+
+#### Bug Fixes
+
+-   Add missing `@babel/plugin-proposal-class-properties` dependency [#4076](https://github.com/storybooks/storybook/pull/4076)
+-   Don't display wrong warning when loading ".js" or ".json" [#4060](https://github.com/storybooks/storybook/pull/4060)
+-   Fix autodetection of used components in info addon [#4004](https://github.com/storybooks/storybook/pull/4004)
+
+#### Maintenance
+
+-   Faster CircleCI [#4068](https://github.com/storybooks/storybook/pull/4068)
+
+# 4.0.0-alpha.17
+
+2018-August-24
+
+#### Breaking Changes
+
+-   Babel 7 [#3746](https://github.com/storybooks/storybook/pull/3746)
+
+#### Features
+
+-   Emit messages when stories fail to render [#3967](https://github.com/storybooks/storybook/pull/3967)
+-   Svelte support [#3770](https://github.com/storybooks/storybook/pull/3770)
+-   Allow extending extensions without a full control mode [#3976](https://github.com/storybooks/storybook/pull/3976)
+
+#### Bug Fixes
+
+-   Storyshots puppeteer images do not match [#4045](https://github.com/storybooks/storybook/pull/4045)
+-   Storyshots puppeteer images do not match [#4037](https://github.com/storybooks/storybook/pull/4037)
+-   Bring .jsx back [#4024](https://github.com/storybooks/storybook/pull/4024)
+-   Fix custom webpack config warnings [#4009](https://github.com/storybooks/storybook/pull/4009)
+-   sorting by kind and nested stories [#3963](https://github.com/storybooks/storybook/pull/3963)
+
+#### Maintenance
+
+-   Temp revert the 36a2676 [#4062](https://github.com/storybooks/storybook/pull/4062)
+-   Remove deprecation of --db-path and --enable-db [#4030](https://github.com/storybooks/storybook/pull/4030)
+-   Remove git info extraction [#4031](https://github.com/storybooks/storybook/pull/4031)
+-   Fixed homepage links [skip ci] [#4008](https://github.com/storybooks/storybook/pull/4008)
+-   CHANGE html-webpack-plugin for generate-page-plugin [#3919](https://github.com/storybooks/storybook/pull/3919)
+
 # 4.0.0-alpha.16
 
 2018-August-06

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -25,10 +25,10 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/client-logger": "4.0.0-alpha.16",
-    "@storybook/components": "4.0.0-alpha.16",
-    "@storybook/core-events": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/client-logger": "4.0.0-alpha.18",
+    "@storybook/components": "4.0.0-alpha.18",
+    "@storybook/core-events": "4.0.0-alpha.18",
     "axe-core": "^3.0.3",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -20,9 +20,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/components": "4.0.0-alpha.16",
-    "@storybook/core-events": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/components": "4.0.0-alpha.18",
+    "@storybook/core-events": "4.0.0-alpha.18",
     "deep-equal": "^1.0.1",
     "emotion-theming": "^9.2.6",
     "global": "^4.3.2",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -24,8 +24,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/core-events": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/core-events": "4.0.0-alpha.18",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "react-emotion": "^9.2.6",

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Storybook decorator to center components",
   "license": "MIT",
   "author": "Muhammed Thanish <mnmtanish@gmail.com>",

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -19,8 +19,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/core-events": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/core-events": "4.0.0-alpha.18",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.2",
     "react-emotion": "^9.2.6",

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "storybook"

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "A Storybook addon to show additional information for your stories.",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/client-logger": "4.0.0-alpha.16",
-    "@storybook/components": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/client-logger": "4.0.0-alpha.18",
+    "@storybook/components": "4.0.0-alpha.18",
     "core-js": "2.5.7",
     "global": "^4.3.2",
     "marksy": "^6.0.3",

diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap
@@ -1250,6 +1250,55 @@ exports[`addon Info should render <Info /> and external markdown 1`] = `
                 </Styled(pre)>
               </Pre>
             </div>
+            <div>
+              <h1
+                style={
+                  Object {
+                    "borderBottom": "1px solid #EEE",
+                    "fontSize": "25px",
+                    "margin": "20px 0 0 0",
+                    "padding": "0 0 5px 0",
+                  }
+                }
+              >
+                Prop Types
+              </h1>
+              <div
+                key="TestComponent_0"
+              >
+                <h2
+                  style={
+                    Object {
+                      "margin": "20px 0 0 0",
+                    }
+                  }
+                >
+                  "
+                  TestComponent
+                  " Component
+                </h2>
+                <Component
+                  excludedPropTypes={Array []}
+                  maxPropArrayLength={3}
+                  maxPropObjectKeys={3}
+                  maxPropStringLength={50}
+                  type={[Function]}
+                >
+                  <PropTable
+                    excludedPropTypes={Array []}
+                    maxPropArrayLength={3}
+                    maxPropObjectKeys={3}
+                    maxPropStringLength={50}
+                    propDefinitions={Array []}
+                    type={[Function]}
+                  >
+                    <small>
+                      No propTypes defined!
+                    </small>
+                  </PropTable>
+                </Component>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -2601,6 +2650,55 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)"
                 </Styled(pre)>
               </Pre>
             </div>
+            <div>
+              <h1
+                style={
+                  Object {
+                    "borderBottom": "1px solid #EEE",
+                    "fontSize": "25px",
+                    "margin": "20px 0 0 0",
+                    "padding": "0 0 5px 0",
+                  }
+                }
+              >
+                Prop Types
+              </h1>
+              <div
+                key="TestComponent_0"
+              >
+                <h2
+                  style={
+                    Object {
+                      "margin": "20px 0 0 0",
+                    }
+                  }
+                >
+                  "
+                  TestComponent
+                  " Component
+                </h2>
+                <Component
+                  excludedPropTypes={Array []}
+                  maxPropArrayLength={3}
+                  maxPropObjectKeys={3}
+                  maxPropStringLength={50}
+                  type={[Function]}
+                >
+                  <PropTable
+                    excludedPropTypes={Array []}
+                    maxPropArrayLength={3}
+                    maxPropObjectKeys={3}
+                    maxPropStringLength={50}
+                    propDefinitions={Array []}
+                    type={[Function]}
+                  >
+                    <small>
+                      No propTypes defined!
+                    </small>
+                  </PropTable>
+                </Component>
+              </div>
+            </div>
           </div>
         </div>
       </div>

diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js
@@ -330,8 +330,8 @@ class Story extends Component {
         innerChildren.forEach(extract);
         return;
       }
-      if (innerChildren.props && innerChildren.props.innerChildren) {
-        extract(innerChildren.props.innerChildren);
+      if (innerChildren.props && innerChildren.props.children) {
+        extract(innerChildren.props.children);
       }
       if (
         typeof innerChildren === 'string' ||

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -25,8 +25,8 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/components": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/components": "4.0.0-alpha.18",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "react-emotion": "^9.2.6",

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Storybook Addon Prop Editor Component",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/components": "4.0.0-alpha.16",
-    "@storybook/core-events": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/components": "4.0.0-alpha.18",
+    "@storybook/core-events": "4.0.0-alpha.18",
     "copy-to-clipboard": "^3.0.8",
     "escape-html": "^1.0.3",
     "fast-deep-equal": "^2.0.1",

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Story Links addon for storybook",
   "keywords": [
     "storybook"
@@ -20,9 +20,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
-    "@storybook/components": "4.0.0-alpha.16",
-    "@storybook/core-events": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
+    "@storybook/components": "4.0.0-alpha.18",
+    "@storybook/core-events": "4.0.0-alpha.18",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"
   },

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -18,7 +18,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16",
+    "@storybook/addons": "4.0.0-alpha.18",
     "marked": "^0.4.0",
     "prop-types": "^15.6.2",
     "react-emotion": "^9.2.6"

diff --git a/addons/options/package.json b/addons/options/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "4.0.0-alpha.16",
+  "version": "4.0.0-alpha.18",
   "description": "Options addon for storybook",
   "keywords": [
     "storybook"
@@ -19,7 +19,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.16"
+    "@storybook/addons": "4.0.0-alpha.18"
   },
   "peerDependencies": {
     "react": "*"