Skip to content

Commit

Permalink
Merge branch 'master' into dependencies.io-update-build-276.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
danielduan authored Mar 2, 2018
2 parents 0b54388 + 0a6a739 commit 0d37f57
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/polymer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"common-tags": "^1.4.0",
"copy-webpack-plugin": "^4.4.2",
"copy-webpack-plugin": "^4.5.0",
"core-js": "^2.5.1",
"dotenv-webpack": "^1.5.5",
"find-cache-dir": "^1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ SectionHeader.propTypes = {
selected: PropTypes.bool.isRequired,
};

const ListItem = ({ title, selected, onPress }) => (
const ListItem = ({ kind, title, selected, onPress }) => (
<TouchableOpacity
key={title}
style={style.item}
onPress={onPress}
testID={`Storybook.ListItem.${title}`}
testID={`Storybook.ListItem.${kind}.${title}`}
accessibilityLabel={`Storybook.ListItem.${title}`}
>
<Text style={[style.itemText, selected && style.itemTextSelected]}>{title}</Text>
Expand All @@ -28,6 +28,7 @@ const ListItem = ({ title, selected, onPress }) => (

ListItem.propTypes = {
title: PropTypes.string.isRequired,
kind: PropTypes.string.isRequired,
onPress: PropTypes.func.isRequired,
selected: PropTypes.bool.isRequired,
};
Expand Down Expand Up @@ -92,10 +93,12 @@ export default class StoryListView extends Component {
render() {
return (
<ListView
testID="Storybook.ListView"
style={[style.list, { width: this.props.width }]}
renderRow={item => (
<ListItem
title={item.name}
kind={item.kind}
selected={
item.kind === this.props.selectedKind && item.name === this.props.selectedStory
}
Expand Down
2 changes: 1 addition & 1 deletion examples/polymer-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"babel-core": "^6.26.0",
"babel-loader": "^7.1.3",
"babel-runtime": "^6.26.0",
"copy-webpack-plugin": "^4.4.2",
"copy-webpack-plugin": "^4.5.0",
"html-webpack-plugin": "^2.30.1",
"webpack-dev-server": "^2.11.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"babel-preset-env": "^1.6.0",
"babel-preset-vue": "^2.0.1",
"cross-env": "^5.1.3",
"file-loader": "^1.1.10",
"file-loader": "^1.1.11",
"vue-loader": "^14.1.1",
"webpack": "^3.11.0",
"webpack-dev-server": "^2.11.2"
Expand Down
2 changes: 1 addition & 1 deletion lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dotenv": "^5.0.1",
"events": "^2.0.0",
"express": "^4.16.2",
"file-loader": "^1.1.10",
"file-loader": "^1.1.11",
"global": "^4.3.2",
"json-loader": "^0.5.7",
"postcss-flexbugs-fixes": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"babel-preset-stage-0": "^6.24.1",
"chalk": "^2.3.1",
"codecov": "^3.0.0",
"codelyzer": "^4.1.0",
"codelyzer": "^4.2.1",
"commander": "^2.14.1",
"concurrently": "^3.5.1",
"cross-env": "^5.1.3",
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3355,9 +3355,9 @@ codecov@^3.0.0:
request "2.81.0"
urlgrey "0.4.4"

codelyzer@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.1.0.tgz#3117754538d8f5ffa36dff91d340573a836cf373"
codelyzer@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.2.1.tgz#d56eaacefca7e8138aac0a630e484bdb09988544"
dependencies:
app-root-path "^2.0.1"
css-selector-tokenizer "^0.7.0"
Expand Down Expand Up @@ -3931,15 +3931,15 @@ copy-paste@^1.3.0:
optionalDependencies:
sync-exec "~0.6.x"

copy-webpack-plugin@^4.4.2:
version "4.4.2"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.4.2.tgz#c92bcd7df4d5e42c51398cc36b23820d0d10446a"
copy-webpack-plugin@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.0.tgz#9cb012163317666ea47479d2a8c57daca3557da5"
dependencies:
cacache "^10.0.1"
find-cache-dir "^1.0.0"
globby "^7.1.1"
is-glob "^4.0.0"
loader-utils "^0.2.15"
loader-utils "^1.1.0"
minimatch "^3.0.4"
p-limit "^1.0.0"
serialize-javascript "^1.4.0"
Expand Down Expand Up @@ -5930,9 +5930,9 @@ [email protected]:
loader-utils "^1.0.2"
schema-utils "^0.3.0"

file-loader@^1.1.10:
version "1.1.10"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.10.tgz#77e97dfeab13da64c7085ab3e3887e29ae588aea"
file-loader@^1.1.11:
version "1.1.11"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
dependencies:
loader-utils "^1.0.2"
schema-utils "^0.4.5"
Expand Down

0 comments on commit 0d37f57

Please sign in to comment.