Skip to content

Commit e87cdaf

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.34-releases
2 parents 6708ffc + 3caa44a commit e87cdaf

File tree

208 files changed

+4889
-6635
lines changed

Some content is hidden

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

208 files changed

+4889
-6635
lines changed

.depalignrc.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,8 @@
103103
"^7.1.2",
104104
"^9.4.6",
105105
"^9.7.4",
106-
"^9.6.4",
107-
"^9.4.10",
108-
"^9.7.0"
106+
"^9.6.4"
109107
],
110-
"react-redux": ["^5.0.6", "^7.1.3", "^7.1.1"],
111-
"redux": ["^3.7.2", "^4.0.5", "^4.0.4", "^4.0.1"],
112108
"webpack": ["^5.52.1"],
113109
"webpack-cli": ["^4.9.2"],
114110
"webpack-merge": ["^5.8.0"],
@@ -128,12 +124,13 @@
128124
"pluralize": ["^8.0.0", "^1.2.1"],
129125
"d3-timer": ["^1.0.3", "1.0.10", "1.0.7"],
130126
"react-click-outside": ["^3.0.1", "^2.2.0"],
131-
"jquery": ["^3.0.0", "^2.1.4", "^3.3.1", "^3.5.0"],
127+
"jquery": ["^2.1.4"],
132128
"style-loader": ["^3.2.1"],
133129
"postcss-loader": ["^6.1.1"],
134130
"node-loader": ["^2.0.0"],
135131
"less-loader": ["^10.0.1"],
136132
"babel-loader": ["^7.1.5"],
137-
"@babel/core": ["7.16.0"]
133+
"@babel/core": ["7.16.0"],
134+
"js-yaml": ["^3.13.1"]
138135
}
139136
}

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ Abraham Egnor <[email protected]>
6565
Preston Vasquez <[email protected]>
6666
Aleksandr Rudo <[email protected]>
6767
68+
svc-devtoolsbot <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
The following third-party software is used by and included in **compass**.
2-
This document was automatically generated on Fri Sep 16 2022.
2+
This document was automatically generated on Wed Sep 21 2022.
33

44
## List of dependencies
55

66
Package|Version|License
77
-------|-------|-------
8-
**[@mongosh/node-runtime-worker-thread](#975c6217103fb0b0e66097aecebc09181640d795c2408bc8e0e0f27f180ebc19)**|1.5.4|Apache-2.0
8+
**[@mongosh/node-runtime-worker-thread](#15af2bd3c4e8ac5324529caabe5d302ad7a91ec05bc5e17e7dd3e24c7152de76)**|1.6.0|Apache-2.0
99
**[ansi-regex](#945d39147a145d6a28d87154006fa731c2e69d2a19e76cc7012624a1109f9317)**|2.1.1|MIT
1010
**[ansi-regex](#f4a8a360dfe3cdd0cbb8fcfa0cff23bb22eafa4225343577912ddf831d670411)**|3.0.0|MIT
1111
**[aproba](#b8b30f42274956b772cec4ea9f13cebaa5900724e514eaf0098a3ad6f1f7f16e)**|1.2.0|ISC
@@ -36,7 +36,7 @@ Package|Version|License
3636
**[inherits](#3eafa9bfb872baf192e837ab771da2e95e983ee682371a2b1c579e518e96f7b4)**|2.0.4|ISC
3737
**[ini](#2269ab4bd2e1fa90571f520780ab5499f6d49da3b7daee9b9dfdad9e93c33a18)**|1.3.8|ISC
3838
**[interruptor](#d6fd68c71b18a07f39270565100f4a6c1351ecdeca77766cde73da8315ff695a)**|1.0.1|Apache-2.0
39-
**[ip](#5685147aca3b4349b98f73886bea53bac77e33a79e0f28d66abf77beb1dc5289)**|1.1.5|MIT
39+
**[ip](#33b800e533214fc453224c9f9638baadd7f665810f85320b60145d7348a69e58)**|2.0.0|MIT
4040
**[ipv6-normalize](#7a4346dbf206011966449898fcd37178a9be89acf6dff120b676d4c4d0dec203)**|1.0.1|MIT
4141
**[is-fullwidth-code-point](#4b36fcbed647fcfb1016159ad5d4b5399c52c3fe258134e06275ab22ed10ceb9)**|1.0.0|MIT
4242
**[is-fullwidth-code-point](#37e66573b7442d1313698f6e836d77c2b42ea4625ea9f6da41c091c6e5a8f30d)**|2.0.0|MIT
@@ -48,7 +48,7 @@ Package|Version|License
4848
**[mimic-response](#0c868fd85c36cbce69ede58ff4693b89140b6a529a6794843f4985674d63642e)**|2.1.0|MIT
4949
**[minimist](#837db6b00930af97755b724568aecf8b139361dc2148c7db77673ba6ae44a44d)**|1.2.6|MIT
5050
**[mkdirp-classic](#e79cc875152b50c2eb57a97163d99f0155bf4e4af7ba4a7e01c12a17a4a3305c)**|0.5.3|MIT
51-
**[mongodb-client-encryption](#0fdc9824a7aa567fbfa09c4fa0daea7038911d19a9c84c5659beb0d4a2980f49)**|2.2.0-alpha.6|Apache-2.0
51+
**[mongodb-client-encryption](#d9133b2d4fe5d0339732cf85e863f366ddd48de8f976d9f723a73a58c2a4ca15)**|2.2.1|Apache-2.0
5252
**[mongodb-compass](#83bc011aa472d9fe55460f83c3fcfc98ca134ed763686df7a4bc080171ccb917)**|0.0.1-dev.0|SSPL
5353
**[ms](#0a987b2f79ff37005e452a5afa7dacd3042061a7077054d2ba9cabacd88506d2)**|2.1.2|MIT
5454
**[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)**|1.0.2|MIT
@@ -82,7 +82,7 @@ Package|Version|License
8282
**[simple-get](#c2c12990b6319daff653bdf953cadfa368185f0edc671124fb1028f6979df829)**|4.0.1|MIT
8383
**[simple-get](#ade55c33f4d681462bccf90b122b9e974e43632f78545b6d8dc845e7f185e5da)**|3.1.0|MIT
8484
**[smart-buffer](#bc8fbee089eb9cddf673c4c9dbc15edd13839063c27e2814009b6a0448065875)**|4.2.0|MIT
85-
**[socks](#be442b0d268ca721821c446050bbb72fae9939fc8c52474b47d9d904d18f0193)**|2.6.2|MIT
85+
**[socks](#d248334926a1dc960150cbe3b2ab15fa021e1b8b498cf04f0f32a9a876263e66)**|2.7.0|MIT
8686
**[string-width](#b0725207ba4a78809dec9436283671608c6a6c89b5f5cc66db6ce6da7bfb0cc0)**|1.0.2|MIT
8787
**[string-width](#e3ae6ddac7d522ef262f26fbded9f398d3642ba93321363b4634916ce1962b01)**|2.1.1|MIT
8888
**[strip-ansi](#79e4e45eb767932cbcc94ba2f18534155184857640dee665f4b43ae6d5294646)**|3.0.1|MIT
@@ -100,8 +100,8 @@ Package|Version|License
100100

101101
## Package details
102102

103-
<a id="975c6217103fb0b0e66097aecebc09181640d795c2408bc8e0e0f27f180ebc19"></a>
104-
### [@mongosh/node-runtime-worker-thread](https://www.npmjs.com/package/@mongosh/node-runtime-worker-thread) (version 1.5.4)
103+
<a id="15af2bd3c4e8ac5324529caabe5d302ad7a91ec05bc5e17e7dd3e24c7152de76"></a>
104+
### [@mongosh/node-runtime-worker-thread](https://www.npmjs.com/package/@mongosh/node-runtime-worker-thread) (version 1.6.0)
105105
<!-- initially found at node_modules/@mongosh/node-runtime-worker-thread -->
106106
> MongoDB shell runtime that lives in a worker thread
107107
@@ -1768,9 +1768,9 @@ Authors:
17681768
* Anna Henningsen <[email protected]>
17691769

17701770

1771-
<a id="5685147aca3b4349b98f73886bea53bac77e33a79e0f28d66abf77beb1dc5289"></a>
1772-
### [ip](https://www.npmjs.com/package/ip) (version 1.1.5)
1773-
<!-- initially found at node_modules/ip -->
1771+
<a id="33b800e533214fc453224c9f9638baadd7f665810f85320b60145d7348a69e58"></a>
1772+
### [ip](https://www.npmjs.com/package/ip) (version 2.0.0)
1773+
<!-- initially found at node_modules/socks/node_modules/ip -->
17741774
License tags: MIT
17751775

17761776
Authors:
@@ -2275,8 +2275,8 @@ Authors:
22752275
* Mathias Buus (@mafintosh)
22762276

22772277

2278-
<a id="0fdc9824a7aa567fbfa09c4fa0daea7038911d19a9c84c5659beb0d4a2980f49"></a>
2279-
### [mongodb-client-encryption](https://www.npmjs.com/package/mongodb-client-encryption) (version 2.2.0-alpha.6)
2278+
<a id="d9133b2d4fe5d0339732cf85e863f366ddd48de8f976d9f723a73a58c2a4ca15"></a>
2279+
### [mongodb-client-encryption](https://www.npmjs.com/package/mongodb-client-encryption) (version 2.2.1)
22802280
<!-- initially found at node_modules/mongodb-client-encryption -->
22812281
> Official client encryption module for the MongoDB Node.js driver
22822282
@@ -4403,8 +4403,8 @@ Authors:
44034403
* syvita
44044404

44054405

4406-
<a id="be442b0d268ca721821c446050bbb72fae9939fc8c52474b47d9d904d18f0193"></a>
4407-
### [socks](https://www.npmjs.com/package/socks) (version 2.6.2)
4406+
<a id="d248334926a1dc960150cbe3b2ab15fa021e1b8b498cf04f0f32a9a876263e66"></a>
4407+
### [socks](https://www.npmjs.com/package/socks) (version 2.7.0)
44084408
<!-- initially found at node_modules/socks -->
44094409
> Fully featured SOCKS proxy client supporting SOCKSv4, SOCKSv4a, and SOCKSv5. Includes Bind and Associate functionality.
44104410

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.0.0",
3+
"version": "1.0.1",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -15,7 +15,7 @@
1515
"dependencies": {
1616
"@babel/core": "^7.14.3",
1717
"@babel/eslint-parser": "^7.14.3",
18-
"@mongodb-js/eslint-plugin-compass": "^1.0.0",
18+
"@mongodb-js/eslint-plugin-compass": "^1.0.1",
1919
"@typescript-eslint/eslint-plugin": "^5.30.5",
2020
"@typescript-eslint/parser": "^5.30.5",
2121
"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.0",
16+
"version": "1.0.1",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,7 +37,7 @@
3737
"reformat": "npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.0.0",
40+
"@mongodb-js/mocha-config-compass": "^1.0.1",
4141
"@mongodb-js/prettier-config-compass": "^1.0.0",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",

configs/mocha-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/mocha-config-compass",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",
@@ -34,7 +34,7 @@
3434
"identity-obj-proxy": "^3.0.0",
3535
"react-16-node-hanging-test-fix": "^1.0.0",
3636
"sinon-chai": "^3.7.0",
37-
"ts-node": "^10.8.2",
37+
"ts-node": "^10.9.1",
3838
"why-is-node-running": "^2.2.2"
3939
}
4040
}

configs/tsconfig-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@mongodb-js/tsconfig-compass",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "Shared Compass Typescript configuration",
55
"license": "SSPL",
66
"files": [
77
"tsconfig.common.json",
88
"tsconfig.react.json"
99
],
1010
"peerDependencies": {
11-
"typescript": "^4.3.5"
11+
"typescript": "^4.8.3"
1212
},
1313
"devDependencies": {
1414
"@mongodb-js/prettier-config-compass": "^1.0.0",

configs/webpack-config-compass/package.json

Lines changed: 4 additions & 4 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.0",
16+
"version": "1.0.1",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,17 +45,17 @@
4545
"reformat": "npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.0.0",
48+
"@mongodb-js/eslint-config-compass": "^1.0.1",
4949
"@mongodb-js/prettier-config-compass": "^1.0.0",
50-
"@mongodb-js/tsconfig-compass": "^1.0.0",
50+
"@mongodb-js/tsconfig-compass": "^1.0.1",
5151
"@types/cli-progress": "^3.9.2",
5252
"@types/html-webpack-plugin": "^3.2.6",
5353
"@types/mini-css-extract-plugin": "^2.3.0",
5454
"@types/webpack-bundle-analyzer": "^4.4.1",
5555
"depcheck": "^1.4.1",
5656
"eslint": "^7.25.0",
5757
"prettier": "^2.7.1",
58-
"typescript": "^4.7.4"
58+
"typescript": "^4.8.3"
5959
},
6060
"dependencies": {
6161
"@babel/core": "^7.18.6",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export const lessLoader = (args: ConfigArgs) => ({
142142

143143
// eslint-disable-next-line @typescript-eslint/no-unused-vars
144144
export const assetsLoader = (_args: ConfigArgs) => ({
145-
test: /\.(jpe?g|png|svg|gif|woff|woff2|ttf|eot)(\?.+?)?$/,
145+
test: /\.(jpe?g|png|svg|gif|woff|woff2|ttf|eot|otf)(\?.+?)?$/,
146146
// asset (or asset auto) will either compile as data-uri or to a file path
147147
// based on the size, this is a good strategy for loading assets in the GUI
148148
type: 'asset',
@@ -155,7 +155,7 @@ export const assetsLoader = (_args: ConfigArgs) => ({
155155

156156
// eslint-disable-next-line @typescript-eslint/no-unused-vars
157157
export const resourceLoader = (_args: ConfigArgs) => ({
158-
test: /\.(jpe?g|png|svg|gif|woff|woff2|ttf|eot)(\?.+?)?$/,
158+
test: /\.(jpe?g|png|svg|gif|woff|woff2|ttf|eot|otf)(\?.+?)?$/,
159159
// asset/resource always compiles imports to paths to files, this is a good
160160
// strategy for electron main (node.js) process where handling data uris might
161161
// be more work than handling files

0 commit comments

Comments
 (0)