Merge branch 'main' into NODE-7046

Author: durran

.evergreen/config.in.yml

@@ -617,6 +617,9 @@ functions:
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
 
+          # use Node20
+          export PATH=/opt/devtools/node20/bin:/opt/dev/tools/bin:$PATH
+
           # Download all the task coverage files.
           # NOTE: All coverage files are too large for V8 to handle the resulting call to
           #       JSON.stringify from within nyc, so with stick to Fermiun to include the

.evergreen/config.yml

@@ -556,6 +556,9 @@ functions:
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
 
+          # use Node20
+          export PATH=/opt/devtools/node20/bin:/opt/dev/tools/bin:$PATH
+
           # Download all the task coverage files.
           # NOTE: All coverage files are too large for V8 to handle the resulting call to
           #       JSON.stringify from within nyc, so with stick to Fermiun to include the
@@ -1994,24 +1997,6 @@ tasks:
       - func: install mongodb-client-encryption from source
       - func: assume secrets manager role
       - func: run custom csfle tests
-  - name: test-latest-driver-mongodb-client-encryption-6.0.0
-    tags:
-      - run-custom-dependency-tests
-    commands:
-      - command: expansions.update
-        type: setup
-        params:
-          updates:
-            - {key: NODE_LTS_VERSION, value: 20.19.0}
-            - {key: VERSION, value: '7.0'}
-            - {key: TOPOLOGY, value: replica_set}
-            - {key: CLIENT_ENCRYPTION, value: 'true'}
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-      - func: install package
-        vars:
-          PACKAGE: [email protected]
-      - func: run tests
   - name: test-alpine-fle
     tags:
       - alpine-fle
@@ -3205,7 +3190,6 @@ buildvariants:
       - run-custom-csfle-tests-5.0
       - run-custom-csfle-tests-rapid
       - run-custom-csfle-tests-latest
-      - test-latest-driver-mongodb-client-encryption-6.0.0
   - name: rhel8-test-gcp-kms
     display_name: GCP KMS Test
     run_on: debian11-small

.evergreen/generate_evergreen_tasks.js

@@ -623,27 +623,28 @@ for (const serverVersion of ['5.0', 'rapid', 'latest']) {
   });
 }
 
-customDependencyTests.push({
-  name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
-  tags: ['run-custom-dependency-tests'],
-  commands: [
-    updateExpansions({
-      NODE_LTS_VERSION: LOWEST_LTS,
-      VERSION: '7.0',
-      TOPOLOGY: 'replica_set',
-      CLIENT_ENCRYPTION: true
-    }),
-    { func: 'install dependencies' },
-    { func: 'bootstrap mongo-orchestration' },
-    {
-      func: 'install package',
-      vars: {
-        PACKAGE: '[email protected]'
-      }
-    },
-    { func: 'run tests' }
-  ]
-});
+// TODO(NODE-6997): update to 7.0.0 after release
+// customDependencyTests.push({
+//   name: `test-latest-driver-mongodb-client-encryption-6.0.0`,
+//   tags: ['run-custom-dependency-tests'],
+//   commands: [
+//     updateExpansions({
+//       NODE_LTS_VERSION: LOWEST_LTS,
+//       VERSION: '7.0',
+//       TOPOLOGY: 'replica_set',
+//       CLIENT_ENCRYPTION: true
+//     }),
+//     { func: 'install dependencies' },
+//     { func: 'bootstrap mongo-orchestration' },
+//     {
+//       func: 'install package',
+//       vars: {
+//         PACKAGE: '[email protected]'
+//       }
+//     },
+//     { func: 'run tests' }
+//   ]
+// });
 
 const coverageTask = {
   name: 'download and merge coverage'.split(' ').join('-'),

.evergreen/install-mongodb-client-encryption.sh

@@ -12,8 +12,7 @@ rm -rf mongodb-client-encryption
 git clone https://github.com/mongodb-js/mongodb-client-encryption.git
 pushd mongodb-client-encryption
 
-# TODO(NODE-7218): test against latest mongodb-client-encryption
-git checkout aa61a35f5e174cd1c1e247e036093e18c88268c6
+git checkout main
 
 node --version
 npm --version

.github/dependabot.yml

@@ -27,9 +27,6 @@ updates:
       # chai-subset requires @types/chai 4.x.
       - dependency-name: "@types/chai"
         versions: [">=4.0.0"]
-      # nyc is Node18+ only starting on [email protected].
-      - dependency-name: "nyc"
-        versions: [">=16.0.0"]
       # mocha-plugin-eslint breaks our lint configuration
       - dependency-name: "mocha-plugin-eslint"
         versions: [">=10.0.0"]

etc/notes/releasing.md

@@ -1,7 +1,19 @@
 # Releasing MongoDB Node.js Packages
 
+- [Releasing MongoDB Node.js Packages](#releasing-mongodb-nodejs-packages)
+  - [Pre-requisites](#pre-requisites)
+  - [Branching and backport strategy](#branching-and-backport-strategy)
+    - [Backports](#backports)
+  - [`release-please`](#release-please)
+  - [Release Notes](#release-notes)
+  - [Release Instructions](#release-instructions)
+    - [Authentication](#authentication)
+    - [Prebuilds](#prebuilds)
+  - [Alphas / Prereleases](#alphas--prereleases)
+  - [Packages](#packages)
+
 > [!NOTE]
-> _Last updated: Thu Jun 6_
+> _Last updated: Oct 1, 2025_
 
 ## Pre-requisites
 
@@ -95,6 +107,52 @@ prebuild uploads archives of the native dependency to the github release.
 Uploading binaries should happen automatically after the git tag/github release has been made.
 It may take some time for the building and uploading to finish, but no more than a few hours at most.
 
+## Alphas / Prereleases
+
+> [!NOTE]
+> This documentation uses `alpha` as the prerelease tag, but if you wish to use a different tag, just 
+> replace `alpha` with the desired tag.
+
+To configure a repo for a prerelease:
+
+1. Update the release Github action's `npm publish` step to publish an alpha by specifying `--tag alpha`:
+
+```yaml
+      - run: npm publish --provenance --tag alpha
+        if: ${{ needs.release_please.outputs.release_created }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+```
+
+2. Update the release please configuration file with the following parameters:
+   1. Specify `prerelease-type: alpha`.  This tells release-please that we want to use alpha as the pre-release tag.
+   2. Specify `prerelease: true`.  This tells release-please to create the Github release as a pre-release.
+   3. Specify `versioning: prerelease`.  This tells release-please that we wish to release a pre-release.
+
+```json
+{
+  "pull-request-header": "Please run the release_notes action before releasing to generate release highlights",
+  "packages": {
+    ".": {
+      "include-component-in-tag": false,
+      "changelog-path": "HISTORY.md",
+      "release-type": "node",
+      "bump-minor-pre-major": false,
+      "bump-patch-for-minor-pre-major": false,
+      "draft": false,
+      "prerelease-type": "alpha",
+      "prerelease": true,
+      "versioning": "prerelease"
+    }
+  }
+}
+```
+
+After merging the a PR with the above changes, release-please should re-create the release PR as a PR to release 
+an alpha.
+
+Example PR: https://github.com/mongodb-js/mongodb-client-encryption/pull/104
+
 ## Packages
 
 The following is a list of packages the Node.js team is responsible for and these release instructions apply to.

package-lock.json

@@ -34,7 +34,7 @@
     "@mongodb-js/zstd": "^1.1.0 || ^2.0.0",
     "gcp-metadata": "^5.2.0",
     "kerberos": "^2.0.1",
-    "mongodb-client-encryption": ">=6.0.0 <7",
+    "mongodb-client-encryption": "^7.0.0-alpha",
     "snappy": "^7.3.2",
     "socks": "^2.7.1"
   },
@@ -96,7 +96,7 @@
     "js-yaml": "^4.1.0",
     "mocha": "^11.7.1",
     "mocha-sinon": "^2.1.2",
-    "mongodb-client-encryption": "^6.5.0",
+    "mongodb-client-encryption": "^7.0.0-alpha.1",
     "mongodb-legacy": "^6.1.3",
     "nyc": "^15.1.0",
     "prettier": "^3.6.2",
@@ -174,4 +174,4 @@
       "moduleResolution": "node"
     }
   }
-}
+}