Skip to content

Commit 71e6d9e

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 39757b2 + 4eaf037 commit 71e6d9e

File tree

117 files changed

+3212
-3560
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+3212
-3560
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
6262
- [**@mongodb-js/databases-collections-list**](packages/databases-collections-list): List view for the databases and collections
6363
- [**@mongodb-js/explain-plan-helper**](packages/explain-plan-helper): Explain plan utility methods for MongoDB Compass
6464
- [**@mongodb-js/my-queries-storage**](packages/my-queries-storage): Saved aggregations and queries storage
65-
- [**@mongodb-js/ssh-tunnel**](packages/ssh-tunnel): Yet another ssh tunnel based on ssh2
6665
- [**bson-transpilers**](packages/bson-transpilers): Source to source compilers using ANTLR
6766
- [**compass-e2e-tests**](packages/compass-e2e-tests): E2E test suite for Compass app that follows smoke tests / feature testing matrix
6867
- [**compass-preferences-model**](packages/compass-preferences-model): Compass preferences model

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.1.4",
3+
"version": "1.1.5",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.0.18",
19+
"@mongodb-js/eslint-plugin-compass": "^1.0.19",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

configs/eslint-plugin-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.0.18",
16+
"version": "1.0.19",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,7 +37,7 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.3.10",
40+
"@mongodb-js/mocha-config-compass": "^1.4.0",
4141
"@mongodb-js/prettier-config-compass": "^1.0.2",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",

configs/mocha-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/mocha-config-compass",
3-
"version": "1.3.10",
3+
"version": "1.4.0",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",

configs/webpack-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.3.15",
16+
"version": "1.4.0",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.1.4",
48+
"@mongodb-js/eslint-config-compass": "^1.1.5",
4949
"@mongodb-js/prettier-config-compass": "^1.0.2",
5050
"@mongodb-js/tsconfig-compass": "^1.0.4",
5151
"@types/cli-progress": "^3.9.2",

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

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import type {
2-
ResolveOptions,
3-
WebpackPluginInstance,
4-
Configuration,
1+
import {
2+
type ResolveOptions,
3+
type WebpackPluginInstance,
4+
type Configuration,
5+
ProvidePlugin,
56
} from 'webpack';
67
import { merge } from 'webpack-merge';
78
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
@@ -110,6 +111,11 @@ const sharedResolveOptions = (
110111
};
111112
};
112113

114+
const providePlugin = new ProvidePlugin({
115+
URL: ['whatwg-url', 'URL'],
116+
URLSearchParams: ['whatwg-url', 'URLSearchParams'],
117+
});
118+
113119
export function createElectronMainConfig(
114120
args: Partial<ConfigArgs>
115121
): WebpackConfig {
@@ -212,6 +218,7 @@ export function createElectronRendererConfig(
212218
plugins: [
213219
...entriesToHtml(entries),
214220
new WebpackPluginMulticompilerProgress(),
221+
providePlugin,
215222
],
216223
node: false as const,
217224
externals: toCommonJsExternal(sharedExternals),
@@ -339,8 +346,9 @@ export function createWebConfig(args: Partial<ConfigArgs>): WebpackConfig {
339346
...sharedResolveOptions(opts.target),
340347
},
341348
ignoreWarnings: sharedIgnoreWarnings,
342-
plugins:
343-
isServe(opts) && opts.hot
349+
plugins: [
350+
providePlugin,
351+
...(isServe(opts) && opts.hot
344352
? [
345353
// Plugin types are not matching Webpack 5, but they work
346354
new ReactRefreshWebpackPlugin() as unknown as WebpackPluginInstance,
@@ -355,7 +363,8 @@ export function createWebConfig(args: Partial<ConfigArgs>): WebpackConfig {
355363

356364
new DuplicatePackageCheckerPlugin(),
357365
]
358-
: [],
366+
: []),
367+
],
359368
};
360369
}
361370

0 commit comments

Comments
 (0)