Merge branch 'master' into tmeasday/use-client-api-in-react-native

storybookjs · Feb 20, 2018 · f1c1d0c · f1c1d0c
2 parents e8ddefc + b97b07b
commit f1c1d0c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/app/react-native/src/server/index.js b/app/react-native/src/server/index.js
@@ -24,6 +24,13 @@ export default class Server {
       }
     }
 
+    // see https://github.com/websockets/ws/issues/1256#issuecomment-364988689
+    socket.on('error', err => {
+      // Ignore network errors like `ECONNRESET`, `EPIPE`, etc.
+      if (err.errno) return;
+      throw err;
+    });
+
     socket.on('message', data => {
       this.wsServer.clients.forEach(c => {
         if (!this.options.manualId || (socket.pairedId && socket.pairedId === c.pairedId)) {

diff --git a/docs/package.json b/docs/package.json
@@ -31,7 +31,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.202",
+    "gatsby": "^1.9.203",
     "gatsby-link": "^1.6.37",
     "gatsby-plugin-sharp": "^1.6.31",
     "gatsby-remark-autolink-headers": "^1.4.12",

diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -4504,9 +4504,9 @@ gatsby-transformer-remark@^1.7.33:
     unist-util-select "^1.5.0"
     unist-util-visit "^1.1.1"
 
-gatsby@^1.9.202:
-  version "1.9.202"
-  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.202.tgz#05bbf7429b860474956c22378c681ff3888139c3"
+gatsby@^1.9.203:
+  version "1.9.203"
+  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.203.tgz#de632e1faace1a9a0d1d99f0430739784c4260a0"
   dependencies:
     async "^2.1.2"
     babel-code-frame "^6.22.0"

diff --git a/lib/ui/package.json b/lib/ui/package.json
@@ -28,7 +28,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.pick": "^4.4.0",
     "lodash.sortby": "^4.7.0",
-    "podda": "^1.2.2",
+    "@storybook/podda": "^1.2.3",
     "prop-types": "^15.6.0",
     "qs": "^6.5.1",
     "react-fuzzy": "^0.5.2",

diff --git a/lib/ui/src/index.js b/lib/ui/src/index.js
@@ -1,5 +1,5 @@
 import { createApp } from '@storybook/mantra-core';
-import Podda from 'podda';
+import Podda from '@storybook/podda';
 
 import buildContext from './context';
 import shortcutsModule from './modules/shortcuts';

diff --git a/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js b/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js
@@ -1,4 +1,4 @@
-import Podda from 'podda';
+import Podda from '@storybook/podda';
 import genPoddaLoader from './gen_podda_loader';
 
 describe('manager.ui.libs.gen_podda_loader', () => {

diff --git a/yarn.lock b/yarn.lock
@@ -276,6 +276,13 @@
     "@storybook/react-simple-di" "^1.2.1"
     babel-runtime "6.x.x"
 
+"@storybook/podda@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@storybook/podda/-/podda-1.2.3.tgz#53c4a1a3f8c7bbd5755dff5c34576fd1af9d38ba"
+  dependencies:
+    babel-runtime "^6.11.6"
+    immutable "^3.8.1"
+
 "@storybook/react-komposer@^2.0.1", "@storybook/react-komposer@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.3.tgz#f9e12a9586b2ce95c24c137eabb8b71527ddb369"
@@ -11670,13 +11677,6 @@ pngjs@^3.0.0, pngjs@^3.3.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.1.tgz#8e14e6679ee7424b544334c3b2d21cea6d8c209a"
 
-podda@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/podda/-/podda-1.2.2.tgz#15b0edbd334ade145813343f5ecf9c10a71cf500"
-  dependencies:
-    babel-runtime "^6.11.6"
-    immutable "^3.8.1"
-
 [email protected], polymer-webpack-loader@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/polymer-webpack-loader/-/polymer-webpack-loader-2.0.1.tgz#d15d45328f6a6700366dfaee83fc606f39cdcee0"