Skip to content

Commit df7bc09

Browse files
shilmanshilman
authored
Merge branch 'master' into react-native-dependency-version
2 parents 9eb61c2 + ba3b2a8 commit df7bc09

28 files changed

Lines changed: 975 additions & 284 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
defaults: &defaults
2+
working_directory: /tmp/storybook
3+
docker:
4+
- image: node:8
5+
6+
version: 2
7+
dependencies:
8+
pre:
9+
- npm install -g npm
10+
jobs:
11+
validate:
12+
<<: *defaults
13+
steps:
14+
- run:
15+
name: "Checking Versions"
16+
command: |
17+
node --version
18+
npm --version
19+
yarn --version
20+
build:
21+
<<: *defaults
22+
steps:
23+
- checkout
24+
- restore_cache:
25+
keys:
26+
- root-dependencies-{{ checksum "package.json" }}
27+
- root-dependencies-
28+
- run:
29+
name: "Install root dependencies"
30+
command: |
31+
yarn install
32+
- save_cache:
33+
key: root-dependencies-{{ checksum "package.json" }}
34+
paths:
35+
- node_modules
36+
- restore_cache:
37+
keys:
38+
- package-dependencies-{{ checksum "package.json" }}
39+
- package-dependencies-
40+
- run:
41+
name: "Bootstrapping"
42+
command: |
43+
npm run bootstrap
44+
- save_cache:
45+
key: package-dependencies-{{ checksum "package.json" }}
46+
paths:
47+
- app/**/node_modules
48+
- docs/**/node_modules
49+
- examples/**/node_modules
50+
- lib/**/node_modules
51+
example-kitchen-sink:
52+
<<: *defaults
53+
steps:
54+
- run:
55+
name: "Running kitchen-sink"
56+
command: |
57+
echo "TODO"
58+
example-test-cra:
59+
<<: *defaults
60+
steps:
61+
- checkout
62+
- restore_cache:
63+
keys:
64+
- root-dependencies-{{ checksum "package.json" }}
65+
- root-dependencies-
66+
- run:
67+
name: "Install root dependencies"
68+
command: |
69+
yarn install
70+
- run:
71+
name: "Bootstrapping"
72+
command: |
73+
npm run bootstrap
74+
npm run bootstrap:test-cra
75+
- run:
76+
name: "Running test-cra"
77+
command: |
78+
echo "TODO"
79+
example-react-native:
80+
<<: *defaults
81+
steps:
82+
- checkout
83+
- restore_cache:
84+
keys:
85+
- root-dependencies-{{ checksum "package.json" }}
86+
- root-dependencies-
87+
- run:
88+
name: "Install root dependencies"
89+
command: |
90+
yarn install
91+
- run:
92+
name: "Bootstrapping packages"
93+
command: |
94+
npm run bootstrap
95+
npm run bootstrap:react-native-vanilla
96+
- run:
97+
name: "Running react-native"
98+
command: |
99+
echo "TODO"
100+
101+
docs:
102+
<<: *defaults
103+
steps:
104+
- checkout
105+
- restore_cache:
106+
keys:
107+
- root-dependencies-{{ checksum "package.json" }}
108+
- root-dependencies-
109+
- run:
110+
name: "Install root dependencies"
111+
command: |
112+
yarn install
113+
- run:
114+
name: "Bootstrapping"
115+
command: |
116+
npm run bootstrap:docs
117+
- run:
118+
name: "Running docs"
119+
command: |
120+
npm run docs:build
121+
lint:
122+
<<: *defaults
123+
steps:
124+
- checkout
125+
- restore_cache:
126+
keys:
127+
- root-dependencies-{{ checksum "package.json" }}
128+
- root-dependencies-
129+
- run:
130+
name: "Install root dependencies"
131+
command: |
132+
yarn install
133+
- run:
134+
name: "Linting"
135+
command: |
136+
npm run lint
137+
unit-test:
138+
<<: *defaults
139+
steps:
140+
- checkout
141+
- restore_cache:
142+
keys:
143+
- root-dependencies-{{ checksum "package.json" }}
144+
- root-dependencies-
145+
- run:
146+
name: "Install root dependencies"
147+
command: |
148+
yarn install
149+
- run:
150+
name: "Bootstrapping"
151+
command: |
152+
npm run bootstrap
153+
npm run bootstrap:docs
154+
npm run bootstrap:test-cra
155+
npm run bootstrap:react-native-vanilla
156+
- run:
157+
name: "Unit testing"
158+
command: |
159+
npm run test -- --coverage -i
160+
npm run coverage
161+
deploy:
162+
<<: *defaults
163+
steps:
164+
- run:
165+
name: "Deploy"
166+
command: |
167+
echo "TODO"
168+
workflows:
169+
version: 2
170+
build_accept_deploy:
171+
jobs:
172+
- validate
173+
- build
174+
- example-kitchen-sink
175+
- example-test-cra
176+
- example-react-native
177+
- docs
178+
- lint
179+
- unit-test
180+
- deploy:
181+
type: approval
182+
requires:
183+
- lint
184+
- unit-test
185+
- docs

‎.travis.yml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[![Build Status](https://travis-ci.org/storybooks/storybook.svg?branch=master)](https://travis-ci.org/storybooks/storybook)
55
[![CodeFactor](https://www.codefactor.io/repository/github/storybooks/storybook/badge)](https://www.codefactor.io/repository/github/storybooks/storybook)
66
[![Known Vulnerabilities](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847/badge.svg)](https://snyk.io/test/github/storybooks/storybook/8f36abfd6697e58cd76df3526b52e4b9dc894847)
7-
[![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)
8-
[![Storybook Slack](https://storybooks-slackin.herokuapp.com/badge.svg)](https://storybooks-slackin.herokuapp.com/)
7+
[![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)
8+
[![Storybook Slack](https://now-examples-slackin-nqnzoygycp.now.sh/badge.svg)](https://now-examples-slackin-nqnzoygycp.now.sh/)
99
[![Backers on Open Collective](https://opencollective.com/storybook/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/storybook/sponsors/badge.svg)](#sponsors)
1010

1111
* * *

‎addons/actions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@storybook/addons": "^3.1.6",
2525
"deep-equal": "^1.0.1",
2626
"json-stringify-safe": "^5.0.1",
27-
"prop-types": "^15.5.8",
27+
"prop-types": "^15.5.10",
2828
"react-inspector": "^2.1.1",
2929
"uuid": "^3.1.0"
3030
},

‎addons/comments/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"insert-css": "^1.0.0",
3232
"marked": "^0.3.6",
3333
"moment": "^2.18.1",
34-
"prop-types": "^15.5.8",
34+
"prop-types": "^15.5.10",
3535
"react-render-html": "^0.1.6",
3636
"react-textarea-autosize": "^4.3.0"
3737
},

‎addons/events/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
},
2222
"dependencies": {
2323
"@storybook/addons": "^3.1.6",
24-
"babel-runtime": "^6.5.0",
24+
"babel-runtime": "^6.23.0",
2525
"format-json": "^1.0.3",
2626
"prop-types": "^15.5.10",
27-
"react-textarea-autosize": "^4.0.5",
28-
"uuid": "^3.0.1"
27+
"react-textarea-autosize": "^4.3.0",
28+
"uuid": "^3.1.0"
2929
},
3030
"devDependencies": {
31-
"react": "^15.3.2",
32-
"react-dom": "^15.3.2"
31+
"react": "^15.5.4",
32+
"react-dom": "^15.5.4"
3333
},
3434
"peerDependencies": {
3535
"react": "*"

‎addons/info/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"babel-runtime": "^6.23.0",
1919
"global": "^4.3.2",
2020
"marksy": "^2.0.0",
21-
"prop-types": "^15.5.8",
21+
"prop-types": "^15.5.10",
2222
"react-addons-create-fragment": "^15.5.3"
2323
},
2424
"devDependencies": {

‎addons/knobs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"insert-css": "^1.0.0",
2424
"lodash.debounce": "^4.0.8",
2525
"moment": "^2.18.1",
26-
"prop-types": "^15.5.8",
26+
"prop-types": "^15.5.10",
2727
"react-color": "^2.11.4",
2828
"react-datetime": "^2.8.10",
2929
"react-textarea-autosize": "^4.3.0"

‎addons/storyshots/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"babel-runtime": "^6.23.0",
1818
"global": "^4.3.2",
19-
"prop-types": "^15.5.8",
19+
"prop-types": "^15.5.10",
2020
"read-pkg-up": "^2.0.0"
2121
},
2222
"devDependencies": {

‎app/react-native/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@storybook/addons": "^3.1.6",
3030
"@storybook/channel-websocket": "^3.1.6",
3131
"@storybook/ui": "^3.1.9",
32-
"autoprefixer": "^7.0.1",
32+
"autoprefixer": "^7.1.1",
3333
"babel-core": "^6.24.1",
3434
"babel-loader": "^7.0.0",
3535
"babel-plugin-syntax-async-functions": "^6.13.0",
@@ -47,22 +47,22 @@
4747
"babel-runtime": "^6.23.0",
4848
"case-sensitive-paths-webpack-plugin": "^2.0.0",
4949
"commander": "^2.9.0",
50-
"css-loader": "^0.28.0",
50+
"css-loader": "^0.28.1",
5151
"events": "^1.1.1",
52-
"express": "^4.15.2",
52+
"express": "^4.15.3",
5353
"file-loader": "^0.11.1",
5454
"find-cache-dir": "^1.0.0",
5555
"global": "^4.3.2",
5656
"json-loader": "^0.5.4",
5757
"json5": "^0.5.1",
58-
"postcss-loader": "^2.0.3",
58+
"postcss-loader": "^2.0.5",
5959
"shelljs": "^0.7.7",
6060
"style-loader": "^0.17.0",
6161
"url-loader": "^0.5.8",
6262
"util-deprecate": "^1.0.2",
63-
"uuid": "^3.0.1",
64-
"webpack": "^2.4.1",
65-
"webpack-dev-middleware": "^1.10.1",
63+
"uuid": "^3.1.0",
64+
"webpack": "^2.5.1 || ^3.0.0",
65+
"webpack-dev-middleware": "^1.10.2",
6666
"webpack-hot-middleware": "^2.18.0",
6767
"ws": "^3.0.0"
6868
},

0 commit comments

Comments
 (0)