GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 03:11:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into webpack-4

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
Hypnosphi 2018-03-21 01:01:15 +03:00
commit 8ac0ab3bc1
5 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/angular/src/client/preview/angular/helpers.ts
View File

@ -76,10 +76,7 @@ const createComponentFromTemplate = (template: string, styles: string[]): Functi
})(componentClass);
};
const initModule = (
currentStory: IGetStory,
reRender: boolean = false
): Function => {
const initModule = (currentStory: IGetStory, reRender: boolean = false): Function => {
const storyObj = currentStory();
const { component, template, props, styles, moduleMetadata = {} } = storyObj;

5
app/angular/src/client/preview/angular/types.ts
View File

@ -28,8 +28,5 @@ export type NgProvidedData = NgStory | NgError;
export type IGetStory = () => NgStory;
export type IRenderStoryFn = (
story: IGetStory,
reRender?: boolean
) => void;
export type IRenderStoryFn = (story: IGetStory, reRender?: boolean) => void;
export type IRenderErrorFn = (error: Error) => void;

2
lib/core/package.json
View File

@ -22,7 +22,7 @@
"@storybook/client-logger": "3.4.0-rc.3",
"@storybook/node-logger": "3.4.0-rc.3",
"@storybook/ui": "3.4.0-rc.3",
"autoprefixer": "^7.2.6",
"autoprefixer": "^8.0.0",
"babel-runtime": "^6.26.0",
"chalk": "^2.3.2",
"commander": "^2.15.0",

1
lib/core/src/server/config/defaults/webpack.config.js
View File

@ -24,7 +24,6 @@ export function createDefaultWebpackConfig(storybookBaseConfig) {
plugins: () => [
require('postcss-flexbugs-fixes'), // eslint-disable-line
autoprefixer({
browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'],
flexbox: 'no-2009',
}),
],

29
yarn.lock
View File

@ -1077,12 +1077,12 @@ autoprefixer@^7.2.3:
postcss "^6.0.16"
postcss-value-parser "^3.2.3"
autoprefixer@^7.2.6:
version "7.2.6"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
autoprefixer@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.0.0.tgz#c19e480f061013127c373df0b01cf46919943f74"
dependencies:
browserslist "^2.11.3"
caniuse-lite "^1.0.30000805"
browserslist "^3.0.0"
caniuse-lite "^1.0.30000808"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.17"
@ -2763,7 +2763,7 @@ browserify@^14.5.0:
vm-browserify "~0.0.1"
xtend "^4.0.0"
browserslist@3.1.1:
browserslist@3.1.1, browserslist@^3.0.0:
version "3.1.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.1.1.tgz#d380fc048bc3a33e60fb87dc135110ebaaa6320a"
dependencies:
@ -2784,13 +2784,6 @@ browserslist@^2.1.2, browserslist@^2.11.1, browserslist@^2.5.1:
caniuse-lite "^1.0.30000789"
electron-to-chromium "^1.3.30"
browserslist@^2.11.3:
version "2.11.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
dependencies:
caniuse-lite "^1.0.30000792"
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"
@ -3042,9 +3035,9 @@ caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000789, caniuse-lite@^1.0.300007
version "1.0.30000791"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
caniuse-lite@^1.0.30000792, caniuse-lite@^1.0.30000805:
version "1.0.30000809"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000809.tgz#1e12c1344b8f74d56737ee2614bcedb648943479"
caniuse-lite@^1.0.30000808:
version "1.0.30000810"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz#47585fffce0e9f3593a6feea4673b945424351d9"
caniuse-lite@^1.0.30000809:
version "1.0.30000815"
@ -4998,8 +4991,8 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
electron-releases "^2.1.0"
electron-to-chromium@^1.3.33:
version "1.3.39"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.39.tgz#d7a4696409ca0995e2750156da612c221afad84d"
version "1.3.34"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.34.tgz#d93498f40391bb0c16a603d8241b9951404157ed"
elegant-spinner@^1.0.1:
version "1.0.1"