Skip to content

Commit

Permalink
Merge branch 'master' into add-docs-guide-angular
Browse files Browse the repository at this point in the history
  • Loading branch information
@Quramy
Quramy committed Dec 27, 2017
2 parents fdcbfad + fd2b0fc commit c683136
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion addons/info/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ setDefaults({
inline: true, // Displays info inline vs click button to view
source: true, // Displays the source of story Component
propTables: [/* Components used in story */], // displays Prop Tables with this components
propTablesExclude: [], // Exclude Components from being shown in Prop Tables section
propTablesExclude: [], // Exclude Components from being shown in Prop Tables section. Accepts an array of component classes or functions.
styles: {}, // Overrides styles of addon. The object should follow this shape: https://github.com/storybooks/storybook/blob/master/addons/info/src/components/Story.js#L19. This prop can also accept a function which has the default stylesheet passed as an argument.
components: {}, // Overrides components used to display markdown
maxPropsIntoLine: 1, // Max props to display per line in source code
Expand Down
2 changes: 1 addition & 1 deletion addons/info/src/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import deprecate from 'util-deprecate';
import nestedObjectAssign from 'nested-object-assign';
import logger from '@storybook/client-logger';
import { logger } from '@storybook/client-logger';
import Story from './components/Story';
import PropTable from './components/PropTable';
import makeTableComponent from './components/makeTableComponent';
Expand Down
8 changes: 4 additions & 4 deletions lib/cli/test/snapshots/angular-cli/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"ts-node": "1.2.1",
"tslint": "^4.3.0",
"typescript": "~2.4.0",
"@storybook/angular": "^3.3.0",
"@storybook/addon-notes": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0",
"@storybook/angular": "^3.3.1",
"@storybook/addon-notes": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1",
"@types/lodash-es": "^4.17.0"
}
}
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/meteor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-1": "^6.24.1",
"babel-root-slash-import": "^1.1.0",
"@storybook/react": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0"
"@storybook/react": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1"
}
}
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"rollup-plugin-commonjs": "^8.2.0",
"rollup-plugin-node-resolve": "^3.0.0",
"rollup-plugin-replace": "^1.1.1",
"@storybook/react": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0"
"@storybook/react": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1"
}
}
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/react_native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"babel-preset-react-native": "3.0.1",
"jest": "20.0.4",
"react-test-renderer": "16.0.0-alpha.12",
"@storybook/react-native": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0",
"@storybook/react-native": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1",
"react-dom": "16.0.0-alpha.12",
"prop-types": "^15.6.0"
},
Expand Down
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/react_native_scripts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"react-native-scripts": "1.3.1",
"jest-expo": "~20.0.0",
"react-test-renderer": "16.0.0-alpha.12",
"@storybook/react-native": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0",
"@storybook/react-native": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1",
"react-dom": "16.0.0-alpha.12",
"prop-types": "^15.6.0"
},
Expand Down
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/react_project/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"babel-preset-react": "^6.24.1",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"@storybook/react": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0"
"@storybook/react": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/react_scripts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"build-storybook": "build-storybook -s public"
},
"devDependencies": {
"@storybook/react": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0"
"@storybook/react": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1"
}
}
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/sfc_vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
"webpack-dev-middleware": "^1.10.0",
"webpack-hot-middleware": "^2.18.0",
"webpack-merge": "^4.1.0",
"@storybook/vue": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0",
"@storybook/vue": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1",
"babel-preset-vue": "^2.0.0"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/snapshots/update_package_organisations/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"react-scripts": "0.9.x"
},
"devDependencies": {
"@storybook/react": "^3.3.0"
"@storybook/react": "^3.3.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
"rollup-plugin-serve": "^0.4.0",
"rollup-plugin-vue": "^2.4.0",
"rollup-watch": "^4.0.0",
"@storybook/vue": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0",
"@storybook/vue": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1",
"babel-preset-vue": "^2.0.0"
}
}
6 changes: 3 additions & 3 deletions lib/cli/test/snapshots/webpack_react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"babel-loader": "^7.1.2",
"babel-preset-react": "^6.24.1",
"webpack": "^3.5.5",
"@storybook/react": "^3.3.0",
"@storybook/addon-actions": "^3.3.0",
"@storybook/addon-links": "^3.3.0"
"@storybook/react": "^3.3.1",
"@storybook/addon-actions": "^3.3.1",
"@storybook/addon-links": "^3.3.1"
}
}

0 comments on commit c683136

Please sign in to comment.