Skip to content

Commit

Permalink
Merge branch 'master' into fixes-877
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen authored Jul 19, 2017
2 parents 8a48f80 + 251c563 commit 66f2546
Show file tree
Hide file tree
Showing 28 changed files with 977 additions and 283 deletions.
185 changes: 185 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
defaults: &defaults
working_directory: /tmp/storybook
docker:
- image: node:8

version: 2
dependencies:
pre:
- npm install -g npm
jobs:
validate:
<<: *defaults
steps:
- run:
name: "Checking Versions"
command: |
node --version
npm --version
yarn --version
build:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- root-dependencies-{{ checksum "package.json" }}
- root-dependencies-
- run:
name: "Install root dependencies"
command: |
yarn install
- save_cache:
key: root-dependencies-{{ checksum "package.json" }}
paths:
- node_modules
- restore_cache:
keys:
- package-dependencies-{{ checksum "package.json" }}
- package-dependencies-
- run:
name: "Bootstrapping"
command: |
npm run bootstrap
- save_cache:
key: package-dependencies-{{ checksum "package.json" }}
paths:
- app/**/node_modules
- docs/**/node_modules
- examples/**/node_modules
- lib/**/node_modules
example-kitchen-sink:
<<: *defaults
steps:
- run:
name: "Running kitchen-sink"
command: |
echo "TODO"
example-test-cra:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- root-dependencies-{{ checksum "package.json" }}
- root-dependencies-
- run:
name: "Install root dependencies"
command: |
yarn install
- run:
name: "Bootstrapping"
command: |
npm run bootstrap
npm run bootstrap:test-cra
- run:
name: "Running test-cra"
command: |
echo "TODO"
example-react-native:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- root-dependencies-{{ checksum "package.json" }}
- root-dependencies-
- run:
name: "Install root dependencies"
command: |
yarn install
- run:
name: "Bootstrapping packages"
command: |
npm run bootstrap
npm run bootstrap:react-native-vanilla
- run:
name: "Running react-native"
command: |
echo "TODO"
docs:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- root-dependencies-{{ checksum "package.json" }}
- root-dependencies-
- run:
name: "Install root dependencies"
command: |
yarn install
- run:
name: "Bootstrapping"
command: |
npm run bootstrap:docs
- run:
name: "Running docs"
command: |
npm run docs:build
lint:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- root-dependencies-{{ checksum "package.json" }}
- root-dependencies-
- run:
name: "Install root dependencies"
command: |
yarn install
- run:
name: "Linting"
command: |
npm run lint
unit-test:
<<: *defaults
steps:
- checkout
- restore_cache:
keys:
- root-dependencies-{{ checksum "package.json" }}
- root-dependencies-
- run:
name: "Install root dependencies"
command: |
yarn install
- run:
name: "Bootstrapping"
command: |
npm run bootstrap
npm run bootstrap:docs
npm run bootstrap:test-cra
npm run bootstrap:react-native-vanilla
- run:
name: "Unit testing"
command: |
npm run test -- --coverage -i
npm run coverage
deploy:
<<: *defaults
steps:
- run:
name: "Deploy"
command: |
echo "TODO"
workflows:
version: 2
build_accept_deploy:
jobs:
- validate
- build
- example-kitchen-sink
- example-test-cra
- example-react-native
- docs
- lint
- unit-test
- deploy:
type: approval
requires:
- lint
- unit-test
- docs
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion addons/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@storybook/addons": "^3.1.6",
"deep-equal": "^1.0.1",
"json-stringify-safe": "^5.0.1",
"prop-types": "^15.5.8",
"prop-types": "^15.5.10",
"react-inspector": "^2.1.1",
"uuid": "^3.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion addons/comments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"insert-css": "^1.0.0",
"marked": "^0.3.6",
"moment": "^2.18.1",
"prop-types": "^15.5.8",
"prop-types": "^15.5.10",
"react-render-html": "^0.1.6",
"react-textarea-autosize": "^4.3.0"
},
Expand Down
10 changes: 5 additions & 5 deletions addons/events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
},
"dependencies": {
"@storybook/addons": "^3.1.6",
"babel-runtime": "^6.5.0",
"babel-runtime": "^6.23.0",
"format-json": "^1.0.3",
"prop-types": "^15.5.10",
"react-textarea-autosize": "^4.0.5",
"uuid": "^3.0.1"
"react-textarea-autosize": "^4.3.0",
"uuid": "^3.1.0"
},
"devDependencies": {
"react": "^15.3.2",
"react-dom": "^15.3.2"
"react": "^15.5.4",
"react-dom": "^15.5.4"
},
"peerDependencies": {
"react": "*"
Expand Down
2 changes: 1 addition & 1 deletion addons/info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"babel-runtime": "^6.23.0",
"global": "^4.3.2",
"marksy": "^2.0.0",
"prop-types": "^15.5.8",
"prop-types": "^15.5.10",
"react-addons-create-fragment": "^15.5.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"insert-css": "^1.0.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.18.1",
"prop-types": "^15.5.8",
"prop-types": "^15.5.10",
"react-color": "^2.11.4",
"react-datetime": "^2.8.10",
"react-textarea-autosize": "^4.3.0"
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"babel-runtime": "^6.23.0",
"global": "^4.3.2",
"prop-types": "^15.5.8",
"prop-types": "^15.5.10",
"read-pkg-up": "^2.0.0"
},
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@storybook/addons": "^3.1.6",
"@storybook/channel-websocket": "^3.1.6",
"@storybook/ui": "^3.1.9",
"autoprefixer": "^7.0.1",
"autoprefixer": "^7.1.1",
"babel-core": "^6.24.1",
"babel-loader": "^7.0.0",
"babel-plugin-syntax-async-functions": "^6.13.0",
Expand All @@ -47,22 +47,22 @@
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"commander": "^2.9.0",
"css-loader": "^0.28.0",
"css-loader": "^0.28.1",
"events": "^1.1.1",
"express": "^4.15.2",
"express": "^4.15.3",
"file-loader": "^0.11.1",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
"json-loader": "^0.5.4",
"json5": "^0.5.1",
"postcss-loader": "^2.0.3",
"postcss-loader": "^2.0.5",
"shelljs": "^0.7.7",
"style-loader": "^0.17.0",
"url-loader": "^0.5.8",
"util-deprecate": "^1.0.2",
"uuid": "^3.0.1",
"webpack": "^2.4.1",
"webpack-dev-middleware": "^1.10.1",
"uuid": "^3.1.0",
"webpack": "^2.5.1 || ^3.0.0",
"webpack-dev-middleware": "^1.10.2",
"webpack-hot-middleware": "^2.18.0",
"ws": "^3.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"babel-preset-stage-0": "^6.24.1",
"babel-runtime": "^6.23.0",
"case-sensitive-paths-webpack-plugin": "^2.0.0",
"chalk": "^1.1.3",
"chalk": "^2.0.1",
"commander": "^2.9.0",
"common-tags": "^1.4.0",
"configstore": "^3.1.0",
Expand Down Expand Up @@ -67,7 +67,7 @@
"style-loader": "^0.17.0",
"url-loader": "^0.5.8",
"util-deprecate": "^1.0.2",
"uuid": "^3.0.1",
"uuid": "^3.1.0",
"webpack": "^2.5.1 || ^3.0.0",
"webpack-dev-middleware": "^1.10.2",
"webpack-hot-middleware": "^2.18.0"
Expand Down
5 changes: 4 additions & 1 deletion app/react/src/server/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ export default function(configType, baseConfig, configDir) {
...config.module,
// We need to use our and custom rules.
...customConfig.module,
rules: [...config.module.rules, ...(customConfig.module.rules || [])],
rules: [
...config.module.rules,
...((customConfig.module && customConfig.module.rules) || []),
],
},
resolve: {
...config.resolve,
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"prop-types": "^15.5.10",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"uuid": "^3.0.1"
"uuid": "^3.1.0"
},
"devDependencies": {
"@storybook/addon-actions": "^3.0.0",
Expand Down
Loading

0 comments on commit 66f2546

Please sign in to comment.