Merge pull request #1724 from storybooks/release/3.3

release/3.3

.circleci/config.yml

@@ -68,6 +68,7 @@ jobs:
           command: |
             cd examples/vue-kitchen-sink
             yarn build-storybook
+
       - run:
           name: "Run react kitchen-sink"
           command: |
@@ -198,6 +199,46 @@ jobs:
           command: |
             yarn test --coverage --runInBand --core
             yarn coverage
+  cli:
+    working_directory: /tmp/storybook
+    docker:
+      - image: andthensome/docker-node-rsync
+    environment:
+        BASH_ENV: ~/.bashrc
+    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: "Test CLI"
+          command: |
+            yarn test --cli
+  cli-latest-cra:
+    working_directory: /tmp/storybook
+    docker:
+      - image: andthensome/docker-node-rsync
+    environment:
+        BASH_ENV: ~/.bashrc
+    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: "Test CLI with latest CR(N)A"
+          command: |
+            yarn test-latest-cra
   deploy:
     <<: *defaults
     steps:
@@ -223,3 +264,9 @@ workflows:
       - unit-test:
           requires:
             - build
+      - cli:
+          requires:
+            - build
+      - cli-latest-cra:
+          requires:
+            - build

.eslintignore

@@ -5,7 +5,7 @@ node_modules
 addons/**/example/**
 app/**/demo/**
 docs/public
-
+lib/cli/test
 *.bundle.js
 *.js.map
 

.eslintrc.js

@@ -51,6 +51,7 @@ module.exports = {
           '**/example/**',
           '*.js',
           '**/*.test.js',
+          '**/*.stories.js',
           '**/scripts/*.js',
           '**/stories/**/*.js',
           '**/__tests__/**/*.js',

.gitignore

@@ -2,6 +2,7 @@ node_modules
 *.log
 .idea
 .vscode
+*.sw*
 npm-shrinkwrap.json
 dist
 .tern-port
@@ -20,4 +21,3 @@ package-lock.json
 storybook-static
 integration/__image_snapshots__/__diff_output__
 .jest-test-results.json
-

.mailmap

@@ -0,0 +1,50 @@
+# --- instructions --- #
+
+# Add your account in this format:
+Your name here <yourname@example.com> # github:my-github-account, npm:my-npm-account, twitter:my-twitter-handle
+
+# supported:
+# github, npm, twitter, website
+
+# --- list ----------- #
+
+Aaron Mc Adam <aaron@aaronmcadam.com> 
+Aruna Herath <aruna@kadira.io> <arunabherath@gmail.com> 
+Arunoda Susiripala <arunoda.susiripala@gmail.com>  Arunoda Susiripala <arunoda.susiripala@gmail.com> 
+Benedikt D Valdez <benediktvaldez@users.noreply.github.com>  Benedikt D Valdez <benediktvaldez@users.noreply.github.com> 
+Daniel Duan <dduan@squarespace.com> <dduan@yahoo.com> 
+Daniel James <daniel@thzinc.com> <djames@syncromatics.com> 
+Danny Andrews <danny-andrews@users.noreply.github.com>  danny@ownlocal.com> 
+Dustin Kane <dkane@athenahealth.com> <dustinpkane@gmail.com> 
+Eli Sherer <eli.sherer@gmail.com>  elish <elish@payoneer.com> 
+Evgeny Kochetkov <evgeny.kochetkov@me.com>  Evgeny Kochetkov <evgenykochetkov@users.noreply.github.com> 
+Fabien Bernard <fabien0102@hotmail.com>  Fabien BERNARD <fabien0102@hotmail.com> 
+Fernando Daciuk <f.daciuk@gmail.com> <fdaciuk@users.noreply.github.com> 
+Greenkeeper <support@greenkeeper.io>  greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com> 
+Greenkeeper <support@greenkeeper.io>  greenkeeperio-bot <support@greenkeeper.io> 
+Jason Schloer <jschloer@Jasons-Mac-Pro.local>  jschloer <jschloer@terragotech.com> 
+Jean-Michel Francois <jmfrancois@talend.com>  Jean-Michel FRANCOIS <jmfrancois@talend.com> 
+Jeff Carbonella <jeff.carbonella@gmail.com> <jeff@contactually.com> 
+Jeff Knaggs <jeef3@users.noreply.github.com> <mail@jeef3.com> 
+Jordan Gensler <jordan.gensler@airbnb.com> <jordangens@gmail.com> 
+Kanitkorn Sujautra <k.sujautra@gmail.com>  Kanitkorn S <lukyth@users.noreply.github.com> 
+Kent C. Dodds <kent@doddsfamily.us> <kent+github@doddsfamily.us> 
+larry <bshy522@gmail.com> <larry@yunify.com> 
+Madushan Nishantha <j.l.madushan@gmail.com> <madushan1000@users.noreply.github.com> 
+Marie-Laure Thuret <mthuret@users.noreply.github.com>  mthuret <marielaure.thuret@algolia.com> 
+Max Hodges <max@whiterabbitjapan.com>  MaxHodges <max@whiterabbitjapan.com> 
+Michael Shilman <shilman@lab80.co> <shilman@users.noreply.github.com> 
+Michael Shilman <shilman@lab80.co> <michael@lab80.co> 
+Muhammed Thanish <mnmtanish@gmail.com> <mnmtanish@users.noreply.github.com> 
+Ned Schwartz <ned@theinterned.net>  Ned Schwartz <ned@theinterned.net> 
+Joe Nelson <Joe.Nelson@regence.com>  Nelson, Joe <Joe.Nelson@regence.com> 
+Nikolay Kozhuharenko <Nikolay.Kozhuharenko@gmail.com>  Nikolay <Nikolay.Kozhuharenko@gmail.com> 
+Norbert de Langen <ndelangen@me.com>  # github:ndelangen, npm:ndelangen, twitter:norbertdelangen
+Oleg Proskurin <regx@usul.su>  UsulPro <regx@usul.su> 
+Orta <orta.therox@gmail.com>  orta <orta.therox@gmail.com> 
+Ritesh Kumar <ritz078@users.noreply.github.com>  Ritesh Kumar <rkritesh078@gmail.com> 
+Sylvain Bannier <sylvain.bannier@smile.fr>  Sylvain BANNIER <sylvain.bannier@smile.fr> 
+Tom Coleman <tom@percolatestudio.com>  Tom Coleman <tom@thesnail.org> 
+Trevor Eyre <trevoreyre@gmail.com> # github:TrevorEyre, twitter:trevor_eyre
+William Castandet <wcastand@gmail.com>  wcastand <wcastand@gmail.com> 
+Xavier Cazalot <xavier.cazalot@gmail.com>  xavcz <xavier.cazalot@gmail.com>