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

Merge branch 'tech/cleanup-unused-dependencies' into tech/upgrades

Browse Source 
# Conflicts:
#	addons/actions/package.json
#	package.json
#	yarn.lock
This commit is contained in:
Norbert de Langen 2019-02-25 11:31:32 +01:00
commit 5f510f724f
6 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/react/package.json
View File

@ -32,7 +32,7 @@
"@storybook/core": "5.0.0-beta.3",
"@storybook/node-logger": "5.0.0-beta.3",
"@svgr/webpack": "^4.0.3",
"babel-plugin-named-asset-import": "^0.3.0",
"babel-plugin-named-asset-import": "^0.3.1",
"babel-plugin-react-docgen": "^2.0.2",
"babel-preset-react-app": "^7.0.1",
"common-tags": "^1.8.0",

4
lib/ui/src/components/sidebar/treeview/treeview.mockdata.js
View File

@ -66,8 +66,8 @@ export const mockDataset = {
},
'2-22': {
isRoot: false,
isLeaf: false,
isComponent: true,
isLeaf: true,
isComponent: false,
id: '2-22',
depth: 1,
name: 'Child B2',

17
lib/ui/src/settings/__snapshots__/about.stories.storyshot
View File

@ -396,8 +396,10 @@ exports[`Storyshots UI|Settings/AboutScreen failed to fetch new version 1`] = `
background: #FEDED2;
color: #FF4400;
font-weight: 700;
font-size: 14px;
padding: 10px 20px;
margin-bottom: 24px;
border-radius: 4px;
border: 1px solid rgba(0,0,0,.1);
text-align: center;
}
@ -917,6 +919,11 @@ exports[`Storyshots UI|Settings/AboutScreen new version required 1`] = `
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin-bottom: .75rem;
}
.emotion-11 {
@ -1444,15 +1451,16 @@ exports[`Storyshots UI|Settings/AboutScreen new version required 1`] = `
background: #E1FFD4;
color: #66BF3C;
font-weight: 700;
font-size: 14px;
padding: 10px 20px;
margin-bottom: 24px;
border-radius: 4px;
border: 1px solid rgba(0,0,0,.1);
text-align: center;
}
.emotion-31 {
margin-top: 20px;
padding-bottom: 20px;
border-top: 1px solid rgba(0,0,0,.1);
}
@ -2298,8 +2306,10 @@ exports[`Storyshots UI|Settings/AboutScreen up to date 1`] = `
background: #EAF3FC;
color: #333333;
font-weight: 700;
font-size: 14px;
padding: 10px 20px;
margin-bottom: 24px;
border-radius: 4px;
border: 1px solid rgba(0,0,0,.1);
text-align: center;
}
@ -2313,6 +2323,11 @@ exports[`Storyshots UI|Settings/AboutScreen up to date 1`] = `
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
margin-bottom: .75rem;
}
.emotion-11 {

6
lib/ui/src/settings/about.js
View File

@ -50,6 +50,8 @@ const SubheadingLink = styled(Link)(({ theme }) => ({
const Subheader = styled.div({
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: '.75rem',
});
const UpdateMessage = styled.div(
@ -65,9 +67,10 @@ const UpdateMessage = styled.div(
({ theme }) => ({
fontWeight: theme.typography.weight.bold,
fontSize: theme.typography.size.s2,
padding: '10px 20px',
marginBottom: 24,
borderRadius: theme.borderRadius,
borderRadius: theme.appBorderRadius,
border: `1px solid ${theme.appBorderColor}`,
textAlign: 'center',
})
@ -80,7 +83,6 @@ const ErrorMessage = styled.div(({ theme }) => ({
const Upgrade = styled.div(({ theme }) => ({
marginTop: 20,
paddingBottom: 20,
borderTop: `1px solid ${theme.appBorderColor}`,
}));

2
package.json
View File

@ -88,7 +88,7 @@
"concurrently": "^4.0.1",
"core-js": "^2.6.5",
"cross-env": "^5.2.0",
"danger": "^7.0.13",
"danger": "^7.0.14",
"enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.9.1",
"eslint": "^5.14.1",

11
yarn.lock
View File

@ -4167,7 +4167,7 @@ babel-plugin-module-resolver@^3.1.1:
reselect "^3.0.1"
resolve "^1.4.0"
babel-plugin-named-asset-import@^0.3.0, babel-plugin-named-asset-import@^0.3.1:
babel-plugin-named-asset-import@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.1.tgz#5ec13ec446d0a1e5bb6c57a1f94c9cdedb0c50d6"
integrity sha512-vzZlo+yEB5YHqI6CRRTDojeT43J3Wf3C/MVkZW5UlbSeIIVUYRKtxaFT2L/VTv9mbIyatCW39+9g/SZolvwRUQ==
@ -7745,10 +7745,10 @@ damerau-levenshtein@^1.0.4:
resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
danger@^7.0.13:
version "7.0.13"
resolved "https://registry.yarnpkg.com/danger/-/danger-7.0.13.tgz#41e9b64db1f0875a5b86834224fc7ee1a19ef8d0"
integrity sha512-6tHEWYCCycI0szlodbxDUR4d91l3Gu33ChrowvJOYZ5P9VhxTkmamWC04b3f5qgxkrFsQCTiuAL8eqvMQyOQyw==
danger@^7.0.14:
version "7.0.14"
resolved "https://registry.yarnpkg.com/danger/-/danger-7.0.14.tgz#c600b463f591a5c8aeac926b6066cf415ecd6e88"
integrity sha512-8JoWH5wge25vo0ROSplA+edy2PVk5Ttn7iR7oEq/XwWxp18lHG4B8JuYgMWqp68EcJbJlKxTWQfmANJudmJuiA==
dependencies:
"@babel/polyfill" "^7.2.5"
"@octokit/rest" "^16.14.1"
@ -7767,6 +7767,7 @@ danger@^7.0.13:
lodash.includes "^4.3.0"
lodash.isobject "^3.0.2"
lodash.keys "^4.0.8"
lodash.memoize "^4.1.2"
memfs-or-file-map-to-github-branch "^1.1.0"
node-cleanup "^2.1.2"
node-fetch "^2.3.0"