Merge pull request #1101 from storybooks/greenkeeper/lerna-2.0.0-rc.5

Update lerna to the latest version 🚀

Author: ndelangen

.travis.yml

@@ -11,7 +11,7 @@ before_install: ./scripts/travis/before_install.sh
 after_success: ./scripts/travis/after_success.sh
 script:
   - npm run bootstrap
-  - (cd examples/test-cra && npm install)
+  - lerna exec --scope test-cra  -- npm i
   - npm run lint
   - npm run test -- --coverage
   - npm run coverage

addons/comments/src/stories/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@storybook/react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import Button from '../index';
 import CommentForm from '../manager/components/CommentForm';
 import CommentList from '../manager/components/CommentList';

addons/info/example/story.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Button from './Button';
 
-import { storiesOf, action } from '@storybook/react';
+import { storiesOf } from '@storybook/react';
 import { action } from '@storybook/addon-actions';
 import backgrounds from 'react-storybook-addon-backgrounds';
 

addons/storyshots/stories/directly_required/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { storiesOf, action } from '@storybook/react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
 import Button from './Button';
 
 storiesOf('Another Button', module)

jest.config.js

@@ -5,9 +5,14 @@ module.exports = {
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/__mocks__/fileMock.js',
     '\\.(css|scss)$': '<rootDir>/__mocks__/styleMock.js',
   },
-  projects: ['<rootDir>/packages/*', '<rootDir>/examples/*'],
+  roots: ['<rootDir>/addons', '<rootDir>/app', '<rootDir>/lib', '<rootDir>/examples'],
   collectCoverage: false,
-  collectCoverageFrom: ['packages/**/*.{js,jsx}', '!**/generators/**'],
+  collectCoverageFrom: [
+    'app/**/*.{js,jsx}',
+    'lib/**/*.{js,jsx}',
+    'addons/**/*.{js,jsx}',
+    '!**/generators/**',
+  ],
   coverageDirectory: 'coverage',
   testEnvironment: 'jsdom',
   setupTestFrameworkScriptFile: './node_modules/jest-enzyme/lib/index.js',

lerna.json

@@ -1,17 +1,12 @@
 {
-  "lerna": "2.0.0-rc.3",
+  "lerna": "2.0.0-rc.5",
   "version": "3.0.0-alpha.4",
   "commands": {
     "bootstrap": {
       "ignore": [
         "test-cra"
       ]
     },
-    "exec": {
-      "ignore": [
-        "test-cra"
-      ]
-    },
     "publish": {
       "ignore": [
         "cra-storybook",

lib/cli/generators/REACT/template/stories/index.js

@@ -1,5 +1,7 @@
 import React from 'react';
-import { storiesOf, action, linkTo } from '@storybook/react';
+import { storiesOf } from '@storybook/react';
+import { action } from '@storybook/addon-actions';
+import { linkTo } from '@storybook/addon-links';
 import Button from './Button';
 import Welcome from './Welcome';
 

lib/cli/lib/has_yarn.js

@@ -1,4 +1,4 @@
-const spawnSync = require('spawn-sync');
+const spawnSync = require('cross-spawn').sync;
 
 module.exports = function hasYarn() {
   const result = spawnSync('yarn', ['--version'], { silent: true });

lib/cli/lib/helpers.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const logger = console;
-const spawnSync = require('spawn-sync');
+const spawnSync = require('cross-spawn').sync;
 
 exports.getPackageJson = function getPackageJson() {
   const packageJsonPath = path.resolve('package.json');

lib/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@storybook/cli",
   "version": "3.0.0-alpha.4",
-  "description": "Easiest way to add Storybook support to your project.",
+  "description": "Storybook's CLI - easiest method of adding storybook to your projects",
   "bin": {
     "getstorybook": "./bin/generate.js"
   },
@@ -11,7 +11,8 @@
   },
   "keywords": [
     "storybook",
-    "generator"
+    "generator",
+    "cli"
   ],
   "author": "",
   "license": "MIT",
@@ -22,10 +23,14 @@
   "dependencies": {
     "chalk": "^1.1.3",
     "commander": "^2.9.0",
+    "cross-spawn": "^5.0.1",
     "json5": "^0.5.1",
     "merge-dirs": "^0.2.1",
     "shelljs": "^0.7.7",
-    "spawn-sync": "^1.0.15",
-    "update-notifier": "^2.1.0"
+    "update-notifier": "^2.1.0",
+    "opencollective": "^1.0.3"
+  },
+  "scripts": {
+    "postinstall": "opencollective postinstall"
   }
 }