Merge branch 'main' into 1.32-releases

Author: mcasimir

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 Jul 10 2022.
+This document was automatically generated on Mon Jul 18 2022.
 
 ## List of dependencies
 

configs/eslint-config-compass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/eslint-config-compass",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Shared Compass eslint configuration",
   "license": "SSPL",
   "main": "index.js",
@@ -15,7 +15,7 @@
   "dependencies": {
     "@babel/core": "^7.14.3",
     "@babel/eslint-parser": "^7.14.3",
-    "@mongodb-js/eslint-plugin-compass": "^0.3.0",
+    "@mongodb-js/eslint-plugin-compass": "^0.4.0",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "eslint-config-prettier": "^8.3.0",

configs/eslint-plugin-compass/package.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -37,8 +37,8 @@
     "reformat": "npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/mocha-config-compass": "^0.11.0",
-    "@mongodb-js/prettier-config-compass": "^0.5.0",
+    "@mongodb-js/mocha-config-compass": "^0.12.0",
+    "@mongodb-js/prettier-config-compass": "^0.6.0",
     "depcheck": "^1.4.1",
     "eslint": "^7.25.0",
     "mocha": "^8.4.0",

configs/mocha-config-compass/index.js

@@ -4,7 +4,7 @@ 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 updaing
+// 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 = [

configs/mocha-config-compass/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@mongodb-js/mocha-config-compass",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Shared mocha mocha configuration for Compass packages",
   "license": "SSPL",
   "main": "index.js",
   "devDependencies": {
-    "@mongodb-js/prettier-config-compass": "^0.5.0",
+    "@mongodb-js/prettier-config-compass": "^0.6.0",
     "prettier": "^2.7.1"
   },
   "scripts": {

configs/prettier-config-compass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/prettier-config-compass",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Shared Compass prettier configuration",
   "license": "SSPL",
   "main": "index.json",

configs/tsconfig-compass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/tsconfig-compass",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Shared Compass Typescript configuration",
   "license": "SSPL",
   "files": [
@@ -11,7 +11,7 @@
     "typescript": "^4.3.5"
   },
   "devDependencies": {
-    "@mongodb-js/prettier-config-compass": "^0.5.0",
+    "@mongodb-js/prettier-config-compass": "^0.6.0",
     "prettier": "^2.7.1"
   },
   "scripts": {

configs/webpack-config-compass/package.json

@@ -13,7 +13,7 @@
     "email": "[email protected]"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -24,8 +24,8 @@
   "license": "SSPL",
   "main": "dist/index.js",
   "exports": {
-    "require": "./dist/index.js",
-    "import": "./dist/.esm-wrapper.mjs"
+    "import": "./dist/.esm-wrapper.mjs",
+    "require": "./dist/index.js"
   },
   "bin": {
     "webpack-compass": "./bin/webpack.js"
@@ -45,9 +45,9 @@
     "reformat": "npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-compass": "^0.10.0",
-    "@mongodb-js/prettier-config-compass": "^0.5.0",
-    "@mongodb-js/tsconfig-compass": "^0.6.0",
+    "@mongodb-js/eslint-config-compass": "^0.11.0",
+    "@mongodb-js/prettier-config-compass": "^0.6.0",
+    "@mongodb-js/tsconfig-compass": "^0.7.0",
     "@types/cli-progress": "^3.9.2",
     "@types/html-webpack-plugin": "^3.2.6",
     "@types/mini-css-extract-plugin": "^2.3.0",

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

@@ -1,3 +1,5 @@
+import { execSync } from 'child_process';
+
 export const sharedExternals: string[] = [
   // Native Modules are very hard to bundle correctly with Webpack (and there is
   // not much reason to do so) so to make our lives easier, we will always
@@ -17,4 +19,28 @@ export const sharedExternals: string[] = [
   'bson-ext',
   'snappy',
   'snappy/package.json',
+  // Only used by compass-shell, but in theory should stay external everywhere
+  '@mongosh/node-runtime-worker-thread',
+];
+
+const monorepoWorkspaces = (
+  JSON.parse(
+    execSync('npx lerna list --all --json', {
+      encoding: 'utf-8',
+
+      stdio: ['ignore', 'pipe', 'ignore'],
+    })
+  ) as { name: string; location: string }[]
+).map((ws) => ws.name);
+
+export const pluginExternals: string[] = [
+  // All monorepo dependencies should be externalized
+  ...monorepoWorkspaces,
+  // React needs to always stay external to avoid the chance of having multiple
+  // react runtimes in one context
+  'react',
+  // Arbitrary external dependencies that would make sense to keep out of the
+  // plugin bundles, feel free to update this as needed
+  'mongodb-ace-autocompleter',
+  'bson',
 ];

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

@@ -27,7 +27,7 @@ import {
   entriesToHtml,
   getLibraryNameFromCwd,
 } from './util';
-import { sharedExternals } from './externals';
+import { sharedExternals, pluginExternals } from './externals';
 import { WebpackPluginMulticompilerProgress } from './webpack-plugin-multicompiler-progress';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 
@@ -310,14 +310,20 @@ export function compassPluginConfig(
     }
 
     return [
-      createElectronMainConfig({
-        ...opts,
-        entry: sandboxMain,
-      }),
-      createElectronRendererConfig({
-        ...opts,
-        entry: sandboxRenderer,
-      }),
+      merge(
+        createElectronMainConfig({
+          ...opts,
+          entry: sandboxMain,
+        }),
+        { externals: toCommonJsExternal(pluginExternals) }
+      ),
+      merge(
+        createElectronRendererConfig({
+          ...opts,
+          entry: sandboxRenderer,
+        }),
+        { externals: toCommonJsExternal(pluginExternals) }
+      ),
     ];
   }
 
@@ -326,19 +332,26 @@ export function compassPluginConfig(
     : path.join(opts.cwd, 'src', 'index.js');
 
   return [
-    createElectronRendererConfig({
-      ...opts,
-      entry,
-      outputFilename: 'index.js',
-    }),
-    createWebConfig({
-      ...opts,
-      entry,
-      outputFilename: 'browser.js',
-    }),
+    merge(
+      createElectronRendererConfig({
+        ...opts,
+        entry,
+        outputFilename: 'index.js',
+      }),
+      { externals: toCommonJsExternal(pluginExternals) }
+    ),
+    merge(
+      createWebConfig({
+        ...opts,
+        entry,
+        outputFilename: 'browser.js',
+      }),
+      { externals: toCommonJsExternal(pluginExternals) }
+    ),
   ];
 }
 
+export { sharedExternals, pluginExternals };
 export { webpackArgsWithDefaults, isServe } from './args';
 export { default as webpack } from 'webpack';
 export { merge } from 'webpack-merge';