Skip to content

Commit fed4e96

Browse files
committed
fix package-lock.json merge conflict
2 parents 055b898 + 0a5c629 commit fed4e96

File tree

169 files changed

+5310
-2372
lines changed

Some content is hidden

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

169 files changed

+5310
-2372
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ Walter Tan <[email protected]>
107107
Raymond Lo <[email protected]>
108108
Moses Yang <[email protected]>
109109
Moses Yang <[email protected]>
110+
Jimmy Choi <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Tue Jul 15 2025.
2+
This document was automatically generated on Fri Jul 18 2025.
33

44
## List of dependencies
55

@@ -228,7 +228,7 @@ This document was automatically generated on Tue Jul 15 2025.
228228
| **[dunder-proto](#390fd69f2035b583e461890d5b0a3230f4adb33b042e6f0d1472dd911bc1de98)** | 1.0.1 | MIT |
229229
| **[ee-first](#e2746902c758ae8a6f91ffb9618cd53717f936cb33c6323e65b6b7b24f7ebefe)** | 1.1.1 | MIT |
230230
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
231-
| **[electron](#50db33bd42c0f86b4b388266a973d54d6f0470454681f225e0060533b0faae38)** | 37.2.1 | MIT |
231+
| **[electron](#13106dc4731439f2d21284fcd1e9f7363c38e0671b23818c0e3397fb780e6eac)** | 37.2.2 | MIT |
232232
| **[encodeurl](#177948a319ae0aeebbd65742c53c62b37c75ec1d021afa5a188d10a7ceae6623)** | 2.0.0 | MIT |
233233
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
234234
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -18618,9 +18618,9 @@ License files:
1861818618

1861918619
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1862018620

18621-
<a id="50db33bd42c0f86b4b388266a973d54d6f0470454681f225e0060533b0faae38"></a>
18621+
<a id="13106dc4731439f2d21284fcd1e9f7363c38e0671b23818c0e3397fb780e6eac"></a>
1862218622

18623-
### [electron](https://www.npmjs.com/package/electron) (version 37.2.1)
18623+
### [electron](https://www.npmjs.com/package/electron) (version 37.2.2)
1862418624

1862518625
License tags: MIT
1862618626

configs/eslint-config-compass/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.4.2",
3+
"version": "1.4.3",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -17,9 +17,9 @@
1717
"@babel/core": "^7.24.3",
1818
"@babel/eslint-parser": "^7.14.3",
1919
"@mongodb-js/eslint-config-devtools": "^0.9.9",
20-
"@mongodb-js/eslint-plugin-compass": "^1.2.11",
21-
"@typescript-eslint/eslint-plugin": "^8.35.1",
22-
"@typescript-eslint/parser": "^8.35.1",
20+
"@mongodb-js/eslint-plugin-compass": "^1.2.12",
21+
"@typescript-eslint/eslint-plugin": "^8.37.0",
22+
"@typescript-eslint/parser": "^8.37.0",
2323
"eslint": "^8.57.1",
2424
"eslint-config-prettier": "^8.3.0",
2525
"eslint-plugin-chai-friendly": "^1.1.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.2.11",
16+
"version": "1.2.12",
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.6.10",
40+
"@mongodb-js/mocha-config-compass": "^1.6.11",
4141
"@mongodb-js/prettier-config-compass": "^1.2.8",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^8.57.1",

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.6.10",
3+
"version": "1.6.11",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",

configs/testing-library-compass/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
},
1313
"homepage": "https://github.com/mongodb-js/compass",
14-
"version": "1.3.5",
14+
"version": "1.3.6",
1515
"repository": {
1616
"type": "git",
1717
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,8 +45,8 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.4.2",
49-
"@mongodb-js/mocha-config-compass": "^1.6.10",
48+
"@mongodb-js/eslint-config-compass": "^1.4.3",
49+
"@mongodb-js/mocha-config-compass": "^1.6.11",
5050
"@mongodb-js/prettier-config-compass": "^1.2.8",
5151
"@mongodb-js/tsconfig-compass": "^1.2.9",
5252
"@types/chai": "^4.2.21",

configs/webpack-config-compass/package.json

Lines changed: 3 additions & 3 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.9.0",
16+
"version": "1.9.1",
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.4.2",
48+
"@mongodb-js/eslint-config-compass": "^1.4.3",
4949
"@mongodb-js/prettier-config-compass": "^1.2.8",
5050
"@mongodb-js/tsconfig-compass": "^1.2.9",
5151
"@types/cli-progress": "^3.9.2",
@@ -71,7 +71,7 @@
7171
"cli-progress": "^3.9.1",
7272
"core-js": "^3.17.3",
7373
"css-loader": "^4.3.0",
74-
"electron": "^37.2.1",
74+
"electron": "^37.2.2",
7575
"html-webpack-plugin": "^5.6.0",
7676
"less": "^3.13.1",
7777
"less-loader": "^10.0.1",

docs/tracking-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
> the tracking plan for the specific Compass version you can use the following
77
> URL: `https://github.com/mongodb-js/compass/blob/<compass version>/docs/tracking-plan.md`
88
9-
Generated on Tue, Jul 15, 2025
9+
Generated on Fri, Jul 18, 2025
1010

1111
## Table of Contents
1212

0 commit comments

Comments
 (0)