Merge branch 'next' of github.com:storybookjs/storybook into next

storybookjs · Feb 4, 2020 · 51e3144 · 51e3144
2 parents 631a394 + 82c0abf
commit 51e3144
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.enzyme.test.js.snap
@@ -246,7 +246,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
               }
             }
           >
-            src/stories/index.js
+            src/stories/1-Button.stories.js
           </code>
         </InlineCode>
         .)
@@ -450,7 +450,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
               }
             }
           >
-            src/stories/index.js
+            src/stories/1-Button.stories.js
           </code>
         </InlineCode>
         .)

diff --git a/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallow.test.js.snap b/addons/storyshots/storyshots-core/stories/__snapshots__/storyshot.shallow.test.js.snap
@@ -139,7 +139,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>
@@ -213,7 +213,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>

diff --git a/...toryshots/storyshots-core/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap b/...toryshots/storyshots-core/stories/__snapshots__/storyshot.shallowWithOptions.test.js.snap
@@ -139,7 +139,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>
@@ -213,7 +213,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
     </InlineCode>
      stories located at 
     <InlineCode>
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </InlineCode>
     .)
   </p>

diff --git a/.../storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap b/.../storyshots-core/stories/__snapshots__/storyshot.snapshotWithOptionsFunction.test.js.snap
@@ -213,7 +213,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
@@ -387,7 +387,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>

diff --git a/...toryshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo b/...toryshots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.foo
@@ -117,7 +117,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>

diff --git a/...ots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot b/...ots/storyshots-core/stories/required_with_context/__snapshots__/Welcome.stories.storyshot
@@ -117,7 +117,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>
@@ -291,7 +291,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>

diff --git a/app/react/src/demo/Welcome.tsx b/app/react/src/demo/Welcome.tsx
@@ -151,7 +151,7 @@ const Welcome: FunctionComponent<WelcomeProps> = ({ showApp }) => (
       You can also edit those components and see changes right away.
       <br />
       (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-      <InlineCode>src/stories/index.js</InlineCode>
+      <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </p>
     <p>

diff --git a/examples/mithril-kitchen-sink/src/Welcome.js b/examples/mithril-kitchen-sink/src/Welcome.js
@@ -109,7 +109,7 @@ const Welcome = {
         You can also edit those components and see changes right away.
         <br />
         (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-        <InlineCode>src/stories/index.js</InlineCode>
+        <InlineCode>src/stories/1-Button.stories.js</InlineCode>
         .)
       </p>
       <p>

diff --git a/examples/preact-kitchen-sink/src/Welcome.js b/examples/preact-kitchen-sink/src/Welcome.js
@@ -112,7 +112,7 @@ const Welcome = ({ showApp }) => (
       You can also edit those components and see changes right away.
       <br />
       (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-      <InlineCode>src/stories/index.js</InlineCode>
+      <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </p>
     <p>

diff --git a/examples/preact-kitchen-sink/src/stories/__snapshots__/welcome.stories.storyshot b/examples/preact-kitchen-sink/src/stories/__snapshots__/welcome.stories.storyshot
@@ -128,7 +128,7 @@ exports[`Storyshots Welcome to Storybook 1`] = `
         }
       }
     >
-      src/stories/index.js
+      src/stories/1-Button.stories.js
     </code>
     .)
   </p>

diff --git a/lib/cli/generators/MITHRIL/template-csf/stories/Welcome.js b/lib/cli/generators/MITHRIL/template-csf/stories/Welcome.js
@@ -150,7 +150,7 @@ const Welcome = {
         You can also edit those components and see changes right away.
         <br />
         (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-        <InlineCode>src/stories/index.js</InlineCode>
+        <InlineCode>src/stories/1-Button.stories.js</InlineCode>
         .)
       </p>
       <p>

diff --git a/lib/cli/generators/PREACT/template-csf/stories/Welcome.js b/lib/cli/generators/PREACT/template-csf/stories/Welcome.js
@@ -101,7 +101,7 @@ const Welcome = ({ showApp }) => (
       You can also edit those components and see changes right away.
       <br />
       (Try editing the <InlineCode>Button</InlineCode> stories located at&nbsp;
-      <InlineCode>src/stories/index.js</InlineCode>
+      <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </p>
     <p>

diff --git a/lib/cli/generators/RAX/template-csf/stories/Welcome.js b/lib/cli/generators/RAX/template-csf/stories/Welcome.js
@@ -92,7 +92,7 @@ const Welcome = ({ showApp }) => (
     <P>
       Just like that, you can add your own components as stories. You can also edit those components
       and see changes right away. (Try editing the <InlineCode>Button</InlineCode> stories located
-      at <InlineCode>src/stories/index.js</InlineCode>
+      at <InlineCode>src/stories/1-Button.stories.js</InlineCode>
       .)
     </P>
     <P>
-Original file line number
+Diff line change
@@ Expand Up / @@ -213,7 +213,7 @@ exports[`Storyshots Welcome MDX to Storybook 1`] = ` @@
             }
           }
         >
-          src/stories/index.js
+          src/stories/1-Button.stories.js
         </code>
         .)
       </p>
@@ Expand Down Expand Up / @@ -387,7 +387,7 @@ exports[`Storyshots Welcome to Storybook 1`] = ` @@
             }
           }
         >
-          src/stories/index.js
+          src/stories/1-Button.stories.js
         </code>
         .)
       </p>
@@ Expand Down @@