From 6df02c249c8af7e6dd253ac3c6c03adda0fa5d5e Mon Sep 17 00:00:00 2001 From: Fatih Kalifa Date: Mon, 11 Mar 2019 15:48:44 +0700 Subject: [PATCH 01/27] fix code block in addon-info --- .../info/src/__snapshots__/index.test.js.snap | 1340 +++++++++++++++++ addons/info/src/components/markdown/code.js | 17 +- addons/info/src/index.test.js | 4 +- 3 files changed, 1357 insertions(+), 4 deletions(-) diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap index 836ee6c3a6a..ef70ad4dbd1 100644 --- a/addons/info/src/__snapshots__/index.test.js.snap +++ b/addons/info/src/__snapshots__/index.test.js.snap @@ -2589,6 +2589,237 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)" `; exports[`addon Info should render component description if story kind matches component 1`] = ` +.emotion-5 { + position: relative; + overflow: hidden; + border: 1px solid rgba(0,0,0,.1); +} + +.emotion-2 { + position: relative; + overflow: auto; +} + +.emotion-2 code { + padding-right: 10px; +} + +.emotion-2 * .token { + font-family: "Operator Mono","Fira Code Retina","Fira Code","FiraCode-Retina","Andale Mono","Lucida Console",Consolas,Monaco,monospace; + -webkit-font-smoothing: antialiased; +} + +.emotion-2 * .token.comment { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.prolog { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.doctype { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.cdata { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.string { + color: #A31515; +} + +.emotion-2 * .token.punctuation { + color: #393A34; +} + +.emotion-2 * .token.operator { + color: #393A34; +} + +.emotion-2 * .token.url { + color: #36acaa; +} + +.emotion-2 * .token.symbol { + color: #36acaa; +} + +.emotion-2 * .token.number { + color: #36acaa; +} + +.emotion-2 * .token.boolean { + color: #36acaa; +} + +.emotion-2 * .token.variable { + color: #36acaa; +} + +.emotion-2 * .token.constant { + color: #36acaa; +} + +.emotion-2 * .token.inserted { + color: #36acaa; +} + +.emotion-2 * .token.atrule { + color: #0000ff; +} + +.emotion-2 * .token.keyword { + color: #0000ff; +} + +.emotion-2 * .token.attr-value { + color: #0000ff; +} + +.emotion-2 * .token.function { + color: #393A34; +} + +.emotion-2 * .token.deleted { + color: #9a050f; +} + +.emotion-2 * .token.important { + font-weight: bold; +} + +.emotion-2 * .token.bold { + font-weight: bold; +} + +.emotion-2 * .token.italic { + font-style: italic; +} + +.emotion-2 * .token.class-name { + color: #2B91AF; +} + +.emotion-2 * .token.tag { + color: #800000; +} + +.emotion-2 * .token.selector { + color: #800000; +} + +.emotion-2 * .token.attr-name { + color: #ff0000; +} + +.emotion-2 * .token.property { + color: #ff0000; +} + +.emotion-2 * .token.regex { + color: #ff0000; +} + +.emotion-2 * .token.entity { + color: #ff0000; +} + +.emotion-2 * .token.directive.tag .tag { + background: #ffff00; + color: #393A34; +} + +.emotion-2 * .language-json .token.boolean { + color: #0000ff; +} + +.emotion-2 * .language-json .token.number { + color: #0000ff; +} + +.emotion-2 * .language-json .token.property { + color: #2B91AF; +} + +.emotion-2 * .namespace { + opacity: 0.7; +} + +.emotion-1 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; + margin: 0; + padding: 10px; +} + +.emotion-0 { + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + padding-right: 0; + opacity: 1; +} + +.emotion-4 { + position: absolute; + bottom: 0; + right: 0; + max-width: 100%; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + background: #FFFFFF; +} + +.emotion-3 { + border: 0 none; + padding: 4px 10px; + cursor: pointer; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + color: #333333; + background: #FFFFFF; + font-size: 12px; + line-height: 16px; + font-weight: 700; + border-top: 1px solid rgba(0,0,0,.1); + border-left: 1px solid rgba(0,0,0,.1); + margin-left: -1px; + border-radius: 4px 0 0 0; +} + +.emotion-3:not(:last-child) { + border-right: 1px solid rgba(0,0,0,.1); +} + +.emotion-3 + * { + border-left: 1px solid rgba(0,0,0,.1); + border-radius: 0; +} + +.emotion-3:focus { + box-shadow: #1EA7FD 0 -3px 0 0 inset; + outline: 0 none; +} +

+ + + + +
+ +
+ + + 
+                                
+                                  
+                                    a
+                                    
+                                      ;
+                                    
+                                  
+                                
+
+ + +
+ + + +
+ + + +
+ + +
+ + + +

+ + + + +
+ +
+ + + 
+                                
+                                  
+                                    a
+                                    
+                                      ;
+                                    
+                                  
+                                
+
+ + +
+ + + +
+ + + +
+ + +
+ + + +

? -const Code = ({ props }) => ; +const Code = ({ code, language, ...props }) => ( + + + {code} + + +); Code.propTypes = { - props: PropTypes.shape({}).isRequired, + code: PropTypes.string.isRequired, + language: PropTypes.string, +}; + +Code.defaultProps = { + language: null, }; export { Code }; diff --git a/addons/info/src/index.test.js b/addons/info/src/index.test.js index 339d4c669ad..55bc463e690 100644 --- a/addons/info/src/index.test.js +++ b/addons/info/src/index.test.js @@ -33,7 +33,9 @@ const storybookReactClassMock = { # Awesome test component description ## with markdown support **bold** *cursive* - `, +\`\`\`js +a; +\`\`\``, name: 'TestComponent', }, }; From 4c72dfa2afa36d48f0b733f569ca685e474166b6 Mon Sep 17 00:00:00 2001 From: Fatih Kalifa Date: Fri, 15 Mar 2019 23:58:27 +0700 Subject: [PATCH 02/27] update more snapshot --- .../info/src/__snapshots__/index.test.js.snap | 3144 ++++++++++++++++- .../addon-info.stories.storyshot | 1392 ++++++++ 2 files changed, 4386 insertions(+), 150 deletions(-) diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap index ef70ad4dbd1..0703164e28b 100644 --- a/addons/info/src/__snapshots__/index.test.js.snap +++ b/addons/info/src/__snapshots__/index.test.js.snap @@ -2589,15 +2589,171 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)" `; exports[`addon Info should render component description if story kind matches component 1`] = ` -.emotion-5 { +.emotion-10 { position: relative; overflow: hidden; border: 1px solid rgba(0,0,0,.1); + background: #FFFFFF; +} + +.emotion-5 { + position: relative; +} + +.emotion-5 code { + padding-right: 10px; +} + +.emotion-5 * .token { + font-family: "Operator Mono","Fira Code Retina","Fira Code","FiraCode-Retina","Andale Mono","Lucida Console",Consolas,Monaco,monospace; + -webkit-font-smoothing: antialiased; +} + +.emotion-5 * .token.comment { + color: #008000; + font-style: italic; +} + +.emotion-5 * .token.prolog { + color: #008000; + font-style: italic; +} + +.emotion-5 * .token.doctype { + color: #008000; + font-style: italic; +} + +.emotion-5 * .token.cdata { + color: #008000; + font-style: italic; +} + +.emotion-5 * .token.string { + color: #A31515; +} + +.emotion-5 * .token.punctuation { + color: #393A34; +} + +.emotion-5 * .token.operator { + color: #393A34; +} + +.emotion-5 * .token.url { + color: #36acaa; +} + +.emotion-5 * .token.symbol { + color: #36acaa; +} + +.emotion-5 * .token.number { + color: #36acaa; +} + +.emotion-5 * .token.boolean { + color: #36acaa; +} + +.emotion-5 * .token.variable { + color: #36acaa; +} + +.emotion-5 * .token.constant { + color: #36acaa; +} + +.emotion-5 * .token.inserted { + color: #36acaa; +} + +.emotion-5 * .token.atrule { + color: #0000ff; +} + +.emotion-5 * .token.keyword { + color: #0000ff; +} + +.emotion-5 * .token.attr-value { + color: #0000ff; +} + +.emotion-5 * .token.function { + color: #393A34; +} + +.emotion-5 * .token.deleted { + color: #9a050f; +} + +.emotion-5 * .token.important { + font-weight: bold; +} + +.emotion-5 * .token.bold { + font-weight: bold; +} + +.emotion-5 * .token.italic { + font-style: italic; +} + +.emotion-5 * .token.class-name { + color: #2B91AF; +} + +.emotion-5 * .token.tag { + color: #800000; +} + +.emotion-5 * .token.selector { + color: #800000; +} + +.emotion-5 * .token.attr-name { + color: #ff0000; +} + +.emotion-5 * .token.property { + color: #ff0000; +} + +.emotion-5 * .token.regex { + color: #ff0000; +} + +.emotion-5 * .token.entity { + color: #ff0000; +} + +.emotion-5 * .token.directive.tag .tag { + background: #ffff00; + color: #393A34; +} + +.emotion-5 * .language-json .token.boolean { + color: #0000ff; +} + +.emotion-5 * .language-json .token.number { + color: #0000ff; +} + +.emotion-5 * .language-json .token.property { + color: #2B91AF; +} + +.emotion-5 * .namespace { + opacity: 0.7; } .emotion-2 { + overflow-y: auto; + overflow-x: auto; position: relative; - overflow: auto; } .emotion-2 code { @@ -2771,7 +2927,7 @@ exports[`addon Info should render component description if story kind matches co opacity: 1; } -.emotion-4 { +.emotion-9 { position: absolute; bottom: 0; right: 0; @@ -2783,7 +2939,7 @@ exports[`addon Info should render component description if story kind matches co background: #FFFFFF; } -.emotion-3 { +.emotion-8 { border: 0 none; padding: 4px 10px; cursor: pointer; @@ -2806,16 +2962,16 @@ exports[`addon Info should render component description if story kind matches co border-radius: 4px 0 0 0; } -.emotion-3:not(:last-child) { +.emotion-8:not(:last-child) { border-right: 1px solid rgba(0,0,0,.1); } -.emotion-3 + * { +.emotion-8 + * { border-left: 1px solid rgba(0,0,0,.1); border-radius: 0; } -.emotion-3:focus { +.emotion-8:focus { box-shadow: #1EA7FD 0 -3px 0 0 inset; outline: 0 none; } @@ -3188,6 +3344,7 @@ exports[`addon Info should render component description if story kind matches co "appBorderRadius": 4, "background": Object { "app": "#F6F9FC", + "bar": "#FFFFFF", "content": "#FFFFFF", "hoverable": "rgba(0,0,0,.05)", "negative": "#FEDED2", @@ -3382,7 +3539,6 @@ exports[`addon Info should render component description if story kind matches co
- -
+ - - - 
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+                                        
+
,
+                                      "ctr": 82,
+                                      "isSpeedy": false,
+                                      "key": "css",
+                                      "nonce": undefined,
+                                      "tags": Array [
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                        ,
+                                      ],
+                                    },
+                                  }
+                                }
+                                serialized={
+                                  Object {
+                                    "map": undefined,
+                                    "name": "6ym4y",
+                                    "next": undefined,
+                                    "styles": "[data-simplebar]{position:relative;flex-direction:column;flex-wrap:wrap;justify-content:flex-start;align-content:flex-start;align-items:flex-start;width:inherit;height:inherit;max-width:inherit;max-height:inherit;}.simplebar-wrapper{overflow:hidden;width:inherit;height:inherit;max-width:inherit;max-height:inherit;}.simplebar-mask{direction:inherit;position:absolute;overflow:hidden;padding:0;margin:0;left:0;top:0;bottom:0;right:0;width:auto !important;height:auto !important;z-index:0;}.simplebar-offset{direction:inherit !important;box-sizing:inherit !important;resize:none !important;position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;-webkit-overflow-scrolling:touch;}.simplebar-content{direction:inherit;box-sizing:border-box !important;position:relative;display:block;height:100% /* Required for horizontal native scrollbar to not appear if parent is taller than natural height */;width:auto;visibility:visible;overflow:scroll;max-width:100% /* Not required for horizontal scroll to trigger */;max-height:100% /* Needed for vertical scroll to trigger */;}.simplebar-placeholder{max-height:100%;max-width:100%;width:100%;pointer-events:none;}.simplebar-height-auto-observer-wrapper{box-sizing:inherit !important;height:100%;width:inherit;max-width:1px;position:relative;float:left;max-height:1px;overflow:hidden;z-index:-1;padding:0;margin:0;pointer-events:none;flex-grow:inherit;flex-shrink:0;flex-basis:0;}.simplebar-height-auto-observer{box-sizing:inherit;display:block;opacity:0;position:absolute;top:0;left:0;height:1000%;width:1000%;min-height:1px;min-width:1px;overflow:hidden;pointer-events:none;z-index:-1;}.simplebar-track{z-index:1;position:absolute;right:0;bottom:0;pointer-events:none;}.simplebar-scrollbar{position:absolute;right:2px;width:6px;min-height:10px;}.simplebar-scrollbar:before{position:absolute;content:\\"\\";border-radius:6px;left:0;right:0;opacity:0;transition:opacity 0.2s linear;background:#333333;}.simplebar-track .simplebar-scrollbar.simplebar-visible:before{opacity:0.2;transition:opacity 0s linear;}.simplebar-track.simplebar-vertical{top:0;width:10px;right:0;}.simplebar-track.simplebar-vertical .simplebar-scrollbar:before{top:2px;bottom:2px;}.simplebar-track.simplebar-horizontal{left:0;height:10px;bottom:0;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar:before{height:100%;left:2px;right:2px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar{right:auto;left:0;top:2px;height:6px;min-height:0;min-width:10px;width:auto;}[data-simplebar-direction=\\"rtl\\"] .simplebar-track.simplebar-vertical{right:auto;left:0;}.hs-dummy-scrollbar-size{direction:rtl;position:fixed;opacity:0;visibility:hidden;height:500px;width:500px;overflow-y:hidden;overflow-x:scroll;}",
+                                  }
+                                }
+                              />
+                            
+                            
+                              
-                                
-                                  
+                                  

-                                    a
-                                    
-                                      ;
-                                    
-                                  
-                                
-
- - -
- +
+
+
+
+
+
+ + + 
+                                                  
+                                                    
+                                                      a
+                                                      
+                                                        ;
+                                                      
+                                                    
+                                                  
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + + + + +
+
+
@@ -4004,6 +4359,239 @@ exports[`Storyshots Addons|Info/Parameters Disable the addon entirely 1`] = ` `; exports[`Storyshots Addons|Info/Parameters Overwrite the parameters with markdown variable 1`] = ` +.emotion-5 { + position: relative; + overflow: hidden; + border: 1px solid rgba(0,0,0,.1); + background: #FFFFFF; +} + +.emotion-2 { + overflow-y: auto; + overflow-x: auto; + position: relative; +} + +.emotion-2 code { + padding-right: 10px; +} + +.emotion-2 * .token { + font-family: "Operator Mono","Fira Code Retina","Fira Code","FiraCode-Retina","Andale Mono","Lucida Console",Consolas,Monaco,monospace; + -webkit-font-smoothing: antialiased; +} + +.emotion-2 * .token.comment { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.prolog { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.doctype { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.cdata { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.string { + color: #A31515; +} + +.emotion-2 * .token.punctuation { + color: #393A34; +} + +.emotion-2 * .token.operator { + color: #393A34; +} + +.emotion-2 * .token.url { + color: #36acaa; +} + +.emotion-2 * .token.symbol { + color: #36acaa; +} + +.emotion-2 * .token.number { + color: #36acaa; +} + +.emotion-2 * .token.boolean { + color: #36acaa; +} + +.emotion-2 * .token.variable { + color: #36acaa; +} + +.emotion-2 * .token.constant { + color: #36acaa; +} + +.emotion-2 * .token.inserted { + color: #36acaa; +} + +.emotion-2 * .token.atrule { + color: #0000ff; +} + +.emotion-2 * .token.keyword { + color: #0000ff; +} + +.emotion-2 * .token.attr-value { + color: #0000ff; +} + +.emotion-2 * .token.function { + color: #393A34; +} + +.emotion-2 * .token.deleted { + color: #9a050f; +} + +.emotion-2 * .token.important { + font-weight: bold; +} + +.emotion-2 * .token.bold { + font-weight: bold; +} + +.emotion-2 * .token.italic { + font-style: italic; +} + +.emotion-2 * .token.class-name { + color: #2B91AF; +} + +.emotion-2 * .token.tag { + color: #800000; +} + +.emotion-2 * .token.selector { + color: #800000; +} + +.emotion-2 * .token.attr-name { + color: #ff0000; +} + +.emotion-2 * .token.property { + color: #ff0000; +} + +.emotion-2 * .token.regex { + color: #ff0000; +} + +.emotion-2 * .token.entity { + color: #ff0000; +} + +.emotion-2 * .token.directive.tag .tag { + background: #ffff00; + color: #393A34; +} + +.emotion-2 * .language-json .token.boolean { + color: #0000ff; +} + +.emotion-2 * .language-json .token.number { + color: #0000ff; +} + +.emotion-2 * .language-json .token.property { + color: #2B91AF; +} + +.emotion-2 * .namespace { + opacity: 0.7; +} + +.emotion-1 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; + margin: 0; + padding: 10px; +} + +.emotion-0 { + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + padding-right: 0; + opacity: 1; +} + +.emotion-4 { + position: absolute; + bottom: 0; + right: 0; + max-width: 100%; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + background: #FFFFFF; +} + +.emotion-3 { + border: 0 none; + padding: 4px 10px; + cursor: pointer; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + color: #333333; + background: #FFFFFF; + font-size: 12px; + line-height: 16px; + font-weight: 700; + border-top: 1px solid rgba(0,0,0,.1); + border-left: 1px solid rgba(0,0,0,.1); + margin-left: -1px; + border-radius: 4px 0 0 0; +} + +.emotion-3:not(:last-child) { + border-right: 1px solid rgba(0,0,0,.1); +} + +.emotion-3 + * { + border-left: 1px solid rgba(0,0,0,.1); + border-radius: 0; +} + +.emotion-3:focus { + box-shadow: #1EA7FD 0 -3px 0 0 inset; + outline: 0 none; +} +
Sometimes you might want to manually include some code examples:
+
+
+
+
+
+
+
+
+
+ 
+                        
+                          
+                            const
+                          
+                           
+                          
+                            Button
+                          
+                           
+                          
+                            =
+                          
+                           
+                          
+                            (
+                          
+                          
+                            )
+                          
+                           
+                          
+                            =>
+                          
+                           
+                          
+                            <
+                          
+                          button 
+                          
+                            /
+                          
+                          
+                            >
+                          
+                          
+                            ;
+                          
+                        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
@@ -4287,6 +4997,239 @@ exports[`Storyshots Addons|Info/Parameters Overwrite the parameters with markdow `; exports[`Storyshots Addons|Info/Parameters Overwrite the text parameter with markdown inline 1`] = ` +.emotion-5 { + position: relative; + overflow: hidden; + border: 1px solid rgba(0,0,0,.1); + background: #FFFFFF; +} + +.emotion-2 { + overflow-y: auto; + overflow-x: auto; + position: relative; +} + +.emotion-2 code { + padding-right: 10px; +} + +.emotion-2 * .token { + font-family: "Operator Mono","Fira Code Retina","Fira Code","FiraCode-Retina","Andale Mono","Lucida Console",Consolas,Monaco,monospace; + -webkit-font-smoothing: antialiased; +} + +.emotion-2 * .token.comment { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.prolog { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.doctype { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.cdata { + color: #008000; + font-style: italic; +} + +.emotion-2 * .token.string { + color: #A31515; +} + +.emotion-2 * .token.punctuation { + color: #393A34; +} + +.emotion-2 * .token.operator { + color: #393A34; +} + +.emotion-2 * .token.url { + color: #36acaa; +} + +.emotion-2 * .token.symbol { + color: #36acaa; +} + +.emotion-2 * .token.number { + color: #36acaa; +} + +.emotion-2 * .token.boolean { + color: #36acaa; +} + +.emotion-2 * .token.variable { + color: #36acaa; +} + +.emotion-2 * .token.constant { + color: #36acaa; +} + +.emotion-2 * .token.inserted { + color: #36acaa; +} + +.emotion-2 * .token.atrule { + color: #0000ff; +} + +.emotion-2 * .token.keyword { + color: #0000ff; +} + +.emotion-2 * .token.attr-value { + color: #0000ff; +} + +.emotion-2 * .token.function { + color: #393A34; +} + +.emotion-2 * .token.deleted { + color: #9a050f; +} + +.emotion-2 * .token.important { + font-weight: bold; +} + +.emotion-2 * .token.bold { + font-weight: bold; +} + +.emotion-2 * .token.italic { + font-style: italic; +} + +.emotion-2 * .token.class-name { + color: #2B91AF; +} + +.emotion-2 * .token.tag { + color: #800000; +} + +.emotion-2 * .token.selector { + color: #800000; +} + +.emotion-2 * .token.attr-name { + color: #ff0000; +} + +.emotion-2 * .token.property { + color: #ff0000; +} + +.emotion-2 * .token.regex { + color: #ff0000; +} + +.emotion-2 * .token.entity { + color: #ff0000; +} + +.emotion-2 * .token.directive.tag .tag { + background: #ffff00; + color: #393A34; +} + +.emotion-2 * .language-json .token.boolean { + color: #0000ff; +} + +.emotion-2 * .language-json .token.number { + color: #0000ff; +} + +.emotion-2 * .language-json .token.property { + color: #2B91AF; +} + +.emotion-2 * .namespace { + opacity: 0.7; +} + +.emotion-1 { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: start; + -webkit-justify-content: flex-start; + -ms-flex-pack: start; + justify-content: flex-start; + margin: 0; + padding: 10px; +} + +.emotion-0 { + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + padding-right: 0; + opacity: 1; +} + +.emotion-4 { + position: absolute; + bottom: 0; + right: 0; + max-width: 100%; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + background: #FFFFFF; +} + +.emotion-3 { + border: 0 none; + padding: 4px 10px; + cursor: pointer; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-align-items: center; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + color: #333333; + background: #FFFFFF; + font-size: 12px; + line-height: 16px; + font-weight: 700; + border-top: 1px solid rgba(0,0,0,.1); + border-left: 1px solid rgba(0,0,0,.1); + margin-left: -1px; + border-radius: 4px 0 0 0; +} + +.emotion-3:not(:last-child) { + border-right: 1px solid rgba(0,0,0,.1); +} + +.emotion-3 + * { + border-left: 1px solid rgba(0,0,0,.1); + border-radius: 0; +} + +.emotion-3:focus { + box-shadow: #1EA7FD 0 -3px 0 0 inset; + outline: 0 none; +} +
description or documentation about my component, supports markdown
+
+
+
+
+
+
+
+
+
+ 
+                      
+                        
+                          <
+                        
+                        Button
+                        
+                          >
+                        
+                        Click Here
+                        
+                          <
+                        
+                        
+                          /
+                        
+                        Button
+                        
+                          >
+                        
+                      
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+

Sometimes you might want to manually include some code examples:
+
+
+
+
+
+
+
+
+
+ 
+                        
+                          
+                            const
+                          
+                           
+                          
+                            Button
+                          
+                           
+                          
+                            =
+                          
+                           
+                          
+                            (
+                          
+                          
+                            )
+                          
+                           
+                          
+                            =>
+                          
+                           
+                          
+                            <
+                          
+                          button 
+                          
+                            /
+                          
+                          
+                            >
+                          
+                          
+                            ;
+                          
+                        
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
From ff0f138157083ffa3a2f1bb99e9b9e7eb4c833a5 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 2 Apr 2019 19:07:13 +0800 Subject: [PATCH 03/27] Refactor story_store - don't touch URL - only emit events, don't listen on them - add tests --- lib/client-api/src/story_store.js | 35 +--------- lib/client-api/src/story_store.test.js | 59 ----------------- lib/core/src/client/preview/start.js | 42 +++++++----- lib/core/src/client/preview/start.test.js | 39 ++++++++++- lib/core/src/client/preview/url.js | 39 +++++++++++ lib/core/src/client/preview/url.test.js | 79 +++++++++++++++++++++++ 6 files changed, 184 insertions(+), 109 deletions(-) create mode 100644 lib/core/src/client/preview/url.js create mode 100644 lib/core/src/client/preview/url.test.js diff --git a/lib/client-api/src/story_store.js b/lib/client-api/src/story_store.js index f6dbf7c47bd..13d25d71dbd 100644 --- a/lib/client-api/src/story_store.js +++ b/lib/client-api/src/story_store.js @@ -1,16 +1,11 @@ /* eslint no-underscore-dangle: 0 */ -import { history, document } from 'global'; import EventEmitter from 'eventemitter3'; -import qs from 'qs'; import memoize from 'memoizerific'; import debounce from 'lodash.debounce'; import { stripIndents } from 'common-tags'; import Events from '@storybook/core-events'; import { logger } from '@storybook/client-logger'; -import { toId } from '@storybook/router/utils'; - -import pathToId from './pathToId'; // TODO: these are copies from components/nav/lib // refactor to DRY @@ -49,9 +44,6 @@ const toExtracted = obj => return Object.assign(acc, { [key]: value }); }, {}); -const getIdFromLegacyQuery = ({ path, selectedKind, selectedStory }) => - (path && pathToId(path)) || (selectedKind && selectedStory && toId(selectedKind, selectedStory)); - export default class StoryStore extends EventEmitter { constructor(params) { super(); @@ -61,19 +53,6 @@ export default class StoryStore extends EventEmitter { this._revision = 0; this._selection = {}; this._channel = params.channel; - - this.on(Events.STORY_INIT, () => { - let storyId = this.getIdOnPath(); - if (!storyId) { - const query = qs.parse(document.location.search, { ignoreQueryPrefix: true }); - storyId = getIdFromLegacyQuery(query); - if (storyId) { - const { path, selectedKind, selectedStory, ...rest } = query; - this.setPath(storyId, rest); - } - } - this.setSelection(this.fromId(storyId)); - }); } setChannel = channel => { @@ -82,16 +61,6 @@ export default class StoryStore extends EventEmitter { // NEW apis - getIdOnPath = () => { - const { id } = qs.parse(document.location.search, { ignoreQueryPrefix: true }); - return id; - }; - - setPath = (storyId, params = {}) => { - const path = `${document.location.pathname}?${qs.stringify({ ...params, id: storyId })}`; - history.replaceState({}, '', path); - }; - fromId = id => { try { const data = this._data[id]; @@ -126,8 +95,8 @@ export default class StoryStore extends EventEmitter { ); } - setSelection = data => { - this._selection = data; + setSelection = ({ storyId }) => { + this._selection = { storyId }; setTimeout(() => this.emit(Events.STORY_RENDER), 1); }; diff --git a/lib/client-api/src/story_store.test.js b/lib/client-api/src/story_store.test.js index b68499539f2..e587e62027a 100644 --- a/lib/client-api/src/story_store.test.js +++ b/lib/client-api/src/story_store.test.js @@ -1,25 +1,9 @@ -import { history, document } from 'global'; import createChannel from '@storybook/channel-postmessage'; -import Events from '@storybook/core-events'; import { toId } from '@storybook/router/utils'; import StoryStore from './story_store'; import { defaultDecorateStory } from './client_api'; -jest.mock('global', () => ({ - history: { replaceState: jest.fn() }, - window: { - addEventListener: jest.fn(), - }, - document: { - location: { - pathname: 'pathname', - search: '', - }, - addEventListener: jest.fn(), - }, -})); - jest.mock('@storybook/node-logger', () => ({ logger: { info: jest.fn(), @@ -148,47 +132,4 @@ describe('preview.story_store', () => { }); }); }); - - describe('setPath', () => { - it('preserves custom URL params', () => { - const store = new StoryStore({ channel }); - - store.setPath('story--id', { foo: 'bar' }); - expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?foo=bar&id=story--id'); - }); - }); - - describe('STORY_INIT', () => { - const storyFn = () => 0; - - it('supports path params', () => { - document.location = { - pathname: 'pathname', - search: '?path=/story/kind--story&bar=baz', - }; - const store = new StoryStore({ channel }); - store.addStory(...make('kind', 'story', storyFn)); - store.setSelection = jest.fn(); - - store.emit(Events.STORY_INIT); - expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?bar=baz&id=kind--story'); - expect(store.setSelection).toHaveBeenCalled(); - expect(store.setSelection.mock.calls[0][0].getDecorated()).toEqual(storyFn); - }); - - it('supports story kind/name params', () => { - document.location = { - pathname: 'pathname', - search: '?selectedKind=kind&selectedStory=story&bar=baz', - }; - const store = new StoryStore({ channel }); - store.addStory(...make('kind', 'story', storyFn)); - store.setSelection = jest.fn(); - - store.emit(Events.STORY_INIT); - expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?bar=baz&id=kind--story'); - expect(store.setSelection).toHaveBeenCalled(); - expect(store.setSelection.mock.calls[0][0].getDecorated()).toEqual(storyFn); - }); - }); }); diff --git a/lib/core/src/client/preview/start.js b/lib/core/src/client/preview/start.js index deaa08b6774..6593ef2824a 100644 --- a/lib/core/src/client/preview/start.js +++ b/lib/core/src/client/preview/start.js @@ -6,6 +6,7 @@ import { toId } from '@storybook/router/utils'; import { logger } from '@storybook/client-logger'; import Events from '@storybook/core-events'; import deprecate from 'util-deprecate'; +import { initializePath, setPath } from './url'; const classes = { MAIN: 'sb-show-main', @@ -114,8 +115,19 @@ export default function start(render, { decorateStory } = {}) { const renderMain = forceRender => { const revision = storyStore.getRevision(); - const selection = storyStore.getSelection(); - const { kind, name, getDecorated, id } = selection || {}; + const { storyId } = storyStore.getSelection(); + + const data = storyStore.fromId(storyId); + + const { kind, name, getDecorated, id } = data || {}; + + const renderContext = { + ...context, + ...data, + selectedKind: kind, + selectedStory: name, + forceRender, + }; if (getDecorated) { // Render story only if selectedKind or selectedStory have changed. @@ -135,21 +147,16 @@ export default function start(render, { decorateStory } = {}) { addons.getChannel().emit(Events.STORY_CHANGED, id); } - render({ - ...context, - ...selection, - selectedKind: kind, - selectedStory: name, - forceRender, - }); + previousRevision = revision; + previousKind = kind; + previousStory = name; + + render(renderContext); addons.getChannel().emit(Events.STORY_RENDERED, id); } else { showNopreview(); addons.getChannel().emit(Events.STORY_MISSING, id); } - previousRevision = revision; - previousKind = kind; - previousStory = name; if (!forceRender) { document.documentElement.scrollTop = 0; @@ -187,10 +194,8 @@ export default function start(render, { decorateStory } = {}) { storyId = deprecatedToId(kind, name); } - const data = storyStore.fromId(storyId); - - storyStore.setSelection(data); - storyStore.setPath(storyId); + storyStore.setSelection({ storyId }); + setPath({ storyId }); }); // Handle keyboard shortcuts @@ -205,6 +210,11 @@ export default function start(render, { decorateStory } = {}) { }; } + storyStore.on(Events.STORY_INIT, () => { + const { storyId } = initializePath(); + storyStore.setSelection({ storyId }); + }); + storyStore.on(Events.STORY_RENDER, renderUI); if (typeof window !== 'undefined') { diff --git a/lib/core/src/client/preview/start.test.js b/lib/core/src/client/preview/start.test.js index 4b9270593e1..df34092ab60 100644 --- a/lib/core/src/client/preview/start.test.js +++ b/lib/core/src/client/preview/start.test.js @@ -1,9 +1,12 @@ -import { document } from 'global'; +/* eslint-disable no-underscore-dangle */ +import { history, document } from 'global'; +import Events from '@storybook/core-events'; import start from './start'; jest.mock('@storybook/client-logger'); jest.mock('global', () => ({ + history: { replaceState: jest.fn() }, navigator: { userAgent: 'browser', platform: '' }, window: { addEventListener: jest.fn(), @@ -85,3 +88,37 @@ it('emits an error and shows error when your framework calls showError', () => { expect(render).toHaveBeenCalled(); expect(document.body.classList.add).toHaveBeenCalledWith('sb-show-errordisplay'); }); + +describe('STORY_INIT', () => { + it('supports path params', () => { + document.location = { + pathname: 'pathname', + search: '?path=/story/kind--story&bar=baz', + }; + + const render = jest.fn(); + const { clientApi } = start(render); + const store = clientApi._storyStore; + store.setSelection = jest.fn(); + store.emit(Events.STORY_INIT); + + store.emit(); + expect(store.setSelection).toHaveBeenCalledWith({ storyId: 'kind--story' }); + }); + + it('supports story kind/name params', () => { + document.location = { + pathname: 'pathname', + search: '?selectedKind=kind&selectedStory=story&bar=baz', + }; + + const render = jest.fn(); + const { clientApi } = start(render); + const store = clientApi._storyStore; + store.setSelection = jest.fn(); + + store.emit(Events.STORY_INIT); + expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?bar=baz&id=kind--story'); + expect(store.setSelection).toHaveBeenCalledWith({ storyId: 'kind--story' }); + }); +}); diff --git a/lib/core/src/client/preview/url.js b/lib/core/src/client/preview/url.js new file mode 100644 index 00000000000..12c1c18bb75 --- /dev/null +++ b/lib/core/src/client/preview/url.js @@ -0,0 +1,39 @@ +import { history, document } from 'global'; +import qs from 'qs'; +import { toId } from '@storybook/router/utils'; + +export function pathToId(path) { + const match = (path || '').match(/^\/story\/(.+)/); + if (!match) { + throw new Error(`Invalid path '${path}', must start with '/story/'`); + } + return match[1]; +} + +export const setPath = ({ storyId }) => { + const { path, selectedKind, selectedStory, ...rest } = qs.parse(document.location.search, { + ignoreQueryPrefix: true, + }); + const newPath = `${document.location.pathname}?${qs.stringify({ ...rest, id: storyId })}`; + history.replaceState({}, '', newPath); +}; + +export const getIdFromLegacyQuery = ({ path, selectedKind, selectedStory }) => + (path && pathToId(path)) || (selectedKind && selectedStory && toId(selectedKind, selectedStory)); + +export const parseQueryParameters = search => { + const { id } = qs.parse(search, { ignoreQueryPrefix: true }); + return id; +}; + +export const initializePath = () => { + const query = qs.parse(document.location.search, { ignoreQueryPrefix: true }); + let { id: storyId } = query; + if (!storyId) { + storyId = getIdFromLegacyQuery(query); + if (storyId) { + setPath({ storyId }); + } + } + return { storyId }; +}; diff --git a/lib/core/src/client/preview/url.test.js b/lib/core/src/client/preview/url.test.js new file mode 100644 index 00000000000..0a33955e4c7 --- /dev/null +++ b/lib/core/src/client/preview/url.test.js @@ -0,0 +1,79 @@ +import { history, document } from 'global'; +import { + pathToId, + setPath, + getIdFromLegacyQuery, + parseQueryParameters, + initializePath, +} from './url'; + +jest.mock('global', () => ({ + history: { replaceState: jest.fn() }, + document: { + location: { + pathname: 'pathname', + search: '', + }, + }, +})); + +describe('url', () => { + describe('pathToId', () => { + it('should parse valid ids', () => { + expect(pathToId('/story/story--id')).toEqual('story--id'); + }); + it('should error on invalid ids', () => { + [null, '', '/whatever/story/story--id'].forEach(path => { + expect(() => pathToId(path)).toThrow(/Invalid/); + }); + }); + }); + + describe('setPath', () => { + it('should navigate to storyId', () => { + setPath({ storyId: 'story--id' }); + expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?id=story--id'); + }); + it('should replace legacy parameters but preserve others', () => { + document.location.search = 'foo=bar&selectedStory=selStory&selectedKind=selKind'; + setPath({ storyId: 'story--id' }); + expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?foo=bar&id=story--id'); + }); + }); + + describe('getIdFromLegacyQuery', () => { + it('should parse story paths', () => { + expect(getIdFromLegacyQuery({ path: '/story/story--id' })).toBe('story--id'); + }); + it('should parse legacy queries', () => { + expect( + getIdFromLegacyQuery({ path: null, selectedKind: 'kind', selectedStory: 'story' }) + ).toBe('kind--story'); + }); + it('should not parse non-queries', () => { + expect(getIdFromLegacyQuery({})).toBeUndefined(); + }); + }); + + describe('parseQueryParameters', () => { + it('should parse id', () => { + expect(parseQueryParameters('?foo=bar&id=story--id')).toBe('story--id'); + }); + it('should not parse non-ids', () => { + expect(parseQueryParameters('')).toBeUndefined(); + }); + }); + + describe('initializePath', () => { + it('should handle id queries', () => { + document.location.search = '?id=story--id'; + expect(initializePath()).toEqual({ storyId: 'story--id' }); + expect(history.replaceState).not.toHaveBeenCalled(); + }); + it('should redirect legacy queries', () => { + document.location.search = '?selectedKind=kind&selectedStory=story'; + expect(initializePath()).toEqual({ storyId: 'kind--story' }); + expect(history.replaceState).toHaveBeenCalledWith({}, '', 'pathname?id=kind--story'); + }); + }); +}); From a38266f3f11d1498f48aafc100173309ff1c1d69 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 26 Apr 2019 15:15:47 +0200 Subject: [PATCH 04/27] FIX snapshots --- .../info/src/__snapshots__/index.test.js.snap | 80 ++++++------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap index aec8c30a6b0..7f135eace07 100644 --- a/addons/info/src/__snapshots__/index.test.js.snap +++ b/addons/info/src/__snapshots__/index.test.js.snap @@ -4476,25 +4476,13 @@ exports[`addon Info should render component description if story kind matches co "toString": [Function], }, "hoverable": Object { - "map": undefined, - "name": "wpaw6f", - "next": undefined, - "styles": " - transition: all 150ms ease-out; - transform: translate3d(0, 0, 0); - - &:hover { - transform: translate3d(0, -2px, 0); - } - - &:active { - transform: translate3d(0, 0, 0); - } -", + "map": "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9hbmltYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBd0NxQiIsImZpbGUiOiIuLi9zcmMvYW5pbWF0aW9uLnRzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3NzLCBrZXlmcmFtZXMgfSBmcm9tICdAZW1vdGlvbi9jb3JlJztcblxuZXhwb3J0IGNvbnN0IGVhc2luZyA9IHtcbiAgcnViYmVyOiAnY3ViaWMtYmV6aWVyKDAuMTc1LCAwLjg4NSwgMC4zMzUsIDEuMDUpJyxcbn07XG5cbmNvbnN0IHJvdGF0ZTM2MCA9IGtleWZyYW1lc2Bcblx0ZnJvbSB7XG5cdFx0dHJhbnNmb3JtOiByb3RhdGUoMGRlZyk7XG5cdH1cblx0dG8ge1xuXHRcdHRyYW5zZm9ybTogcm90YXRlKDM2MGRlZyk7XG5cdH1cbmA7XG5cbmNvbnN0IGdsb3cgPSBrZXlmcmFtZXNgXG4gIDAlLCAxMDAlIHsgb3BhY2l0eTogMTsgfVxuICA1MCUgeyBvcGFjaXR5OiAuNDsgfVxuYDtcblxuY29uc3QgZmxvYXQgPSBrZXlmcmFtZXNgXG4gIDAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDFweCk7IH1cbiAgMjUlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDBweCk7IH1cbiAgNTAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKC0zcHgpOyB9XG4gIDEwMCUgeyB0cmFuc2Zvcm06IHRyYW5zbGF0ZVkoMXB4KTsgfVxuYDtcblxuY29uc3QgamlnZ2xlID0ga2V5ZnJhbWVzYFxuICAwJSwgMTAwJSB7IHRyYW5zZm9ybTp0cmFuc2xhdGUzZCgwLDAsMCk7IH1cbiAgMTIuNSUsIDYyLjUlIHsgdHJhbnNmb3JtOnRyYW5zbGF0ZTNkKC00cHgsMCwwKTsgfVxuICAzNy41JSwgODcuNSUgeyAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCg0cHgsMCwwKTsgIH1cbmA7XG5cbmNvbnN0IGlubGluZUdsb3cgPSBjc3NgXG4gIGFuaW1hdGlvbjogJHtnbG93fSAxLjVzIGVhc2UtaW4tb3V0IGluZmluaXRlO1xuICBjb2xvcjogdHJhbnNwYXJlbnQ7XG4gIGN1cnNvcjogcHJvZ3Jlc3M7XG5gO1xuXG4vLyBob3ZlciAmIGFjdGl2ZSBzdGF0ZSBmb3IgbGlua3MgYW5kIGJ1dHRvbnNcbmNvbnN0IGhvdmVyYWJsZSA9IGNzc2BcbiAgdHJhbnNpdGlvbjogYWxsIDE1MG1zIGVhc2Utb3V0O1xuICB0cmFuc2Zvcm06IHRyYW5zbGF0ZTNkKDAsIDAsIDApO1xuXG4gICY6aG92ZXIge1xuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlM2QoMCwgLTJweCwgMCk7XG4gIH1cblxuICAmOmFjdGl2ZSB7XG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCgwLCAwLCAwKTtcbiAgfVxuYDtcblxuZXhwb3J0IGNvbnN0IGFuaW1hdGlvbiA9IHtcbiAgcm90YXRlMzYwLFxuICBnbG93LFxuICBmbG9hdCxcbiAgamlnZ2xlLFxuICBpbmxpbmVHbG93LFxuICBob3ZlcmFibGUsXG59O1xuIl19 */", + "name": "1023qba-hoverable", + "styles": "transition:all 150ms ease-out;transform:translate3d(0,0,0);&:hover{transform:translate3d(0,-2px,0);}&:active{transform:translate3d(0,0,0);}label:hoverable;", }, "inlineGlow": Object { - "map": undefined, - "name": "zv3h0s", + "map": "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9hbmltYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBaUNzQiIsImZpbGUiOiIuLi9zcmMvYW5pbWF0aW9uLnRzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3NzLCBrZXlmcmFtZXMgfSBmcm9tICdAZW1vdGlvbi9jb3JlJztcblxuZXhwb3J0IGNvbnN0IGVhc2luZyA9IHtcbiAgcnViYmVyOiAnY3ViaWMtYmV6aWVyKDAuMTc1LCAwLjg4NSwgMC4zMzUsIDEuMDUpJyxcbn07XG5cbmNvbnN0IHJvdGF0ZTM2MCA9IGtleWZyYW1lc2Bcblx0ZnJvbSB7XG5cdFx0dHJhbnNmb3JtOiByb3RhdGUoMGRlZyk7XG5cdH1cblx0dG8ge1xuXHRcdHRyYW5zZm9ybTogcm90YXRlKDM2MGRlZyk7XG5cdH1cbmA7XG5cbmNvbnN0IGdsb3cgPSBrZXlmcmFtZXNgXG4gIDAlLCAxMDAlIHsgb3BhY2l0eTogMTsgfVxuICA1MCUgeyBvcGFjaXR5OiAuNDsgfVxuYDtcblxuY29uc3QgZmxvYXQgPSBrZXlmcmFtZXNgXG4gIDAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDFweCk7IH1cbiAgMjUlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDBweCk7IH1cbiAgNTAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKC0zcHgpOyB9XG4gIDEwMCUgeyB0cmFuc2Zvcm06IHRyYW5zbGF0ZVkoMXB4KTsgfVxuYDtcblxuY29uc3QgamlnZ2xlID0ga2V5ZnJhbWVzYFxuICAwJSwgMTAwJSB7IHRyYW5zZm9ybTp0cmFuc2xhdGUzZCgwLDAsMCk7IH1cbiAgMTIuNSUsIDYyLjUlIHsgdHJhbnNmb3JtOnRyYW5zbGF0ZTNkKC00cHgsMCwwKTsgfVxuICAzNy41JSwgODcuNSUgeyAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCg0cHgsMCwwKTsgIH1cbmA7XG5cbmNvbnN0IGlubGluZUdsb3cgPSBjc3NgXG4gIGFuaW1hdGlvbjogJHtnbG93fSAxLjVzIGVhc2UtaW4tb3V0IGluZmluaXRlO1xuICBjb2xvcjogdHJhbnNwYXJlbnQ7XG4gIGN1cnNvcjogcHJvZ3Jlc3M7XG5gO1xuXG4vLyBob3ZlciAmIGFjdGl2ZSBzdGF0ZSBmb3IgbGlua3MgYW5kIGJ1dHRvbnNcbmNvbnN0IGhvdmVyYWJsZSA9IGNzc2BcbiAgdHJhbnNpdGlvbjogYWxsIDE1MG1zIGVhc2Utb3V0O1xuICB0cmFuc2Zvcm06IHRyYW5zbGF0ZTNkKDAsIDAsIDApO1xuXG4gICY6aG92ZXIge1xuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlM2QoMCwgLTJweCwgMCk7XG4gIH1cblxuICAmOmFjdGl2ZSB7XG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCgwLCAwLCAwKTtcbiAgfVxuYDtcblxuZXhwb3J0IGNvbnN0IGFuaW1hdGlvbiA9IHtcbiAgcm90YXRlMzYwLFxuICBnbG93LFxuICBmbG9hdCxcbiAgamlnZ2xlLFxuICBpbmxpbmVHbG93LFxuICBob3ZlcmFibGUsXG59O1xuIl19 */", + "name": "1euta6d-inlineGlow", "next": Object { "name": "animation-r0iffl", "next": undefined, @@ -4503,12 +4491,7 @@ exports[`addon Info should render component description if story kind matches co 50% { opacity: .4; } }", }, - "styles": " - animation: animation-r0iffl 1.5s ease-in-out infinite; - background: rgba(0,0,0,.1); - color: transparent; - cursor: progress; -", + "styles": "animation:animation-r0iffl 1.5s ease-in-out infinite;color:transparent;cursor:progress;label:inlineGlow;", }, "jiggle": Object { "anim": 1, @@ -4540,6 +4523,8 @@ exports[`addon Info should render component description if story kind matches co "app": "#F6F9FC", "bar": "#FFFFFF", "content": "#FFFFFF", + "critical": "#FF4400", + "gridCellSize": 10, "hoverable": "rgba(0,0,0,.05)", "negative": "#FEDED2", "positive": "#E1FFD4", @@ -4670,6 +4655,7 @@ exports[`addon Info should render component description if story kind matches co "color": Object { "ancillary": "#22a699", "border": "rgba(0,0,0,.1)", + "critical": "#FFFFFF", "dark": "#666666", "darker": "#444444", "darkest": "#333333", @@ -4730,7 +4716,7 @@ exports[`addon Info should render component description if story kind matches co } } > - -
- + @@ -6055,7 +6041,7 @@ exports[`addon Info should render component description if story kind matches co
- +
@@ -7730,25 +7716,13 @@ exports[`addon Info should render component description if story name matches co "toString": [Function], }, "hoverable": Object { - "map": undefined, - "name": "wpaw6f", - "next": undefined, - "styles": " - transition: all 150ms ease-out; - transform: translate3d(0, 0, 0); - - &:hover { - transform: translate3d(0, -2px, 0); - } - - &:active { - transform: translate3d(0, 0, 0); - } -", + "map": "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9hbmltYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBd0NxQiIsImZpbGUiOiIuLi9zcmMvYW5pbWF0aW9uLnRzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3NzLCBrZXlmcmFtZXMgfSBmcm9tICdAZW1vdGlvbi9jb3JlJztcblxuZXhwb3J0IGNvbnN0IGVhc2luZyA9IHtcbiAgcnViYmVyOiAnY3ViaWMtYmV6aWVyKDAuMTc1LCAwLjg4NSwgMC4zMzUsIDEuMDUpJyxcbn07XG5cbmNvbnN0IHJvdGF0ZTM2MCA9IGtleWZyYW1lc2Bcblx0ZnJvbSB7XG5cdFx0dHJhbnNmb3JtOiByb3RhdGUoMGRlZyk7XG5cdH1cblx0dG8ge1xuXHRcdHRyYW5zZm9ybTogcm90YXRlKDM2MGRlZyk7XG5cdH1cbmA7XG5cbmNvbnN0IGdsb3cgPSBrZXlmcmFtZXNgXG4gIDAlLCAxMDAlIHsgb3BhY2l0eTogMTsgfVxuICA1MCUgeyBvcGFjaXR5OiAuNDsgfVxuYDtcblxuY29uc3QgZmxvYXQgPSBrZXlmcmFtZXNgXG4gIDAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDFweCk7IH1cbiAgMjUlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDBweCk7IH1cbiAgNTAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKC0zcHgpOyB9XG4gIDEwMCUgeyB0cmFuc2Zvcm06IHRyYW5zbGF0ZVkoMXB4KTsgfVxuYDtcblxuY29uc3QgamlnZ2xlID0ga2V5ZnJhbWVzYFxuICAwJSwgMTAwJSB7IHRyYW5zZm9ybTp0cmFuc2xhdGUzZCgwLDAsMCk7IH1cbiAgMTIuNSUsIDYyLjUlIHsgdHJhbnNmb3JtOnRyYW5zbGF0ZTNkKC00cHgsMCwwKTsgfVxuICAzNy41JSwgODcuNSUgeyAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCg0cHgsMCwwKTsgIH1cbmA7XG5cbmNvbnN0IGlubGluZUdsb3cgPSBjc3NgXG4gIGFuaW1hdGlvbjogJHtnbG93fSAxLjVzIGVhc2UtaW4tb3V0IGluZmluaXRlO1xuICBjb2xvcjogdHJhbnNwYXJlbnQ7XG4gIGN1cnNvcjogcHJvZ3Jlc3M7XG5gO1xuXG4vLyBob3ZlciAmIGFjdGl2ZSBzdGF0ZSBmb3IgbGlua3MgYW5kIGJ1dHRvbnNcbmNvbnN0IGhvdmVyYWJsZSA9IGNzc2BcbiAgdHJhbnNpdGlvbjogYWxsIDE1MG1zIGVhc2Utb3V0O1xuICB0cmFuc2Zvcm06IHRyYW5zbGF0ZTNkKDAsIDAsIDApO1xuXG4gICY6aG92ZXIge1xuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlM2QoMCwgLTJweCwgMCk7XG4gIH1cblxuICAmOmFjdGl2ZSB7XG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCgwLCAwLCAwKTtcbiAgfVxuYDtcblxuZXhwb3J0IGNvbnN0IGFuaW1hdGlvbiA9IHtcbiAgcm90YXRlMzYwLFxuICBnbG93LFxuICBmbG9hdCxcbiAgamlnZ2xlLFxuICBpbmxpbmVHbG93LFxuICBob3ZlcmFibGUsXG59O1xuIl19 */", + "name": "1023qba-hoverable", + "styles": "transition:all 150ms ease-out;transform:translate3d(0,0,0);&:hover{transform:translate3d(0,-2px,0);}&:active{transform:translate3d(0,0,0);}label:hoverable;", }, "inlineGlow": Object { - "map": undefined, - "name": "zv3h0s", + "map": "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9hbmltYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBaUNzQiIsImZpbGUiOiIuLi9zcmMvYW5pbWF0aW9uLnRzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY3NzLCBrZXlmcmFtZXMgfSBmcm9tICdAZW1vdGlvbi9jb3JlJztcblxuZXhwb3J0IGNvbnN0IGVhc2luZyA9IHtcbiAgcnViYmVyOiAnY3ViaWMtYmV6aWVyKDAuMTc1LCAwLjg4NSwgMC4zMzUsIDEuMDUpJyxcbn07XG5cbmNvbnN0IHJvdGF0ZTM2MCA9IGtleWZyYW1lc2Bcblx0ZnJvbSB7XG5cdFx0dHJhbnNmb3JtOiByb3RhdGUoMGRlZyk7XG5cdH1cblx0dG8ge1xuXHRcdHRyYW5zZm9ybTogcm90YXRlKDM2MGRlZyk7XG5cdH1cbmA7XG5cbmNvbnN0IGdsb3cgPSBrZXlmcmFtZXNgXG4gIDAlLCAxMDAlIHsgb3BhY2l0eTogMTsgfVxuICA1MCUgeyBvcGFjaXR5OiAuNDsgfVxuYDtcblxuY29uc3QgZmxvYXQgPSBrZXlmcmFtZXNgXG4gIDAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDFweCk7IH1cbiAgMjUlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKDBweCk7IH1cbiAgNTAlIHsgdHJhbnNmb3JtOiB0cmFuc2xhdGVZKC0zcHgpOyB9XG4gIDEwMCUgeyB0cmFuc2Zvcm06IHRyYW5zbGF0ZVkoMXB4KTsgfVxuYDtcblxuY29uc3QgamlnZ2xlID0ga2V5ZnJhbWVzYFxuICAwJSwgMTAwJSB7IHRyYW5zZm9ybTp0cmFuc2xhdGUzZCgwLDAsMCk7IH1cbiAgMTIuNSUsIDYyLjUlIHsgdHJhbnNmb3JtOnRyYW5zbGF0ZTNkKC00cHgsMCwwKTsgfVxuICAzNy41JSwgODcuNSUgeyAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCg0cHgsMCwwKTsgIH1cbmA7XG5cbmNvbnN0IGlubGluZUdsb3cgPSBjc3NgXG4gIGFuaW1hdGlvbjogJHtnbG93fSAxLjVzIGVhc2UtaW4tb3V0IGluZmluaXRlO1xuICBjb2xvcjogdHJhbnNwYXJlbnQ7XG4gIGN1cnNvcjogcHJvZ3Jlc3M7XG5gO1xuXG4vLyBob3ZlciAmIGFjdGl2ZSBzdGF0ZSBmb3IgbGlua3MgYW5kIGJ1dHRvbnNcbmNvbnN0IGhvdmVyYWJsZSA9IGNzc2BcbiAgdHJhbnNpdGlvbjogYWxsIDE1MG1zIGVhc2Utb3V0O1xuICB0cmFuc2Zvcm06IHRyYW5zbGF0ZTNkKDAsIDAsIDApO1xuXG4gICY6aG92ZXIge1xuICAgIHRyYW5zZm9ybTogdHJhbnNsYXRlM2QoMCwgLTJweCwgMCk7XG4gIH1cblxuICAmOmFjdGl2ZSB7XG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUzZCgwLCAwLCAwKTtcbiAgfVxuYDtcblxuZXhwb3J0IGNvbnN0IGFuaW1hdGlvbiA9IHtcbiAgcm90YXRlMzYwLFxuICBnbG93LFxuICBmbG9hdCxcbiAgamlnZ2xlLFxuICBpbmxpbmVHbG93LFxuICBob3ZlcmFibGUsXG59O1xuIl19 */", + "name": "1euta6d-inlineGlow", "next": Object { "name": "animation-r0iffl", "next": undefined, @@ -7757,12 +7731,7 @@ exports[`addon Info should render component description if story name matches co 50% { opacity: .4; } }", }, - "styles": " - animation: animation-r0iffl 1.5s ease-in-out infinite; - background: rgba(0,0,0,.1); - color: transparent; - cursor: progress; -", + "styles": "animation:animation-r0iffl 1.5s ease-in-out infinite;color:transparent;cursor:progress;label:inlineGlow;", }, "jiggle": Object { "anim": 1, @@ -7794,6 +7763,8 @@ exports[`addon Info should render component description if story name matches co "app": "#F6F9FC", "bar": "#FFFFFF", "content": "#FFFFFF", + "critical": "#FF4400", + "gridCellSize": 10, "hoverable": "rgba(0,0,0,.05)", "negative": "#FEDED2", "positive": "#E1FFD4", @@ -7924,6 +7895,7 @@ exports[`addon Info should render component description if story name matches co "color": Object { "ancillary": "#22a699", "border": "rgba(0,0,0,.1)", + "critical": "#FFFFFF", "dark": "#666666", "darker": "#444444", "darkest": "#333333", @@ -7984,7 +7956,7 @@ exports[`addon Info should render component description if story name matches co } } > - -
- + @@ -9423,7 +9395,7 @@ exports[`addon Info should render component description if story name matches co
- +

From 4a1852373211a85a137202d89b4acad6ef7359a0 Mon Sep 17 00:00:00 2001 From: Andrew Lisowski Date: Wed, 22 May 2019 17:30:46 -0700 Subject: [PATCH 05/27] add ability to have multiple sections in the notes panel --- addons/notes/README.md | 15 ++++++ addons/notes/src/Panel.tsx | 93 ++++++++++++++++++++++++++++---------- addons/notes/src/shared.ts | 8 +++- 3 files changed, 91 insertions(+), 25 deletions(-) diff --git a/addons/notes/README.md b/addons/notes/README.md index 368b117e4fe..fc6a7411e7c 100644 --- a/addons/notes/README.md +++ b/addons/notes/README.md @@ -81,3 +81,18 @@ When using Markdown, you can also embed gifs from Giphy into your Markdown. Curr ``` + +## Multiple Notes Sections + +If you need to display different notes for different consumers of your storybook (e.g design, developers), you can configure multiple notes pages. The following will render a tab with unique notes for both `Introduction` and `Design`. + +```js +import { storiesOf } from '@storybook/react'; +import Component from './Component'; +import intro from './intro.md'; +import design from './design.md'; + +storiesOf('Component', module).add('With Markdown', () => , { + notes: { Introduction: intro, 'Design Notes': design }, +}); +``` diff --git a/addons/notes/src/Panel.tsx b/addons/notes/src/Panel.tsx index 401e457c03a..8dcee5a2240 100644 --- a/addons/notes/src/Panel.tsx +++ b/addons/notes/src/Panel.tsx @@ -9,6 +9,8 @@ import { Placeholder, DocumentFormatting, Link, + TabWrapper, + TabsState, } from '@storybook/components'; import Markdown from 'markdown-to-jsx'; import Giphy from './giphy'; @@ -29,14 +31,14 @@ interface Props { api: API; } -function read(param: Parameters | undefined): string | undefined { +function read(param: Parameters | undefined): Record | string | undefined { if (!param) { return undefined; } if (typeof param === 'string') { return param; } - if ('disabled' in param) { + if ('disable' in param) { return undefined; } if ('text' in param) { @@ -45,6 +47,9 @@ function read(param: Parameters | undefined): string | undefined { if ('markdown' in param) { return param.markdown; } + if (typeof param === 'object') { + return param; + } return undefined; } @@ -108,7 +113,10 @@ interface Overrides { } type Options = typeof defaultOptions & Overrides; -const mapper = ({ state, api }: Combo): { value?: string; options: Options } => { +const mapper = ({ + state, + api, +}: Combo): { value?: string | Record; options: Options } => { const extraElements = Object.entries(api.getElements(types.NOTES_ELEMENT)).reduce( (acc, [k, v]) => ({ ...acc, [k]: v.render }), {} @@ -131,27 +139,64 @@ const NotesPanel = ({ active }: Props) => { return ( - {({ options, value }: { options: Options; value?: string }) => { - return value ? ( - - - {value} - - - ) : ( - - No notes yet - - Learn how to{' '} - - document components in Markdown - - - + {({ options, value }: { options: Options; value?: string | Record }) => { + if (!value) { + return ( + + No notes yet + + Learn how to{' '} + + document components in Markdown + + + + ); + } + + if (typeof value === 'string' || Object.keys(value).length === 1) { + return ( + + + + {typeof value === 'object' ? Object.values(value)[0] : value} + + + + ); + } + + const groups: { title: string; render: (props: { active: boolean }) => void }[] = []; + + Object.entries(value).forEach(([title, docs]) => { + groups.push({ + render: ({ active: isActive }) => ( + + + + {docs} + + + + ), + title, + }); + }); + + return ( +
+ + {groups.map(group => ( +
+ {group.render} +
+ ))} + +
); }} diff --git a/addons/notes/src/shared.ts b/addons/notes/src/shared.ts index effa90303b5..18079e1a3e2 100644 --- a/addons/notes/src/shared.ts +++ b/addons/notes/src/shared.ts @@ -11,5 +11,11 @@ interface MarkdownParameter { interface DisabledParameter { disable: boolean; } +type TabsParameter = Record; -export type Parameters = string | TextParameter | MarkdownParameter | DisabledParameter; +export type Parameters = + | string + | TextParameter + | MarkdownParameter + | DisabledParameter + | TabsParameter; From c28af59e7db496ed01cec55dab70c98916d5d858 Mon Sep 17 00:00:00 2001 From: Vincent Lecrubier Date: Fri, 31 May 2019 09:49:38 +0100 Subject: [PATCH 06/27] Add pnp-webpack-plugin to dependencies --- lib/core/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/core/package.json b/lib/core/package.json index 642ed588453..a4aa726e7dc 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -65,6 +65,7 @@ "lazy-universal-dotenv": "^2.0.0", "node-fetch": "^2.6.0", "open": "^6.1.0", + "pnp-webpack-plugin": "1.4.3", "postcss-flexbugs-fixes": "^4.1.0", "postcss-loader": "^3.0.0", "pretty-hrtime": "^1.0.3", From 8c4d575620d232320f69fd487ca1f490146f2aae Mon Sep 17 00:00:00 2001 From: Vincent Lecrubier Date: Fri, 31 May 2019 09:54:04 +0100 Subject: [PATCH 07/27] Add dependencies to ui --- lib/ui/package.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/ui/package.json b/lib/ui/package.json index d69cfa4cdfb..c67db143fd8 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -22,8 +22,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { + "@emotion/core": "^10.0.9", + "@emotion/styled": "^10.0.9", + "@emotion/styled-base": "^10.0.10", "@storybook/addons": "5.1.0-rc.3", "@storybook/api": "5.1.0-rc.3", + "@storybook/channels": "^5.0.11", "@storybook/client-logger": "5.1.0-rc.3", "@storybook/components": "5.1.0-rc.3", "@storybook/core-events": "5.1.0-rc.3", @@ -31,6 +35,7 @@ "@storybook/theming": "5.1.0-rc.3", "core-js": "^3.0.1", "core-js-pure": "^3.0.1", + "emotion-theming": "^10.0.10", "fast-deep-equal": "^2.0.1", "fuse.js": "^3.4.4", "global": "^4.3.2", @@ -47,6 +52,7 @@ "react-hotkeys": "2.0.0-pre4", "react-resize-detector": "^4.0.5", "recompose": "^0.30.0", + "regenerator-runtime": "^0.13.2", "resolve-from": "^5.0.0", "semver": "^6.0.0", "store2": "^2.7.1", From 55a7bf1e640fd0782821feb23b68adebd1e0e57c Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 6 Jun 2019 00:59:10 +0200 Subject: [PATCH 08/27] ADD faster reset script --- .../storyshots-puppeteer/package.json | 7 +- package.json | 1 + scripts/bootstrap.js | 89 +++++++++--- scripts/reset.js | 41 ++++++ yarn.lock | 128 +++++++++++++++++- 5 files changed, 238 insertions(+), 28 deletions(-) create mode 100644 scripts/reset.js diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json index c1fcb848271..1bcfdd9333b 100644 --- a/addons/storyshots/storyshots-puppeteer/package.json +++ b/addons/storyshots/storyshots-puppeteer/package.json @@ -26,11 +26,14 @@ "@storybook/router": "5.1.0-rc.5", "core-js": "^3.0.1", "jest-image-snapshot": "^2.8.2", - "puppeteer": "^1.12.2", "regenerator-runtime": "^0.12.1" }, + "optionalDependencies": { + "puppeteer": "^1.12.2" + }, "peerDependencies": { - "@storybook/addon-storyshots": "5.1.0-rc.0" + "@storybook/addon-storyshots": "5.1.0-rc.0", + "puppeteer": "^1.12.2" }, "publishConfig": { "access": "public" diff --git a/package.json b/package.json index 9b2095c874a..3a05f6e4506 100644 --- a/package.json +++ b/package.json @@ -196,6 +196,7 @@ "sort-package-json": "^1.21.0", "svelte": "^3.4.1", "svelte-jest": "^0.2.0", + "trash": "^6.0.0", "ts-jest": "^24.0.2", "typescript": "^3.4.1", "weak": "^1.0.1" diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 3b9935785e3..13bf6a994e2 100755 --- a/scripts/bootstrap.js +++ b/scripts/bootstrap.js @@ -37,15 +37,24 @@ const spawn = (command, options = {}) => { }; const main = program - .version('3.0.0') + .version('5.0.0') .option('--all', `Bootstrap everything ${chalk.gray('(all)')}`); -const createTask = ({ defaultValue, option, name, check = () => true, command, pre = [] }) => ({ +const createTask = ({ + defaultValue, + option, + name, + check = () => true, + command, + pre = [], + order, +}) => ({ value: false, defaultValue: defaultValue || false, option: option || undefined, name: name || 'unnamed task', check: check || (() => true), + order, command: () => { // run all pre tasks pre @@ -63,6 +72,16 @@ const createTask = ({ defaultValue, option, name, check = () => true, command, p }); const tasks = { + core: createTask({ + name: `Core, Dll & Examples ${chalk.gray('(core)')}`, + defaultValue: true, + option: '--core', + command: () => { + log.info(prefix, 'yarn workspace'); + }, + pre: ['install', 'build', 'dll'], + order: 1, + }), reset: createTask({ name: `Clean and re-install dependencies ${chalk.red('(reset)')}`, defaultValue: false, @@ -70,22 +89,27 @@ const tasks = { command: () => { log.info(prefix, 'git clean'); spawn('git clean -fdx --exclude=".vscode" --exclude=".idea"'); - log.info(prefix, 'yarn install'); - spawn('yarn install'); }, + order: 0, }), - core: createTask({ - name: `Core, Dll & Examples ${chalk.gray('(core)')}`, - defaultValue: true, - option: '--core', + install: createTask({ + name: `install dependencies ${chalk.gray('(install)')}`, + defaultValue: false, + option: '--install', + command: () => { + spawn('yarn install --ignore-optional --no-scripts'); + }, + order: 1, + }), + build: createTask({ + name: `Core, Dll & Examples ${chalk.gray('(build)')}`, + defaultValue: false, + option: '--build', command: () => { - log.info(prefix, 'yarn workspace'); - spawn('yarn install'); log.info(prefix, 'prepare'); spawn('lerna run prepare'); - log.info(prefix, 'dll'); - spawn('lerna run createDlls --scope "@storybook/ui"'); }, + order: 2, }), dll: createTask({ name: `Generate DLL ${chalk.gray('(dll)')}`, @@ -95,6 +119,7 @@ const tasks = { log.info(prefix, 'dll'); spawn('lerna run createDlls --scope "@storybook/ui"'); }, + order: 3, }), docs: createTask({ name: `Documentation ${chalk.gray('(docs)')}`, @@ -103,6 +128,7 @@ const tasks = { command: () => { spawn('yarn bootstrap:docs'); }, + order: 6, }), packs: createTask({ name: `Build tarballs of packages ${chalk.gray('(build-packs)')}`, @@ -112,6 +138,7 @@ const tasks = { spawn('yarn build-packs'); }, check: () => getDirectories(join(__dirname, '..', 'packs')).length > 0, + order: 5, }), registry: createTask({ name: `Run local registry ${chalk.gray('(reg)')}`, @@ -120,9 +147,16 @@ const tasks = { command: () => { spawn('./scripts/run-registry.js'); }, + order: 11, }), }; +const groups = { + main: ['core', 'docs'], + subtasks: ['install', 'build', 'dll', 'packs'], + devtasks: ['registry', 'reset'], +}; + Object.keys(tasks) .reduce((acc, key) => acc.option(tasks[key].option, tasks[key].name), main) .parse(process.argv); @@ -131,6 +165,21 @@ Object.keys(tasks).forEach(key => { tasks[key].value = program[tasks[key].option.replace('--', '')] || program.all; }); +const createSeperator = input => `- ${input}${' ---------'.substr(0, 12)}`; + +const choices = Object.values(groups) + .map(l => + l.map(key => ({ + name: tasks[key].name, + checked: tasks[key].defaultValue, + })) + ) + .reduce( + (acc, i, k) => + acc.concat(new inquirer.Separator(createSeperator(Object.keys(groups)[k]))).concat(i), + [] + ); + let selection; if ( !Object.keys(tasks) @@ -141,12 +190,10 @@ if ( .prompt([ { type: 'checkbox', - message: 'Select which packages to bootstrap', + message: 'Select the bootstrap activities', name: 'todo', - choices: Object.keys(tasks).map(key => ({ - name: tasks[key].name, - checked: tasks[key].defaultValue, - })), + pageSize: Object.keys(tasks).length + Object.keys(groups).length, + choices, }, ]) .then(({ todo }) => @@ -186,9 +233,11 @@ selection if (list.length === 0) { log.warn(prefix, 'Nothing to bootstrap'); } else { - list.forEach(key => { - key.command(); - }); + list + .sort((a, b) => a.order - b.order) + .forEach(key => { + key.command(); + }); process.stdout.write('\x07'); } }) diff --git a/scripts/reset.js b/scripts/reset.js new file mode 100644 index 00000000000..96f41a74f41 --- /dev/null +++ b/scripts/reset.js @@ -0,0 +1,41 @@ +import fs from 'fs'; +import { spawn, exec } from 'child_process'; +import trash from 'trash'; + +fs.writeFileSync('reset.log', ''); + +// let results = []; +const cleaningProcess = spawn('git', [ + 'clean', + '-xdf', + '-n', + '--exclude=".vscode"', + '--exclude=".idea"', +]); + +cleaningProcess.stdout.on('data', data => { + if (data && data.toString()) { + const l = data + .toString() + .split(/\n/) + .forEach(i => { + const [, uri] = i.match(/Would remove (.*)$/) || []; + + if (uri) { + trash(uri); + } + }); + } + fs.appendFile('reset.log', data, err => { + if (err) { + throw err; + } + }); +}); +cleaningProcess.on('exit', code => { + if (code === 0) { + console.log('all went well, files are being trashed now'); + } else { + console.error(code); + } +}); diff --git a/yarn.lock b/yarn.lock index 17e6c9556b0..ac9c4c91ebf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3190,6 +3190,18 @@ resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#8013f2af54a2b7d735f71560ff360d3a8176a87b" integrity sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q== +"@sindresorhus/df@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-1.0.1.tgz#c69b66f52f6fcdd287c807df210305dbaf78500d" + integrity sha1-xptm9S9vzdKHyAffIQMF2694UA0= + +"@sindresorhus/df@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-2.1.0.tgz#d208cf27e06f0bb476d14d7deccd7d726e9aa389" + integrity sha1-0gjPJ+BvC7R20U197M19cm6ao4k= + dependencies: + execa "^0.2.2" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -9192,6 +9204,17 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.0.5, cosmiconfig@^5.1.0, cosmiconfig@^5.2.0: js-yaml "^3.13.1" parse-json "^4.0.0" +cp-file@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" + integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA== + dependencies: + graceful-fs "^4.1.2" + make-dir "^2.0.0" + nested-error-stacks "^2.0.0" + pify "^4.0.1" + safe-buffer "^5.0.1" + create-ecdh@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" @@ -9292,6 +9315,14 @@ cross-fetch@^1.0.0: node-fetch "1.7.3" whatwg-fetch "2.0.3" +cross-spawn-async@^2.1.1: + version "2.2.5" + resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" + integrity sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= + dependencies: + lru-cache "^4.0.0" + which "^1.2.8" + cross-spawn@5.1.0, cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -11975,6 +12006,17 @@ execa@^0.10.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.2.2.tgz#e2ead472c2c31aad6f73f1ac956eef45e12320cb" + integrity sha1-4urUcsLDGq1vc/GslW7vReEjIMs= + dependencies: + cross-spawn-async "^2.1.1" + npm-run-path "^1.0.0" + object-assign "^4.0.1" + path-key "^1.0.0" + strip-eof "^1.0.0" + execa@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" @@ -15714,7 +15756,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-path-inside@^2.1.0: +is-path-inside@^2.0.0, is-path-inside@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== @@ -19044,7 +19086,7 @@ lowlight@~1.9.1: fault "^1.0.2" highlight.js "~9.12.0" -lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3: +lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== @@ -20296,6 +20338,15 @@ morgan@^1.9.0: on-finished "~2.3.0" on-headers "~1.0.1" +mount-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mount-point/-/mount-point-3.0.0.tgz#665cb9edebe80d110e658db56c31d0aef51a8f97" + integrity sha1-Zly57evoDREOZY21bDHQrvUaj5c= + dependencies: + "@sindresorhus/df" "^1.0.1" + pify "^2.3.0" + pinkie-promise "^2.0.1" + mout@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/mout/-/mout-1.1.0.tgz#0b29d41e6a80fa9e2d4a5be9d602e1d9d02177f6" @@ -20313,6 +20364,15 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" +move-file@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/move-file/-/move-file-1.2.0.tgz#789f92d276c62511d214b1b285aa16e015c2f2fc" + integrity sha512-USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA== + dependencies: + cp-file "^6.1.0" + make-dir "^3.0.0" + path-exists "^3.0.0" + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -20460,6 +20520,11 @@ neo-async@^2.5.0, neo-async@^2.6.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== +nested-error-stacks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" + integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug== + nested-object-assign@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/nested-object-assign/-/nested-object-assign-1.0.3.tgz#5aca69390d9affe5a612152b5f0843ae399ac597" @@ -20866,6 +20931,13 @@ npm-registry-fetch@^3.8.0, npm-registry-fetch@^3.9.0: make-fetch-happen "^4.0.1" npm-package-arg "^6.1.0" +npm-run-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f" + integrity sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= + dependencies: + path-key "^1.0.0" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -21400,7 +21472,7 @@ p-try@^1.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= -p-try@^2.0.0: +p-try@^2.0.0, p-try@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== @@ -21834,6 +21906,11 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= +path-key@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af" + integrity sha1-XVPVeAGWRsDWiADbThRua9wqx68= + path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" @@ -21955,7 +22032,7 @@ picomatch@^2.0.5: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6" integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA== -pify@^2.0.0, pify@^2.3.0: +pify@^2.0.0, pify@^2.2.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= @@ -21970,7 +22047,7 @@ pify@^4.0.1: resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pinkie-promise@^2.0.0: +pinkie-promise@^2.0.0, pinkie-promise@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= @@ -28635,6 +28712,20 @@ tr46@~0.0.3: resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= +trash@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/trash/-/trash-6.0.0.tgz#9f2f1cfe83be1a3956e74f90d5ced706678246cd" + integrity sha512-5/ZF/7yPYX9Q8e4Dop2WMClV8VRJiWybUV2FhPovkm0I2csNlmY2DXpcCa50UObXx2+SE6421ViTa4sTpEA4WA== + dependencies: + globby "^7.1.1" + is-path-inside "^2.0.0" + make-dir "^3.0.0" + move-file "^1.1.0" + p-map "^2.0.0" + p-try "^2.2.0" + uuid "^3.3.2" + xdg-trashdir "^2.1.1" + tree-kill@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" @@ -29483,6 +29574,13 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== +user-home@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" + integrity sha1-nHC/2Babwdy/SGBODwS4tJzenp8= + dependencies: + os-homedir "^1.0.0" + username-sync@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592" @@ -30540,7 +30638,7 @@ which-pm-runs@^1.0.0: resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= -which@1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.8, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -31030,11 +31128,29 @@ xcode@^1.0.0: simple-plist "^0.2.1" uuid "^3.3.2" +xdg-basedir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2" + integrity sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I= + dependencies: + os-homedir "^1.0.0" + xdg-basedir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= +xdg-trashdir@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/xdg-trashdir/-/xdg-trashdir-2.1.1.tgz#59a60aaf8e6f9240c1daed9a0944b2f514c27d8e" + integrity sha512-KcVhPaOu2ZurYNHSRTf1+ZHORkTZGCQ+u0JHN17QixRISJq4pXOnjt/lQcehvtHL5QAKhSzKgyjrcNnPdkPBHA== + dependencies: + "@sindresorhus/df" "^2.1.0" + mount-point "^3.0.0" + pify "^2.2.0" + user-home "^2.0.0" + xdg-basedir "^2.0.0" + xhr@^2.0.1: version "2.5.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.5.0.tgz#bed8d1676d5ca36108667692b74b316c496e49dd" From 371fe9053038f933a4a8b4af9097a216c2b8e607 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 6 Jun 2019 01:57:31 +0200 Subject: [PATCH 09/27] IMPROVE the reset script, it's now safe! won't permanently delete files --- package.json | 1 + scripts/bootstrap.js | 511 +++++++++++++++++++++++-------------------- scripts/reset.js | 11 +- 3 files changed, 285 insertions(+), 238 deletions(-) diff --git a/package.json b/package.json index 3a05f6e4506..646d74e4480 100644 --- a/package.json +++ b/package.json @@ -147,6 +147,7 @@ "core-js": "^3.0.1", "cross-env": "^5.2.0", "danger": "^7.0.15", + "del": "^4.1.1", "enzyme": "^3.9.0", "enzyme-adapter-react-16": "^1.9.1", "eslint": "^5.14.1", diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 13bf6a994e2..890f22dbe5e 100755 --- a/scripts/bootstrap.js +++ b/scripts/bootstrap.js @@ -1,248 +1,285 @@ #!/usr/bin/env node -const inquirer = require('inquirer'); -const program = require('commander'); -const childProcess = require('child_process'); -const chalk = require('chalk'); -const log = require('npmlog'); +/* eslint-disable global-require, no-octal-escape */ +const childProcess = require('child_process'); const { lstatSync, readdirSync } = require('fs'); const { join } = require('path'); -const isTgz = source => lstatSync(source).isFile() && source.match(/.tgz$/); -const getDirectories = source => - readdirSync(source) - .map(name => join(source, name)) - .filter(isTgz); +let cooldown = 0; -log.heading = 'storybook'; -const prefix = 'bootstrap'; -log.addLevel('aborted', 3001, { fg: 'red', bold: true }); +try { + require('inquirer'); + require('commander'); + require('chalk'); + require('npmlog'); +} catch (e) { + console.log('🕘 running bootstrap on a clean repo, we have to install dependencies'); + childProcess.spawnSync('yarn', ['install', '--ignore-optional'], { + stdio: ['inherit', 'inherit', 'inherit'], + }); + process.stdout.write('\x07'); + process.stdout.write('\033c'); -const spawn = (command, options = {}) => { - const out = childProcess.spawnSync( - `${command}`, - Object.assign( - { - shell: true, - stdio: 'inherit', - }, - options - ) - ); - - if (out.status !== 0) { - process.exit(out.status); - } - return out; -}; - -const main = program - .version('5.0.0') - .option('--all', `Bootstrap everything ${chalk.gray('(all)')}`); - -const createTask = ({ - defaultValue, - option, - name, - check = () => true, - command, - pre = [], - order, -}) => ({ - value: false, - defaultValue: defaultValue || false, - option: option || undefined, - name: name || 'unnamed task', - check: check || (() => true), - order, - command: () => { - // run all pre tasks - pre - // eslint-disable-next-line no-use-before-define - .map(key => tasks[key]) - .forEach(task => { - if (!task.check()) { - task.command(); - } - }); - - log.info(prefix, name); - command(); - }, -}); - -const tasks = { - core: createTask({ - name: `Core, Dll & Examples ${chalk.gray('(core)')}`, - defaultValue: true, - option: '--core', - command: () => { - log.info(prefix, 'yarn workspace'); - }, - pre: ['install', 'build', 'dll'], - order: 1, - }), - reset: createTask({ - name: `Clean and re-install dependencies ${chalk.red('(reset)')}`, - defaultValue: false, - option: '--reset', - command: () => { - log.info(prefix, 'git clean'); - spawn('git clean -fdx --exclude=".vscode" --exclude=".idea"'); - }, - order: 0, - }), - install: createTask({ - name: `install dependencies ${chalk.gray('(install)')}`, - defaultValue: false, - option: '--install', - command: () => { - spawn('yarn install --ignore-optional --no-scripts'); - }, - order: 1, - }), - build: createTask({ - name: `Core, Dll & Examples ${chalk.gray('(build)')}`, - defaultValue: false, - option: '--build', - command: () => { - log.info(prefix, 'prepare'); - spawn('lerna run prepare'); - }, - order: 2, - }), - dll: createTask({ - name: `Generate DLL ${chalk.gray('(dll)')}`, - defaultValue: false, - option: '--dll', - command: () => { - log.info(prefix, 'dll'); - spawn('lerna run createDlls --scope "@storybook/ui"'); - }, - order: 3, - }), - docs: createTask({ - name: `Documentation ${chalk.gray('(docs)')}`, - defaultValue: false, - option: '--docs', - command: () => { - spawn('yarn bootstrap:docs'); - }, - order: 6, - }), - packs: createTask({ - name: `Build tarballs of packages ${chalk.gray('(build-packs)')}`, - defaultValue: false, - option: '--packs', - command: () => { - spawn('yarn build-packs'); - }, - check: () => getDirectories(join(__dirname, '..', 'packs')).length > 0, - order: 5, - }), - registry: createTask({ - name: `Run local registry ${chalk.gray('(reg)')}`, - defaultValue: false, - option: '--reg', - command: () => { - spawn('./scripts/run-registry.js'); - }, - order: 11, - }), -}; - -const groups = { - main: ['core', 'docs'], - subtasks: ['install', 'build', 'dll', 'packs'], - devtasks: ['registry', 'reset'], -}; - -Object.keys(tasks) - .reduce((acc, key) => acc.option(tasks[key].option, tasks[key].name), main) - .parse(process.argv); - -Object.keys(tasks).forEach(key => { - tasks[key].value = program[tasks[key].option.replace('--', '')] || program.all; -}); - -const createSeperator = input => `- ${input}${' ---------'.substr(0, 12)}`; - -const choices = Object.values(groups) - .map(l => - l.map(key => ({ - name: tasks[key].name, - checked: tasks[key].defaultValue, - })) - ) - .reduce( - (acc, i, k) => - acc.concat(new inquirer.Separator(createSeperator(Object.keys(groups)[k]))).concat(i), - [] - ); - -let selection; -if ( - !Object.keys(tasks) - .map(key => tasks[key].value) - .filter(Boolean).length -) { - selection = inquirer - .prompt([ - { - type: 'checkbox', - message: 'Select the bootstrap activities', - name: 'todo', - pageSize: Object.keys(tasks).length + Object.keys(groups).length, - choices, - }, - ]) - .then(({ todo }) => - todo.map(name => tasks[Object.keys(tasks).find(i => tasks[i].name === name)]) - ) - .then(list => { - if (list.find(i => i === tasks.reset)) { - return inquirer - .prompt([ - { - type: 'confirm', - message: `${chalk.red('DESTRUCTIVE')} files not present in git ${chalk.underline( - 'will get deleted' - )}, except for .idea and .vscode, ${chalk.cyan('Continue?')}`, - name: 'sure', - }, - ]) - .then(({ sure }) => { - if (sure) { - return list; - } - throw new Error('problem is between keyboard and chair'); - }); - } - return list; - }); -} else { - selection = Promise.resolve( - Object.keys(tasks) - .map(key => tasks[key]) - .filter(item => item.value === true) - ); + // give the filesystem some time + cooldown = 1000; +} finally { + // eslint-disable-next-line no-use-before-define + setTimeout(run, cooldown); } -selection - .then(list => { - if (list.length === 0) { - log.warn(prefix, 'Nothing to bootstrap'); - } else { - list - .sort((a, b) => a.order - b.order) - .forEach(key => { - key.command(); - }); - process.stdout.write('\x07'); +function run() { + const inquirer = require('inquirer'); + const program = require('commander'); + const chalk = require('chalk'); + const log = require('npmlog'); + + const isTgz = source => lstatSync(source).isFile() && source.match(/.tgz$/); + const getDirectories = source => + readdirSync(source) + .map(name => join(source, name)) + .filter(isTgz); + + log.heading = 'storybook'; + const prefix = 'bootstrap'; + log.addLevel('aborted', 3001, { fg: 'red', bold: true }); + + const spawn = (command, options = {}) => { + const out = childProcess.spawnSync( + `${command}`, + Object.assign( + { + shell: true, + stdio: 'inherit', + }, + options + ) + ); + + if (out.status !== 0) { + process.exit(out.status); } - }) - .catch(e => { - log.aborted(prefix, chalk.red(e.message)); - log.silly(prefix, e); - process.exit(1); + return out; + }; + + const main = program + .version('5.0.0') + .option('--all', `Bootstrap everything ${chalk.gray('(all)')}`); + + const createTask = ({ + defaultValue, + option, + name, + check = () => true, + command, + pre = [], + order, + }) => ({ + value: false, + defaultValue: defaultValue || false, + option: option || undefined, + name: name || 'unnamed task', + check: check || (() => true), + order, + command: () => { + // run all pre tasks + pre + // eslint-disable-next-line no-use-before-define + .map(key => tasks[key]) + .forEach(task => { + if (task.check()) { + task.command(); + } + }); + + log.info(prefix, name); + command(); + }, }); + + const tasks = { + core: createTask({ + name: `Core, Dll & Examples ${chalk.gray('(core)')}`, + defaultValue: true, + option: '--core', + command: () => { + log.info(prefix, 'yarn workspace'); + }, + pre: ['install', 'build', 'dll'], + order: 1, + }), + reset: createTask({ + name: `Clean repository ${chalk.red('(reset)')}`, + defaultValue: false, + option: '--reset', + command: () => { + log.info(prefix, 'git clean'); + spawn('node -r esm ./scripts/reset.js'); + }, + order: 0, + }), + install: createTask({ + name: `Install dependencies ${chalk.gray('(install)')}`, + defaultValue: false, + option: '--install', + command: () => { + spawn('yarn install --ignore-optional '); + }, + order: 1, + }), + build: createTask({ + name: `Build packages ${chalk.gray('(build)')}`, + defaultValue: false, + option: '--build', + command: () => { + log.info(prefix, 'prepare'); + spawn('lerna run prepare'); + }, + order: 2, + }), + dll: createTask({ + name: `Generate DLL ${chalk.gray('(dll)')}`, + defaultValue: false, + option: '--dll', + command: () => { + log.info(prefix, 'dll'); + spawn('lerna run createDlls --scope "@storybook/ui"'); + }, + order: 3, + }), + docs: createTask({ + name: `Documentation ${chalk.gray('(docs)')}`, + defaultValue: false, + option: '--docs', + command: () => { + spawn('yarn bootstrap:docs'); + }, + order: 6, + }), + packs: createTask({ + name: `Build tarballs of packages ${chalk.gray('(build-packs)')}`, + defaultValue: false, + option: '--packs', + command: () => { + spawn('yarn build-packs'); + }, + check: () => getDirectories(join(__dirname, '..', 'packs')).length === 0, + order: 5, + }), + registry: createTask({ + name: `Run local registry ${chalk.gray('(reg)')}`, + defaultValue: false, + option: '--reg', + command: () => { + spawn('./scripts/run-registry.js'); + }, + order: 11, + }), + dev: createTask({ + name: `Run build in watch mode ${chalk.gray('(dev)')}`, + defaultValue: false, + option: '--dev', + command: () => { + spawn('yarn dev'); + }, + order: 9, + }), + }; + + const groups = { + main: ['core', 'docs'], + buildtasks: ['install', 'build', 'dll', 'packs'], + devtasks: ['dev', 'registry', 'reset'], + }; + + Object.keys(tasks) + .reduce((acc, key) => acc.option(tasks[key].option, tasks[key].name), main) + .parse(process.argv); + + Object.keys(tasks).forEach(key => { + tasks[key].value = program[tasks[key].option.replace('--', '')] || program.all; + }); + + const createSeperator = input => `- ${input}${' ---------'.substr(0, 12)}`; + + const choices = Object.values(groups) + .map(l => + l.map(key => ({ + name: tasks[key].name, + checked: tasks[key].defaultValue, + })) + ) + .reduce( + (acc, i, k) => + acc.concat(new inquirer.Separator(createSeperator(Object.keys(groups)[k]))).concat(i), + [] + ); + + let selection; + if ( + !Object.keys(tasks) + .map(key => tasks[key].value) + .filter(Boolean).length + ) { + selection = inquirer + .prompt([ + { + type: 'checkbox', + message: 'Select the bootstrap activities', + name: 'todo', + pageSize: Object.keys(tasks).length + Object.keys(groups).length, + choices, + }, + ]) + .then(({ todo }) => + todo.map(name => tasks[Object.keys(tasks).find(i => tasks[i].name === name)]) + ) + .then(list => { + if (list.find(i => i === tasks.reset)) { + return inquirer + .prompt([ + { + type: 'confirm', + message: `${chalk.red( + 'DESTRUCTIVE' + )} deletes node_modules, files not present in git ${chalk.underline( + 'will get trashed' + )}, except for .idea and .vscode, ${chalk.cyan('Continue?')}`, + name: 'sure', + }, + ]) + .then(({ sure }) => { + if (sure) { + return list; + } + throw new Error('problem is between keyboard and chair'); + }); + } + return list; + }); + } else { + selection = Promise.resolve( + Object.keys(tasks) + .map(key => tasks[key]) + .filter(item => item.value === true) + ); + } + + selection + .then(list => { + if (list.length === 0) { + log.warn(prefix, 'Nothing to bootstrap'); + } else { + list + .sort((a, b) => a.order - b.order) + .forEach(key => { + key.command(); + }); + process.stdout.write('\x07'); + } + }) + .catch(e => { + log.aborted(prefix, chalk.red(e.message)); + log.silly(prefix, e); + process.exit(1); + }); +} diff --git a/scripts/reset.js b/scripts/reset.js index 96f41a74f41..05f3b8bb7a5 100644 --- a/scripts/reset.js +++ b/scripts/reset.js @@ -1,6 +1,7 @@ import fs from 'fs'; import { spawn, exec } from 'child_process'; import trash from 'trash'; +import del from 'del'; fs.writeFileSync('reset.log', ''); @@ -22,7 +23,15 @@ cleaningProcess.stdout.on('data', data => { const [, uri] = i.match(/Would remove (.*)$/) || []; if (uri) { - trash(uri); + if (uri.match(/node_modules/)) { + del(uri).then(() => { + console.log('deleted ' + uri); + }); + } else { + trash(uri).then(() => { + console.log('trashed ' + uri); + }); + } } }); } From 7a399f77ef2d3455226aaf1908d5840079a45aaa Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 6 Jun 2019 10:03:43 +0200 Subject: [PATCH 10/27] FIX linting --- scripts/reset.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/reset.js b/scripts/reset.js index 05f3b8bb7a5..59f77675dc3 100644 --- a/scripts/reset.js +++ b/scripts/reset.js @@ -25,11 +25,11 @@ cleaningProcess.stdout.on('data', data => { if (uri) { if (uri.match(/node_modules/)) { del(uri).then(() => { - console.log('deleted ' + uri); + console.log(`deleted ${uri}`); }); } else { trash(uri).then(() => { - console.log('trashed ' + uri); + console.log(`trashed ${uri}`); }); } } From 82394e12ec134ab083130ddc40bdb983b9d93d0b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 7 Jun 2019 17:11:45 +0200 Subject: [PATCH 11/27] CHANGE contributing guide to show the yarn install command is no longer necessary --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 12de650895e..6955a15605a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,6 @@ To test your project against the current latest version of storybook, you can cl ```sh git clone https://github.com/storybookjs/storybook.git cd storybook -yarn install yarn bootstrap ``` @@ -139,7 +138,6 @@ A good way to do that is using the example `cra-kitchen-sink` app embedded in th # Download and build this repository: git clone https://github.com/storybookjs/storybook.git cd storybook -yarn install yarn bootstrap --core # make changes to try and reproduce the problem, such as adding components + stories From f979ecadca38961d579387cefd9a9950fd855cf4 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 7 Jun 2019 12:50:32 -0700 Subject: [PATCH 12/27] Add SCSS to presets gallery --- docs/src/pages/presets/preset-gallery/index.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/src/pages/presets/preset-gallery/index.md b/docs/src/pages/presets/preset-gallery/index.md index d993c54d65f..450d98a61ee 100644 --- a/docs/src/pages/presets/preset-gallery/index.md +++ b/docs/src/pages/presets/preset-gallery/index.md @@ -11,7 +11,11 @@ Storybook-maintained presets are available in the [Presets repo](https://github. ### [Typescript](https://github.com/storybookjs/presets/tree/master/packages/preset-typescript) -Write your stories in typescript with a single line of configuration. +One-line Typescript w/ docgen configuration for storybook. + +### [SCSS](https://github.com/storybookjs/presets/tree/master/packages/preset-scss) + +One-line SCSS configuration for storybook. ## Community presets From 14fc78f0af4173837287b90334d13d77689a2288 Mon Sep 17 00:00:00 2001 From: Jakub Werner Date: Thu, 13 Jun 2019 12:42:34 +0200 Subject: [PATCH 13/27] change for contexts title fallback --- .../src/manager/components/ToolBarControl.tsx | 2 +- .../src/manager/components/ToolBarMenu.tsx | 14 +++++++++----- .../stories/addon-contexts.stories.js | 1 - lib/api/src/version.ts | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/addons/contexts/src/manager/components/ToolBarControl.tsx b/addons/contexts/src/manager/components/ToolBarControl.tsx index 0fab1e873ed..20de51e2555 100644 --- a/addons/contexts/src/manager/components/ToolBarControl.tsx +++ b/addons/contexts/src/manager/components/ToolBarControl.tsx @@ -47,5 +47,5 @@ export const ToolBarControl: ToolBarControl = ({ }, }; - return icon && list.length && !options.disable ? : null; + return list.length && !options.disable ? : null; }; diff --git a/addons/contexts/src/manager/components/ToolBarMenu.tsx b/addons/contexts/src/manager/components/ToolBarMenu.tsx index efba73366bb..1054bddf83e 100644 --- a/addons/contexts/src/manager/components/ToolBarMenu.tsx +++ b/addons/contexts/src/manager/components/ToolBarMenu.tsx @@ -1,10 +1,10 @@ import React, { ComponentProps } from 'react'; -import { Icons, IconButton, WithTooltip } from '@storybook/components'; +import { Icons, IconButton, WithTooltip, TabButton } from '@storybook/components'; import { ToolBarMenuOptions } from './ToolBarMenuOptions'; import { ContextNode, FCNoChildren } from '../../shared/types.d'; type ToolBarMenu = FCNoChildren<{ - icon: ComponentProps['icon']; + icon?: ComponentProps['icon'] | '' | void; title: ContextNode['title']; active: boolean; expanded: boolean; @@ -28,8 +28,12 @@ export const ToolBarMenu: ToolBarMenu = ({ onVisibilityChange={setExpanded} tooltip={} > - - - + {icon ? ( + + + + ) : ( + {title} + )} ); diff --git a/examples/official-storybook/stories/addon-contexts.stories.js b/examples/official-storybook/stories/addon-contexts.stories.js index f7d8bb94ba6..7f646826d73 100644 --- a/examples/official-storybook/stories/addon-contexts.stories.js +++ b/examples/official-storybook/stories/addon-contexts.stories.js @@ -5,7 +5,6 @@ import { withContexts } from '@storybook/addon-contexts/react'; // Example A: Simple CSS Theming const topLevelContexts = [ { - icon: 'sidebaralt', title: 'CSS Themes', components: ['div'], params: [ diff --git a/lib/api/src/version.ts b/lib/api/src/version.ts index 26f79de3bc3..cc27aa19153 100644 --- a/lib/api/src/version.ts +++ b/lib/api/src/version.ts @@ -1 +1 @@ -export const version = '5.2.0-unreleased.0'; +export const version = '5.2.0-alpha.23'; From 11fdc16aeff3fe5c102339897ccbb8187eda084c Mon Sep 17 00:00:00 2001 From: Jakub Werner Date: Thu, 13 Jun 2019 12:49:48 +0200 Subject: [PATCH 14/27] adding test --- .../manager/components/ToolBarMenu.test.tsx | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/addons/contexts/src/manager/components/ToolBarMenu.test.tsx b/addons/contexts/src/manager/components/ToolBarMenu.test.tsx index dd1e7ef26f4..2d4e9a6942b 100644 --- a/addons/contexts/src/manager/components/ToolBarMenu.test.tsx +++ b/addons/contexts/src/manager/components/ToolBarMenu.test.tsx @@ -53,4 +53,51 @@ describe('Tests on addon-contexts component: ToolBarMenu', () => { `); }); + + it('should render TabButton with title if the icon is given', () => { + // given + const someProps = { + title: 'Some Context', + active: true, + expanded: false, + setExpanded: jest.fn, + optionsProps: { + activeName: 'A', + list: ['A', 'B'], + onSelectOption: jest.fn, + }, + }; + + // when + const result = shallow(); + + // then + expect(result).toMatchInlineSnapshot(` + + } + tooltipShown={false} + trigger="click" + > + + Some Context + + + `); + }); }); From 665b352de29a11d77fad5741867215d3edea88e6 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 13 Jun 2019 16:19:25 +0200 Subject: [PATCH 15/27] FIX lockfile --- yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3de24a16bfd..fa3b0f755ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10556,7 +10556,7 @@ emojis-list@^2.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= -emotion-theming@^10.0.9: +emotion-theming@^10.0.10, emotion-theming@^10.0.9: version "10.0.10" resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.10.tgz#efe8751119751bdc70fdc1795fe4cde0fb0cf14c" integrity sha512-E4SQ3Y91avxxydDgubi/po/GaC5MM1XHm8kcClKg1PA/TeOye0PiLBzAzlgt9dBzDRV9+qHDunsayPvzVYIYng== @@ -20938,7 +20938,7 @@ pnp-webpack-plugin@1.2.1: dependencies: ts-pnp "^1.0.0" -pnp-webpack-plugin@^1.2.1: +pnp-webpack-plugin@1.4.3, pnp-webpack-plugin@^1.2.1: version "1.4.3" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.4.3.tgz#0a100b63f4a1d09cee6ee55a87393b69f03ab5c7" integrity sha512-ExrNwuFH3DudHwWY2uRMqyiCOBEDdhQYHIAsqW/CM6hIZlSgXC/ma/p08FoNOUhVyh9hl1NGnMpR94T5i3SHaQ== From ca6487386a1b3f00132b16030b52d4db7e9e3647 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Thu, 13 Jun 2019 15:14:42 +0000 Subject: [PATCH 16/27] Bump html-react-parser from 0.7.0 to 0.7.1 in /docs Bumps [html-react-parser](https://github.com/remarkablemark/html-react-parser) from 0.7.0 to 0.7.1. - [Release notes](https://github.com/remarkablemark/html-react-parser/releases) - [Changelog](https://github.com/remarkablemark/html-react-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/remarkablemark/html-react-parser/compare/v0.7.0...v0.7.1) Signed-off-by: dependabot-preview[bot] --- docs/package.json | 2 +- docs/yarn.lock | 66 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/docs/package.json b/docs/package.json index f834a7402a3..5168568d94a 100644 --- a/docs/package.json +++ b/docs/package.json @@ -33,7 +33,7 @@ "gatsby-source-filesystem": "^1.5.39", "gatsby-transformer-remark": "^1.7.44", "global": "^4.4.0", - "html-react-parser": "^0.7.0", + "html-react-parser": "^0.7.1", "is-builtin-module": "^3.0.0", "lodash": "^4.17.11", "marked": "^0.6.2", diff --git a/docs/yarn.lock b/docs/yarn.lock index 2efeceaa441..6af46929b90 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -2895,6 +2895,11 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895" integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A== +core-js@^2.4.1: + version "2.6.9" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" + integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A== + core-js@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.1.tgz#1343182634298f7f38622f95e73f54e48ddf4738" @@ -4308,6 +4313,25 @@ fb-watchman@^2.0.0: dependencies: bser "^2.0.0" +fbjs-css-vars@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" + integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== + +fbjs@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a" + integrity sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA== + dependencies: + core-js "^2.4.1" + fbjs-css-vars "^1.0.0" + isomorphic-fetch "^2.1.1" + loose-envify "^1.0.0" + object-assign "^4.1.0" + promise "^7.1.1" + setimmediate "^1.0.5" + ua-parser-js "^0.7.18" + fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.14, fbjs@^0.8.4, fbjs@^0.8.9: version "0.8.17" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" @@ -5723,14 +5747,14 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8= -html-react-parser@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-0.7.0.tgz#943b935ce76705bdbef13eed2fec7eee010e5d06" - integrity sha512-CheTifRqOK1mFmtTnFnDUeHPrA19knrus4Hx+7lS/V5ywHvjAl5BMM8phVLWwLo73rqP2QBpnfvraXMMBgHqMw== +html-react-parser@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-0.7.1.tgz#4230717092e1d2ea486bbe5e6b7f8c955b29cf91" + integrity sha512-e1rvyL5F4BjtQ+p89Y00lQem9A6G45WksytIwEpgxr7rVz4tF0vh1+jcQc8JfAjxWh8hOvzt2VCn1rPPpFZsVQ== dependencies: "@types/domhandler" "2.4.1" html-dom-parser "0.2.1" - react-dom-core "0.0.4" + react-dom-core "0.1.1" style-to-object "0.2.2" html-void-elements@^1.0.0, html-void-elements@^1.0.1: @@ -8132,6 +8156,11 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== +object-assign@4.1.1, object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-assign@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" @@ -8142,11 +8171,6 @@ object-assign@^3.0.0: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= -object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - object-component@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291" @@ -9681,6 +9705,14 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-15@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/react-15/-/react-15-0.2.0.tgz#5cc915031b433c50bdec225d3ef8b80a07295175" + integrity sha512-9bdNuBo2I+2AerqURa37AcCKwHqjOvWuNrsd8wKXF+Y+ceBbJAJ1GkWeTliZV40RiEiAgRCLOzwCBxihCZvOfg== + dependencies: + fbjs "1.0.0" + object-assign "4.1.1" + react-addons-create-fragment@^15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/react-addons-create-fragment/-/react-addons-create-fragment-15.6.2.tgz#a394de7c2c7becd6b5475ba1b97ac472ce7c74f8" @@ -9735,12 +9767,14 @@ react-document-title@^2.0.3: prop-types "^15.5.6" react-side-effect "^1.0.2" -react-dom-core@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/react-dom-core/-/react-dom-core-0.0.4.tgz#26ef74749c1235993b0e570a83308f323a485b2a" - integrity sha512-nJoncKG/Ltlv3K7f0uVwX3kEvhrRl3dyKguxpYR3OmFF1REcRHiWWxSkD1hJdgeVfoBFp/DPVp48JZuaQhwLoQ== +react-dom-core@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/react-dom-core/-/react-dom-core-0.1.1.tgz#d580a72941f84f7b5b53d95d406b654181fb8021" + integrity sha512-06UPgimujyIOsR9owLdLy5731O8rxs/CZrFYX/ZPDLC6VUDwJuTkPWmLVA03es1tO7JqsqsET4rVe0cfKBEQXA== dependencies: - react "15" + fbjs "1.0.0" + object-assign "4.1.1" + react-15 "0.2.0" react-dom@^15.6.0: version "15.6.2" @@ -9939,7 +9973,7 @@ react-transition-group@^1.2.0: prop-types "^15.5.6" warning "^3.0.0" -react@15, react@^15.6.0: +react@^15.6.0: version "15.6.2" resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72" integrity sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI= From 7629704d44c183602d055472da0c9ab76d2f65d7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 14 Jun 2019 00:42:40 +0200 Subject: [PATCH 17/27] IMPROVEMENTS on addon-info, I know shocker right? --- addons/info/package.json | 1 + addons/info/src/components/Node.js | 179 -------------------- addons/info/src/components/Story.js | 96 ++++------- addons/info/src/components/markdown/code.js | 4 +- addons/info/src/components/markdown/text.js | 20 +-- yarn.lock | 119 ++++++++++++- 6 files changed, 155 insertions(+), 264 deletions(-) delete mode 100644 addons/info/src/components/Node.js diff --git a/addons/info/package.json b/addons/info/package.json index 1dd2b8e3a6f..65ddf062ed6 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -28,6 +28,7 @@ "@storybook/theming": "5.2.0-alpha.23", "core-js": "^3.0.1", "global": "^4.3.2", + "jsx-to-string": "^1.4.0", "marksy": "^7.0.0", "nested-object-assign": "^1.0.3", "prop-types": "^15.7.2", diff --git a/addons/info/src/components/Node.js b/addons/info/src/components/Node.js deleted file mode 100644 index a51c716a27a..00000000000 --- a/addons/info/src/components/Node.js +++ /dev/null @@ -1,179 +0,0 @@ -import React from 'react'; -import { isForwardRef } from 'react-is'; -import PropTypes from 'prop-types'; -import Props from './Props'; -import { getDisplayName } from '../react-utils'; - -const stylesheet = { - containerStyle: {}, - tagStyle: { - color: '#444', - }, -}; - -function getData(element) { - const data = { - name: null, - text: null, - children: null, - }; - - if (element === null) { - return data; - } - - if (typeof element === 'string') { - data.text = element; - return data; - } - - if (typeof element === 'number') { - data.text = String.toString(element); - return data; - } - - data.children = element.props.children; - data.name = getDisplayName(element.type); - - return data; -} - -export default function Node(props) { - const { - node, - depth, - maxPropsIntoLine, - maxPropObjectKeys, - maxPropArrayLength, - maxPropStringLength, - } = props; - const { tagStyle, containerStyle } = stylesheet; - - const leftPad = { - paddingLeft: 3 + (depth + 1) * 15, - paddingRight: 3, - }; - - // Keep a copy so that further mutations to containerStyle don't impact us: - const containerStyleCopy = Object.assign({}, containerStyle, leftPad); - - const { name, text, children } = getData(node); - - // Just text - if (!name) { - return ( -
- {text} -
- ); - } - - if (isForwardRef(node) && !node.type.displayName) { - const childElement = node.type.render(node.props); - return ( -
-
- - < - {`ForwardRef`} - - - > -
- -
- - </ - {`ForwardRef`} - > - -
-
- ); - } - - // Single-line tag - if (!children) { - return ( -
- - < - {name} - - - /> -
- ); - } - - // tag with children - return ( -
-
- - < - {name} - - - > -
- {React.Children.map(children, childElement => ( - - ))} -
- - </ - {name} - > - -
-
- ); -} - -Node.defaultProps = { - node: null, - depth: 0, -}; - -Node.propTypes = { - node: PropTypes.node, - depth: PropTypes.number, - maxPropsIntoLine: PropTypes.number.isRequired, - maxPropObjectKeys: PropTypes.number.isRequired, - maxPropArrayLength: PropTypes.number.isRequired, - maxPropStringLength: PropTypes.number.isRequired, -}; diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index a8dc10026c6..61d61cdda46 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -1,14 +1,14 @@ /* eslint no-underscore-dangle: 0 */ -import React, { Component, createElement } from 'react'; +import React, { Fragment, Component, createElement } from 'react'; import { isForwardRef } from 'react-is'; import { polyfill } from 'react-lifecycles-compat'; import PropTypes from 'prop-types'; import global from 'global'; import marksy from 'marksy'; -import Node from './Node'; -import { Pre } from './markdown'; +import jsxToString from 'react-element-to-jsx-string'; +import { Code } from './markdown'; import { getDisplayName, getType } from '../react-utils'; global.STORYBOOK_REACT_CLASSES = global.STORYBOOK_REACT_CLASSES || []; @@ -37,10 +37,9 @@ const stylesheetBase = { position: 'fixed', background: 'white', top: 0, - bottom: 0, left: 0, - right: 0, - padding: '0 40px', + height: '110vh', + width: '100vw', overflow: 'auto', zIndex: 99999, }, @@ -54,12 +53,9 @@ const stylesheetBase = { fontWeight: 300, lineHeight: 1.45, fontSize: '15px', - border: '1px solid #eee', padding: '20px 40px 40px', borderRadius: '2px', backgroundColor: '#fff', - marginTop: '20px', - marginBottom: '20px', }, infoContent: { marginBottom: 0, @@ -133,7 +129,7 @@ class Story extends Component { const { stylesheet } = this.state; return ( -
+ {this._renderInlineHeader()} {this._renderStory()}
@@ -144,7 +140,7 @@ class Story extends Component { {this._getPropTables()}
-
+ ); } @@ -187,7 +183,7 @@ class Story extends Component { }; return ( -
+
{children}
-
- -
-
- {this._getInfoHeader()} - {this._getInfoContent()} - {this._getComponentDescription()} - {this._getSourceCode()} - {this._getPropTables()} + {open ? ( +
+ +
+
+ {this._getInfoHeader()} + {this._getInfoContent()} + {this._getComponentDescription()} + {this._getSourceCode()} + {this._getPropTables()} +
-
-
+ ) : null} + ); } @@ -260,7 +258,8 @@ class Story extends Component { padding = matches[0].length; } const source = lines.map(s => s.slice(padding)).join('\n'); - return
{this.marksy(source).tree}
; + + return {this.marksy(source).tree}; } _getComponentDescription() { @@ -275,7 +274,7 @@ class Story extends Component { Object.keys(STORYBOOK_REACT_CLASSES).forEach(key => { if (validMatches.includes(STORYBOOK_REACT_CLASSES[key].name)) { const componentDescription = STORYBOOK_REACT_CLASSES[key].docgenInfo.description; - retDiv =
{this.marksy(componentDescription).tree}
; + retDiv = {this.marksy(componentDescription).tree}; } }); } @@ -284,14 +283,7 @@ class Story extends Component { } _getSourceCode() { - const { - showSource, - maxPropsIntoLine, - maxPropObjectKeys, - maxPropArrayLength, - maxPropStringLength, - children, - } = this.props; + const { showSource, children } = this.props; const { stylesheet } = this.state; if (!showSource) { @@ -299,22 +291,10 @@ class Story extends Component { } return ( -
+

Story Source

- 
-          {React.Children.map(children, (root, idx) => (
-            
-          ))}
-
-
+ + ); } @@ -404,16 +384,15 @@ class Story extends Component { } return ( -
+

Prop Types

{propTables} -
+ ); } render() { const { showInline } = this.props; - // return showInline ? this._renderInline() : this._renderOverlay(); } } @@ -437,7 +416,6 @@ Story.propTypes = { styles: PropTypes.func.isRequired, children: PropTypes.oneOfType([PropTypes.object, PropTypes.array]), components: PropTypes.shape({}), - maxPropsIntoLine: PropTypes.number.isRequired, maxPropObjectKeys: PropTypes.number.isRequired, maxPropArrayLength: PropTypes.number.isRequired, maxPropStringLength: PropTypes.number.isRequired, diff --git a/addons/info/src/components/markdown/code.js b/addons/info/src/components/markdown/code.js index 141aa3de5da..3bd41509241 100644 --- a/addons/info/src/components/markdown/code.js +++ b/addons/info/src/components/markdown/code.js @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'; import { SyntaxHighlighter } from '@storybook/components'; import { ThemeProvider, convert } from '@storybook/theming'; -const Code = ({ code, language = 'plaintext' }) => ( +const Code = ({ code, language = 'plaintext', ...rest }) => ( - + {code} diff --git a/addons/info/src/components/markdown/text.js b/addons/info/src/components/markdown/text.js index f7928328bd5..356a4575cd5 100644 --- a/addons/info/src/components/markdown/text.js +++ b/addons/info/src/components/markdown/text.js @@ -5,35 +5,21 @@ const defaultProps = { children: null }; const propTypes = { children: PropTypes.node }; export function P({ children }) { - const style = { - fontSize: '15px', - }; - - //

is oftentimes used as a parent element of - // and 

 elements, which is why 

-  // is used as the outputted element when parsing
-  // marksy content rather than 
.
-  return 
{children}
;
+  return 
{children}
;
 }
 
 P.defaultProps = defaultProps;
 P.propTypes = propTypes;
 
 export function LI({ children }) {
-  const style = {
-    fontSize: '15px',
-  };
-  return 
  • {children}
    • ;
+  return 
  • {children}
    • ;
 }
 
 LI.defaultProps = defaultProps;
 LI.propTypes = propTypes;
 
 export function UL({ children }) {
-  const style = {
-    fontSize: '15px',
-  };
-  return 
      {children}
    ;
+  return 
      {children}
    ;
 }
 
 UL.defaultProps = defaultProps;
diff --git a/yarn.lock b/yarn.lock
index de90f12b16a..adeae948831 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4340,7 +4340,7 @@ acorn@^3.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
   integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
 
-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
+acorn@^5.0.0, acorn@^5.2.1, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
@@ -6428,6 +6428,11 @@ base32.js@0.1.0:
   resolved "https://registry.yarnpkg.com/base32.js/-/base32.js-0.1.0.tgz#b582dec693c2f11e893cf064ee6ac5b6131a2202"
   integrity sha1-tYLexpPC8R6JPPBk7mrFthMaIgI=
 
+base62@^1.1.0:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.8.tgz#1264cb0fb848d875792877479dbe8bae6bae3428"
+  integrity sha512-V6YHUbjLxN1ymqNLb1DPHoU1CpfdL7d2YTIp5W3U4hhoG4hhxNmsFDs66M9EXxBiSEke5Bt5dwdfMwwZF70iLA==
+
 base64-arraybuffer@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
@@ -8378,7 +8383,7 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, commander@^2.18.0, commander@^2.19.0, commander@^2.6.0, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0:
+commander@^2.11.0, commander@^2.12.1, commander@^2.14.1, commander@^2.15.1, commander@^2.18.0, commander@^2.19.0, commander@^2.5.0, commander@^2.6.0, commander@^2.8.1, commander@^2.9.0, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -8403,6 +8408,21 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
+commoner@^0.10.1:
+  version "0.10.8"
+  resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5"
+  integrity sha1-NPw2cs0kOT6LtH5wyqApOBH08sU=
+  dependencies:
+    commander "^2.5.0"
+    detective "^4.3.1"
+    glob "^5.0.15"
+    graceful-fs "^4.1.2"
+    iconv-lite "^0.4.5"
+    mkdirp "^0.5.0"
+    private "^0.1.6"
+    q "^1.1.2"
+    recast "^0.11.17"
+
 compare-func@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
@@ -9820,6 +9840,14 @@ detect-port@^1.3.0:
     address "^1.0.1"
     debug "^2.6.0"
 
+detective@^4.3.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
 detective@^5.0.2:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
@@ -10674,6 +10702,14 @@ env-ci@^2.1.0:
     execa "^1.0.0"
     java-properties "^0.2.9"
 
+envify@^3.0.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/envify/-/envify-3.4.1.tgz#d7122329e8df1688ba771b12501917c9ce5cbce8"
+  integrity sha1-1xIjKejfFoi6dxsSUBkXyc5cvOg=
+  dependencies:
+    jstransform "^11.0.3"
+    through "~2.3.4"
+
 envinfo@5.10.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.10.0.tgz#503a9774ae15b93ea68bdfae2ccd6306624ea6df"
@@ -11173,6 +11209,11 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
+esprima-fb@^15001.1.0-dev-harmony-fb:
+  version "15001.1.0-dev-harmony-fb"
+  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz#30a947303c6b8d5e955bee2b99b1d233206a6901"
+  integrity sha1-MKlHMDxrjV6VW+4rmbHSMyBqaQE=
+
 esprima@^3.1.3, esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -12215,6 +12256,17 @@ fbjs@0.8.17, fbjs@^0.8.0, fbjs@^0.8.1, fbjs@^0.8.4, fbjs@^0.8.9:
     setimmediate "^1.0.5"
     ua-parser-js "^0.7.18"
 
+fbjs@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.6.1.tgz#9636b7705f5ba9684d44b72f78321254afc860f7"
+  integrity sha1-lja3cF9bqWhNRLcveDISVK/IYPc=
+  dependencies:
+    core-js "^1.0.0"
+    loose-envify "^1.0.0"
+    promise "^7.0.3"
+    ua-parser-js "^0.7.9"
+    whatwg-fetch "^0.9.0"
+
 fbjs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a"
@@ -13177,7 +13229,7 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^5.0.10:
+glob@^5.0.10, glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
   integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
@@ -14135,7 +14187,7 @@ iconv-lite@0.4.23:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -14244,6 +14296,11 @@ immer@1.10.0:
   resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d"
   integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==
 
+immutable@^4.0.0-rc.9:
+  version "4.0.0-rc.12"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.12.tgz#ca59a7e4c19ae8d9bf74a97bdf0f6e2f2a5d0217"
+  integrity sha512-0M2XxkZLx/mi3t8NVwIm1g8nHoEmM9p9UBl/G9k4+hm0kBgOVdMV/B3CY5dQ8qG8qc80NN4gDV4HQv6FTJ5q7A==
+
 import-cwd@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
@@ -16509,6 +16566,11 @@ json-stable-stringify@~0.0.0:
   dependencies:
     jsonify "~0.0.0"
 
+json-stringify-pretty-compact@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8"
+  integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ==
+
 json-stringify-safe@5.0.x, json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -16603,6 +16665,17 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jstransform@^11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/jstransform/-/jstransform-11.0.3.tgz#09a78993e0ae4d4ef4487f6155a91f6190cb4223"
+  integrity sha1-CaeJk+CuTU70SH9hVakfYZDLQiM=
+  dependencies:
+    base62 "^1.1.0"
+    commoner "^0.10.1"
+    esprima-fb "^15001.1.0-dev-harmony-fb"
+    object-assign "^2.0.0"
+    source-map "^0.4.2"
+
 jsx-ast-utils@^2.0.1, jsx-ast-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz#0ee4e2c971fb9601c67b5641b71be80faecf0b36"
@@ -16610,6 +16683,15 @@ jsx-ast-utils@^2.0.1, jsx-ast-utils@^2.1.0:
   dependencies:
     array-includes "^3.0.3"
 
+jsx-to-string@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsx-to-string/-/jsx-to-string-1.4.0.tgz#66dc34d773dab9f40fe993cff9940e5da655b705"
+  integrity sha1-Ztw013PaufQP6ZPP+ZQOXaZVtwU=
+  dependencies:
+    immutable "^4.0.0-rc.9"
+    json-stringify-pretty-compact "^1.0.1"
+    react "^0.14.0"
+
 jszip@^3.1.3:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.2.1.tgz#c5d32df7274042282b157efb16e522b43435e01a"
@@ -19813,6 +19895,11 @@ object-assign@4.1.1, object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
+object-assign@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
+  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
+
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -21927,7 +22014,7 @@ promise@8.0.2:
   dependencies:
     asap "~2.0.6"
 
-promise@^7.1.1:
+promise@^7.0.3, promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
@@ -23307,6 +23394,14 @@ react@*, react@16.8.6, react@^16.6.0, react@^16.8.3:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
+react@^0.14.0:
+  version "0.14.9"
+  resolved "https://registry.yarnpkg.com/react/-/react-0.14.9.tgz#9110a6497c49d44ba1c0edd317aec29c2e0d91d1"
+  integrity sha1-kRCmSXxJ1EuhwO3TF67CnC4NkdE=
+  dependencies:
+    envify "^3.0.0"
+    fbjs "^0.6.1"
+
 react@^15.4.2:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
@@ -23557,7 +23652,7 @@ realpath-native@^1.0.0, realpath-native@^1.1.0:
   dependencies:
     util.promisify "^1.0.0"
 
-recast@^0.11.3, recast@~0.11.12:
+recast@^0.11.17, recast@^0.11.3, recast@~0.11.12:
   version "0.11.23"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
   integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
@@ -26666,7 +26761,7 @@ through2@^3.0.0, through2@^3.0.1:
   dependencies:
     readable-stream "2 || 3"
 
-through@2, through@2.3.x, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3.6:
+through@2, through@2.3.x, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -27255,6 +27350,11 @@ ua-parser-js@^0.7.18, ua-parser-js@^0.7.19:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
   integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
 
+ua-parser-js@^0.7.9:
+  version "0.7.20"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098"
+  integrity sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==
+
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -28674,6 +28774,11 @@ whatwg-fetch@3.0.0, whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
   integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
 
+whatwg-fetch@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
+  integrity sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA=
+
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"

From 4bd6121f83dbcd698c77e7353bc34ff6925c1514 Mon Sep 17 00:00:00 2001
From: Laurent Debersaques 
Date: Sun, 16 Jun 2019 00:33:30 +0200
Subject: [PATCH 18/27] cli: replaced merge-dirs dependency by fs-extra

---
 lib/cli/generators/ANGULAR/index.js       | 4 ++--
 lib/cli/generators/EMBER/index.js         | 4 ++--
 lib/cli/generators/HTML/index.js          | 4 ++--
 lib/cli/generators/MARKO/index.js         | 4 ++--
 lib/cli/generators/METEOR/index.js        | 4 ++--
 lib/cli/generators/MITHRIL/index.js       | 4 ++--
 lib/cli/generators/POLYMER/index.js       | 4 ++--
 lib/cli/generators/PREACT/index.js        | 4 ++--
 lib/cli/generators/RAX/index.js           | 4 ++--
 lib/cli/generators/REACT/index.js         | 4 ++--
 lib/cli/generators/REACT_NATIVE/index.js  | 4 ++--
 lib/cli/generators/REACT_SCRIPTS/index.js | 4 ++--
 lib/cli/generators/RIOT/index.js          | 4 ++--
 lib/cli/generators/SFC_VUE/index.js       | 4 ++--
 lib/cli/generators/SVELTE/index.js        | 4 ++--
 lib/cli/generators/VUE/index.js           | 4 ++--
 lib/cli/generators/WEBPACK_REACT/index.js | 4 ++--
 lib/cli/package.json                      | 2 +-
 18 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/lib/cli/generators/ANGULAR/index.js b/lib/cli/generators/ANGULAR/index.js
index d437358cf96..6c3e84e50b1 100644
--- a/lib/cli/generators/ANGULAR/index.js
+++ b/lib/cli/generators/ANGULAR/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import {
   editStorybookTsConfig,
@@ -70,7 +70,7 @@ function editAngularAppTsConfig() {
 }
 
 export default async npmOptions => {
-  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   await addDependencies(npmOptions);
   editAngularAppTsConfig();
diff --git a/lib/cli/generators/EMBER/index.js b/lib/cli/generators/EMBER/index.js
index a9160e77c1d..cc4316c4c4f 100644
--- a/lib/cli/generators/EMBER/index.js
+++ b/lib/cli/generators/EMBER/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -17,7 +17,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/HTML/index.js b/lib/cli/generators/HTML/index.js
index 33ad4425699..bef0abdc484 100755
--- a/lib/cli/generators/HTML/index.js
+++ b/lib/cli/generators/HTML/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import npmInit from '../../lib/npm_init';
 import {
@@ -11,7 +11,7 @@ import {
 
 export default async npmOptions => {
   const storybookVersion = await getVersion(npmOptions, '@storybook/html');
-  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   let packageJson = getPackageJson();
   if (!packageJson) {
diff --git a/lib/cli/generators/MARKO/index.js b/lib/cli/generators/MARKO/index.js
index 40de28c14a2..08ec019d813 100644
--- a/lib/cli/generators/MARKO/index.js
+++ b/lib/cli/generators/MARKO/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -16,7 +16,7 @@ export default async npmOptions => {
     '@storybook/addon-knobs'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/METEOR/index.js b/lib/cli/generators/METEOR/index.js
index 27873d4fee9..fbed7d7eaeb 100644
--- a/lib/cli/generators/METEOR/index.js
+++ b/lib/cli/generators/METEOR/index.js
@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import JSON5 from 'json5';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -32,7 +32,7 @@ export default async npmOptions => {
     '@babel/preset-react'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
   packageJson.devDependencies = packageJson.devDependencies || {};
diff --git a/lib/cli/generators/MITHRIL/index.js b/lib/cli/generators/MITHRIL/index.js
index 5a0efb94828..37f55bdb960 100644
--- a/lib/cli/generators/MITHRIL/index.js
+++ b/lib/cli/generators/MITHRIL/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -17,7 +17,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/POLYMER/index.js b/lib/cli/generators/POLYMER/index.js
index 53758fc153c..ee07fb87bb8 100755
--- a/lib/cli/generators/POLYMER/index.js
+++ b/lib/cli/generators/POLYMER/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import {
   getVersions,
@@ -14,7 +14,7 @@ export default async npmOptions => {
     '@storybook/polymer',
     'polymer-webpack-loader'
   );
-  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson() || {}; // Maybe we are in a bower only project, still we need a package json
 
diff --git a/lib/cli/generators/PREACT/index.js b/lib/cli/generators/PREACT/index.js
index 7b66fedbf54..b8e9b9c3e4a 100644
--- a/lib/cli/generators/PREACT/index.js
+++ b/lib/cli/generators/PREACT/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -17,7 +17,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/RAX/index.js b/lib/cli/generators/RAX/index.js
index 48e7df53fd0..de4b9c9a9e4 100644
--- a/lib/cli/generators/RAX/index.js
+++ b/lib/cli/generators/RAX/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -24,7 +24,7 @@ export default async npmOptions => {
     'rax'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/REACT/index.js b/lib/cli/generators/REACT/index.js
index 8e856698246..31dbea118bb 100644
--- a/lib/cli/generators/REACT/index.js
+++ b/lib/cli/generators/REACT/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -17,7 +17,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/REACT_NATIVE/index.js b/lib/cli/generators/REACT_NATIVE/index.js
index d59d4eb899a..b488122772c 100644
--- a/lib/cli/generators/REACT_NATIVE/index.js
+++ b/lib/cli/generators/REACT_NATIVE/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import shell from 'shelljs';
 import chalk from 'chalk';
@@ -26,7 +26,7 @@ export default async (npmOptions, installServer) => {
   );
 
   // copy all files from the template directory to project directory
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   // set correct project name on entry files if possible
   const dirname = shell.ls('-d', 'ios/*.xcodeproj').stdout;
diff --git a/lib/cli/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js
index 82e5906b5f4..a2eb912f192 100644
--- a/lib/cli/generators/REACT_SCRIPTS/index.js
+++ b/lib/cli/generators/REACT_SCRIPTS/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import fs from 'fs';
 import semver from 'semver';
@@ -19,7 +19,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/RIOT/index.js b/lib/cli/generators/RIOT/index.js
index fcf5306edfe..6bbb4334033 100644
--- a/lib/cli/generators/RIOT/index.js
+++ b/lib/cli/generators/RIOT/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import {
   getVersions,
@@ -24,7 +24,7 @@ export default async npmOptions => {
     'riot-tag-loader'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/SFC_VUE/index.js b/lib/cli/generators/SFC_VUE/index.js
index 9cfa6b9aeff..5a9ee404157 100644
--- a/lib/cli/generators/SFC_VUE/index.js
+++ b/lib/cli/generators/SFC_VUE/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import {
   getVersions,
@@ -17,7 +17,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/SVELTE/index.js b/lib/cli/generators/SVELTE/index.js
index e9a8e599f0d..25d3b80e9d4 100644
--- a/lib/cli/generators/SVELTE/index.js
+++ b/lib/cli/generators/SVELTE/index.js
@@ -1,5 +1,5 @@
 import path from 'path';
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import {
   getVersions,
   getPackageJson,
@@ -26,7 +26,7 @@ export default async npmOptions => {
     'svelte-loader'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/VUE/index.js b/lib/cli/generators/VUE/index.js
index 59c48aa8834..5c3b6b543e4 100644
--- a/lib/cli/generators/VUE/index.js
+++ b/lib/cli/generators/VUE/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import {
   getVersions,
@@ -27,7 +27,7 @@ export default async npmOptions => {
     '@babel/core'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/generators/WEBPACK_REACT/index.js b/lib/cli/generators/WEBPACK_REACT/index.js
index c5098f24036..5447ea5b585 100644
--- a/lib/cli/generators/WEBPACK_REACT/index.js
+++ b/lib/cli/generators/WEBPACK_REACT/index.js
@@ -1,4 +1,4 @@
-import mergeDirs from 'merge-dirs';
+import fse from 'fs-extra';
 import path from 'path';
 import {
   getVersions,
@@ -17,7 +17,7 @@ export default async npmOptions => {
     '@storybook/addons'
   );
 
-  mergeDirs(path.resolve(__dirname, 'template/'), '.', 'overwrite');
+  fse.copySync(path.resolve(__dirname, 'template/'), '.', { overwrite: true });
 
   const packageJson = getPackageJson();
 
diff --git a/lib/cli/package.json b/lib/cli/package.json
index bcbfdf04090..7234a76e1c0 100644
--- a/lib/cli/package.json
+++ b/lib/cli/package.json
@@ -35,10 +35,10 @@
     "commander": "^2.19.0",
     "core-js": "^3.0.1",
     "cross-spawn": "^6.0.5",
+    "fs-extra": "^8.0.1",
     "inquirer": "^6.2.0",
     "jscodeshift": "^0.6.3",
     "json5": "^2.1.0",
-    "merge-dirs": "^0.2.1",
     "semver": "^6.0.0",
     "shelljs": "^0.8.3",
     "update-notifier": "^3.0.0"

From e0d3ea256f8b474f336951c78a762f71863ada3b Mon Sep 17 00:00:00 2001
From: Laurent Debersaques 
Date: Sun, 16 Jun 2019 01:07:00 +0200
Subject: [PATCH 19/27] upgraded yarn.lock

---
 yarn.lock | 126 ++++--------------------------------------------------
 1 file changed, 9 insertions(+), 117 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index fadfca9f664..362ec7ff315 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4547,11 +4547,6 @@ ansi-cyan@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
-
 ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -8061,13 +8056,6 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
-  dependencies:
-    restore-cursor "^1.0.1"
-
 cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
@@ -8110,11 +8098,6 @@ cli-truncate@^0.2.1:
     slice-ansi "0.0.4"
     string-width "^1.0.1"
 
-cli-width@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-1.1.1.tgz#a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"
-  integrity sha1-pNKT72frt7iNSk1CwMzwDE0eNm0=
-
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -11374,11 +11357,6 @@ exif-parser@^0.1.12:
   resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
   integrity sha1-WKnS1ywCwfbwKg70qRZicrd2CSI=
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -12252,7 +12230,7 @@ figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
-figures@^1.3.5, figures@^1.7.0:
+figures@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
   integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
@@ -14455,25 +14433,6 @@ inquirer@6.2.2:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
-inquirer@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.11.4.tgz#81e3374e8361beaff2d97016206d359d0b32fa4d"
-  integrity sha1-geM3ToNhvq/y2XAWIG01nQsy+k0=
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^1.0.1"
-    figures "^1.3.5"
-    lodash "^3.3.1"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
 inquirer@^3.0.6:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -17843,11 +17802,6 @@ lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lod
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^3.3.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-  integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
-
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -18412,16 +18366,6 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge-dirs@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/merge-dirs/-/merge-dirs-0.2.1.tgz#21e648b2c6b0261712509e4df36c2424773160c9"
-  integrity sha1-IeZIssawJhcSUJ5N82wkJHcxYMk=
-  dependencies:
-    inquirer "^0.11.0"
-    minimist "^1.2.0"
-    node-fs "~0.1.7"
-    path "^0.12.7"
-
 merge-source-map@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
@@ -19246,11 +19190,6 @@ mustache@^3.0.0:
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a"
   integrity sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA==
 
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-  integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=
-
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
@@ -19438,11 +19377,6 @@ node-forge@0.7.6:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac"
   integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==
 
-node-fs@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/node-fs/-/node-fs-0.1.7.tgz#32323cccb46c9fbf0fc11812d45021cc31d325bb"
-  integrity sha1-MjI8zLRsn78PwRgS1FAhzDHTJbs=
-
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -19970,11 +19904,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -20761,14 +20690,6 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
-path@^0.12.7:
-  version "0.12.7"
-  resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
-  integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
-  dependencies:
-    process "^0.11.1"
-    util "^0.10.3"
-
 paths.macro@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/paths.macro/-/paths.macro-2.0.2.tgz#7b7b3930170c9d41f42ec426c987b2df3505fb72"
@@ -21867,7 +21788,7 @@ process-relative-require@^1.0.0:
   dependencies:
     node-modules-path "^1.0.0"
 
-process@^0.11.1, process@^0.11.10, process@~0.11.0:
+process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
@@ -23560,15 +23481,6 @@ readline-sync@^1.4.9:
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
   integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
 
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  integrity sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
 realpath-native@^1.0.0, realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
@@ -24365,14 +24277,6 @@ rest-handler@^1.2.16:
     path-based-router "^1.1.3"
     raptor-async "^1.1.2"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -24569,13 +24473,6 @@ rtl-detect@^1.0.2:
   resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.0.2.tgz#8eca316f5c6563d54df4e406171dd7819adda67f"
   integrity sha512-5X1422hvphzg2a/bo4tIDbjFjbJUOaPZwqE6dnyyxqwFqfR+tBcvfqapJr0o0VygATVCGKiODEewhZtKF+90AA==
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  integrity sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=
-  dependencies:
-    once "^1.3.0"
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -24612,11 +24509,6 @@ rx-lite@*, rx-lite@^4.0.8:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
   integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-  integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
-
 rxjs-compat@^6.4.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.5.2.tgz#e469070adf6260bdad195e9d4a39f444ae28b458"
@@ -27819,13 +27711,6 @@ util@0.10.3:
   dependencies:
     inherits "2.0.1"
 
-util@^0.10.3, util@~0.10.1:
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
-  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
-  dependencies:
-    inherits "2.0.3"
-
 util@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
@@ -27833,6 +27718,13 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
+util@~0.10.1:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
+  integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
+  dependencies:
+    inherits "2.0.3"
+
 utila@^0.4.0, utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"

From 703c9fd6130f10a003f39d1da7a2ab1587eb3e3e Mon Sep 17 00:00:00 2001
From: Norbert de Langen 
Date: Sun, 16 Jun 2019 21:07:37 +0200
Subject: [PATCH 20/27] IMPROVE reset script

---
 scripts/reset.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/reset.js b/scripts/reset.js
index 59f77675dc3..d1066a7ac76 100644
--- a/scripts/reset.js
+++ b/scripts/reset.js
@@ -23,14 +23,19 @@ cleaningProcess.stdout.on('data', data => {
         const [, uri] = i.match(/Would remove (.*)$/) || [];
 
         if (uri) {
-          if (uri.match(/node_modules/)) {
+          if (uri.match(/node_modules/) || uri.match(/dist/) || uri.match(/\.cache/) || uri.match(/dll/)) {
             del(uri).then(() => {
               console.log(`deleted ${uri}`);
             });
           } else {
-            trash(uri).then(() => {
-              console.log(`trashed ${uri}`);
-            });
+            trash(uri)
+              .then(() => {
+                console.log(`trashed ${uri}`);
+              })
+              .catch(e => {
+                console.log('failed to trash, will try permanent delete');
+                trash(uri);
+              });
           }
         }
       });

From 9c10103acd7cdd3a5811fed6d79e47965bf3d6f6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 
Date: Sun, 16 Jun 2019 20:42:58 +0000
Subject: [PATCH 21/27] Bump jest-expo from 32.0.1 to 33.0.2

Bumps [jest-expo](https://github.com/expo/jest-expo) from 32.0.1 to 33.0.2.
- [Release notes](https://github.com/expo/jest-expo/releases)
- [Commits](https://github.com/expo/jest-expo/commits)

Signed-off-by: dependabot-preview[bot] 
---
 .../crna-kitchen-sink/package.json            |   2 +-
 yarn.lock                                     | 521 +-----------------
 2 files changed, 31 insertions(+), 492 deletions(-)

diff --git a/examples-native/crna-kitchen-sink/package.json b/examples-native/crna-kitchen-sink/package.json
index 6f9371f2654..47d0403452f 100644
--- a/examples-native/crna-kitchen-sink/package.json
+++ b/examples-native/crna-kitchen-sink/package.json
@@ -37,7 +37,7 @@
     "babel-preset-expo": "^5.1.1",
     "core-js": "^3.0.1",
     "expo-cli": "^2.17.1",
-    "jest-expo": "^32.0.0",
+    "jest-expo": "^33.0.2",
     "react-test-renderer": "16.5.1",
     "schedule": "^0.5.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 0db46921ec2..14a418ab504 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -195,7 +195,7 @@
   optionalDependencies:
     chokidar "^2.0.4"
 
-"@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.0.0-beta.44":
+"@babel/code-frame@7.0.0", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.44":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
   integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
@@ -4696,13 +4696,6 @@ app-root-path@^2.2.1:
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
   integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
-  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
-  dependencies:
-    default-require-extensions "^1.0.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -5163,7 +5156,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@6, babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.7.2:
+babel-core@6, babel-core@^6.26.0, babel-core@^6.7.2:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
@@ -5400,14 +5393,6 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
-  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
-  dependencies:
-    babel-plugin-istanbul "^4.1.6"
-    babel-preset-jest "^23.2.0"
-
 babel-jest@^24.7.1, babel-jest@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
@@ -5551,16 +5536,6 @@ babel-plugin-htmlbars-inline-precompile@^1.0.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-1.0.0.tgz#a9d2f6eaad8a3f3d361602de593a8cbef8179c22"
   integrity sha512-4jvKEHR1bAX03hBDZ94IXsYCj3bwk9vYsn6ux6JZNL2U5pvzCWjqyrGahfsGNrhERyxw8IqcirOi9Q6WCo3dkQ==
 
-babel-plugin-istanbul@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
-  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.10.1"
-    test-exclude "^4.2.1"
-
 babel-plugin-istanbul@^5.1.0:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba"
@@ -5570,11 +5545,6 @@ babel-plugin-istanbul@^5.1.0:
     istanbul-lib-instrument "^3.3.0"
     test-exclude "^5.2.3"
 
-babel-plugin-jest-hoist@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
-  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
-
 babel-plugin-jest-hoist@^24.6.0:
   version "24.6.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
@@ -5746,7 +5716,7 @@ babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.8.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
   integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
 
-babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
+babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
   integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
@@ -6256,14 +6226,6 @@ babel-preset-flow@^6.23.0:
   dependencies:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
-babel-preset-jest@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
-  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
-  dependencies:
-    babel-plugin-jest-hoist "^23.2.0"
-    babel-plugin-syntax-object-rest-spread "^6.13.0"
-
 babel-preset-jest@^24.6.0:
   version "24.6.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
@@ -6384,7 +6346,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
   integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
@@ -6399,7 +6361,7 @@ babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.19.0, babel-tra
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
   integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
@@ -9629,13 +9591,6 @@ default-gateway@^4.2.0:
     execa "^1.0.0"
     ip-regex "^2.1.0"
 
-default-require-extensions@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
-  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
-  dependencies:
-    strip-bom "^2.0.0"
-
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
@@ -11443,18 +11398,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
-  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
-  dependencies:
-    ansi-styles "^3.2.0"
-    jest-diff "^23.6.0"
-    jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-
 expect@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d"
@@ -12342,14 +12285,6 @@ filename-regex@^2.0.0:
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
   integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
-fileset@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
-  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
-  dependencies:
-    glob "^7.0.3"
-    minimatch "^3.0.3"
-
 filesize@3.6.1, filesize@^3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -13578,7 +13513,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
-handlebars@^4.0.11, handlebars@^4.0.3, handlebars@^4.0.4, handlebars@^4.1.0, handlebars@^4.1.2:
+handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.1.0, handlebars@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
   integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
@@ -13626,11 +13561,6 @@ has-cors@1.1.0:
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
   integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
 has-flag@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -14829,11 +14759,6 @@ is-function@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
   integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
 
-is-generator-fn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
-  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
-
 is-generator-fn@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
@@ -15218,23 +15143,6 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-api@^1.3.1:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
-  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
-  dependencies:
-    async "^2.1.4"
-    fileset "^2.0.2"
-    istanbul-lib-coverage "^1.2.1"
-    istanbul-lib-hook "^1.2.2"
-    istanbul-lib-instrument "^1.10.2"
-    istanbul-lib-report "^1.1.5"
-    istanbul-lib-source-maps "^1.2.6"
-    istanbul-reports "^1.5.1"
-    js-yaml "^3.7.0"
-    mkdirp "^0.5.1"
-    once "^1.4.0"
-
 istanbul-instrumenter-loader@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz#9957bd59252b373fae5c52b7b5188e6fde2a0949"
@@ -15245,7 +15153,7 @@ istanbul-instrumenter-loader@3.0.1:
     loader-utils "^1.1.0"
     schema-utils "^0.3.0"
 
-istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
+istanbul-lib-coverage@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
   integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
@@ -15255,14 +15163,7 @@ istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
   integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
-istanbul-lib-hook@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
-  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
-  dependencies:
-    append-transform "^0.4.0"
-
-istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2, istanbul-lib-instrument@^1.7.3:
+istanbul-lib-instrument@^1.7.3:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
   integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
@@ -15288,16 +15189,6 @@ istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
     istanbul-lib-coverage "^2.0.5"
     semver "^6.0.0"
 
-istanbul-lib-report@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
-  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
-  dependencies:
-    istanbul-lib-coverage "^1.2.1"
-    mkdirp "^0.5.1"
-    path-parse "^1.0.5"
-    supports-color "^3.1.2"
-
 istanbul-lib-report@^2.0.4:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
@@ -15307,17 +15198,6 @@ istanbul-lib-report@^2.0.4:
     make-dir "^2.1.0"
     supports-color "^6.1.0"
 
-istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
-  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
-  dependencies:
-    debug "^3.1.0"
-    istanbul-lib-coverage "^1.2.1"
-    mkdirp "^0.5.1"
-    rimraf "^2.6.1"
-    source-map "^0.5.3"
-
 istanbul-lib-source-maps@^3.0.1:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
@@ -15329,13 +15209,6 @@ istanbul-lib-source-maps@^3.0.1:
     rimraf "^2.6.3"
     source-map "^0.6.1"
 
-istanbul-reports@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
-  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
-  dependencies:
-    handlebars "^4.0.3"
-
 istanbul-reports@^2.1.1:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
@@ -15401,13 +15274,6 @@ java-properties@^0.2.9:
   resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-0.2.10.tgz#2551560c25fa1ad94d998218178f233ad9b18f60"
   integrity sha512-CpKJh9VRNhS+XqZtg1UMejETGEiqwCGDC/uwPEEQwc2nfdbSm73SIE29TplG2gLYuBOOTNDqxzG6A9NtEPLt0w==
 
-jest-changed-files@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
-  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
-  dependencies:
-    throat "^4.0.0"
-
 jest-changed-files@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b"
@@ -15417,48 +15283,6 @@ jest-changed-files@^24.8.0:
     execa "^1.0.0"
     throat "^4.0.0"
 
-jest-cli@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
-  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    exit "^0.1.2"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    import-local "^1.0.0"
-    is-ci "^1.0.10"
-    istanbul-api "^1.3.1"
-    istanbul-lib-coverage "^1.2.0"
-    istanbul-lib-instrument "^1.10.1"
-    istanbul-lib-source-maps "^1.2.4"
-    jest-changed-files "^23.4.2"
-    jest-config "^23.6.0"
-    jest-environment-jsdom "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-haste-map "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve-dependencies "^23.6.0"
-    jest-runner "^23.6.0"
-    jest-runtime "^23.6.0"
-    jest-snapshot "^23.6.0"
-    jest-util "^23.4.0"
-    jest-validate "^23.6.0"
-    jest-watcher "^23.4.0"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    node-notifier "^5.2.1"
-    prompts "^0.1.9"
-    realpath-native "^1.0.0"
-    rimraf "^2.5.4"
-    slash "^1.0.0"
-    string-length "^2.0.0"
-    strip-ansi "^4.0.0"
-    which "^1.2.12"
-    yargs "^11.0.0"
-
 jest-cli@^24.7.1, jest-cli@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989"
@@ -15478,26 +15302,6 @@ jest-cli@^24.7.1, jest-cli@^24.8.0:
     realpath-native "^1.1.0"
     yargs "^12.0.2"
 
-jest-config@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
-  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
-  dependencies:
-    babel-core "^6.0.0"
-    babel-jest "^23.6.0"
-    chalk "^2.0.1"
-    glob "^7.1.1"
-    jest-environment-jsdom "^23.4.0"
-    jest-environment-node "^23.4.0"
-    jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.6.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.6.0"
-    jest-util "^23.4.0"
-    jest-validate "^23.6.0"
-    micromatch "^2.3.11"
-    pretty-format "^23.6.0"
-
 jest-config@^24.0.0, jest-config@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f"
@@ -15521,16 +15325,6 @@ jest-config@^24.0.0, jest-config@^24.8.0:
     pretty-format "^24.8.0"
     realpath-native "^1.1.0"
 
-jest-diff@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
-  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
-  dependencies:
-    chalk "^2.0.1"
-    diff "^3.2.0"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.6.0"
-
 jest-diff@^24.7.0, jest-diff@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172"
@@ -15555,14 +15349,6 @@ jest-docblock@^24.3.0:
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
-  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
-  dependencies:
-    chalk "^2.0.1"
-    pretty-format "^23.6.0"
-
 jest-each@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"
@@ -15609,15 +15395,6 @@ jest-environment-jsdom-thirteen@^1.0.0, jest-environment-jsdom-thirteen@^1.0.1:
     jest-util "^24.0.0"
     jsdom "^13.0.0"
 
-jest-environment-jsdom@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
-  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
-  dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
-    jsdom "^11.5.1"
-
 jest-environment-jsdom@^24.0.0, jest-environment-jsdom@^24.7.1, jest-environment-jsdom@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857"
@@ -15630,14 +15407,6 @@ jest-environment-jsdom@^24.0.0, jest-environment-jsdom@^24.7.1, jest-environment
     jest-util "^24.8.0"
     jsdom "^11.5.1"
 
-jest-environment-node@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
-  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
-  dependencies:
-    jest-mock "^23.2.0"
-    jest-util "^23.4.0"
-
 jest-environment-node@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231"
@@ -15658,22 +15427,17 @@ jest-enzyme@^7.0.2:
     enzyme-to-json "^3.3.0"
     jest-environment-enzyme "^7.0.2"
 
-jest-expo@^32.0.0:
-  version "32.0.1"
-  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-32.0.1.tgz#83bb16cba0d14d75bc635b8fb078bc33e82b99ad"
-  integrity sha512-FnqfaQ0LuzOgG3/qJh6G+pard5SnWnTfJ7Ad+NFl6CEyZhLp/sCu01fl+CGpal2LFSPODChheIaLYebgw69d+g==
+jest-expo@^33.0.2:
+  version "33.0.2"
+  resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-33.0.2.tgz#6e4c595162047eca2bbb9fcf214a067af3f21b0e"
+  integrity sha512-OSk8hVm9D8YSw8R7vOOjoERQIqlsAwNgQzqpFdNQROy2/TNzntGBy+8hLsic7y8h2CDXmKVsxvBtiKD4CTOZRg==
   dependencies:
-    "@babel/core" "^7.1.0"
-    babel-core "^7.0.0-bridge.0"
-    babel-jest "^23.6.0"
-    jest "^23.6.0"
+    babel-jest "^24.7.1"
+    jest "^24.7.1"
     json5 "^2.1.0"
-    react-test-renderer "^16.5.0"
-
-jest-get-type@^22.1.0:
-  version "22.4.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
-  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
+    lodash "^4.5.0"
+    react-test-renderer "^16.8.6"
+    whatwg-fetch "^3.0.0"
 
 jest-get-type@^24.8.0:
   version "24.8.0"
@@ -15694,20 +15458,6 @@ jest-haste-map@23.5.0:
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-haste-map@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
-  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
-  dependencies:
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.1.11"
-    invariant "^2.2.4"
-    jest-docblock "^23.2.0"
-    jest-serializer "^23.0.1"
-    jest-worker "^23.2.0"
-    micromatch "^2.3.11"
-    sane "^2.0.0"
-
 jest-haste-map@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz#51794182d877b3ddfd6e6d23920e3fe72f305800"
@@ -15740,24 +15490,6 @@ jest-image-snapshot@^2.8.2:
     pngjs "^3.3.3"
     rimraf "^2.6.2"
 
-jest-jasmine2@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
-  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
-  dependencies:
-    babel-traverse "^6.0.0"
-    chalk "^2.0.1"
-    co "^4.6.0"
-    expect "^23.6.0"
-    is-generator-fn "^1.0.0"
-    jest-diff "^23.6.0"
-    jest-each "^23.6.0"
-    jest-matcher-utils "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-snapshot "^23.6.0"
-    jest-util "^23.4.0"
-    pretty-format "^23.6.0"
-
 jest-jasmine2@^24.7.1, jest-jasmine2@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898"
@@ -15780,13 +15512,6 @@ jest-jasmine2@^24.7.1, jest-jasmine2@^24.8.0:
     pretty-format "^24.8.0"
     throat "^4.0.0"
 
-jest-leak-detector@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
-  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
-  dependencies:
-    pretty-format "^23.6.0"
-
 jest-leak-detector@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980"
@@ -15794,15 +15519,6 @@ jest-leak-detector@^24.8.0:
   dependencies:
     pretty-format "^24.8.0"
 
-jest-matcher-utils@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
-  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    pretty-format "^23.6.0"
-
 jest-matcher-utils@^24.7.0, jest-matcher-utils@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495"
@@ -15813,17 +15529,6 @@ jest-matcher-utils@^24.7.0, jest-matcher-utils@^24.8.0:
     jest-get-type "^24.8.0"
     pretty-format "^24.8.0"
 
-jest-message-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
-  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
-  dependencies:
-    "@babel/code-frame" "^7.0.0-beta.35"
-    chalk "^2.0.1"
-    micromatch "^2.3.11"
-    slash "^1.0.0"
-    stack-utils "^1.0.1"
-
 jest-message-util@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
@@ -15838,11 +15543,6 @@ jest-message-util@^24.8.0:
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
-  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
-
 jest-mock@^24.0.0, jest-mock@^24.5.0, jest-mock@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
@@ -15878,24 +15578,11 @@ jest-raw-loader@^1.0.1:
   resolved "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz#ce9f56d54650f157c4a7d16d224ba5d613bcd626"
   integrity sha1-zp9W1UZQ8VfEp9FtIkul1hO81iY=
 
-jest-regex-util@^23.3.0:
-  version "23.3.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
-  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
-
 jest-regex-util@^24.3.0:
   version "24.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
   integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
 
-jest-resolve-dependencies@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
-  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
-  dependencies:
-    jest-regex-util "^23.3.0"
-    jest-snapshot "^23.6.0"
-
 jest-resolve-dependencies@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0"
@@ -15916,15 +15603,6 @@ jest-resolve@24.7.1:
     jest-pnp-resolver "^1.2.1"
     realpath-native "^1.1.0"
 
-jest-resolve@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
-  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
-  dependencies:
-    browser-resolve "^1.11.3"
-    chalk "^2.0.1"
-    realpath-native "^1.0.0"
-
 jest-resolve@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f"
@@ -15936,25 +15614,6 @@ jest-resolve@^24.8.0:
     jest-pnp-resolver "^1.2.1"
     realpath-native "^1.1.0"
 
-jest-runner@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
-  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
-  dependencies:
-    exit "^0.1.2"
-    graceful-fs "^4.1.11"
-    jest-config "^23.6.0"
-    jest-docblock "^23.2.0"
-    jest-haste-map "^23.6.0"
-    jest-jasmine2 "^23.6.0"
-    jest-leak-detector "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-runtime "^23.6.0"
-    jest-util "^23.4.0"
-    jest-worker "^23.2.0"
-    source-map-support "^0.5.6"
-    throat "^4.0.0"
-
 jest-runner@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"
@@ -15980,33 +15639,6 @@ jest-runner@^24.8.0:
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
-  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
-  dependencies:
-    babel-core "^6.0.0"
-    babel-plugin-istanbul "^4.1.6"
-    chalk "^2.0.1"
-    convert-source-map "^1.4.0"
-    exit "^0.1.2"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.1.11"
-    jest-config "^23.6.0"
-    jest-haste-map "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-regex-util "^23.3.0"
-    jest-resolve "^23.6.0"
-    jest-snapshot "^23.6.0"
-    jest-util "^23.4.0"
-    jest-validate "^23.6.0"
-    micromatch "^2.3.11"
-    realpath-native "^1.0.0"
-    slash "^1.0.0"
-    strip-bom "3.0.0"
-    write-file-atomic "^2.1.0"
-    yargs "^11.0.0"
-
 jest-runtime@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620"
@@ -16046,22 +15678,6 @@ jest-serializer@^24.4.0:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
   integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
 
-jest-snapshot@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
-  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
-  dependencies:
-    babel-types "^6.0.0"
-    chalk "^2.0.1"
-    jest-diff "^23.6.0"
-    jest-matcher-utils "^23.6.0"
-    jest-message-util "^23.4.0"
-    jest-resolve "^23.6.0"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    pretty-format "^23.6.0"
-    semver "^5.5.0"
-
 jest-snapshot@^24.1.0, jest-snapshot@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"
@@ -16087,20 +15703,6 @@ jest-specific-snapshot@^2.0.0:
   dependencies:
     jest-snapshot "^24.1.0"
 
-jest-util@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
-  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
-  dependencies:
-    callsites "^2.0.0"
-    chalk "^2.0.1"
-    graceful-fs "^4.1.11"
-    is-ci "^1.0.10"
-    jest-message-util "^23.4.0"
-    mkdirp "^0.5.1"
-    slash "^1.0.0"
-    source-map "^0.6.0"
-
 jest-util@^24.0.0, jest-util@^24.5.0, jest-util@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1"
@@ -16119,16 +15721,6 @@ jest-util@^24.0.0, jest-util@^24.5.0, jest-util@^24.8.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-validate@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
-  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    leven "^2.1.0"
-    pretty-format "^23.6.0"
-
 jest-validate@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849"
@@ -16175,15 +15767,6 @@ jest-watch-typeahead@^0.3.0:
     string-length "^2.0.0"
     strip-ansi "^5.0.0"
 
-jest-watcher@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
-  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    chalk "^2.0.1"
-    string-length "^2.0.0"
-
 jest-watcher@^24.3.0, jest-watcher@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4"
@@ -16225,14 +15808,6 @@ jest@24.7.1:
     import-local "^2.0.0"
     jest-cli "^24.7.1"
 
-jest@^23.6.0:
-  version "23.6.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
-  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
-  dependencies:
-    import-local "^1.0.0"
-    jest-cli "^23.6.0"
-
 jest@^24.7.1:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
@@ -16310,7 +15885,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.10.0, js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@^3.10.0, js-yaml@^3.12.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1, js-yaml@^3.9.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -16725,11 +16300,6 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-kleur@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
-  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
-
 kleur@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -17839,7 +17409,7 @@ lodash@4.17.5:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
   integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==
 
-lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.10:
+lodash@4.x, "lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1, lodash@~4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -19008,7 +18578,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -20712,7 +20282,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5, path-parse@^1.0.6:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -21951,14 +21521,6 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prompts@^0.1.9:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
-  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
-  dependencies:
-    kleur "^2.0.1"
-    sisteransi "^0.1.1"
-
 prompts@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz#bf90bc71f6065d255ea2bdc0fe6520485c1b45db"
@@ -23265,7 +22827,7 @@ react-test-renderer@16.5.1:
     react-is "^16.5.1"
     schedule "^0.4.0"
 
-react-test-renderer@^16.0.0-0, react-test-renderer@^16.5.0, react-test-renderer@^16.8.3:
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.8.3, react-test-renderer@^16.8.6:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
   integrity sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==
@@ -23558,7 +23120,7 @@ readline-sync@^1.4.9:
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
   integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
 
-realpath-native@^1.0.0, realpath-native@^1.1.0:
+realpath-native@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
   integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
@@ -25212,11 +24774,6 @@ simplebar@^4.0.0:
     resize-observer-polyfill "^1.5.1"
     scrollbarwidth "^0.1.3"
 
-sisteransi@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
-  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
-
 sisteransi@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz#77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"
@@ -26036,11 +25593,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom@3.0.0, strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -26048,6 +25600,11 @@ strip-bom@^2.0.0:
   dependencies:
     is-utf8 "^0.2.0"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
 strip-color@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/strip-color/-/strip-color-0.1.0.tgz#106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b"
@@ -26214,13 +25771,6 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^3.1.2:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -26545,17 +26095,6 @@ terser@^3.16.1, terser@^3.17.0, terser@^3.7.5:
     source-map "~0.6.1"
     source-map-support "~0.5.10"
 
-test-exclude@^4.2.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
-  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
-  dependencies:
-    arrify "^1.0.1"
-    micromatch "^2.3.11"
-    object-assign "^4.1.0"
-    read-pkg-up "^1.0.1"
-    require-main-filename "^1.0.1"
-
 test-exclude@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -28739,7 +28278,7 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
-which@1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.8, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@1, which@^1.2.10, which@^1.2.14, which@^1.2.8, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -29116,7 +28655,7 @@ write-file-atomic@^1.2.0:
     imurmurhash "^0.1.4"
     slide "^1.1.5"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.1.0, write-file-atomic@^2.3.0:
+write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
   integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==

From 23cc5a7ea6ac93c0373c8a14f20e11eac5891353 Mon Sep 17 00:00:00 2001
From: Norbert de Langen 
Date: Sun, 16 Jun 2019 23:28:48 +0200
Subject: [PATCH 22/27] FIX snapshots

---
 .../info/src/__snapshots__/index.test.js.snap | 17994 ++++++++--------
 .../addon-info.stories.storyshot              | 12250 +++--------
 2 files changed, 11405 insertions(+), 18839 deletions(-)

diff --git a/addons/info/src/__snapshots__/index.test.js.snap b/addons/info/src/__snapshots__/index.test.js.snap
index 4ac4d39e4cd..64aa1bba1d5 100644
--- a/addons/info/src/__snapshots__/index.test.js.snap
+++ b/addons/info/src/__snapshots__/index.test.js.snap
@@ -33,1220 +33,101 @@ exports[`addon Info should render  and external markdown 1`] = `
     showSource={true}
     styles={[Function]}
   >
-    
    
-      
-      
-      
    
-        
-        
    
-          
    
-            
    
+            
    
+              x => x + 1
+            
    
+            
    
+              [object Object]
+            
    
+            
    
+              1,2,3
+            
    
+            
    
+              7
+            
    
+            
    
+              seven
+            
    
+            
    
+              true
+            
    
+            
    
+              undefined
+            
    
+            
-              
    
-              
    
-            
    
-            
    
-              
    HTML Mock

    ", - } - } - key="0" - /> -
    -
    -

    - Story Source -

    - 
    -                
    -                  
    
-                    
-                          It's a 
-                           story:
-                          
-                        
    
-                      }
-                    >
-                      
    
-                        
    
-                          
-                            <
-                            div
-                          
-                          
-                                It's a 
-                                 story:
-                                
-                              
    
-                            }
-                            singleLine={false}
-                          >
-                            
-                          
-                          
-                            >
-                          
-                        
    
-                        
-                          
    
-                            
-                              It's a 
-                            
-                          
    
-                            
-                        
-                          
    
-                            
-                          
    
-                            
-                        
-                          
    
-                            
-                               story:
-                            
-                          
    
-                            
-                        
-                          }
-                        >
-                          
    
-                            
-                              <
-                              TestComponent
-                            
-                            
-                              }
-                              singleLine={true}
-                            >
-                              
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    func
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          func
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    obj
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          
-                                            {
-                                            
-                                              
-                                                a
-                                              
-                                            
-                                            : 
-                                            
-                                              
-                                                'a'
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                b
-                                              
-                                            
-                                            : 
-                                            
-                                              
-                                                'b'
-                                              
-                                            
-                                            }
-                                          
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    array
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          
-                                            [
-                                            
-                                              
-                                                
-                                                  1
-                                                
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                
-                                                  2
-                                                
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                
-                                                  3
-                                                
-                                              
-                                            
-                                            ]
-                                          
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    number
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          7
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    string
-                                  
-                                  
-                                    =
-                                    
-                                      "
-                                      
-                                        
-                                          seven
-                                        
-                                      
-                                      "
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    bool
-                                  
-                                  
    
-                                    
-                                  
-                                
-                            
-                              />
-                            
-                          
    
-                            
-                        
    
-                          
-                            </
-                            div
-                            >
-                          
-                        
    
-
    - - - - - - - - -
    -

    - Prop Types -

    -
    -

    - " - TestComponent - " Component -

    - - - - No propTypes defined! - - - -
    -
    + test +     + + storiesOf + +
      +
    • + 1 +
      • +
    • + 2 +
      • +
    - + +     `; @@ -1286,1302 +167,101 @@ containing **bold**, *cursive* text, \`code\` and [a link](https://github.com)" showSource={true} styles={[Function]} > -
    -
    -
    - It's a - story: - -
    -

    - x => x + 1 -

    -

    - [object Object] -

    -

    - 1,2,3 -

    -

    - 7 -

    -
    - seven -
    -
    - true -
    -

    - undefined -

    - - test - - - storiesOf - -
      -
    • - 1 -
      • -
    • - 2 -
      • -
    -
    -     -
    -
    - -
    - -
    -
    -
    +

    + x => x + 1 +

    +

    + [object Object] +

    +

    + 1,2,3 +

    +

    + 7 +

    +
    + seven +
    +
    + true +
    +

    + undefined +

    + -

    -

    -

    - -
    -

    - Story Source -

    - 
    -                
    -                  
    
-                    
-                          It's a 
-                           story:
-                          
-                        
    
-                      }
-                    >
-                      
    
-                        
    
-                          
-                            <
-                            div
-                          
-                          
-                                It's a 
-                                 story:
-                                
-                              
    
-                            }
-                            singleLine={false}
-                          >
-                            
-                          
-                          
-                            >
-                          
-                        
    
-                        
-                          
    
-                            
-                              It's a 
-                            
-                          
    
-                            
-                        
-                          
    
-                            
-                          
    
-                            
-                        
-                          
    
-                            
-                               story:
-                            
-                          
    
-                            
-                        
-                          }
-                        >
-                          
    
-                            
-                              <
-                              TestComponent
-                            
-                            
-                              }
-                              singleLine={true}
-                            >
-                              
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    func
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          func
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    obj
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          
-                                            {
-                                            
-                                              
-                                                a
-                                              
-                                            
-                                            : 
-                                            
-                                              
-                                                'a'
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                b
-                                              
-                                            
-                                            : 
-                                            
-                                              
-                                                'b'
-                                              
-                                            
-                                            }
-                                          
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    array
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          
-                                            [
-                                            
-                                              
-                                                
-                                                  1
-                                                
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                
-                                                  2
-                                                
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                
-                                                  3
-                                                
-                                              
-                                            
-                                            ]
-                                          
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    number
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          7
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    string
-                                  
-                                  
-                                    =
-                                    
-                                      "
-                                      
-                                        
-                                          seven
-                                        
-                                      
-                                      "
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    bool
-                                  
-                                  
    
-                                    
-                                  
-                                
-                            
-                              />
-                            
-                          
    
-                            
-                        
    
-                          
-                            </
-                            div
-                            >
-                          
-                        
    
-
    - -
    - - - - - -
    -
    -

    - Prop Types -

    -
    -

    - " - TestComponent - " Component -

    - - - - No propTypes defined! - - - -
    -
    + test + + + storiesOf + +
      +
    • + 1 +
      • +
    • + 2 +
      • +
    -
    + + `; @@ -2619,1155 +299,101 @@ exports[`addon Info should render for memoized component 1`] = ` showSource={true} styles={[Function]} > -
    -
    -
    - It's a - story: - -
    -

    - x => x + 1 -

    -

    - [object Object] -

    -

    - 1,2,3 -

    -

    - 7 -

    -
    - seven -
    -
    - true -
    -

    - undefined -

    - - test - - - storiesOf - -
      -
    • - 1 -
      • -
    • - 2 -
      • -
    -
    -     -
    -
    - -
    - -
    -
    -
    +

    + x => x + 1 +

    +

    + [object Object] +

    +

    + 1,2,3 +

    +

    + 7 +

    +
    + seven +
    +
    + true +
    +

    + undefined +

    + -

    -

    -

    -
    -

    - Story Source -

    - 
    -                
    -                  
    
-                    
-                          It's a 
-                           story:
-                          
-                        
    
-                      }
-                    >
-                      
    
-                        
    
-                          
-                            <
-                            div
-                          
-                          
-                                It's a 
-                                 story:
-                                
-                              
    
-                            }
-                            singleLine={false}
-                          >
-                            
-                          
-                          
-                            >
-                          
-                        
    
-                        
-                          
    
-                            
-                              It's a 
-                            
-                          
    
-                            
-                        
-                          
    
-                            
-                          
    
-                            
-                        
-                          
    
-                            
-                               story:
-                            
-                          
    
-                            
-                        
-                          }
-                        >
-                          
    
-                            
-                              <
-                              TestComponent
-                            
-                            
-                              }
-                              singleLine={true}
-                            >
-                              
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    func
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          func
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    obj
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          
-                                            {
-                                            
-                                              
-                                                a
-                                              
-                                            
-                                            : 
-                                            
-                                              
-                                                'a'
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                b
-                                              
-                                            
-                                            : 
-                                            
-                                              
-                                                'b'
-                                              
-                                            
-                                            }
-                                          
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    array
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          
-                                            [
-                                            
-                                              
-                                                
-                                                  1
-                                                
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                
-                                                  2
-                                                
-                                              
-                                            
-                                            ,
-                                            
-                                              
-                                                
-                                                  3
-                                                
-                                              
-                                            
-                                            ]
-                                          
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    number
-                                  
-                                  
-                                    =
-                                    
-                                      {
-                                      
-                                        
-                                          7
-                                        
-                                      
-                                      }
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    string
-                                  
-                                  
-                                    =
-                                    
-                                      "
-                                      
-                                        
-                                          seven
-                                        
-                                      
-                                      "
-                                    
-                                  
-                                    
-                                
-                                  
-                                    
    
-                                      
-                                      
-                                  
-                                    bool
-                                  
-                                  
    
-                                    
-                                  
-                                
-                            
-                              />
-                            
-                          
    
-                            
-                        
    
-                          
-                            </
-                            div
-                            >
-                          
-                        
    
-
    - -
    - - - - - -
    + test + + + storiesOf + +
      +
    • + 1 +
      • +
    • + 2 +
      • +
    -
    + + `; @@ -4202,310 +828,296 @@ exports[`addon Info should render component description if story kind matches co styles={[Function]} >
    -
    +
    -
    + TestComponent + +

    + Basic test +

    +
    +
    +
    +
    +
    + It's a + Basic test + story: + +
    +

    + x => x + 1 +

    +

    + [object Object] +

    +

    + 1,2,3 +

    +

    + 7 +

    +
    + seven +
    +
    + true +
    +

    + undefined +

    + + test + + + storiesOf + +
      +
    • + 1 +
      • +
    • + 2 +
      • +
    +
    +     +
    +
    +
    +
    +

    +

    -

    - TestComponent -

    -

    - Basic test -

    -
    -
    -
    -
    -
    - It's a - Basic test - story: - -
    -

    - x => x + 1 -

    -

    - [object Object] -

    -

    - 1,2,3 -

    -

    - 7 -

    -
    - seven -
    -
    - true -
    -

    - undefined -

    - - test - - - storiesOf - -
      -
    • - 1 -
      • -
    • - 2 -
      • -
    -
    -     -
    -
    -
    -
    + +

    -
    -

    + with markdown support +

    +

    +

    +

    + -

    - Awesome test component description -

    - -

    + + -

    - with markdown support -

    -

    -

    -

    - - bold - - - - cursive - -
    -

    - - +

    +

    + + + + - - -
    + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + "ctr": 82, + "isSpeedy": false, + "key": "css", + "nonce": undefined, + "tags": Array [ + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ], + }, + } + } + serialized={ + Object { + "map": undefined, + "name": "nh5djz", + "next": undefined, + "styles": "[data-simplebar]{position:relative;flex-direction:column;flex-wrap:wrap;justify-content:flex-start;align-content:flex-start;align-items:flex-start;}.simplebar-wrapper{overflow:hidden;width:inherit;height:inherit;max-width:inherit;max-height:inherit;}.simplebar-mask{direction:inherit;position:absolute;overflow:hidden;padding:0;margin:0;left:0;top:0;bottom:0;right:0;width:auto !important;height:auto !important;z-index:0;}.simplebar-offset{direction:inherit !important;resize:none !important;position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;-webkit-overflow-scrolling:touch;}.simplebar-content-wrapper{direction:inherit;position:relative;display:block;visibility:visible;}.simplebar-placeholder{max-height:100%;max-width:100%;width:100%;pointer-events:none;}.simplebar-height-auto-observer-wrapper{height:100%;width:inherit;max-width:1px;position:relative;float:left;max-height:1px;overflow:hidden;z-index:-1;padding:0;margin:0;pointer-events:none;flex-grow:inherit;flex-shrink:0;flex-basis:0;}.simplebar-height-auto-observer{display:block;opacity:0;position:absolute;top:0;left:0;height:1000%;width:1000%;min-height:1px;min-width:1px;overflow:hidden;pointer-events:none;z-index:-1;}.simplebar-track{z-index:1;position:absolute;right:0;bottom:0;pointer-events:none;overflow:hidden;}[data-simplebar].simplebar-dragging .simplebar-track{pointer-events:all;}.simplebar-scrollbar{position:absolute;right:2px;width:7px;min-height:10px;}.simplebar-scrollbar:before{position:absolute;content:\\"\\";border-radius:7px;left:0;right:0;opacity:0;transition:opacity 0.2s linear;background:#333333;}.simplebar-track .simplebar-scrollbar.simplebar-visible:before{opacity:0.5;transition:opacity 0s linear;}.simplebar-track.simplebar-vertical{top:0;width:11px;}.simplebar-track.simplebar-vertical .simplebar-scrollbar:before{top:2px;bottom:2px;}.simplebar-track.simplebar-horizontal{left:0;height:11px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar:before{height:100%;left:2px;right:2px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar{right:auto;left:0;top:2px;height:7px;min-height:0;min-width:10px;width:auto;}[data-simplebar-direction=\\"rtl\\"] .simplebar-track.simplebar-vertical{right:auto;left:0;}", + } + } + /> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - "ctr": 82, - "isSpeedy": false, - "key": "css", - "nonce": undefined, - "tags": Array [ - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ], - }, - } - } - serialized={ - Object { - "map": undefined, - "name": "nh5djz", - "next": undefined, - "styles": "[data-simplebar]{position:relative;flex-direction:column;flex-wrap:wrap;justify-content:flex-start;align-content:flex-start;align-items:flex-start;}.simplebar-wrapper{overflow:hidden;width:inherit;height:inherit;max-width:inherit;max-height:inherit;}.simplebar-mask{direction:inherit;position:absolute;overflow:hidden;padding:0;margin:0;left:0;top:0;bottom:0;right:0;width:auto !important;height:auto !important;z-index:0;}.simplebar-offset{direction:inherit !important;resize:none !important;position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;-webkit-overflow-scrolling:touch;}.simplebar-content-wrapper{direction:inherit;position:relative;display:block;visibility:visible;}.simplebar-placeholder{max-height:100%;max-width:100%;width:100%;pointer-events:none;}.simplebar-height-auto-observer-wrapper{height:100%;width:inherit;max-width:1px;position:relative;float:left;max-height:1px;overflow:hidden;z-index:-1;padding:0;margin:0;pointer-events:none;flex-grow:inherit;flex-shrink:0;flex-basis:0;}.simplebar-height-auto-observer{display:block;opacity:0;position:absolute;top:0;left:0;height:1000%;width:1000%;min-height:1px;min-width:1px;overflow:hidden;pointer-events:none;z-index:-1;}.simplebar-track{z-index:1;position:absolute;right:0;bottom:0;pointer-events:none;overflow:hidden;}[data-simplebar].simplebar-dragging .simplebar-track{pointer-events:all;}.simplebar-scrollbar{position:absolute;right:2px;width:7px;min-height:10px;}.simplebar-scrollbar:before{position:absolute;content:\\"\\";border-radius:7px;left:0;right:0;opacity:0;transition:opacity 0.2s linear;background:#333333;}.simplebar-track .simplebar-scrollbar.simplebar-visible:before{opacity:0.5;transition:opacity 0s linear;}.simplebar-track.simplebar-vertical{top:0;width:11px;}.simplebar-track.simplebar-vertical .simplebar-scrollbar:before{top:2px;bottom:2px;}.simplebar-track.simplebar-horizontal{left:0;height:11px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar:before{height:100%;left:2px;right:2px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar{right:auto;left:0;top:2px;height:7px;min-height:0;min-width:10px;width:auto;}[data-simplebar-direction=\\"rtl\\"] .simplebar-track.simplebar-vertical{right:auto;left:0;}", - } - } - /> - - - -
    +
    +
    +
    -
    -
    -
    -
    -
    - - - 
    +                                                  
-                                                    
-                                                      
-                                                        a
-                                                        
-                                                          ;
-                                                        
-                                                      
-                                                    
-
    -     -     -
    -
    + a + + ; + + + + + +
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - -
    - - - -
    -     -     -
    - - - -     -
    -
    -

    - Story Source -

    - 
    -              
    -                
    
-                  
-                        It's a 
-                        Basic test
-                         story:
-                        
-                      
    
+                                  
    
+                                
    
+                                
    
+                                  
    
+                                
    
+                                
    
+                                  
    
+                                
    
+                              
    
+                            
+                          
+                        
+                      
+                    
+                  
+                  
-                    
    
+                    
                       
    
-                        
-                          <
-                          div
-                        
-                        
-                              It's a 
-                              Basic test
-                               story:
-                              
-                            
    
-                          }
-                          singleLine={false}
-                        >
-                          
-                        
-                        
-                          >
-                        
+                          
+                        
                       
    
-                      
-                        
    
-                          
-                            It's a 
-                          
-                        
    
-                          
-                      
-                        
    
-                          
-                            Basic test
-                          
-                        
    
-                          
-                      
-                        
    
-                          
-                             story:
-                          
-                        
    
-                          
-                      
-                        }
-                      >
-                        
    
-                          
-                            <
-                            TestComponent
-                          
-                          
-                            }
-                            singleLine={true}
-                          >
-                            
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  func
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        func
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  obj
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        
-                                          {
-                                          
-                                            
-                                              a
-                                            
-                                          
-                                          : 
-                                          
-                                            
-                                              'a'
-                                            
-                                          
-                                          ,
-                                          
-                                            
-                                              b
-                                            
-                                          
-                                          : 
-                                          
-                                            
-                                              'b'
-                                            
-                                          
-                                          }
-                                        
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  array
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        
-                                          [
-                                          
-                                            
-                                              
-                                                1
-                                              
-                                            
-                                          
-                                          ,
-                                          
-                                            
-                                              
-                                                2
-                                              
-                                            
-                                          
-                                          ,
-                                          
-                                            
-                                              
-                                                3
-                                              
-                                            
-                                          
-                                          ]
-                                        
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  number
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        7
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  string
-                                
-                                
-                                  =
-                                  
-                                    "
-                                    
-                                      
-                                        seven
-                                      
-                                    
-                                    "
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  bool
-                                
-                                
    
-                                  
-                                
-                              
-                          
-                            />
-                          
-                        
    
-                          
-                      
    
-                        
-                          </
-                          div
-                          >
-                        
-                      
    
-                    
    
-                  
+                    
+
    - + + +     +

    + Story Source +

    + +
    " + format={false} + language="jsx" + > + + + +
    - - - - -
    -
    + +
    + + + +
    +     + +
    + + + +
    @@ -7451,310 +5385,296 @@ exports[`addon Info should render component description if story name matches co styles={[Function]} >
    -
    +
    -
    + Test Components + +

    + TestComponent +

    +
    +
    +
    +
    +
    + It's a + TestComponent + story: + +
    +

    + x => x + 1 +

    +

    + [object Object] +

    +

    + 1,2,3 +

    +

    + 7 +

    +
    + seven +
    +
    + true +
    +

    + undefined +

    + + test + + + storiesOf + +
      +
    • + 1 +
      • +
    • + 2 +
      • +
    +
    +     +
    +
    +
    +
    +

    +

    -

    - Test Components -

    -

    - TestComponent -

    -
    -
    -
    -
    -
    - It's a - TestComponent - story: - -
    -

    - x => x + 1 -

    -

    - [object Object] -

    -

    - 1,2,3 -

    -

    - 7 -

    -
    - seven -
    -
    - true -
    -

    - undefined -

    - - test - - - storiesOf - -
      -
    • - 1 -
      • -
    • - 2 -
      • -
    -
    -     -
    -
    -
    -
    + +

    -
    -

    + with markdown support +

    +

    +

    +

    + -

    - Awesome test component description -

    - -

    + + -

    - with markdown support -

    -

    -

    -

    - - bold - - - - cursive - -
    -

    - - +

    +

    + + + + - - -
    + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + "ctr": 82, + "isSpeedy": false, + "key": "css", + "nonce": undefined, + "tags": Array [ + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ], + }, + } + } + serialized={ + Object { + "map": undefined, + "name": "nh5djz", + "next": undefined, + "styles": "[data-simplebar]{position:relative;flex-direction:column;flex-wrap:wrap;justify-content:flex-start;align-content:flex-start;align-items:flex-start;}.simplebar-wrapper{overflow:hidden;width:inherit;height:inherit;max-width:inherit;max-height:inherit;}.simplebar-mask{direction:inherit;position:absolute;overflow:hidden;padding:0;margin:0;left:0;top:0;bottom:0;right:0;width:auto !important;height:auto !important;z-index:0;}.simplebar-offset{direction:inherit !important;resize:none !important;position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;-webkit-overflow-scrolling:touch;}.simplebar-content-wrapper{direction:inherit;position:relative;display:block;visibility:visible;}.simplebar-placeholder{max-height:100%;max-width:100%;width:100%;pointer-events:none;}.simplebar-height-auto-observer-wrapper{height:100%;width:inherit;max-width:1px;position:relative;float:left;max-height:1px;overflow:hidden;z-index:-1;padding:0;margin:0;pointer-events:none;flex-grow:inherit;flex-shrink:0;flex-basis:0;}.simplebar-height-auto-observer{display:block;opacity:0;position:absolute;top:0;left:0;height:1000%;width:1000%;min-height:1px;min-width:1px;overflow:hidden;pointer-events:none;z-index:-1;}.simplebar-track{z-index:1;position:absolute;right:0;bottom:0;pointer-events:none;overflow:hidden;}[data-simplebar].simplebar-dragging .simplebar-track{pointer-events:all;}.simplebar-scrollbar{position:absolute;right:2px;width:7px;min-height:10px;}.simplebar-scrollbar:before{position:absolute;content:\\"\\";border-radius:7px;left:0;right:0;opacity:0;transition:opacity 0.2s linear;background:#333333;}.simplebar-track .simplebar-scrollbar.simplebar-visible:before{opacity:0.5;transition:opacity 0s linear;}.simplebar-track.simplebar-vertical{top:0;width:11px;}.simplebar-track.simplebar-vertical .simplebar-scrollbar:before{top:2px;bottom:2px;}.simplebar-track.simplebar-horizontal{left:0;height:11px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar:before{height:100%;left:2px;right:2px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar{right:auto;left:0;top:2px;height:7px;min-height:0;min-width:10px;width:auto;}[data-simplebar-direction=\\"rtl\\"] .simplebar-track.simplebar-vertical{right:auto;left:0;}", + } + } + /> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - "ctr": 82, - "isSpeedy": false, - "key": "css", - "nonce": undefined, - "tags": Array [ - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - , - ], - }, - } - } - serialized={ - Object { - "map": undefined, - "name": "nh5djz", - "next": undefined, - "styles": "[data-simplebar]{position:relative;flex-direction:column;flex-wrap:wrap;justify-content:flex-start;align-content:flex-start;align-items:flex-start;}.simplebar-wrapper{overflow:hidden;width:inherit;height:inherit;max-width:inherit;max-height:inherit;}.simplebar-mask{direction:inherit;position:absolute;overflow:hidden;padding:0;margin:0;left:0;top:0;bottom:0;right:0;width:auto !important;height:auto !important;z-index:0;}.simplebar-offset{direction:inherit !important;resize:none !important;position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;-webkit-overflow-scrolling:touch;}.simplebar-content-wrapper{direction:inherit;position:relative;display:block;visibility:visible;}.simplebar-placeholder{max-height:100%;max-width:100%;width:100%;pointer-events:none;}.simplebar-height-auto-observer-wrapper{height:100%;width:inherit;max-width:1px;position:relative;float:left;max-height:1px;overflow:hidden;z-index:-1;padding:0;margin:0;pointer-events:none;flex-grow:inherit;flex-shrink:0;flex-basis:0;}.simplebar-height-auto-observer{display:block;opacity:0;position:absolute;top:0;left:0;height:1000%;width:1000%;min-height:1px;min-width:1px;overflow:hidden;pointer-events:none;z-index:-1;}.simplebar-track{z-index:1;position:absolute;right:0;bottom:0;pointer-events:none;overflow:hidden;}[data-simplebar].simplebar-dragging .simplebar-track{pointer-events:all;}.simplebar-scrollbar{position:absolute;right:2px;width:7px;min-height:10px;}.simplebar-scrollbar:before{position:absolute;content:\\"\\";border-radius:7px;left:0;right:0;opacity:0;transition:opacity 0.2s linear;background:#333333;}.simplebar-track .simplebar-scrollbar.simplebar-visible:before{opacity:0.5;transition:opacity 0s linear;}.simplebar-track.simplebar-vertical{top:0;width:11px;}.simplebar-track.simplebar-vertical .simplebar-scrollbar:before{top:2px;bottom:2px;}.simplebar-track.simplebar-horizontal{left:0;height:11px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar:before{height:100%;left:2px;right:2px;}.simplebar-track.simplebar-horizontal .simplebar-scrollbar{right:auto;left:0;top:2px;height:7px;min-height:0;min-width:10px;width:auto;}[data-simplebar-direction=\\"rtl\\"] .simplebar-track.simplebar-vertical{right:auto;left:0;}", - } - } - /> - - - -
    +
    +
    +
    -
    -
    -
    -
    -
    - - - 
    +                                                  
-                                                    
-                                                      
-                                                        a
-                                                        
-                                                          ;
-                                                        
-                                                      
-                                                    
-
    -     -     -
    -
    + a + + ; + + + + + +
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - -
    - - - -
    -     -     -
    - - - -     -
    -
    -

    - Story Source -

    - 
    -              
    -                
    
-                  
-                        It's a 
-                        TestComponent
-                         story:
-                        
-                      
    
+                                  
    
+                                
    
+                                
    
+                                  
    
+                                
    
+                                
    
+                                  
    
+                                
    
+                              
    
+                            
+                          
+                        
+                      
+                    
+                  
+                  
-                    
    
+                    
                       
    
-                        
-                          <
-                          div
-                        
-                        
-                              It's a 
-                              TestComponent
-                               story:
-                              
-                            
    
-                          }
-                          singleLine={false}
-                        >
-                          
-                        
-                        
-                          >
-                        
+                          
+                        
                       
    
-                      
-                        
    
-                          
-                            It's a 
-                          
-                        
    
-                          
-                      
-                        
    
-                          
-                            TestComponent
-                          
-                        
    
-                          
-                      
-                        
    
-                          
-                             story:
-                          
-                        
    
-                          
-                      
-                        }
-                      >
-                        
    
-                          
-                            <
-                            TestComponent
-                          
-                          
-                            }
-                            singleLine={true}
-                          >
-                            
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  func
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        func
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  obj
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        
-                                          {
-                                          
-                                            
-                                              a
-                                            
-                                          
-                                          : 
-                                          
-                                            
-                                              'a'
-                                            
-                                          
-                                          ,
-                                          
-                                            
-                                              b
-                                            
-                                          
-                                          : 
-                                          
-                                            
-                                              'b'
-                                            
-                                          
-                                          }
-                                        
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  array
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        
-                                          [
-                                          
-                                            
-                                              
-                                                1
-                                              
-                                            
-                                          
-                                          ,
-                                          
-                                            
-                                              
-                                                2
-                                              
-                                            
-                                          
-                                          ,
-                                          
-                                            
-                                              
-                                                3
-                                              
-                                            
-                                          
-                                          ]
-                                        
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  number
-                                
-                                
-                                  =
-                                  
-                                    {
-                                    
-                                      
-                                        7
-                                      
-                                    
-                                    }
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  string
-                                
-                                
-                                  =
-                                  
-                                    "
-                                    
-                                      
-                                        seven
-                                      
-                                    
-                                    "
-                                  
-                                
-                                  
-                              
-                                
-                                  
    
-                                    
-                                    
-                                
-                                  bool
-                                
-                                
    
-                                  
-                                
-                              
-                          
-                            />
-                          
-                        
    
-                          
-                      
    
-                        
-                          </
-                          div
-                          >
-                        
-                      
    
-                    
    
-                  
+                    
+
    - + + +     +

    + Story Source +

    + +
    " + format={false} + language="jsx" + > + + + +
    - - - - -
    -
    + +
    + + + +
    +     + +
    + + + +
    diff --git a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot index c820d2d184e..a1d1992bd3a 100644 --- a/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot +++ b/examples/official-storybook/stories/__snapshots__/addon-info.stories.storyshot @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Storyshots Addons|Info/Decorator Use Info as story decorator 1`] = ` -
    +Array [
    @@ -10,243 +10,19 @@ exports[`Storyshots Addons|Info/Decorator Use Info as story decorator 1`] = ` > Button -
    +
    , - -
    + , +] `; exports[`Storyshots Addons|Info/ForwardRef Displays forwarded ref components correctly 1`] = ` -
    +Array [
    @@ -255,437 +31,19 @@ exports[`Storyshots Addons|Info/ForwardRef Displays forwarded ref components cor > Forwarded Ref Button -
    +
    , - -
    + , +] `; exports[`Storyshots Addons|Info/ForwardRef Uses forwardRef displayName if available 1`] = ` -
    +Array [
    @@ -694,356 +52,19 @@ exports[`Storyshots Addons|Info/ForwardRef Uses forwardRef displayName if availa > Forwarded Ref Button w/ Display Name -
    +
    , - -
    + , +] `; exports[`Storyshots Addons|Info/GitHub issues #1814 1`] = ` -
    +Array [
    @@ -1053,162 +74,19 @@ exports[`Storyshots Addons|Info/GitHub issues #1814 1`] = ` />