Merge branch 'main' into 1.36-releases

Author: lerouxb

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **compass**.
-This document was automatically generated on Sun Mar 05 2023.
+This document was automatically generated on Tue Mar 21 2023.
 
 ## List of dependencies
 

configs/eslint-plugin-compass/package.json

@@ -41,7 +41,7 @@
     "@mongodb-js/prettier-config-compass": "^1.0.0",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
-    "mocha": "^8.4.0",
+    "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "prettier": "^2.7.1"
   }

configs/mocha-config-compass/package.json

@@ -31,6 +31,7 @@
     "chai-enzyme": "^1.0.0-beta.1",
     "enzyme": "^3.11.0",
     "global-jsdom": "^8.3.0",
+    "jsdom": "^21.1.0",
     "identity-obj-proxy": "^3.0.0",
     "react-16-node-hanging-test-fix": "^1.0.0",
     "sinon-chai": "^3.7.0",

configs/mocha-config-compass/register/jsdom-global-register.js

@@ -55,3 +55,7 @@ if (!globalThis.IntersectionObserver) {
 // jsdom doesn't override classes that already exist in global scope
 // https://github.com/jsdom/jsdom/issues/3331
 globalThis.EventTarget = window.EventTarget;
+
+Range.prototype.getClientRects = function () {
+  return [];
+};

configs/mocha-config-compass/register/why-node-running.js

@@ -1,6 +1,9 @@
 require('why-is-node-running/include');
 exports.mochaHooks = {
   afterAll() {
+    if (process.argv.includes('--watch')) {
+      return;
+    }
     const timeout = setTimeout(() => {
       console.log(
         "if the process still running, run kill -SIGINFO %s to see what's keeping it",

configs/webpack-config-compass/src/loaders.ts

@@ -1,21 +1,62 @@
+import browserslist from 'browserslist';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import { execSync } from 'child_process';
+
 import type { ConfigArgs } from './args';
 import { isServe } from './args';
+import chalk from 'chalk';
+
+function isLatestBrowserslist() {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const browserslistVersion = require('browserslist/package.json').version;
+  const command = `npm view browserslist version --json`;
+  const latestBrowserslistVersion = JSON.parse(
+    execSync(command).toString().trim()
+  );
+
+  return browserslistVersion === latestBrowserslistVersion;
+}
 
 const electronVersion = (() => {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const [maj, min] = require('electron/package.json').version.split(
     '.'
   ) as string[];
+
   return `${maj}.${min}`;
 })();
 
+const browserslistElectronVersion = (() => {
+  const installedElectronVersion = `electron ${electronVersion}`;
+  try {
+    // Occasionally it may happen that browserslist does not catch up with
+    // Electron versions.
+
+    // If we discover that our version of Electron is not supported by browserslist
+    // we first try to determine if a new version of browserslist is avaliable.
+    //
+    // If a new version of browserslist is available we throw an error and prompt to update
+    // browserslist, otherwise we ignore the error and we use the last known electron version.
+    browserslist(installedElectronVersion);
+    return installedElectronVersion;
+  } catch (e) {
+    if (!isLatestBrowserslist()) {
+      const errorMessage = `${(e as Error).message}.
+Please update browserslist in webpack-config-compass:
+npm i -S -w @mongodb-js/webpack-config-compass browserslist@latest`;
+      throw new Error(chalk.red(errorMessage));
+    }
+
+    return 'last 1 electron version';
+  }
+})();
+
 /**
- * "We support the latest two versions Chrome, Firefox and Safari."
- * @see {@link https://wiki.corp.mongodb.com/display/MMS/Browser+Support}
+ * "Cloud Manager can be accessed on your computer through Chrome, Firefox, Safari and Edge. We no longer support IE."
+ * @see {@link https://wiki.corp.mongodb.com/x/n5kVBQ}
  */
 const cloudSupportedBrowserslistConfig =
-  'last 2 Chrome versions, last 2 Safari versions, last 2 Firefox versions';
+  'last 1 Chrome versions, last 1 Safari versions, last 1 Firefox versions, last 1 Edge versions';
 
 export const javascriptLoader = (args: ConfigArgs, web = false) => ({
   test: /\.(mjs|c?jsx?|tsx?)$/,
@@ -36,7 +77,7 @@ export const javascriptLoader = (args: ConfigArgs, web = false) => ({
           {
             targets: web
               ? cloudSupportedBrowserslistConfig
-              : { electron: electronVersion },
+              : browserslistElectronVersion,
             useBuiltIns: 'usage',
             corejs: { version: '3.12', proposals: true },
           },
@@ -110,7 +151,7 @@ export const cssLoader = (args: ConfigArgs, web = false) => ({
               {
                 browsers: web
                   ? cloudSupportedBrowserslistConfig
-                  : `electron ${electronVersion}`,
+                  : browserslistElectronVersion,
               },
             ],
           ],