Skip to content

Commit

Permalink
Merge pull request #972 from storybooks/fix-examples-failingbuild
Browse files Browse the repository at this point in the history
FIX for test-cra was breaking the build
  • Loading branch information
ndelangen authored Apr 28, 2017
2 parents 57b7161 + 8f36abf commit b0313a1
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ node_js:
before_install: ./scripts/travis/before_install.sh
after_success: ./scripts/travis/after_success.sh
script:
- npm run bootstrap
- npm run lint
- npm run test
- npm run test -- --coverage
- npm run coverage
- npm run test-examples
git:
Expand Down
31 changes: 16 additions & 15 deletions examples/test-cra/package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
{
"name": "test-cra",
"version": "1.0.0",
"private": true,
"scripts": {
"build": "react-scripts build",
"build-storybook": "build-storybook -s public",
"eject": "react-scripts eject",
"start": "react-scripts start",
"storybook": "start-storybook -p 9009 -s public",
"pretest": "npm install",
"test": "react-scripts test --env=jsdom"
},
"dependencies": {
"react": "^15.4.2",
"react-dom": "^15.4.2"
},
"devDependencies": {
"@kadira/storybook": "file:../../packages/react-storybook",
"@kadira/storybook-addon-actions": "file:../../packages/addon-actions",
"@kadira/storybook-addons": "file:../../packages/addons",
"@kadira/storybook-channel": "file:../../packages/channel",
"@kadira/storybook-ui": "file:../../packages/storybook-ui",
"@kadira/storybook-addon-actions": "file:../../packages/addon-actions",
"@kadira/storybook-channel-postmsg": "file:../../packages/channel-postmessage",
"@kadira/storybook-ui": "file:../../packages/storybook-ui",
"react-scripts": "0.9.5"
},
"dependencies": {
"react": "^15.4.2",
"react-dom": "^15.4.2"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"storybook": "start-storybook -p 9009 -s public",
"build-storybook": "build-storybook -s public"
}
"private": true
}
7 changes: 7 additions & 0 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"lerna": "2.0.0-rc.3",
"version": "3.0.0",
"commands": {
"bootstrap": {
"ignore": [
"test-cra"
]
}
},
"packages": [
"packages/*",
"examples/*"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"shelljs": "^0.7.7"
},
"scripts": {
"postinstall": "lerna bootstrap --hoist",
"bootstrap": "lerna bootstrap --hoist",
"lint": "eslint .",
"test": "jest --config ./.jestrc",
"test:watch": "npm test -- --watch",
Expand Down

0 comments on commit b0313a1

Please sign in to comment.