Skip to content

Commit

Permalink
Merge branch 'Replace-console.log-with-npmlog' of https://github.com/…
Browse files Browse the repository at this point in the history
…storybooks/storybook into Replace-console.log-with-npmlog
  • Loading branch information
dangreenisrael committed Nov 25, 2017
2 parents 03576fc + b62b7e3 commit b699f7e
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.7",
"json5": "^0.5.1",
"postcss-loader": "^2.0.8",
"postcss-loader": "^2.0.9",
"prop-types": "^15.6.0",
"react-native-compat": "^1.0.0",
"react-native-iphone-x-helper": "^1.0.1",
Expand All @@ -72,7 +72,7 @@
"ws": "^3.3.2"
},
"devDependencies": {
"react-native": "^0.50.3"
"react-native": "^0.50.4"
},
"peerDependencies": {
"react": "*",
Expand Down
4 changes: 2 additions & 2 deletions app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.12.1",
"common-tags": "^1.4.0",
"common-tags": "^1.5.1",
"configstore": "^3.1.1",
"core-js": "^2.5.1",
"css-loader": "^0.28.7",
Expand All @@ -66,7 +66,7 @@
"markdown-loader": "^2.0.1",
"npmlog": "^4.1.2",
"postcss-flexbugs-fixes": "^3.2.0",
"postcss-loader": "^2.0.8",
"postcss-loader": "^2.0.9",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"redux": "^3.7.2",
Expand Down
4 changes: 2 additions & 2 deletions app/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"case-sensitive-paths-webpack-plugin": "^2.1.1",
"chalk": "^2.3.0",
"commander": "^2.12.1",
"common-tags": "^1.4.0",
"common-tags": "^1.5.1",
"configstore": "^3.1.1",
"core-js": "^2.5.1",
"css-loader": "^0.28.7",
Expand All @@ -58,7 +58,7 @@
"json5": "^0.5.1",
"lodash.pick": "^4.4.0",
"postcss-flexbugs-fixes": "^3.2.0",
"postcss-loader": "^2.0.8",
"postcss-loader": "^2.0.9",
"prop-types": "^15.6.0",
"qs": "^6.5.1",
"react": "^16.1.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"react-fuzzy": "^0.5.1",
"react-icons": "^2.2.7",
"react-inspector": "^2.2.1",
"react-modal": "^3.1.3",
"react-modal": "^3.1.4",
"react-split-pane": "^0.1.71",
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"
Expand Down
29 changes: 22 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3002,6 +3002,12 @@ common-tags@^1.3.1, common-tags@^1.4.0:
dependencies:
babel-runtime "^6.18.0"

common-tags@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.5.1.tgz#e2e39931a013cd02253defeed89a1ad615a27f07"
dependencies:
babel-runtime "^6.26.0"

commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
Expand Down Expand Up @@ -10140,7 +10146,7 @@ postcss-load-plugins@^2.3.0:
cosmiconfig "^2.1.1"
object-assign "^4.1.0"

[email protected], postcss-loader@^2.0.5, postcss-loader@^2.0.8:
[email protected], postcss-loader@^2.0.5:
version "2.0.8"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.8.tgz#8c67ddb029407dfafe684a406cfc16bad2ce0814"
dependencies:
Expand All @@ -10158,6 +10164,15 @@ postcss-loader@^1.3.3:
postcss "^5.2.15"
postcss-load-config "^1.2.0"

postcss-loader@^2.0.9:
version "2.0.9"
resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.9.tgz#001fdf7bfeeb159405ee61d1bb8e59b528dbd309"
dependencies:
loader-utils "^1.1.0"
postcss "^6.0.0"
postcss-load-config "^1.2.0"
schema-utils "^0.3.0"

postcss-merge-idents@^2.1.5:
version "2.1.7"
resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
Expand Down Expand Up @@ -10838,9 +10853,9 @@ react-modal@^2.2.4:
exenv "^1.2.0"
prop-types "^15.5.10"

react-modal@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.3.tgz#bead112cd84681a1ccd18ee1e96c73d881793b75"
react-modal@^3.1.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.4.tgz#eea7369ea4f05ab2897ccca2c676d7d81a5a88b0"
dependencies:
exenv "^1.2.0"
prop-types "^15.5.10"
Expand All @@ -10855,9 +10870,9 @@ react-native-iphone-x-helper@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.0.1.tgz#950dbdaca66f458689a7e9697c5beb9bd53f98f2"

react-native@^0.50.3:
version "0.50.3"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.3.tgz#91282bd5356cc7d794969cdc443cc764389b9af4"
react-native@^0.50.4:
version "0.50.4"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.50.4.tgz#194f5da4939087b3acee712a503475f4942dca7e"
dependencies:
absolute-path "^0.0.0"
art "^0.10.0"
Expand Down

0 comments on commit b699f7e

Please sign in to comment.