Merge remote-tracking branch 'origin/master' into angular-storyshots

# Conflicts:
#	package.json
#	yarn.lock

Author: igor-dv

app/angular/package.json

@@ -42,8 +42,8 @@
     "babel-runtime": "^6.23.0",
     "case-sensitive-paths-webpack-plugin": "^2.0.0",
     "chalk": "^2.1.0",
-    "commander": "^2.11.0",
-    "common-tags": "^1.7.0",
+    "commander": "^2.13.0",
+    "common-tags": "^1.7.2",
     "configstore": "^3.1.0",
     "core-js": "^2.4.1",
     "cross-env": "^5.1.1",
@@ -83,15 +83,15 @@
     "webpack": "^2.5.1 || ^3.0.0",
     "webpack-dev-middleware": "^1.10.2",
     "webpack-hot-middleware": "^2.18.0",
-    "zone.js": "^0.8.19"
+    "zone.js": "^0.8.20"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-plugin-transform-decorators": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "codelyzer": "^3.1.2",
     "mock-fs": "^4.3.0",
-    "nodemon": "^1.14.10",
+    "nodemon": "^1.14.11",
     "typescript": "^2.4.0"
   },
   "peerDependencies": {

app/react-native/package.json

@@ -47,7 +47,7 @@
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
-    "commander": "^2.12.2",
+    "commander": "^2.13.0",
     "css-loader": "^0.28.8",
     "express": "^4.16.2",
     "file-loader": "^1.1.6",

app/react-native/src/bin/storybook-start.js

@@ -75,12 +75,10 @@ if (!program.skipPackager) {
     );
   }
 
-  let cliCommand = 'node node_modules/react-native/local-cli/cli.js start';
+  let cliCommand = 'react-native start';
   if (program.haul) {
     const platform = program.platform || 'all';
-    cliCommand = `node node_modules/haul/bin/cli.js start --config ${
-      program.haul
-    } --platform ${platform}`;
+    cliCommand = `haul start --config ${program.haul} --platform ${platform}`;
   }
   // RN packager
   shelljs.exec(

app/react/package.json

@@ -45,8 +45,8 @@
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
     "chalk": "^2.3.0",
-    "commander": "^2.12.2",
-    "common-tags": "^1.7.0",
+    "commander": "^2.13.0",
+    "common-tags": "^1.7.2",
     "configstore": "^3.1.1",
     "core-js": "^2.5.3",
     "css-loader": "^0.28.8",
@@ -83,7 +83,7 @@
     "webpack-hot-middleware": "^2.21.0"
   },
   "devDependencies": {
-    "nodemon": "^1.14.10"
+    "nodemon": "^1.14.11"
   },
   "peerDependencies": {
     "babel-core": "^6.26.0 || ^7.0.0-0",

app/vue/package.json

@@ -43,8 +43,8 @@
     "babel-runtime": "^6.26.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.1",
     "chalk": "^2.3.0",
-    "commander": "^2.12.2",
-    "common-tags": "^1.7.0",
+    "commander": "^2.13.0",
+    "common-tags": "^1.7.2",
     "configstore": "^3.1.1",
     "core-js": "^2.5.3",
     "css-loader": "^0.28.8",
@@ -81,7 +81,7 @@
     "webpack-hot-middleware": "^2.21.0"
   },
   "devDependencies": {
-    "nodemon": "^1.14.10",
+    "nodemon": "^1.14.11",
     "vue": "^2.5.13",
     "vue-loader": "^13.7.0",
     "vue-template-compiler": "^2.5.13"

docs/src/pages/examples/_examples.yml

@@ -139,3 +139,9 @@ fyndiq-ui:
   description: Fyndiq UI Component library
   source: https://github.com/fyndiq/fyndiq-ui
   demo: https://fyndiq.github.io/fyndiq-ui/
+gumgum:
+  thumbnail: ./thumbnails/gumgum.png
+  title: GumGum
+  description: GumGum (Computer Vision Company) Component library
+  demo: https://storybook.gumgum.com
+  site: https://gumgum.com

docs/src/pages/examples/thumbnails/gumgum.png

@@ -24,10 +24,10 @@
     "@angular/router": "^5.1.3",
     "core-js": "^2.4.1",
     "rxjs": "^5.4.2",
-    "zone.js": "^0.8.19"
+    "zone.js": "^0.8.20"
   },
   "devDependencies": {
-    "@angular/cli": "1.6.3",
+    "@angular/cli": "1.6.4",
     "@angular/compiler-cli": "^5.1.3",
     "@angular/language-service": "^5.1.3",
     "@storybook/addon-actions": "^3.4.0-alpha.1",
@@ -52,3 +52,4 @@
     "typescript": "^2.4.0"
   }
 }
+

examples/angular-cli/package.json

@@ -35,11 +35,11 @@
     "@storybook/client-logger": "^3.4.0-alpha.1",
     "@storybook/components": "^3.4.0-alpha.1",
     "@storybook/react": "^3.4.0-alpha.1",
-    "babel-jest": "^22.0.4",
+    "babel-jest": "^22.0.6",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.0",
     "enzyme-to-json": "^3.2.2",
-    "jest": "^22.0.5",
+    "jest": "^22.0.6",
     "react-scripts": "^1.0.17"
   },
   "private": true

examples/cra-kitchen-sink/package.json

@@ -32,7 +32,7 @@
     "babel-runtime": "^6.26.0",
     "chalk": "^2.3.0",
     "child-process-promise": "^2.2.1",
-    "commander": "^2.12.2",
+    "commander": "^2.13.0",
     "cross-spawn": "^5.0.1",
     "jscodeshift": "^0.4.0",
     "json5": "^0.5.1",