Merge remote-tracking branch 'origin/angular-storyshots' into vue-storyshots

# Conflicts:
#	addons/storyshots/package.json
This commit is contained in:
igor 2018-01-03 12:29:53 +02:00
commit 51b91d8aba
13 changed files with 48 additions and 33 deletions

View File

@ -16,6 +16,7 @@
"example": "jest storyshot.test"
},
"dependencies": {
"@angular/core": ">=4.0.0",
"@storybook/channels": "^3.3.3",
"babel-runtime": "^6.26.0",
"glob": "^7.1.2",
@ -23,7 +24,10 @@
"jest-preset-angular": "^5.0.0",
"jest-specific-snapshot": "^0.3.0",
"prop-types": "^15.6.0",
"read-pkg-up": "^3.0.0"
"react": "*",
"react-test-renderer": "*",
"read-pkg-up": "^3.0.0",
"vue": "^2.5.13"
},
"devDependencies": {
"@storybook/addons": "^3.3.3",
@ -41,11 +45,7 @@
"react-dom": "^16.1.0"
},
"peerDependencies": {
"@angular/core": ">=4.0.0",
"@storybook/addons": "^3.3.3",
"babel-core": "^6.26.0 || ^7.0.0-0",
"react": "*",
"react-test-renderer": "*",
"vue": "^2.5.13"
"babel-core": "^6.26.0 || ^7.0.0-0"
}
}

View File

@ -1,6 +1,6 @@
# Storybook for Angular
Storybook for Angular is a UI development environment for your React components.
Storybook for Angular is a UI development environment for your Angular components.
With it, you can visualize different states of your UI components and develop them interactively.
[![Greenkeeper badge](https://badges.greenkeeper.io/storybooks/storybook.svg)](https://greenkeeper.io/)

View File

@ -30,7 +30,7 @@
"@storybook/ui": "^3.3.3",
"airbnb-js-shims": "^1.1.1",
"angular2-template-loader": "^0.6.2",
"autoprefixer": "^7.1.1",
"autoprefixer": "^7.2.4",
"babel-core": "^6.26.0",
"babel-loader": "^7.0.0",
"babel-plugin-react-docgen": "^1.6.0",

View File

@ -30,7 +30,7 @@
"@storybook/addons": "^3.3.3",
"@storybook/channel-websocket": "^3.3.3",
"@storybook/ui": "^3.3.3",
"autoprefixer": "^7.2.3",
"autoprefixer": "^7.2.4",
"babel-loader": "^7.1.2",
"babel-plugin-syntax-async-functions": "^6.13.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",

View File

@ -31,7 +31,7 @@
"@storybook/node-logger": "^3.3.3",
"@storybook/ui": "^3.3.3",
"airbnb-js-shims": "^1.4.0",
"autoprefixer": "^7.2.3",
"autoprefixer": "^7.2.4",
"babel-loader": "^7.1.2",
"babel-plugin-react-docgen": "^1.8.0",
"babel-plugin-transform-regenerator": "^6.26.0",

View File

@ -29,7 +29,7 @@
"@storybook/channel-postmessage": "^3.3.3",
"@storybook/ui": "^3.3.3",
"airbnb-js-shims": "^1.4.0",
"autoprefixer": "^7.2.3",
"autoprefixer": "^7.2.4",
"babel-loader": "^7.1.2",
"babel-plugin-react-docgen": "^1.8.0",
"babel-plugin-transform-regenerator": "^6.26.0",

View File

@ -4,7 +4,7 @@
"scripts": {
"build-storybook": "build-storybook -c ./",
"storybook": "start-storybook -p 9010 -c ./",
"chromatic": "chromatic test --storybook-addon --exit-zero-on-changes --app-code $CHROMATIC_APP_CODE"
"chromatic": "chromatic test --storybook-addon --exit-zero-on-changes --app-code ab7m45tp9p"
},
"devDependencies": {
"@storybook/addon-a11y": "^3.3.3",

View File

@ -2,8 +2,8 @@
import { configure } from '@storybook/angular';
// automatically import all files ending in *.stories.js
const req = require.context('../stories', true, /.stories.js$/);
// automatically import all files ending in *.stories.ts
const req = require.context('../stories', true, /.stories.ts$/);
function loadStories() {
req.keys().forEach((filename) => req(filename));
}

View File

@ -2,8 +2,8 @@
import { configure } from '@storybook/angular';
// automatically import all files ending in *.stories.js
const req = require.context('../stories', true, /.stories.js$/);
// automatically import all files ending in *.stories.ts
const req = require.context('../stories', true, /.stories.ts$/);
function loadStories() {
req.keys().forEach((filename) => req(filename));
}

View File

@ -47,7 +47,7 @@
"codecov": "^3.0.0",
"commander": "^2.12.2",
"cross-env": "^5.1.3",
"danger": "^2.1.8",
"danger": "^2.1.10",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"eslint": "^4.14.0",

View File

@ -118,7 +118,7 @@
dependencies:
tslib "^1.7.1"
"@angular/core@^5.0.0-beta.7":
"@angular/core@>=4.0.0", "@angular/core@^5.0.0-beta.7":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.1.2.tgz#751070c0f4e5a8c4e2170204e08eca06391b84b1"
dependencies:
@ -830,15 +830,15 @@ autoprefixer@^6.3.1, autoprefixer@^6.5.3:
postcss "^5.2.16"
postcss-value-parser "^3.2.3"
autoprefixer@^7.1.1, autoprefixer@^7.2.3:
version "7.2.3"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.3.tgz#c2841e38b7940c2d0a9bbffd72c75f33637854f8"
autoprefixer@^7.2.4:
version "7.2.4"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.4.tgz#29b367c03876a29bfd3721260d945e3545666c8d"
dependencies:
browserslist "^2.10.0"
caniuse-lite "^1.0.30000783"
browserslist "^2.10.2"
caniuse-lite "^1.0.30000784"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.14"
postcss "^6.0.15"
postcss-value-parser "^3.2.3"
aws-sign2@~0.6.0:
@ -2416,13 +2416,20 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
caniuse-db "^1.0.30000639"
electron-to-chromium "^1.2.7"
browserslist@^2.1.2, browserslist@^2.10.0, browserslist@^2.5.1:
browserslist@^2.1.2, browserslist@^2.5.1:
version "2.10.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
dependencies:
caniuse-lite "^1.0.30000780"
electron-to-chromium "^1.3.28"
browserslist@^2.10.2:
version "2.10.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.2.tgz#0838eec4b3db2d860cee13bf6c0691e7e8133822"
dependencies:
caniuse-lite "^1.0.30000784"
electron-to-chromium "^1.3.30"
bser@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
@ -2598,7 +2605,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000784"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000784.tgz#1be95012d9489c7719074f81aee57dbdffe6361b"
caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000783:
caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000784:
version "1.0.30000784"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
@ -3729,9 +3736,9 @@ damerau-levenshtein@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
danger@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/danger/-/danger-2.1.8.tgz#11cb654831be528e068257846df2141f5b049b79"
danger@^2.1.10:
version "2.1.10"
resolved "https://registry.yarnpkg.com/danger/-/danger-2.1.10.tgz#97a8fcbf0dee72820460dcb6fc4008ef69605be4"
dependencies:
babel-polyfill "7.0.0-alpha.19"
chalk "^2.3.0"
@ -4195,7 +4202,7 @@ electron-releases@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.28:
electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.28, electron-to-chromium@^1.3.30:
version "1.3.30"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
dependencies:
@ -10717,7 +10724,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
source-map "^0.5.6"
supports-color "^3.2.3"
postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.8:
postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.8:
version "6.0.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885"
dependencies:
@ -10725,6 +10732,14 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.8
source-map "^0.6.1"
supports-color "^4.4.0"
postcss@^6.0.15:
version "6.0.15"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.15.tgz#f460cd6269fede0d1bf6defff0b934a9845d974d"
dependencies:
chalk "^2.3.0"
source-map "^0.6.1"
supports-color "^5.1.0"
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@ -11402,7 +11417,7 @@ react-style-proptype@^3.0.0:
dependencies:
prop-types "^15.5.4"
react-test-renderer@^16.0.0-0, react-test-renderer@^16.1.0, react-test-renderer@^16.2.0:
react-test-renderer@*, react-test-renderer@^16.0.0-0, react-test-renderer@^16.1.0, react-test-renderer@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
dependencies:
@ -13266,7 +13281,7 @@ supports-color@^4.0.0, supports-color@^4.1.0, supports-color@^4.2.1, supports-co
dependencies:
has-flag "^2.0.0"
supports-color@^5.0.0:
supports-color@^5.0.0, supports-color@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
dependencies: