Skip to content

Commit

Permalink
Merge branch 'master' into fix-actions-undefined-descriptor
Browse files Browse the repository at this point in the history
  • Loading branch information
Hypnosphi committed Dec 5, 2017
2 parents 745026d + 1db950d commit 1813b89
Show file tree
Hide file tree
Showing 13 changed files with 265 additions and 130 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ module.exports = {
'*.js',
'**/*.test.js',
'**/scripts/*.js',
'**/stories/*.js',
'**/__tests__/*.js',
'**/stories/**/*.js',
'**/__tests__/**/*.js',
],
peerDependencies: true,
},
Expand Down
4 changes: 2 additions & 2 deletions addons/comments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"events": "^1.1.1",
"global": "^4.3.2",
"insert-css": "^2.0.0",
"marked": "^0.3.6",
"moment": "^2.19.2",
"marked": "^0.3.7",
"moment": "^2.19.3",
"prop-types": "^15.6.0",
"react-render-html": "^0.6.0",
"react-textarea-autosize": "^5.2.1"
Expand Down
12 changes: 6 additions & 6 deletions addons/knobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
"global": "^4.3.2",
"insert-css": "^2.0.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.19.2",
"moment": "^2.19.3",
"prop-types": "^15.6.0",
"react-color": "^2.11.4",
"react-datetime": "^2.11.0",
"react-datetime": "^2.11.1",
"react-textarea-autosize": "^5.2.1",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/node": "^8.0.53",
"@types/react": "^16.0.25",
"@types/node": "^8.0.54",
"@types/react": "^16.0.27",
"raw-loader": "^0.5.1",
"style-loader": "^0.19.0",
"typescript": "^2.6.1",
"typescript": "^2.6.2",
"typescript-definition-tester": "^0.0.5",
"vue": "^2.5.8"
"vue": "^2.5.9"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 2 additions & 4 deletions addons/storyshots/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,19 @@
"storybook": "start-storybook -p 6006"
},
"dependencies": {
"@storybook/channels": "^3.2.17",
"babel-core": "^6.26.0",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"prop-types": "^15.6.0",
"read-pkg-up": "^3.0.0"
},
"devDependencies": {
"@storybook/addons": "^3.2.17",
"@storybook/channels": "^3.2.17",
"@storybook/react": "^3.2.17"
},
"peerDependencies": {
"@storybook/addons": "^3.2.17",
"@storybook/channels": "^3.2.17",
"@storybook/react": "^3.2.17",
"babel-core": "^6.26.0",
"react": "*",
"react-test-renderer": "*"
}
Expand Down
6 changes: 3 additions & 3 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@storybook/addons": "^3.2.17",
"@storybook/channel-websocket": "^3.2.17",
"@storybook/ui": "^3.2.17",
"autoprefixer": "^7.1.6",
"autoprefixer": "^7.2.1",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-syntax-async-functions": "^6.13.0",
Expand All @@ -46,7 +46,7 @@
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"commander": "^2.12.1",
"commander": "^2.12.2",
"css-loader": "^0.28.7",
"events": "^1.1.1",
"express": "^4.16.2",
Expand All @@ -65,7 +65,7 @@
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"webpack": "^3.8.1",
"webpack": "^3.10.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.21.0",
"ws": "^3.3.2"
Expand Down
10 changes: 5 additions & 5 deletions app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@storybook/addons": "^3.2.17",
"@storybook/channel-postmessage": "^3.2.17",
"@storybook/ui": "^3.2.17",
"airbnb-js-shims": "^1.3.0",
"autoprefixer": "^7.1.6",
"airbnb-js-shims": "^1.4.0",
"autoprefixer": "^7.2.1",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-react-docgen": "^1.8.0",
Expand All @@ -42,7 +42,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.12.1",
"commander": "^2.12.2",
"common-tags": "^1.5.1",
"configstore": "^3.1.1",
"core-js": "^2.5.1",
Expand Down Expand Up @@ -70,12 +70,12 @@
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"webpack": "^3.8.1",
"webpack": "^3.10.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.12.1"
"nodemon": "^1.12.4"
},
"peerDependencies": {
"react": ">=15.0.0 || ^16.0.0",
Expand Down
14 changes: 7 additions & 7 deletions app/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@storybook/addons": "^3.2.17",
"@storybook/channel-postmessage": "^3.2.17",
"@storybook/ui": "^3.2.17",
"airbnb-js-shims": "^1.3.0",
"autoprefixer": "^7.1.6",
"airbnb-js-shims": "^1.4.0",
"autoprefixer": "^7.2.1",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-react-docgen": "^1.8.0",
Expand All @@ -42,7 +42,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.12.1",
"commander": "^2.12.2",
"common-tags": "^1.5.1",
"configstore": "^3.1.1",
"core-js": "^2.5.1",
Expand Down Expand Up @@ -71,15 +71,15 @@
"uuid": "^3.1.0",
"vue-hot-reload-api": "^2.2.4",
"vue-style-loader": "^3.0.1",
"webpack": "^3.6.0",
"webpack": "^3.10.0",
"webpack-dev-middleware": "^1.12.2",
"webpack-hot-middleware": "^2.21.0"
},
"devDependencies": {
"nodemon": "^1.12.1",
"vue": "^2.5.8",
"nodemon": "^1.12.4",
"vue": "^2.5.9",
"vue-loader": "^13.5.0",
"vue-template-compiler": "^2.5.8"
"vue-template-compiler": "^2.5.9"
},
"peerDependencies": {
"vue": "*",
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ collectors:
versions: "L.Y.Y"
settings:
batch_mode: true
bootstrap_command: echo 'skip updating lockfile'
bootstrap_command: yarn
github_labels:
- dependencies:update
github_assignees:
Expand Down
8 changes: 4 additions & 4 deletions examples/vue-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
"vue-hot-reload-api": "^2.2.4",
"vue-loader": "^13.5.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.8",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.3"
"vue-template-compiler": "^2.5.9",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.9.5"
},
"dependencies": {
"vue": "^2.5.8",
"vue": "^2.5.9",
"vuex": "^3.0.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@storybook/codemod": "^3.2.17",
"chalk": "^2.3.0",
"child-process-promise": "^2.2.1",
"commander": "^2.12.1",
"commander": "^2.12.2",
"cross-spawn": "^5.0.1",
"jscodeshift": "^0.3.30",
"json5": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"qs": "^6.5.1",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.1",
"react-modal": "^3.1.4",
"react-modal": "^3.1.7",
"react-split-pane": "^0.1.71",
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.0.2",
"babel-eslint": "^8.0.3",
"babel-plugin-transform-md-import-to-string": "^1.0.6",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
Expand All @@ -49,16 +49,16 @@
"babel-preset-stage-0": "^6.24.1",
"chalk": "^2.3.0",
"codecov": "^3.0.0",
"commander": "^2.12.1",
"commander": "^2.12.2",
"cross-env": "^5.1.1",
"danger": "^2.0.3",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.0",
"eslint": "^4.12.0",
"eslint": "^4.12.1",
"eslint-config-airbnb": "^16.1.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-jest": "^21.3.2",
"eslint-plugin-jest": "^21.4.0",
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-prettier": "^2.2.0",
Expand All @@ -68,15 +68,15 @@
"github-release-from-changelog": "^1.2.1",
"glob": "^7.1.2",
"husky": "^0.14.3",
"inquirer": "^4.0.0",
"inquirer": "^4.0.1",
"jest": "^21.2.0",
"jest-cli": "^21.2.1",
"jest-enzyme": "^4.0.1",
"jest-image-snapshot": "^2.2.0",
"lerna": "^2.5.1",
"lint-staged": "^6.0.0",
"lodash": "^4.17.4",
"nodemon": "^1.12.1",
"nodemon": "^1.12.4",
"npmlog": "^4.1.2",
"prettier": "^1.8.2",
"process-nextick-args": "^1.0.7",
Expand Down
Loading

0 comments on commit 1813b89

Please sign in to comment.