-
Notifications
You must be signed in to change notification settings - Fork 256
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Upgrade to react 16 #191
Upgrade to react 16 #191
Changes from 16 commits
1367edf
e66261f
bc9f6a7
465fe66
67a280f
31916e0
b5bb104
214e081
a3960fe
5952e41
a13a89b
01ac104
878bf30
ee2f614
9022b85
a4673cf
4963f88
784a04c
f096d29
d3304dc
96779a7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,11 @@ | ||
/* eslint-disable */ | ||
import { configure } from '@kadira/storybook'; | ||
import React from 'react'; | ||
import { configure } from '@storybook/react'; | ||
|
||
const req = require.context('../stories', true, /\.stories\.js$/); | ||
|
||
function loadStories() { | ||
req.keys().forEach((filename) => req(filename)); | ||
} | ||
|
||
configure(loadStories, module); | ||
configure(loadStories, module); |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ cache: | |
directories: | ||
- node_modules | ||
node_js: | ||
- "4" | ||
- "6" | ||
- "8" | ||
before_script: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,29 +46,29 @@ | |
"web-animations" | ||
], | ||
"peerDependencies": { | ||
"react": "0.13.x || 0.14.x || 15.x.x", | ||
"react-dom": "0.13.x || 0.14.x || 15.x.x" | ||
"react": ">0.13.x <16.x.x", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch 👍 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😊 |
||
"react-dom": ">0.13.x <16.x.x" | ||
}, | ||
"devDependencies": { | ||
"@kadira/storybook": "2.30.1", | ||
"@types/react": "15.0.24", | ||
"babel": "6.1.18", | ||
"babel-cli": "6.2.0", | ||
"babel-core": "6.2.1", | ||
"@storybook/react": "^3.2.8", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: can we omit the I don't really think this even matters anymore, with Yarn/NPM5. But, my inner OCD wants it to be consistent, haha. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You probably also want to upgrade it to 3.2.12, there has been some critical bugfixes |
||
"@types/react": "16.0.7", | ||
"babel": "6.23.0", | ||
"babel-cli": "6.26.0", | ||
"babel-core": "6.26.0", | ||
"babel-eslint": "7.2.3", | ||
"babel-loader": "6.2.1", | ||
"babel-loader": "7.1.2", | ||
"babel-plugin-add-module-exports": "0.1.1", | ||
"babel-plugin-istanbul": "4.1.4", | ||
"babel-plugin-transform-decorators-legacy": "1.3.4", | ||
"babel-plugin-transform-object-assign": "6.3.13", | ||
"babel-preset-es2015": "6.1.18", | ||
"babel-preset-flow": "6.23.0", | ||
"babel-preset-react": "6.3.13", | ||
"babel-preset-stage-0": "6.1.18", | ||
"chai": "3.5.0", | ||
"chai-enzyme": "0.7.1", | ||
"create-react-class": "15.5.2", | ||
"enzyme": "2.8.2", | ||
"babel-preset-es2015": "6.24.1", | ||
"babel-preset-flow": "7.0.0-beta.2", | ||
"babel-preset-react": "6.24.1", | ||
"babel-preset-stage-0": "6.24.1", | ||
"chai": "4.1.2", | ||
"create-react-class": "15.6.2", | ||
"enzyme": "3.0.0", | ||
"enzyme-adapter-react-16": "^1.0.0", | ||
"eslint": "3.10.0", | ||
"eslint-config-airbnb": "12.0.0", | ||
"eslint-config-prettier": "^2.3.0", | ||
|
@@ -82,28 +82,28 @@ | |
"flow-bin": "0.54.0", | ||
"flow-coverage-report": "0.3.0", | ||
"husky": "0.14.1", | ||
"karma": "0.13.19", | ||
"karma": "1.7.1", | ||
"karma-chai": "0.1.0", | ||
"karma-chrome-launcher": "0.2.2", | ||
"karma-chrome-launcher": "2.2.0", | ||
"karma-coverage": "1.1.1", | ||
"karma-mocha": "0.2.1", | ||
"karma-sinon": "1.0.4", | ||
"karma-sinon-chai": "1.1.0", | ||
"karma-mocha": "1.3.0", | ||
"karma-sinon": "1.0.5", | ||
"karma-sinon-chai": "1.3.2", | ||
"karma-sourcemap-loader": "0.3.7", | ||
"karma-webpack": "1.7.0", | ||
"karma-webpack": "2.0.4", | ||
"lodash": "4.3.0", | ||
"mocha": "2.4.5", | ||
"mocha": "3.5.3", | ||
"preact": "8.1.0", | ||
"preact-compat": "3.16.0", | ||
"prettier": "^1.6.1", | ||
"prop-types": "15.5.8", | ||
"react": "15.6.1", | ||
"react-dom": "15.6.1", | ||
"react-test-renderer": "15.6.1", | ||
"react": "16.0.0", | ||
"react-dom": "16.0.0", | ||
"react-test-renderer": "16", | ||
"sinon": "1.17.3", | ||
"sinon-chai": "2.8.0", | ||
"tslint": "5.2.0", | ||
"typescript": "2.3.2", | ||
"webpack": "1.12.11" | ||
"webpack": "3.6.0" | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Guessing modern versions of Storybook use Radium?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not directly, but via
react-treebeard
. We useglamorous
for our own componentsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh cool! Wasn't aware you were a contributor to Storybook - thanks for your work there :)