diff --git a/addons/actions/README.md b/addons/actions/README.md index 5a995accc34..cd5c8a7c23a 100644 --- a/addons/actions/README.md +++ b/addons/actions/README.md @@ -3,7 +3,7 @@ [![Build Status on CircleCI](https://circleci.com/gh/storybooks/storybook.svg?style=shield)](https://circleci.com/gh/storybooks/storybook) [![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook) [![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847) -[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook) +[![BCH compliance](https://bettercodehub.com/edge/badge/storybooks/storybook)](https://bettercodehub.com/results/storybooks/storybook) [![codecov](https://codecov.io/gh/storybooks/storybook/branch/master/graph/badge.svg)](https://codecov.io/gh/storybooks/storybook) [![Storybook Slack](https://now-examples-slackin-nqnzoygycp.now.sh/badge.svg)](https://now-examples-slackin-nqnzoygycp.now.sh/) [![Backers on Open Collective](https://opencollective.com/storybook/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/storybook/sponsors/badge.svg)](#sponsors) @@ -57,7 +57,7 @@ If you wish to process action data before sending them over to the logger, you c `decorateAction` takes an array of decorator functions. Each decorator function is passed an array of arguments, and should return a new arguments array to use. `decorateAction` returns a function that can be used like `action` but will log the modified arguments instead of the original arguments. ```js -import { action, decorateAction } from '@storybook/addon-actions' +import { decorateAction } from '@storybook/addon-actions'; import Button from './button'; diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index bda0263d4bd..8d09798e320 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -152,11 +152,11 @@ export default class Story extends React.Component { _renderOverlay() { const buttonStyle = { - ...stylesheet.button.base, - ...stylesheet.button.topRight, + ...this.state.stylesheet.button.base, + ...this.state.stylesheet.button.topRight, }; - const infoStyle = Object.assign({}, stylesheet.info); + const infoStyle = Object.assign({}, this.state.stylesheet.info); if (!this.state.open) { infoStyle.display = 'none'; } @@ -215,7 +215,13 @@ export default class Story extends React.Component { if (React.isValidElement(this.props.info)) { return ( -
+
{this.props.info}
); diff --git a/addons/jest/src/index.js b/addons/jest/src/index.js index e302a7a0f07..61c10a7abcc 100644 --- a/addons/jest/src/index.js +++ b/addons/jest/src/index.js @@ -1,6 +1,6 @@ import addons from '@storybook/addons'; -const findTestResults = (testFiles, jestTestResults, jestTestFilesExt) => +const findTestResults = (testFiles, jestTestResults, jestTestFilesExt = '') => testFiles.map(name => { if (jestTestResults && jestTestResults.testResults) { return { diff --git a/app/react-native/package.json b/app/react-native/package.json index 839938cee91..fa12d4f806f 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -56,7 +56,7 @@ "html-webpack-plugin": "^2.30.1", "json-loader": "^0.5.7", "json5": "^0.5.1", - "postcss-loader": "^2.0.8", + "postcss-loader": "^2.0.9", "prop-types": "^15.6.0", "react-native-compat": "^1.0.0", "react-native-iphone-x-helper": "^1.0.1", @@ -72,7 +72,7 @@ "ws": "^3.3.2" }, "devDependencies": { - "react-native": "^0.50.3" + "react-native": "^0.50.4" }, "peerDependencies": { "react": "*", diff --git a/app/react/package.json b/app/react/package.json index 2100dc5969c..0fe59fd6e35 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -45,7 +45,7 @@ "case-sensitive-paths-webpack-plugin": "^2.1.1", "chalk": "^2.3.0", "commander": "^2.12.1", - "common-tags": "^1.4.0", + "common-tags": "^1.5.1", "configstore": "^3.1.1", "core-js": "^2.5.1", "css-loader": "^0.28.7", @@ -66,7 +66,7 @@ "markdown-loader": "^2.0.1", "npmlog": "^4.1.2", "postcss-flexbugs-fixes": "^3.2.0", - "postcss-loader": "^2.0.8", + "postcss-loader": "^2.0.9", "prop-types": "^15.6.0", "qs": "^6.5.1", "redux": "^3.7.2", diff --git a/app/vue/package.json b/app/vue/package.json index f71cd4c7465..2b9b4586c58 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -43,7 +43,7 @@ "case-sensitive-paths-webpack-plugin": "^2.1.1", "chalk": "^2.3.0", "commander": "^2.12.1", - "common-tags": "^1.4.0", + "common-tags": "^1.5.1", "configstore": "^3.1.1", "core-js": "^2.5.1", "css-loader": "^0.28.7", @@ -58,7 +58,7 @@ "json5": "^0.5.1", "lodash.pick": "^4.4.0", "postcss-flexbugs-fixes": "^3.2.0", - "postcss-loader": "^2.0.8", + "postcss-loader": "^2.0.9", "prop-types": "^15.6.0", "qs": "^6.5.1", "react": "^16.1.0", diff --git a/lib/ui/package.json b/lib/ui/package.json index 8ee0f56a0a1..d4ce63f0cb2 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -33,7 +33,7 @@ "react-fuzzy": "^0.5.1", "react-icons": "^2.2.7", "react-inspector": "^2.2.1", - "react-modal": "^3.1.3", + "react-modal": "^3.1.4", "react-split-pane": "^0.1.71", "react-treebeard": "^2.0.3", "redux": "^3.7.2" diff --git a/yarn.lock b/yarn.lock index 3dacaf016ed..464aca13c7a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3002,6 +3002,12 @@ common-tags@^1.3.1, common-tags@^1.4.0: dependencies: babel-runtime "^6.18.0" +common-tags@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.5.1.tgz#e2e39931a013cd02253defeed89a1ad615a27f07" + dependencies: + babel-runtime "^6.26.0" + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -10140,7 +10146,7 @@ postcss-load-plugins@^2.3.0: cosmiconfig "^2.1.1" object-assign "^4.1.0" -postcss-loader@2.0.8, postcss-loader@^2.0.5, postcss-loader@^2.0.8: +postcss-loader@2.0.8, postcss-loader@^2.0.5: version "2.0.8" resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.8.tgz#8c67ddb029407dfafe684a406cfc16bad2ce0814" dependencies: @@ -10158,6 +10164,15 @@ postcss-loader@^1.3.3: postcss "^5.2.15" postcss-load-config "^1.2.0" +postcss-loader@^2.0.9: + version "2.0.9" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.9.tgz#001fdf7bfeeb159405ee61d1bb8e59b528dbd309" + dependencies: + loader-utils "^1.1.0" + postcss "^6.0.0" + postcss-load-config "^1.2.0" + schema-utils "^0.3.0" + postcss-merge-idents@^2.1.5: version "2.1.7" resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" @@ -10838,9 +10853,9 @@ react-modal@^2.2.4: exenv "^1.2.0" prop-types "^15.5.10" -react-modal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.3.tgz#bead112cd84681a1ccd18ee1e96c73d881793b75" +react-modal@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.4.tgz#eea7369ea4f05ab2897ccca2c676d7d81a5a88b0" dependencies: exenv "^1.2.0" prop-types "^15.5.10" @@ -10855,9 +10870,9 @@ react-native-iphone-x-helper@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.0.1.tgz#950dbdaca66f458689a7e9697c5beb9bd53f98f2" -react-native@^0.50.3: - version "0.50.3" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.3.tgz#91282bd5356cc7d794969cdc443cc764389b9af4" +react-native@^0.50.4: + version "0.50.4" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.4.tgz#194f5da4939087b3acee712a503475f4942dca7e" dependencies: absolute-path "^0.0.0" art "^0.10.0"