From a35219b5a586881637ae7b9d07aa6563aa724791 Mon Sep 17 00:00:00 2001
From: Jason Grout <jgrout6@bloomberg.net>
Date: Tue, 5 Feb 2019 00:16:57 -0800
Subject: [PATCH 1/2] Add node dependencies and a browser field to services for
 the ws and node-fetch packages

Webpack should ignore our import of the ws and node-fetch nodejs packages because of the browser field (see https://github.com/defunctzombie/package-browser-field-spec#ignore-a-module).

Fixes #5856
---
 packages/services/package.json |  8 +++++++-
 yarn.lock                      | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/services/package.json b/packages/services/package.json
index 4f7ec43ff531..cb03c4370080 100644
--- a/packages/services/package.json
+++ b/packages/services/package.json
@@ -42,7 +42,9 @@
     "@phosphor/algorithm": "^1.1.2",
     "@phosphor/coreutils": "^1.3.0",
     "@phosphor/disposable": "^1.1.2",
-    "@phosphor/signaling": "^1.2.2"
+    "@phosphor/signaling": "^1.2.2",
+    "node-fetch": "^2.3.0",
+    "ws": "^6.1.3"
   },
   "devDependencies": {
     "@types/node": "~8.0.47",
@@ -54,6 +56,10 @@
     "webpack": "~4.12.0",
     "webpack-cli": "^3.0.3"
   },
+  "browser": {
+    "node-fetch": false,
+    "ws": false
+  },
   "publishConfig": {
     "access": "public"
   },
diff --git a/yarn.lock b/yarn.lock
index 596c496558fb..b7857b3bf57b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6989,6 +6989,10 @@ node-fetch@^2.1.2, node-fetch@~2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
 
+node-fetch@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
+
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -10771,6 +10775,12 @@ ws@^5.1.1, ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
+  dependencies:
+    async-limiter "~1.0.0"
+
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"

From 433e0de366425f6ae15be914497fd1a07cc0fe7b Mon Sep 17 00:00:00 2001
From: Jason Grout <jgrout6@bloomberg.net>
Date: Tue, 5 Feb 2019 00:18:54 -0800
Subject: [PATCH 2/2] integrity

---
 packages/services/package.json | 12 ++++++------
 yarn.lock                      | 10 ----------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/packages/services/package.json b/packages/services/package.json
index cb03c4370080..3944156007ac 100644
--- a/packages/services/package.json
+++ b/packages/services/package.json
@@ -36,6 +36,10 @@
     "prepublishOnly": "jlpm run build && webpack",
     "watch": "tsc -b --watch"
   },
+  "browser": {
+    "node-fetch": false,
+    "ws": false
+  },
   "dependencies": {
     "@jupyterlab/coreutils": "^3.0.0-alpha.1",
     "@jupyterlab/observables": "^2.2.0-alpha.1",
@@ -43,8 +47,8 @@
     "@phosphor/coreutils": "^1.3.0",
     "@phosphor/disposable": "^1.1.2",
     "@phosphor/signaling": "^1.2.2",
-    "node-fetch": "^2.3.0",
-    "ws": "^6.1.3"
+    "node-fetch": "~2.2.0",
+    "ws": "~6.0.0"
   },
   "devDependencies": {
     "@types/node": "~8.0.47",
@@ -56,10 +60,6 @@
     "webpack": "~4.12.0",
     "webpack-cli": "^3.0.3"
   },
-  "browser": {
-    "node-fetch": false,
-    "ws": false
-  },
   "publishConfig": {
     "access": "public"
   },
diff --git a/yarn.lock b/yarn.lock
index b7857b3bf57b..596c496558fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6989,10 +6989,6 @@ node-fetch@^2.1.2, node-fetch@~2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
 
-node-fetch@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
-
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -10775,12 +10771,6 @@ ws@^5.1.1, ws@^5.2.0:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.3.tgz#d2d2e5f0e3c700ef2de89080ebc0ac6e1bf3a72d"
-  dependencies:
-    async-limiter "~1.0.0"
-
 ws@~3.3.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"