Merge branch '7.x'

.github/workflows/test.yml

@@ -2,18 +2,18 @@ name: Test
 on:
   pull_request:
     paths:
-      - '.github/workflows/test.yml'
-      - 'package.json'
-      - 'index.js'
-      - 'lib/**'
-      - 'test/**.js'
+      - ".github/workflows/test.yml"
+      - "package.json"
+      - "index.js"
+      - "lib/**"
+      - "test/**.js"
   push:
     paths:
-      - '.github/workflows/test.yml'
-      - 'package.json'
-      - 'index.js'
-      - 'lib/**'
-      - 'test/**.js'
+      - ".github/workflows/test.yml"
+      - "package.json"
+      - "index.js"
+      - "lib/**"
+      - "test/**.js"
 permissions:
   contents: read
 
@@ -85,7 +85,7 @@ jobs:
         with:
           name: coverage
           path: coverage
-  
+
   test-deno:
     runs-on: ubuntu-20.04
     name: Deno tests
@@ -117,7 +117,7 @@ jobs:
   test-replica-sets:
     needs:
       - test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     name: Replica Set tests
     env:
       FORCE_COLOR: true

.npmignore

@@ -58,4 +58,8 @@ tsconfig.json
 scripts/
 tools/
 
-*.0x
+*.0x
+valnotes.md
+
+coverage
+.nyc_output

CHANGELOG.md

@@ -1,3 +1,19 @@
+7.8.6 / 2025-01-20
+===================
+ * chore: remove coverage output from bundle
+
+6.13.8 / 2025-01-20
+===================
+ * chore: remove coverage output from bundle
+
+7.8.5 / 2025-01-20
+===================
+ * chore: re-release to force npm audit to pick up 6.x fix for CVE-2025-23061
+
+6.13.7 / 2025-01-20
+===================
+ * chore: re-release to force npm audit to pick up 6.x fix for CVE-2025-23061
+
 8.9.5 / 2025-01-13
 ==================
  * fix: disallow nested $where in populate match CVE-2025-23061
@@ -10,6 +26,7 @@
 6.13.6 / 2025-01-13
 ===================
  * fix: disallow nested $where in populate match CVE-2025-23061
+<<<<<<< HEAD
 
 8.9.4 / 2025-01-09
 ==================
@@ -78,6 +95,8 @@
  * fix: disallow using $where in match
  * perf: cache results from getAllSubdocs() on saveOptions, only loop through known subdoc properties #15055 #15029
  * fix(model+query): support overwriteDiscriminatorKey for bulkWrite updateOne and updateMany, allow inferring discriminator key from update #15046 #15040
+=======
+>>>>>>> 7.x
 
 7.8.3 / 2024-11-26
 ==================