Backport PR #16495: Bump ws from 8.12.0 to 8.17.1 (#16588)

meeseeksmachine · dependabot[bot] · web-flow · commit 3b3fb17d19de · 2024-07-17T17:38:38.000+02:00
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
diff --git a/package.json b/package.json
@@ -104,7 +104,6 @@
     "watch:packages": "python scripts/watch_packages.py"
   },
   "resolutions": {
-    "@jupyterlab/services/ws": "8.12.0",
     "@types/react": "^18.0.26",
     "react": "^18.2.0",
     "yjs": "^13.5.40"
diff --git a/packages/testing/src/jest-config.ts b/packages/testing/src/jest-config.ts
@@ -22,11 +22,29 @@ const esModules = [
 
 module.exports = function (baseDir: string) {
   return {
-    testEnvironment: '@jupyterlab/testing/lib/jest-env.js',
+    coverageReporters: ['json', 'lcov', 'text', 'html'],
+    coverageDirectory: path.join(baseDir, 'coverage'),
+    moduleFileExtensions: [
+      'ts',
+      'tsx',
+      'js',
+      'jsx',
+      'json',
+      'node',
+      'mjs',
+      'cjs'
+    ],
     moduleNameMapper: {
       '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
       '\\.(gif|ttf|eot)$': '@jupyterlab/testing/lib/jest-file-mock.js'
     },
+    reporters: ['default', 'jest-junit', 'github-actions'],
+    resolver: '@jupyterlab/testing/lib/jest-resolver.js',
+    setupFiles: ['@jupyterlab/testing/lib/jest-shim.js'],
+    testEnvironment: '@jupyterlab/testing/lib/jest-env.js',
+    testPathIgnorePatterns: ['/lib/', '/node_modules/'],
+    testRegex: '/test/.*.spec.ts[x]?$',
+    testTimeout: 10000,
     transform: {
       '\\.svg$': '@jupyterlab/testing/lib/jest-raw-loader.js',
       // Extracted from https://github.com/kulshekhar/ts-jest/blob/v29.0.3/presets/index.js
@@ -38,23 +56,6 @@ module.exports = function (baseDir: string) {
       ],
       '^.+\\.jsx?$': 'babel-jest'
     },
-    testTimeout: 10000,
-    setupFiles: ['@jupyterlab/testing/lib/jest-shim.js'],
-    testPathIgnorePatterns: ['/lib/', '/node_modules/'],
-    moduleFileExtensions: [
-      'ts',
-      'tsx',
-      'js',
-      'jsx',
-      'json',
-      'node',
-      'mjs',
-      'cjs'
-    ],
-    transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`],
-    reporters: ['default', 'jest-junit', 'github-actions'],
-    coverageReporters: ['json', 'lcov', 'text', 'html'],
-    coverageDirectory: path.join(baseDir, 'coverage'),
-    testRegex: '/test/.*.spec.ts[x]?$'
+    transformIgnorePatterns: [`/node_modules/(?!${esModules}).+`]
   };
 };
diff --git a/packages/testing/src/jest-resolver.ts b/packages/testing/src/jest-resolver.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+// ws workaround suggested in https://github.com/websockets/ws/issues/2171#issuecomment-1792147402
+// Mentioned solution license is:
+//    Copyright (c) Microsoft Corporation. All rights reserved.
+//    Licensed under the MIT License.
+
+module.exports = (path: string, options: any) => {
+  // Call the defaultResolver, so we leverage its cache, error handling, etc.
+  return options.defaultResolver(path, {
+    ...options,
+    // Use packageFilter to process parsed `package.json` before the resolution (see https://www.npmjs.com/package/resolve#resolveid-opts-cb)
+    packageFilter: (pkg: any) => {
+      // This is a workaround for https://github.com/websockets/ws/pull/2118
+      if (pkg.name === 'ws') {
+        delete pkg['exports']['.']['browser'];
+      }
+      return pkg;
+    }
+  });
+};
diff --git a/yarn.lock b/yarn.lock
@@ -21641,33 +21641,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:8.12.0, ws@npm:^8.11.0":
-  version: 8.12.0
-  resolution: "ws@npm:8.12.0"
+"ws@npm:^7.3.1":
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
+    utf-8-validate: ^5.0.2
   peerDependenciesMeta:
     bufferutil:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 818ff3f8749c172a95a114cceb8b89cedd27e43a82d65c7ad0f7882b1e96a2ee6709e3746a903c3fa88beec0c8bae9a9fcd75f20858b32a166dfb7519316a5d7
+  checksum: f9bb062abf54cc8f02d94ca86dcd349c3945d63851f5d07a3a61c2fcb755b15a88e943a63cf580cbdb5b74436d67ef6b67f745b8f7c0814e411379138e1863cb
   languageName: node
   linkType: hard
 
-"ws@npm:^7.3.1":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+"ws@npm:^8.11.0":
+  version: 8.17.1
+  resolution: "ws@npm:8.17.1"
   peerDependencies:
     bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
+    utf-8-validate: ">=5.0.2"
   peerDependenciesMeta:
     bufferutil:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
+  checksum: 442badcce1f1178ec87a0b5372ae2e9771e07c4929a3180321901f226127f252441e8689d765aa5cfba5f50ac60dd830954afc5aeae81609aefa11d3ddf5cecf
   languageName: node
   linkType: hard
 
