post-rebase cleanup

stories/Dropdown.jsx → src/Dropdown/Dropdown.stories.jsx

+/* eslint-disable import/no-extraneous-dependencies */
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 
-import Dropdown from '../src/Dropdown';
+import Dropdown from './index';
 
-export default function dropdownStories() {
-  return storiesOf('Dropdown', module)
-    .add('basic usage', () => (
-      <Dropdown
-        title="Search Engines"
-        menuItems={[
-          {
-            label: 'Google',
-            href: 'https://google.com',
-          },
-          {
-            label: 'DuckDuckGo',
-            href: 'https://duckduckgo.com',
-          },
-          {
-            label: 'Yahoo',
-            href: 'https://yahoo.com',
-          },
-        ]}
-      />
-    ));
-}
+storiesOf('Dropdown', module)
+  .add('basic usage', () => (
+    <Dropdown
+      title="Search Engines"
+      menuItems={[
+        {
+          label: 'Google',
+          href: 'https://google.com',
+        },
+        {
+          label: 'DuckDuckGo',
+          href: 'https://duckduckgo.com',
+        },
+        {
+          label: 'Yahoo',
+          href: 'https://yahoo.com',
+        },
+      ]}
+    />
+  ));

src/Dropdown.jsx → src/Dropdown/index.jsx

@@ -4,8 +4,8 @@ import PropTypes from 'prop-types';
 import dd from 'bootstrap/scss/_dropdown.scss';
 import borders from 'bootstrap/scss/utilities/_borders.scss';
 
-import pc from './utils/base-styles.scss';
-import Button from './Button';
+import pc from '../utils/base-styles.scss';
+import Button from '../Button';
 
 const triggerKeys = {
   OPEN_MENU: ['ArrowDown', 'Space'],

src/InputSelect/InputSelect.stories.jsx

+/* eslint-disable import/no-extraneous-dependencies */
 import React from 'react';
 import { storiesOf } from '@storybook/react';
 
@@ -90,5 +91,3 @@ storiesOf('InputSelect', module)
       }}
     />
   ));
-
-dropdownStories();

src/index.js

-import Dropdown from './Dropdown';
+import Button from './Button';
 import CheckBox from './CheckBox';
+import Dropdown from './Dropdown';
 import InputSelect from './InputSelect';
 import InputText from './InputText';
 import Tabs from './Tabs';
 
 export {
+  Button,
   CheckBox,
   Dropdown,
   InputSelect,

stories/.eslintrc.json

-{
-  "rules": {
-    "import/no-extraneous-dependencies": "off" // storybook should *not* be a dependency
-  }
-}