Merge branch 'master' into @storybook/addons-3.2.12-7.1.0

This commit is contained in:
Filipp Riabchun 2017-10-03 14:30:39 -07:00 committed by GitHub
commit aa347081b0
7 changed files with 31 additions and 17 deletions

View File

@ -15,6 +15,9 @@ module.exports = {
node: true,
'jest/globals': true,
},
settings: {
'import/core-modules': ['enzyme'],
},
rules: {
strict: [error, 'never'],
'prettier/prettier': [

View File

@ -17,7 +17,7 @@
"storybook": "start-storybook -p 9009 -s pages"
},
"dependencies": {
"@storybook/addon-actions": "latest",
"@storybook/addon-actions": "3.2.12",
"@storybook/addon-links": "latest",
"@storybook/addons": "3.2.12",
"@storybook/react": "latest",

View File

@ -6,7 +6,18 @@
version "3.0.9"
resolved "https://registry.yarnpkg.com/@hypnosphi/fuse.js/-/fuse.js-3.0.9.tgz#ea99f6121b4a8f065b4c71f85595db2714498807"
"@storybook/addon-actions@^3.2.11", "@storybook/addon-actions@latest":
"@storybook/addon-actions@3.2.12":
version "3.2.12"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.2.12.tgz#58ea949a02bd9ee956da7f30802677a44d9db024"
dependencies:
"@storybook/addons" "^3.2.12"
deep-equal "^1.0.1"
json-stringify-safe "^5.0.1"
prop-types "^15.6.0"
react-inspector "^2.2.0"
uuid "^3.1.0"
"@storybook/addon-actions@^3.2.11":
version "3.2.11"
resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.2.11.tgz#4df5ed15369cd3fbe161efaf9e1f88ce7d6c8631"
dependencies:
@ -31,6 +42,10 @@
version "3.2.10"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.2.10.tgz#dd71654674a417f62dcc91009c61e47dffdcac03"
"@storybook/addons@^3.2.12":
version "3.2.12"
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.2.12.tgz#61adccaa8c0016f1439dc8934d8d61042b35e741"
"@storybook/channel-postmessage@^3.2.10":
version "3.2.10"
resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.2.10.tgz#e4dd9983432f7f08dfabe6c8134d246c029c370e"
@ -6811,7 +6826,7 @@ react-icons@^2.2.5:
dependencies:
react-icon-base "2.0.7"
react-inspector@^2.1.6:
react-inspector@^2.1.6, react-inspector@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.2.0.tgz#2aa0778c3512063f598d7a89a28a5d5c7733cad7"
dependencies:

View File

@ -19,7 +19,6 @@
"prop-types": "^15.6.0"
},
"devDependencies": {
"enzyme": "^3.0.0",
"react": "^16.0.0",
"react-dom": "^16.0.0"
},

View File

@ -38,9 +38,6 @@
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"
},
"devDependencies": {
"enzyme": "^3.0.0"
},
"peerDependencies": {
"react": "*",
"react-dom": "*"

View File

@ -50,8 +50,8 @@
"codecov": "^2.3.0",
"commander": "^2.11.0",
"danger": "^1.2.0",
"enzyme": "^3.0.0",
"enzyme-adapter-react-16": "^1.0.0",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.1",
"eslint": "^4.8.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-config-prettier": "^2.4.0",

View File

@ -3844,9 +3844,9 @@ entities@^1.1.1, entities@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
enzyme-adapter-react-16@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.0.tgz#e7edd5536743818dcbef336d40d7da59b3a7db8e"
enzyme-adapter-react-16@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.1.tgz#066cb1735e65d8d95841a023f94dab3ce6109e17"
dependencies:
enzyme-adapter-utils "^1.0.0"
lodash "^4.17.4"
@ -3874,9 +3874,9 @@ enzyme-to-json@^3.0.0:
dependencies:
lodash "^4.17.4"
enzyme@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.0.0.tgz#94ce364254dc654c4e619b25eecc644bf6481de7"
enzyme@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.1.0.tgz#d8ca84085790fbcec6ed40badd14478faee4c25a"
dependencies:
cheerio "^1.0.0-rc.2"
function.prototype.name "^1.0.3"
@ -3887,7 +3887,7 @@ enzyme@^3.0.0:
object.entries "^1.0.4"
object.values "^1.0.4"
raf "^3.3.2"
rst-selector-parser "^2.2.1"
rst-selector-parser "^2.2.2"
errno@^0.1.3, errno@^0.1.4:
version "0.1.4"
@ -10392,7 +10392,7 @@ rndm@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/rndm/-/rndm-1.2.0.tgz#f33fe9cfb52bbfd520aa18323bc65db110a1b76c"
rst-selector-parser@^2.2.1:
rst-selector-parser@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.2.tgz#9927b619bd5af8dc23a76c64caef04edf90d2c65"
dependencies: