Skip to content
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.

Sign up for GitHub

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 react & friends && UPGRADE other dependencies #1908

Merged
merged 10 commits into from
Sep 30, 2017
+688 −661
Merged

UPGRADE react & friends && UPGRADE other dependencies #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
02c6198
UPGRADE react & friends && UPGRADE other dependencies
ndelangen Sep 28, 2017
98e0663
Merge branch 'master' into ndelangen/upgrade-react
ndelangen Sep 29, 2017
37898d6
Merge branch 'master' into ndelangen/upgrade-react
ndelangen Sep 30, 2017
698ef64
Merge branch 'master' into ndelangen/upgrade-react
Hypnosphi Sep 30, 2017
f152c0d
Merge branch 'master' into ndelangen/upgrade-react
Hypnosphi Sep 30, 2017
6f3580f
Fix stories_tree/index.test.js
igor-dv Sep 30, 2017
d1a607e
Merge branch 'master' into ndelangen/upgrade-react
Hypnosphi Sep 30, 2017
8665271
FIX linting
ndelangen Sep 30, 2017
a4146fa
REVERT react-dom version change
ndelangen Sep 30, 2017
2b4930d
Merge branch 'master' into ndelangen/upgrade-react
ndelangen Sep 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions addons/actions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@storybook/addons": "^3.2.10",
"deep-equal": "^1.0.1",
"json-stringify-safe": "^5.0.1",
"prop-types": "^15.5.10",
"react-inspector": "^2.1.6",
"prop-types": "^15.6.0",
"react-inspector": "^2.2.0",
"uuid": "^3.1.0"
},
"devDependencies": {
"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.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions addons/comments/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
},
"dependencies": {
"@storybook/addons": "^3.2.10",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"deep-equal": "^1.0.1",
"events": "^1.1.1",
"global": "^4.3.2",
"insert-css": "^1.0.0",
"marked": "^0.3.6",
"moment": "^2.18.1",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-render-html": "^0.1.6",
"react-textarea-autosize": "^4.3.0"
},
Expand All @@ -41,9 +41,9 @@
"@storybook/addon-actions": "^3.2.11",
"@storybook/react": "^3.2.11",
"git-url-parse": "^6.2.2",
"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.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions addons/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
},
"dependencies": {
"@storybook/addons": "^3.2.10",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"format-json": "^1.0.3",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-textarea-autosize": "^4.3.0",
"uuid": "^3.1.0"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1"
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"peerDependencies": {
"react": "*"
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"license": "MIT",
"dependencies": {
"cors": "^2.8.0",
"express": "^4.14.0",
"express": "^4.15.5",
"express-graphql": "^0.5.4",
"graphql": "^0.7.0"
}
Expand Down
6 changes: 3 additions & 3 deletions addons/graphql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"global": "^4.3.2",
"graphiql": "^0.7.8",
"graphql": "^0.7.0",
"prop-types": "^15.5.10"
"prop-types": "^15.6.0"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions addons/info/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"dependencies": {
"@storybook/addons": "^3.2.10",
"@storybook/components": "^3.2.10",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"marksy": "^2.0.0",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-addons-create-fragment": "^15.5.3",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"git-url-parse": "^6.2.2",
"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.0.0"
},
"peerDependencies": {
"react": "*"
Expand Down
12 changes: 6 additions & 6 deletions addons/knobs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
},
"dependencies": {
"@storybook/addons": "^3.2.10",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"deep-equal": "^1.0.1",
"global": "^4.3.2",
"insert-css": "^1.0.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.18.1",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-color": "^2.11.4",
"react-datetime": "^2.8.10",
"react-textarea-autosize": "^4.3.0",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/node": "^7.0.12",
"@types/react": "^15.0.21",
"@types/react": "^16.0.0",
"git-url-parse": "^6.2.2",
"raw-loader": "^0.5.1",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"style-loader": "^0.17.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"style-loader": "^0.18.2",
"typescript": "^2.2.2",
"typescript-definition-tester": "^0.0.5",
"vue": "^2.4.2"
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/src/react/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import KnobStore from '../KnobStore';
describe('React Handler', () => {
describe('wrapStory', () => {
it('should contain the story and add correct props', () => {
const testChannel = { emit: () => {} };
const testChannel = { emit: jest.fn(), on: jest.fn() };
const testStory = () => <div id="test-story">Test Content</div>;
const testContext = {
kind: 'Foo',
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/src/vue/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import KnobStore from '../KnobStore';

describe('Vue handler', () => {
it('Returns a component with a created function', () => {
const testChannel = { emit: () => {} };
const testChannel = { emit: jest.fn(), on: jest.fn() };
const testStory = () => ({ template: '<div> testStory </div>' });
const testContext = {
kind: 'Foo',
Expand Down
4 changes: 2 additions & 2 deletions addons/links/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"@storybook/addons": "^3.2.10"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions addons/notes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
},
"dependencies": {
"@storybook/addons": "^3.2.10",
"babel-runtime": "^6.23.0",
"prop-types": "^15.5.10",
"babel-runtime": "^6.26.0",
"prop-types": "^15.6.0",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"git-url-parse": "^6.2.2",
"react": "^15.6.1",
"react": "^16.0.0",
"react-addons-test-utils": "^15.5.1",
"react-dom": "^15.6.1"
"react-dom": "^16.0.0"
},
"peerDependencies": {
"react": "*"
Expand Down
6 changes: 3 additions & 3 deletions addons/options/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@storybook/addons": "^3.2.10"
},
"devDependencies": {
"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.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions addons/storyshots/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"read-pkg-up": "^2.0.0"
},
"devDependencies": {
Expand All @@ -27,8 +27,8 @@
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"react": "^15.6.1",
"react-dom": "^15.6.1"
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"peerDependencies": {
"@storybook/addons": "^3.2.10",
Expand Down
34 changes: 17 additions & 17 deletions app/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"@storybook/addons": "^3.2.10",
"@storybook/channel-websocket": "^3.2.10",
"@storybook/ui": "^3.2.11",
"autoprefixer": "^7.1.1",
"autoprefixer": "^7.1.4",
"babel-core": "^6.26.0",
"babel-loader": "^7.0.0",
"babel-loader": "^7.1.2",
"babel-plugin-syntax-async-functions": "^6.13.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
"babel-plugin-transform-class-properties": "^6.24.1",
Expand All @@ -44,35 +44,35 @@
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"commander": "^2.11.0",
"css-loader": "^0.28.1",
"css-loader": "^0.28.7",
"events": "^1.1.1",
"express": "^4.15.3",
"file-loader": "^0.11.1",
"express": "^4.15.5",
"file-loader": "^0.11.2",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"json-loader": "^0.5.4",
"json-loader": "^0.5.7",
"json5": "^0.5.1",
"postcss-loader": "^2.0.5",
"prop-types": "^15.5.10",
"postcss-loader": "^2.0.6",
"prop-types": "^15.6.0",
"react-native-compat": "^1.0.0",
"shelljs": "^0.7.8",
"style-loader": "^0.17.0",
"url-loader": "^0.5.8",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"webpack": "^2.5.1 || ^3.0.0",
"webpack-dev-middleware": "^1.10.2",
"webpack-hot-middleware": "^2.18.0",
"webpack": "^3.6.0",
"webpack-dev-middleware": "^1.12.0",
"webpack-hot-middleware": "^2.19.1",
"ws": "^3.0.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-native": "^0.43.3"
},
"peerDependencies": {
Expand Down
62 changes: 31 additions & 31 deletions app/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,62 +27,62 @@
"@storybook/addons": "^3.2.10",
"@storybook/channel-postmessage": "^3.2.10",
"@storybook/ui": "^3.2.11",
"airbnb-js-shims": "^1.1.1",
"autoprefixer": "^7.1.1",
"airbnb-js-shims": "^1.3.0",
"autoprefixer": "^7.1.4",
"babel-core": "^6.26.0",
"babel-loader": "^7.0.0",
"babel-plugin-react-docgen": "^1.6.0",
"babel-loader": "^7.1.2",
"babel-plugin-react-docgen": "^1.8.0",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-react-app": "^3.0.0",
"babel-preset-react-app": "^3.0.3",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.1.0",
"commander": "^2.11.0",
"common-tags": "^1.4.0",
"configstore": "^3.1.0",
"configstore": "^3.1.1",
"core-js": "^2.5.1",
"css-loader": "^0.28.1",
"express": "^4.15.3",
"file-loader": "^0.11.1",
"css-loader": "^0.28.7",
"express": "^4.15.5",
"file-loader": "^0.11.2",
"find-cache-dir": "^1.0.0",
"glamor": "^2.20.40",
"glamorous": "^4.1.2",
"glamorous": "^4.9.7",
"global": "^4.3.2",
"json-loader": "^0.5.4",
"json-loader": "^0.5.7",
"json-stringify-safe": "^5.0.1",
"json5": "^0.5.1",
"lodash.flattendeep": "^4.4.0",
"lodash.pick": "^4.4.0",
"postcss-flexbugs-fixes": "^3.0.0",
"postcss-loader": "^2.0.5",
"prop-types": "^15.5.10",
"qs": "^6.4.0",
"react-modal": "^2.2.4",
"redux": "^3.6.0",
"request": "^2.81.0",
"serve-favicon": "^2.4.3",
"postcss-flexbugs-fixes": "^3.2.0",
"postcss-loader": "^2.0.6",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react-modal": "^2.3.2",
"redux": "^3.7.2",
"request": "^2.83.0",
"serve-favicon": "^2.4.5",
"shelljs": "^0.7.8",
"style-loader": "^0.17.0",
"url-loader": "^0.5.8",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"webpack": "^2.5.1 || ^3.0.0",
"webpack-dev-middleware": "^1.10.2",
"webpack-hot-middleware": "^2.18.0"
"webpack": "^3.6.0",
"webpack-dev-middleware": "^1.12.0",
"webpack-hot-middleware": "^2.19.1"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"nodemon": "^1.12.0",
"react": "^15.6.1",
"react-dom": "^15.6.1"
"nodemon": "^1.12.1",
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"peerDependencies": {
"react": ">=15.0.0 || ^16.0.0-alpha",
"react-dom": ">=15.0.0 || ^16.0.0-alpha"
"react": ">=15.0.0 || ^16.0.0",
"react-dom": ">=15.0.0 || ^16.0.0"
}
}
Loading