Merge branch 'master' into Hypnosphi-patch-1

storybookjs · Feb 18, 2018 · c0a7c95 · c0a7c95
2 parents 6c173cf + abdd351
commit c0a7c95
Show file tree

Hide file tree

Showing 324 changed files with 4,793 additions and 4,730 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -81,6 +81,11 @@ jobs:
           command: |
             cd examples/angular-cli
             yarn build-storybook
+      - run:
+          name: "Build polymer-cli"
+          command: |
+            cd examples/polymer-cli
+            yarn build-storybook
       - run:
           name: "Run react kitchen-sink (smoke test)"
           command: |
@@ -96,6 +101,10 @@ jobs:
           command: |
             cd examples/angular-cli
             yarn storybook --smoke-test
+      - run:
+          name: "Visually test storybook"
+          command: |
+            yarn chromatic
       - run:
           name: "Run image snapshots"
           command: yarn test --image
@@ -207,26 +216,6 @@ jobs:
           command: |
             yarn test --coverage --runInBand --core
             yarn coverage
-  storybook:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          name: "Restore core dependencies cache"
-          keys:
-            - core-dependencies-{{ checksum "yarn.lock" }}
-      - restore_cache:
-          name: "Restore core dist cache"
-          keys:
-            - core-dist-{{ .Revision }}
-      - run:
-          name: "Link packages"
-          command: |
-            yarn install
-      - run:
-          name: "Visually test storybook"
-          command: |
-            yarn chromatic
   cli:
     working_directory: /tmp/storybook
     docker:
@@ -292,9 +281,6 @@ workflows:
       - unit-test:
           requires:
             - build
-      - storybook:
-          requires:
-            - build
       - cli:
           requires:
             - build

diff --git a/.eslintignore b/.eslintignore
@@ -2,8 +2,6 @@ dist
 build
 coverage
 node_modules
-addons/**/example/**
-app/**/demo/**
 docs/public
 lib/cli/test
 *.bundle.js
@@ -13,3 +11,4 @@ lib/cli/test
 !.eslintrc.js
 !.eslintrc-markdown.js
 !.jest.config.js
+!.storybook
diff --git a/.eslintrc-markdown.js b/.eslintrc-markdown.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,7 +4,13 @@ const ignore = 0;
 
 module.exports = {
   root: true,
-  extends: ['eslint-config-airbnb', 'plugin:jest/recommended', 'prettier'],
+  extends: [
+    'eslint-config-airbnb',
+    'plugin:jest/recommended',
+    'plugin:import/react-native',
+    'prettier',
+    'prettier/react',
+  ],
   plugins: ['prettier', 'jest', 'react', 'json'],
   parser: 'babel-eslint',
   parserOptions: {
@@ -18,9 +24,13 @@ module.exports = {
   settings: {
     'import/core-modules': ['enzyme'],
     'import/ignore': ['node_modules\\/(?!@storybook)'],
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.ts'],
+      },
+    },
   },
   rules: {
-    strict: [error, 'never'],
     'prettier/prettier': [
       warn,
       {
@@ -32,16 +42,13 @@ module.exports = {
       },
     ],
     'no-debugger': process.env.NODE_ENV === 'production' ? error : ignore,
-    quotes: [warn, 'single', { avoidEscape: true }],
     'class-methods-use-this': ignore,
-    'arrow-parens': [warn, 'as-needed'],
-    'space-before-function-paren': ignore,
-    'import/no-unresolved': error,
     'import/extensions': [
       error,
+      'always',
       {
         js: 'never',
-        json: 'always',
+        ts: 'never',
       },
     ],
     'import/no-extraneous-dependencies': [
@@ -56,6 +63,7 @@ module.exports = {
           '**/scripts/*.js',
           '**/stories/**/*.js',
           '**/__tests__/**/*.js',
+          '**/.storybook/**/*.js',
         ],
         peerDependencies: true,
       },
@@ -64,24 +72,41 @@ module.exports = {
     'import/default': error,
     'import/named': error,
     'import/namespace': error,
-    'react/jsx-wrap-multilines': ignore,
-    'react/jsx-indent': ignore,
-    'react/jsx-indent-props': ignore,
-    'react/jsx-closing-bracket-location': ignore,
-    'react/jsx-uses-react': error,
-    'react/jsx-uses-vars': error,
-    'react/react-in-jsx-scope': error,
     'react/jsx-filename-extension': [
       warn,
       {
         extensions: ['.js', '.jsx'],
       },
     ],
-    'jsx-a11y/accessible-emoji': ignore,
-    'jsx-a11y/href-no-hash': ignore,
-    'jsx-a11y/label-has-for': ignore,
-    'jsx-a11y/click-events-have-key-events': error,
-    'jsx-a11y/anchor-is-valid': [warn, { aspects: ['invalidHref'] }],
     'react/no-unescaped-entities': ignore,
+    'jsx-a11y/label-has-for': [
+      error,
+      {
+        required: {
+          some: ['nesting', 'id'],
+        },
+      },
+    ],
+    'jsx-a11y/anchor-is-valid': [
+      error,
+      {
+        components: ['RoutedLink', 'MenuLink', 'LinkTo', 'Link'],
+        specialLink: ['overrideParams', 'kind', 'story', 'to'],
+      },
+    ],
   },
+  overrides: [
+    {
+      files: ['**/react-native*/**', '**/REACT_NATIVE*/**', '**/crna*/**'],
+      rules: {
+        'jsx-a11y/accessible-emoji': ignore,
+      },
+    },
+    {
+      files: '**/.storybook/config.js',
+      rules: {
+        'global-require': ignore,
+      },
+    },
+  ],
 };
diff --git a/.remarkrc.js b/.remarkrc.js
@@ -1,18 +1,3 @@
 module.exports = {
-  plugins: [
-    'remark-preset-lint-recommended',
-    ['remark-lint-list-item-indent', false],
-    [
-      'remark-lint-code',
-      {
-        js: {
-          module: 'node_modules/remark-lint-code-eslint',
-          options: {
-            fix: true,
-            configFile: '.eslintrc-markdown.js',
-          },
-        },
-      },
-    ],
-  ],
+  plugins: ['remark-preset-lint-recommended', ['remark-lint-list-item-indent', false]],
 };