Merge branch 'master' into storyshots-ts-stories-compatibility

This commit is contained in:
Norbert de Langen 2018-01-04 13:25:19 +01:00 committed by GitHub
commit 9e5019c9fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -33,7 +33,6 @@
"vue": "^2.5.13"
},
"peerDependencies": {
"@angular/core": ">=4.0.0",
"@storybook/addons": "^3.3.0",
"react": "*",
"react-dom": "*"

View File

@ -1,5 +1,5 @@
/* eslint no-underscore-dangle: 0 */
// eslint-disable-next-line import/no-extraneous-dependencies
import { Component, SimpleChange, ChangeDetectorRef } from '@angular/core';
import { getParameters, getAnnotations, getPropMetadata } from './utils';

View File

@ -1,5 +1,6 @@
/* eslint-disable no-param-reassign */
/* globals window */
/* eslint-disable no-param-reassign */
// eslint-disable-next-line import/no-extraneous-dependencies
import { ɵReflectionCapabilities } from '@angular/core';
// eslint-disable-next-line new-cap