Merge pull request #2589 from storybooks/eslint-imports

Add more `imports` eslint rules
2025-04-04 19:11:08 +08:00 · 2017-12-28 14:26:55 +03:00 · 2017-12-28 14:26:55 +03:00 · 4b92649daf
commit 4b92649daf
parent c8fe23cbf5 14ff60655e
32 changed files with 35 additions and 3 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -17,6 +17,7 @@ module.exports = {
  },
  settings: {
    'import/core-modules': ['enzyme'],
+    'import/ignore': ['node_modules\\/(?!@storybook)'],
  },
  rules: {
    strict: [error, 'never'],
@ -60,6 +61,9 @@ module.exports = {
      },
    ],
    'import/prefer-default-export': ignore,
+    'import/default': error,
+    'import/named': error,
+    'import/namespace': error,
    'react/jsx-wrap-multilines': ignore,
    'react/jsx-indent': ignore,
    'react/jsx-indent-props': ignore,
--- a/addons/a11y/package.json
+++ b/addons/a11y/package.json
@ -16,6 +16,7 @@
  },
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/storybooks/storybook.git"
--- a/addons/actions/package.json
+++ b/addons/actions/package.json
@ -11,6 +11,7 @@
  },
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/background/package.json
+++ b/addons/background/package.json
@ -15,6 +15,7 @@
  "license": "MIT",
  "author": "jbaxleyiii",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/centered/package.json
+++ b/addons/centered/package.json
@ -5,6 +5,7 @@
  "license": "MIT",
  "author": "Muhammed Thanish <mnmtanish@gmail.com>",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "scripts": {
    "prepare": "node ../../scripts/prepare.js"
  },
--- a/addons/events/package.json
+++ b/addons/events/package.json
@ -10,6 +10,7 @@
  ],
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "git@github.com:storybooks/storybook.git"
--- a/addons/graphql/package.json
+++ b/addons/graphql/package.json
@ -11,6 +11,7 @@
  },
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/info/package.json
+++ b/addons/info/package.json
@ -4,6 +4,7 @@
  "description": "A Storybook addon to show additional information for your stories.",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/info/src/components/markdown/index.js
+++ b/addons/info/src/components/markdown/index.js
@ -1,3 +1,3 @@
 export { H1, H2, H3, H4, H5, H6 } from './htags';
 export { Code, Pre } from './code';
-export { P, Small, A, LI, UL } from './text';
+export { P, A, LI, UL } from './text';
--- a/addons/jest/package.json
+++ b/addons/jest/package.json
@ -16,6 +16,7 @@
  "license": "MIT",
  "author": "Renaud Tertrais <renaud.tertrais@gmail.com> (https://github.com/renaudtertrais)",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/storybooks/storybook"
--- a/addons/knobs/package.json
+++ b/addons/knobs/package.json
@ -4,6 +4,7 @@
  "description": "Storybook Addon Prop Editor Component",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/links/package.json
+++ b/addons/links/package.json
@ -11,6 +11,7 @@
  },
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/notes/package.json
+++ b/addons/notes/package.json
@ -9,6 +9,7 @@
  ],
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/storyshots/package.json
+++ b/addons/storyshots/package.json
@ -4,6 +4,7 @@
  "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/addons/viewport/package.json
+++ b/addons/viewport/package.json
@ -2,7 +2,7 @@
  "name": "@storybook/addon-viewport",
  "version": "3.3.2",
  "description": "Storybook addon to change the viewport size to mobile",
-  "main": "dist/index.js",
+  "main": "register.js",
  "keywords": [
    "storybook"
  ],
--- a/addons/viewport/src/index.js
+++ b/addons/viewport/src/index.js
@ -1 +0,0 @@
-export { register } from './manager';
--- a/app/angular/package.json
+++ b/app/angular/package.json
@ -8,6 +8,7 @@
  },
  "license": "MIT",
  "main": "dist/client/index.js",
+  "jsnext:main": "src/client/index.js",
  "bin": {
    "build-storybook": "./bin/build.js",
    "start-storybook": "./bin/index.js",
--- a/app/react-native/package.json
+++ b/app/react-native/package.json
@ -13,6 +13,7 @@
  },
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "bin": {
    "storybook": "dist/bin/storybook.js"
  },
--- a/app/react/package.json
+++ b/app/react/package.json
@ -8,6 +8,7 @@
  },
  "license": "MIT",
  "main": "dist/client/index.js",
+  "jsnext:main": "src/client/index.js",
  "bin": {
    "build-storybook": "./bin/build.js",
    "start-storybook": "./bin/index.js",
--- a/app/vue/package.json
+++ b/app/vue/package.json
@ -8,6 +8,7 @@
  },
  "license": "MIT",
  "main": "dist/client/index.js",
+  "jsnext:main": "src/client/index.js",
  "bin": {
    "build-storybook": "./bin/build.js",
    "start-storybook": "./bin/index.js",
--- a/docs/src/stories/index.js
+++ b/docs/src/stories/index.js
@ -1,3 +1,5 @@
+// TODO reenable when @storybook/react with jsnext:main is published
+// eslint-disable-next-line import/named
 import { storiesOf } from '@storybook/react';
 import implementations from './implementations';

--- a/examples/cra-kitchen-sink/src/stories/index.stories.js
+++ b/examples/cra-kitchen-sink/src/stories/index.stories.js
@ -3,6 +3,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react';
 import { setOptions } from '@storybook/addon-options';
 import { action } from '@storybook/addon-actions';
+// eslint-disable-next-line import/named
 import { withNotes, WithNotes } from '@storybook/addon-notes';
 import centered from '@storybook/addon-centered';
 import { withInfo } from '@storybook/addon-info';
--- a/examples/official-storybook/stories/addon-notes.stories.js
+++ b/examples/official-storybook/stories/addon-notes.stories.js
@ -1,6 +1,7 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';

+// eslint-disable-next-line import/named
 import { withNotes, WithNotes } from '@storybook/addon-notes';
 import { action } from '@storybook/addon-actions';
 import BaseButton from '../components/BaseButton';
--- a/lib/addons/package.json
+++ b/lib/addons/package.json
@ -11,6 +11,7 @@
  },
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/lib/channel-postmessage/package.json
+++ b/lib/channel-postmessage/package.json
@ -4,6 +4,7 @@
  "description": "",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "scripts": {
    "prepare": "node ../../scripts/prepare.js"
  },
--- a/lib/channel-websocket/package.json
+++ b/lib/channel-websocket/package.json
@ -4,6 +4,7 @@
  "description": "",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "scripts": {
    "prepare": "node ../../scripts/prepare.js"
  },
--- a/lib/channels/package.json
+++ b/lib/channels/package.json
@ -4,6 +4,7 @@
  "description": "",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "scripts": {
    "prepare": "node ../../scripts/prepare.js"
  }
--- a/lib/client-logger/package.json
+++ b/lib/client-logger/package.json
@ -4,6 +4,7 @@
  "description": "",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "scripts": {
    "prepare": "node ../../scripts/prepare.js"
  }
--- a/lib/codemod/package.json
+++ b/lib/codemod/package.json
@ -4,6 +4,7 @@
  "description": "A collection of codemod scripts written with JSCodeshift",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/lib/components/package.json
+++ b/lib/components/package.json
@ -4,6 +4,7 @@
  "description": "Core Storybook Components",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"
--- a/lib/node-logger/package.json
+++ b/lib/node-logger/package.json
@ -4,6 +4,7 @@
  "description": "",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "scripts": {
    "prepare": "node ../../scripts/prepare.js"
  },
--- a/lib/ui/package.json
+++ b/lib/ui/package.json
@ -4,6 +4,7 @@
  "description": "Core Storybook UI",
  "license": "MIT",
  "main": "dist/index.js",
+  "jsnext:main": "src/index.js",
  "repository": {
    "type": "git",
    "url": "https://github.com/storybooks/storybook.git"