Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.depalignrc.json

@@ -48,10 +48,6 @@
     "numeral": [
       "^1.5.6"
     ],
-    "mongodb-query-util": [
-      "^0.2.1",
-      "^0.0.3"
-    ],
     "babel-loader": [
       "^7.1.5"
     ],

README.md

@@ -63,7 +63,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
 - [**bson-transpilers**](packages/bson-transpilers): Source to source compilers using ANTLR
 - [**compass-e2e-tests**](packages/compass-e2e-tests): E2E test suite for Compass app that follows smoke tests / feature testing matrix
 - [**compass-preferences-model**](packages/compass-preferences-model): Compass preferences model
-- [**compass-user-model**](packages/compass-user-model): MongoDB user model
 - [**electron-license**](packages/electron-license): Tools for electron apps to work with licenses
 - [**hadron-app**](packages/hadron-app): Hadron Application Singleton
 - [**hadron-app-registry**](packages/hadron-app-registry): Hadron App Registry

THIRD-PARTY-NOTICES.md

@@ -1,34 +1,12 @@
 'use strict';
-const path = require('path');
-const specs = process.argv.slice(2).filter((arg) => !arg.startsWith('-'));
 
-// This can be written as `{src,test}/**/*.{spec,test}.*`, but this causes
-// issues for mocha on some version. It will try to parse every string in the
-// array by splitting on commas causing a wrong spec pattern to be applied. It
-// is fixed in latest, but as we are still in the process of updating
-// everything to the same version and working around the issue helps with
-// migration (this can be removed when mocha is not in depalignrc anymore)
-const defaultSpecs = [
-  'src/**/*.spec.*',
-  'src/**/*.test.*',
-  'test/**/*.spec.*',
-  'test/**/*.test.*',
-];
+const path = require('path');
+const base = require('@mongodb-js/mocha-config-devtools');
 
 module.exports = {
-  colors: true,
-  timeout: 15000,
+  ...base,
   require: [
-    path.resolve(__dirname, 'register', 'why-node-running.js'),
+    ...base.require,
     path.resolve(__dirname, 'register', 'resolve-from-source-register.js'),
-    path.resolve(__dirname, 'register', 'assets-import-register.js'),
-    path.resolve(__dirname, 'register', 'tsnode-register.js'),
-    path.resolve(__dirname, 'register', 'sinon-chai-register.js'),
-    path.resolve(__dirname, 'register', 'unhandled-rejections.js'),
-    path.resolve(__dirname, 'register', 'dns-config-register.js'),
   ],
-  // Allows to run tests against a particular set of specs instead of all of them
-  spec: specs.length > 0 ? specs : defaultSpecs,
-  extension: ['js', 'ts', 'cjs', 'mjs', 'jsx', 'tsx'],
-  watchFiles: ['test/**/*', 'src/**/*'],
 };

configs/mocha-config-compass/index.js

@@ -24,6 +24,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@mongodb-js/mocha-config-devtools": "^1.0.0",
     "@electron/remote": "^2.0.10",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "chai": "^4.3.4",

configs/mocha-config-compass/package.json

@@ -1,27 +1,12 @@
 'use strict';
-const path = require('path');
-const base = require('.');
-
-const pkgJson = require(path.join(process.cwd(), 'package.json'));
 
-const isEnzyme = !!pkgJson.devDependencies.enzyme;
+const path = require('path');
+const base = require('@mongodb-js/mocha-config-devtools/react');
 
 module.exports = {
   ...base,
   require: [
-    // There is a bug with React tests not exiting due to how React uses
-    // MessageChannel. The bug is fixed in [email protected], but in the meantime we
-    // have to have this script around and it needs to be the absolute first
-    // import
-    // https://github.com/facebook/react/issues/20756#issuecomment-780927519
-    require.resolve('react-16-node-hanging-test-fix'),
     ...base.require,
-    path.resolve(__dirname, 'register', 'jsdom-global-register.js'),
-    path.resolve(__dirname, 'register', 'chai-dom-register.js'),
-    path.resolve(__dirname, 'register', 'css-import-register.js'),
-    // We want to move new components/plugins to use testing-library, but for
-    // compat reasons will register and activate enzyme with adapters if
-    // plugin is using it
-    isEnzyme && path.resolve(__dirname, 'register', 'enzyme-register.js'),
-  ].filter(Boolean),
+    path.resolve(__dirname, 'register', 'resolve-from-source-register.js'),
+  ],
 };