Skip to content

Commit

Permalink
Merge branch 'master' into release/3.3
Browse files Browse the repository at this point in the history 
# Conflicts:
#	CONTRIBUTING.md
#	addons/actions/package.json
#	addons/comments/package.json
#	addons/events/package.json
#	addons/info/package.json
#	addons/knobs/package.json
#	addons/links/package.json
#	addons/notes/package.json
#	addons/storyshots/package.json
#	app/react-native/package.json
#	app/react/package.json
#	app/vue/package.json
#	dependencies.yml
#	examples/cra-kitchen-sink/package.json
#	examples/cra-kitchen-sink/src/stories/__snapshots__/index.storyshot
#	examples/crna-kitchen-sink/package.json
#	examples/react-native-vanilla/package.json
#	lib/ui/package.json
#	lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.test.js
#	yarn.lock
  • Loading branch information
@ndelangen
ndelangen committed Sep 30, 2017
2 parents 7e32662 + 63e82ac commit 244451d
Show file tree
Hide file tree
Showing 35 changed files with 1,045 additions and 3,101 deletions.
10 changes: 5 additions & 5 deletions addons/actions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"dependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
"deep-equal": "^1.0.1",
"prop-types": "^15.5.10",
"react-inspector": "^2.1.6",
"prop-types": "^15.6.0",
"react-inspector": "^2.2.0",
"uuid": "^3.1.0"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-test-renderer": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions addons/comments/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
},
"dependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"deep-equal": "^1.0.1",
"events": "^1.1.1",
"global": "^4.3.2",
"insert-css": "^1.0.0",
"marked": "^0.3.6",
"moment": "^2.18.1",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-render-html": "^0.1.6",
"react-textarea-autosize": "^4.3.0"
},
Expand All @@ -41,9 +41,9 @@
"@storybook/addon-actions": "^3.3.0-alpha.0",
"@storybook/react": "^3.3.0-alpha.0",
"git-url-parse": "^6.2.2",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-test-renderer": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions addons/events/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
},
"dependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"format-json": "^1.0.3",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-textarea-autosize": "^4.3.0",
"uuid": "^3.1.0"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1"
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"peerDependencies": {
"react": "*"
Expand Down
2 changes: 1 addition & 1 deletion addons/graphql/demo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"license": "MIT",
"dependencies": {
"cors": "^2.8.0",
"express": "^4.14.0",
"express": "^4.15.5",
"express-graphql": "^0.5.4",
"graphql": "^0.7.0"
}
Expand Down
6 changes: 3 additions & 3 deletions addons/graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"global": "^4.3.2",
"graphiql": "^0.7.8",
"graphql": "^0.7.0",
"prop-types": "^15.5.10"
"prop-types": "^15.6.0"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions addons/info/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"dependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
"@storybook/components": "^3.3.0-alpha.0",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"global": "^4.3.2",
"marksy": "^2.0.0",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-addons-create-fragment": "^15.5.3",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"git-url-parse": "^6.2.2",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-test-renderer": "^15.6.1"
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0"
},
"peerDependencies": {
"react": "*"
Expand Down
2 changes: 1 addition & 1 deletion addons/info/src/components/PropVal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function PropVal(props) {

if (!braceWrap) return content;

return <span>{content}</span>;
return <span>&#123;{content}&#125;</span>;
}

PropVal.defaultProps = {
Expand Down
12 changes: 6 additions & 6 deletions addons/knobs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@
},
"dependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"deep-equal": "^1.0.1",
"global": "^4.3.2",
"insert-css": "^1.0.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.18.1",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"react-color": "^2.11.4",
"react-datetime": "^2.8.10",
"react-textarea-autosize": "^4.3.0",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@types/node": "^7.0.12",
"@types/react": "^15.0.21",
"@types/react": "^16.0.0",
"git-url-parse": "^6.2.2",
"raw-loader": "^0.5.1",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"style-loader": "^0.17.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"style-loader": "^0.18.2",
"typescript": "^2.2.2",
"typescript-definition-tester": "^0.0.5",
"vue": "^2.4.2"
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/src/react/index.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import KnobStore from '../KnobStore';
describe('React Handler', () => {
describe('wrapStory', () => {
it('should contain the story and add correct props', () => {
const testChannel = { emit: () => {} };
const testChannel = { emit: jest.fn(), on: jest.fn() };
const testStory = () => <div id="test-story">Test Content</div>;
const testContext = {
kind: 'Foo',
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/src/vue/index.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import KnobStore from '../KnobStore';

describe('Vue handler', () => {
it('Returns a component with a created function', () => {
const testChannel = { emit: () => {} };
const testChannel = { emit: jest.fn(), on: jest.fn() };
const testStory = () => ({ template: '<div> testStory </div>' });
const testContext = {
kind: 'Foo',
Expand Down
4 changes: 2 additions & 2 deletions addons/links/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"devDependencies": {
"enzyme": "^2.9.1",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions addons/notes/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
},
"dependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
"babel-runtime": "^6.23.0",
"prop-types": "^15.5.10",
"babel-runtime": "^6.26.0",
"prop-types": "^15.6.0",
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"git-url-parse": "^6.2.2",
"react": "^15.6.1",
"react": "^16.0.0",
"react-addons-test-utils": "^15.5.1",
"react-dom": "^15.6.1"
"react-dom": "^16.0.0"
},
"peerDependencies": {
"react": "*"
Expand Down
6 changes: 3 additions & 3 deletions addons/options/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"@storybook/addons": "^3.3.0-alpha.0"
},
"devDependencies": {
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-test-renderer": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.0.0",
"shelljs": "^0.7.8"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions addons/storyshots/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"example": "jest storyshot.test"
},
"dependencies": {
"babel-runtime": "^6.23.0",
"babel-runtime": "^6.26.0",
"glob": "^7.1.2",
"global": "^4.3.2",
"jest-specific-snapshot": "^0.2.0",
"prop-types": "^15.5.10",
"prop-types": "^15.6.0",
"read-pkg-up": "^2.0.0"
},
"devDependencies": {
Expand All @@ -33,8 +33,8 @@
"babel-preset-react": "^6.24.1",
"jest": "^20.0.4",
"jest-cli": "^20.0.4",
"react": "^15.6.1",
"react-dom": "^15.6.1"
"react": "^16.0.0",
"react-dom": "^16.0.0"
},
"peerDependencies": {
"@storybook/addons": "^3.3.0-alpha.0",
Expand Down
34 changes: 17 additions & 17 deletions app/react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"@storybook/addons": "^3.3.0-alpha.0",
"@storybook/channel-websocket": "^3.3.0-alpha.0",
"@storybook/ui": "^3.3.0-alpha.0",
"autoprefixer": "^7.1.1",
"autoprefixer": "^7.1.4",
"babel-core": "^6.26.0",
"babel-loader": "^7.0.0",
"babel-loader": "^7.1.2",
"babel-plugin-syntax-async-functions": "^6.13.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
"babel-plugin-transform-class-properties": "^6.24.1",
Expand All @@ -44,36 +44,36 @@
"babel-preset-minify": "^0.2.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"commander": "^2.11.0",
"css-loader": "^0.28.1",
"css-loader": "^0.28.7",
"events": "^1.1.1",
"express": "^4.15.3",
"file-loader": "^0.11.1",
"express": "^4.15.5",
"file-loader": "^0.11.2",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.4",
"json-loader": "^0.5.7",
"json5": "^0.5.1",
"postcss-loader": "^2.0.5",
"prop-types": "^15.5.10",
"postcss-loader": "^2.0.6",
"prop-types": "^15.6.0",
"react-native-compat": "^1.0.0",
"shelljs": "^0.7.8",
"style-loader": "^0.17.0",
"url-loader": "^0.5.8",
"style-loader": "^0.18.2",
"url-loader": "^0.5.9",
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
"uuid": "^3.1.0",
"webpack": "^2.5.1 || ^3.0.0",
"webpack-dev-middleware": "^1.10.2",
"webpack-hot-middleware": "^2.18.0",
"webpack": "^3.6.0",
"webpack-dev-middleware": "^1.12.0",
"webpack-hot-middleware": "^2.19.1",
"ws": "^3.0.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-native": "^0.43.3"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit 244451d

Please sign in to comment.