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.

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 deps dealing with license issues #4228

Merged
merged 1 commit into from
Sep 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/client-logger": "4.0.0-alpha.22",
"@storybook/components": "4.0.0-alpha.22",
Expand Down
6 changes: 3 additions & 3 deletions addons/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/core": "^0.13.0",
"@emotion/provider": "0.11.1",
"@emotion/styled": "0.10.5",
"@emotion/core": "^0.13.1",
"@emotion/provider": "^0.11.2",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/components": "4.0.0-alpha.22",
"@storybook/core-events": "4.0.0-alpha.22",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/core-events": "4.0.0-alpha.22",
"global": "^4.3.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/core-events": "4.0.0-alpha.22",
"format-json": "^1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion addons/info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/client-logger": "4.0.0-alpha.22",
"@storybook/components": "4.0.0-alpha.22",
Expand Down
2 changes: 1 addition & 1 deletion addons/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/components": "4.0.0-alpha.22",
"global": "^4.3.2",
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/components": "4.0.0-alpha.22",
"@storybook/core-events": "4.0.0-alpha.22",
Expand Down
2 changes: 1 addition & 1 deletion addons/notes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"marked": "^0.5.0",
"prop-types": "^15.6.2"
Expand Down
2 changes: 1 addition & 1 deletion addons/viewport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/components": "4.0.0-alpha.22",
"@storybook/core-events": "4.0.0-alpha.22",
Expand Down
2 changes: 1 addition & 1 deletion app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"react-dom": "^16.4.2",
"sass-loader": "^7.1.0",
"ts-loader": "^4.5.0",
"webpack": "^4.17.1",
"webpack": "^4.20.0",
"zone.js": "^0.8.26"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion app/polymer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"global": "^4.3.2",
"react": "^16.4.2",
"react-dom": "^16.4.2",
"webpack": "^4.17.1"
"webpack": "^4.20.0"
},
"devDependencies": {
"lit-html": "^0.10.2",
Expand Down
8 changes: 4 additions & 4 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@
"json5": "^2.0.1",
"prop-types": "^15.6.2",
"raw-loader": "^0.5.1",
"react-dev-utils": "6.0.0-next.3e165448",
"react-dev-utils": "6.0.0-next.2150693d",
"react-native-compat": "^1.0.0",
"react-native-iphone-x-helper": "^1.0.3",
"shelljs": "^0.8.2",
"universal-dotenv": "^1.9.0",
"url-parse": "^1.4.3",
"uuid": "^3.3.2",
"webpack": "^4.17.1",
"webpack-dev-middleware": "^3.2.0",
"webpack-hot-middleware": "^2.22.3",
"webpack": "^4.20.0",
"webpack-dev-middleware": "^3.4.0",
"webpack-hot-middleware": "^2.24.2",
"ws": "^6.0.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.0.0",
"@emotion/styled": "0.10.5",
"@emotion/styled": "^0.10.6",
"@storybook/core": "4.0.0-alpha.22",
"babel-plugin-react-docgen": "^2.0.0-babel7.0",
"common-tags": "^1.8.0",
"global": "^4.3.2",
"lodash.flattendeep": "^4.4.0",
"prop-types": "^15.6.2",
"react-dev-utils": "6.0.0-next.3e165448"
"react-dev-utils": "6.0.0-next.2150693d"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0",
Expand Down
3 changes: 1 addition & 2 deletions examples/cra-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"enzyme-adapter-react-16": "^1.3.0",
"enzyme-to-json": "^3.3.4",
"jest": "^23.4.2",
"react-scripts": "^1.1.5",
"webpack": "^4.17.1"
"react-scripts": "^1.1.5"
}
}
2 changes: 1 addition & 1 deletion examples/marko-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/marko": "4.0.0-alpha.22",
"prettier": "^1.14.0",
"webpack": "^4.17.1"
"webpack": "^4.20.0"
}
}
2 changes: 1 addition & 1 deletion examples/mithril-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
"@storybook/addon-viewport": "4.0.0-alpha.22",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/mithril": "4.0.0-alpha.22",
"webpack": "^4.17.1"
"webpack": "^4.20.0"
}
}
8 changes: 4 additions & 4 deletions examples/official-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"storybook": "start-storybook -p 9011 -c ./ -s built-storybooks"
},
"devDependencies": {
"@emotion/core": "0.13.0",
"@emotion/provider": "0.11.1",
"@emotion/styled": "0.10.5",
"@emotion/core": "^0.13.1",
"@emotion/provider": "^0.11.2",
"@emotion/styled": "^0.10.6",
"@storybook/addon-a11y": "4.0.0-alpha.22",
"@storybook/addon-actions": "4.0.0-alpha.22",
"@storybook/addon-backgrounds": "4.0.0-alpha.22",
Expand Down Expand Up @@ -50,6 +50,6 @@
"react-chromatic": "^0.8.4",
"react-dom": "^16.4.2",
"uuid": "^3.3.2",
"webpack": "^4.17.1"
"webpack": "^4.20.0"
}
}
4 changes: 2 additions & 2 deletions examples/polymer-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"global": "^4.3.2",
"lit-html": "^0.10.2",
"polymer-webpack-loader": "^2.0.3",
"webpack": "^4.17.1"
"webpack": "^4.20.0"
},
"devDependencies": {
"copy-webpack-plugin": "^4.5.2",
"html-webpack-plugin": "^3.2.0",
"webpack-dev-server": "^3.1.6"
"webpack-dev-server": "^3.1.9"
}
}
6 changes: 3 additions & 3 deletions examples/riot-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"@storybook/addon-viewport": "4.0.0-alpha.22",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/riot": "4.0.0-alpha.22",
"babel-loader": "^8.0.0",
"babel-loader": "^8.0.2",
"cross-env": "^5.2.0",
"file-loader": "^1.1.11",
"raw-loader": "^0.5.1",
"riot-tag-loader": "^2.1.0",
"svg-url-loader": "^2.3.2",
"webpack": "^4.16.4",
"webpack-dev-server": "^3.1.5"
"webpack": "^4.20.0",
"webpack-dev-server": "^3.1.9"
}
}
4 changes: 2 additions & 2 deletions examples/vue-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"file-loader": "^2.0.0",
"svg-url-loader": "^2.3.2",
"vue-loader": "^15.4.1",
"webpack": "^4.17.1",
"webpack-dev-server": "^3.1.6"
"webpack": "^4.20.0",
"webpack-dev-server": "^3.1.9"
}
}
6 changes: 3 additions & 3 deletions lib/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"@emotion/core": "0.13.0",
"@emotion/provider": "0.11.1",
"@emotion/styled": "0.10.5",
"@emotion/core": "^0.13.1",
"@emotion/provider": "^0.11.2",
"@emotion/styled": "^0.10.6",
"global": "^4.3.2",
"lodash.pick": "^4.4.0",
"lodash.throttle": "^4.1.1",
Expand Down
16 changes: 8 additions & 8 deletions lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/runtime": "^7.0.0",
"@emotion/core": "0.13.0",
"@emotion/provider": "0.11.1",
"@emotion/styled": "0.10.5",
"@emotion/core": "^0.13.1",
"@emotion/provider": "^0.11.2",
"@emotion/styled": "^0.10.6",
"@storybook/addons": "4.0.0-alpha.22",
"@storybook/channel-postmessage": "4.0.0-alpha.22",
"@storybook/client-logger": "4.0.0-alpha.22",
Expand All @@ -39,7 +39,7 @@
"airbnb-js-shims": "^1 || ^2",
"autoprefixer": "^9.1.3",
"babel-plugin-macros": "^2.2.2",
"babel-preset-minify": "canary",
"babel-preset-minify": "^0.5.0",
"case-sensitive-paths-webpack-plugin": "^2.1.2",
"chalk": "^2.4.1",
"commander": "^2.17.0",
Expand All @@ -62,7 +62,7 @@
"prop-types": "^15.6.2",
"qs": "^6.5.2",
"raw-loader": "^0.5.1",
"react-dev-utils": "6.0.0-next.3e165448",
"react-dev-utils": "6.0.0-next.2150693d",
"redux": "^4.0.0",
"resolve": "^1.8.1",
"semver": "^5.5.1",
Expand All @@ -72,9 +72,9 @@
"svg-url-loader": "^2.3.2",
"universal-dotenv": "^1.9.0",
"url-loader": "^1.1.1",
"webpack": "^4.17.1",
"webpack-dev-middleware": "^3.2.0",
"webpack-hot-middleware": "^2.22.3"
"webpack": "^4.20.0",
"webpack-dev-middleware": "^3.4.0",
"webpack-hot-middleware": "^2.24.2"
},
"devDependencies": {
"mock-fs": "^4.5.0"
Expand Down
10 changes: 5 additions & 5 deletions lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@
"storybook": "start-storybook -p 9010"
},
"dependencies": {
"@emotion/core": "0.13.0",
"@emotion/provider": "0.11.1",
"@emotion/styled": "0.10.5",
"@ndelangen/react-treebeard": "^3.0.0",
"@emotion/core": "^0.13.1",
"@emotion/provider": "^0.11.2",
"@emotion/styled": "^0.10.6",
"@storybook/components": "4.0.0-alpha.22",
"@storybook/core-events": "4.0.0-alpha.22",
"@storybook/mantra-core": "^1.7.2",
Expand All @@ -47,7 +46,8 @@
"qs": "^6.5.2",
"react-fuzzy": "^0.5.2",
"react-lifecycles-compat": "^3.0.4",
"react-modal": "^3.5.1"
"react-modal": "^3.5.1",
"react-treebeard": "^3.1.0"
},
"devDependencies": {
"@storybook/addon-actions": "4.0.0-alpha.22",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Treebeard } from '@ndelangen/react-treebeard';
import { Treebeard } from 'react-treebeard';
import PropTypes from 'prop-types';
import React from 'react';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { decorators } from '@ndelangen/react-treebeard';
import { decorators } from 'react-treebeard';
import { Icons } from '@storybook/components';
import React from 'react';
import PropTypes from 'prop-types';
Expand Down
Loading