From cc7bc9efd85eaa0083fda82ff50434abba5b7b70 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 1 Sep 2025 10:17:14 -0300
Subject: [PATCH 01/45] DOCS:Remove references to Meteor Toolbox VS Code
 extension

All mentions and links to the Meteor Toolbox VS Code extension have been removed from documentation and tutorials.

Based on https://forums.meteor.com/t/vs-code-extension/64106/2?u=grubba, and since the extension repository appears to be unmaintained, it seems best to remove it from the docs.

Soon, we will have a more defined process for third-party tools.
---
 v3-docs/docs/.vitepress/config.mts            |  4 ---
 v3-docs/docs/about/what-is.md                 |  2 --
 v3-docs/docs/tutorials/react/index.md         |  2 +-
 .../vue/meteorjs3-vue3-vue-meteor-tracker.md  | 29 +++++++++----------
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/v3-docs/docs/.vitepress/config.mts b/v3-docs/docs/.vitepress/config.mts
index 7c7671d07f..3cb0b54e26 100644
--- a/v3-docs/docs/.vitepress/config.mts
+++ b/v3-docs/docs/.vitepress/config.mts
@@ -72,10 +72,6 @@ export default defineConfig({
                 text: "Packages on Atmosphere",
                 link: "https://atmospherejs.com/",
               },
-              {
-                text: "VS Code Extension",
-                link: "https://marketplace.visualstudio.com/items?itemName=meteor-toolbox.meteor-toolbox",
-              },
               {
                 text: "DevTools - Chrome Extension",
                 link: "https://chromewebstore.google.com/detail/ibniinmoafhgbifjojidlagmggecmpgf",
diff --git a/v3-docs/docs/about/what-is.md b/v3-docs/docs/about/what-is.md
index 11863a0e2b..b87832fa90 100644
--- a/v3-docs/docs/about/what-is.md
+++ b/v3-docs/docs/about/what-is.md
@@ -39,8 +39,6 @@ Meteor is a full-stack JavaScript platform for developing modern web and mobile
 
 - Explore and contribute to our [GitHub repository](https://github.com/meteor). You can access our code, request new features, and start contributing.
 
-- Enhance your coding experience with the [VS Code Extension](https://marketplace.visualstudio.com/items?itemName=meteor-toolbox.meteor-toolbox), which provides IntelliSense support for Meteor's core and packages.
-
 - Use the [Chrome Extension](https://chrome.google.com/webstore/detail/meteor-devtools-evolved/ibniinmoafhgbifjojidlagmggecmpgf) or [Firefox Extension](https://addons.mozilla.org/en-US/firefox/addon/meteor-devtools-evolved/) for insights into your app's performance and to understand what is going on under the hood of your application.
 
 - Discover [Meteor Examples](https://github.com/meteor/examples) to see a range of projects built with Meteor.
diff --git a/v3-docs/docs/tutorials/react/index.md b/v3-docs/docs/tutorials/react/index.md
index 1599e2d186..ef62761bb1 100644
--- a/v3-docs/docs/tutorials/react/index.md
+++ b/v3-docs/docs/tutorials/react/index.md
@@ -4,7 +4,7 @@ In this tutorial, we will create a simple To-Do app using [React](https://react.
 
 React is a popular JavaScript library for building user interfaces. It allows you to create dynamic and interactive applications by composing UI components. React uses a declarative approach, where you define how the UI should look based on the state, and it efficiently updates the view when the state changes. With JSX, a syntax extension that combines JavaScript and HTML, React makes it easy to create reusable components that manage their own state and render seamlessly in the browser.
 
-To start building your React app, you'll need a code editor. If you're unsure which one to choose, [Visual Studio Code](https://code.visualstudio.com/) is a good option. After installing it, you can enhance your experience by adding extensions like [Meteor Toolbox](https://marketplace.visualstudio.com/items?itemName=meteor-toolbox.meteor-toolbox).
+To start building your React app, you'll need a code editor. If you're unsure which one to choose, [Visual Studio Code](https://code.visualstudio.com/) is a good option.
 
 Let’s begin building your app!
 
diff --git a/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md b/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md
index 171d56d105..5b426a8599 100644
--- a/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md
+++ b/v3-docs/docs/tutorials/vue/meteorjs3-vue3-vue-meteor-tracker.md
@@ -4,8 +4,7 @@ In this tutorial, we will create a simple To-Do app using [Vue 3](https://vuejs.
 
 Vue.js is a powerful JavaScript framework for making user interfaces. It helps you build interactive applications by using templates that connect to data and update automatically when the data changes. Vue.js templates use a simple syntax similar to HTML and work with Vue’s reactivity system to show components in the browser.
 
-To start building your Vue.js app, you'll need a code editor. If you're unsure which one to choose, [Visual Studio Code](https://code.visualstudio.com/) is a good option. After installing it, you can enhance your experience by adding extensions like [Meteor Toolbox](https://marketplace.visualstudio.com/items?itemName=meteor-toolbox.meteor-toolbox) and [Vue Language Features](https://marketplace.visualstudio.com/items?itemName=Vue.volar).
-
+To start building your Vue.js app, you'll need a code editor. If you're unsure which one to choose, [Visual Studio Code](https://code.visualstudio.com/) is a good option.
 :::warning
 This tutorial uses the `vue-meteor-tracker` package, which is currently in beta and does not support async calls yet. However, it is still a valuable package, and we hope it will be updated soon. We are also working on a new tutorial that will use Meteor core packages instead.
 :::
@@ -206,7 +205,7 @@ Before creating our collection, let's remove the `links.js` file from the `impor
 ::: code-group
 ```javascript [imports/api/tasksCollection.js]
 import { Mongo } from 'meteor/mongo';
- 
+
 export const TasksCollection = new Mongo.Collection('tasks');
 ```
 :::
@@ -259,7 +258,7 @@ Meteor works with Meteor packages and NPM packages, usually Meteor packages are
 
 The `vue-meteor-tracker` package is already included in the Vue skeleton, so you don’t need to add it.
 
-When importing code from a Meteor package the only difference from NPM modules is that you need to prepend `meteor/` in the from part of your import.  
+When importing code from a Meteor package the only difference from NPM modules is that you need to prepend `meteor/` in the from part of your import.
 First we need to implement a subscription at the `App` component to get the tasks updated from the server. It can be done simply by using the `subscribe` and `autorun` functions from `vue-meteor-tracker`.
 
 ::: info
@@ -500,7 +499,7 @@ Until now, you have only inserted documents to our collection. Let’s see how y
 ### 4.1: Add Checkbox
 
 
-First, you need to add a `checkbox` element to your `Task` component, and we need to add the `v-model` directive to the checkbox. This will allow us to bind the value of the checkbox to the `checked` field of the task document.  
+First, you need to add a `checkbox` element to your `Task` component, and we need to add the `v-model` directive to the checkbox. This will allow us to bind the value of the checkbox to the `checked` field of the task document.
 To do this, we need to add a `ref` to the task document. This will allow us to access the task document in the template. And add a computed property `isChecked` for the state management of the checkbox.
 
 We also have a prop called `task` that is passed to the component. This prop is an object that represents the task document.
@@ -604,7 +603,7 @@ const isChecked = computed(() => taskRef.value.checked);
 const handleCheckboxChange = async (event) => {
     const newCheckedValue = event.target.checked;
     taskRef.value.checked = newCheckedValue;
-    
+
     try {
       await Meteor.callAsync('setIsCheckedTask', taskRef.value._id, newCheckedValue);
     } catch (error) {
@@ -644,9 +643,9 @@ First add a button after the text in your `Task` component and receive a callbac
   {{ task.text }}
 </span>
 
-<button 
+<button
     class="ml-auto bg-red-500 hover:bg-red-600 text-white font-bold py-0.5 px-2 rounded"
-    @click="deleteTask"> &times; 
+    @click="deleteTask"> &times;
 </button>
 ...
 ```
@@ -829,7 +828,7 @@ You should avoid adding zero to your app bar when there are no pending tasks.
 ::: code-group
 ```vue [imports/ui/App.vue]
 <script setup>
-... 
+...
 const incompleteTasksCount = autorun(() => {
   return TasksCollection.find({ checked: { $ne: true } }).count();
 }).result;
@@ -1235,7 +1234,7 @@ async function setIsCheckedTask(taskId, checked) {
     if (!Meteor.userId()) {
         throw new Meteor.Error('Not authorized.');
     }
-    
+
     await TasksCollection.updateAsync(taskId, {
         $set: {
             checked
@@ -1329,13 +1328,13 @@ Make sure you replace `vue3-meteor-3` by a custom name that you want as subdomai
 ```shell
 meteor deploy vue3-meteor-3.meteorapp.com --settings private/settings.json
 Talking to Galaxy servers at https://us-east-1.galaxy-deploy.meteor.com
-Preparing to build your app...                
-Preparing to upload your app... 
+Preparing to build your app...
+Preparing to upload your app...
 Uploaded app bundle for new app at vue-tutorial.meteorapp.com.
 Galaxy is building the app into a native image.
-Waiting for deployment updates from Galaxy... 
-Building app image...                         
-Deploying app...                              
+Waiting for deployment updates from Galaxy...
+Building app image...
+Deploying app...
 You have successfully deployed the first version of your app.
 For details, visit https://galaxy.meteor.com/app/vue3-meteor-3.meteorapp.com
 ```

From d30b31970e7ed75a7518956b885d3c7b85e5c31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 12 May 2025 18:01:24 +0200
Subject: [PATCH 02/45] add test coverage for send emails

---
 packages/accounts-base/accounts-base.d.ts    |  14 ++-
 packages/accounts-password/password_tests.js | 105 ++++++++++++++++++-
 2 files changed, 114 insertions(+), 5 deletions(-)

diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index b11344ce08..16be96cf03 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -204,26 +204,34 @@ export namespace Accounts {
     options?: { fields?: Mongo.FieldSpecifier | undefined }
   ): Promise<Meteor.User | null | undefined>;
 
+  interface SendEmailResult {
+    email: string;
+    user: any;
+    token: string;
+    url: string;
+    options: any;
+  }
+
   function sendEnrollmentEmail(
     userId: string,
     email?: string,
     extraTokenData?: Record<string, unknown>,
     extraParams?: Record<string, unknown>
-  ): Promise<void>;
+  ): Promise<SendEmailResult>;
 
   function sendResetPasswordEmail(
     userId: string,
     email?: string,
     extraTokenData?: Record<string, unknown>,
     extraParams?: Record<string, unknown>
-  ): Promise<void>;
+  ): Promise<SendEmailResult>;
 
   function sendVerificationEmail(
     userId: string,
     email?: string,
     extraTokenData?: Record<string, unknown>,
     extraParams?: Record<string, unknown>
-  ): Promise<void>;
+  ): Promise<SendEmailResult>;
 
   function setUsername(userId: string, newUsername: string): Promise<void>;
 
diff --git a/packages/accounts-password/password_tests.js b/packages/accounts-password/password_tests.js
index f34e172dc7..13f9927018 100644
--- a/packages/accounts-password/password_tests.js
+++ b/packages/accounts-password/password_tests.js
@@ -1789,7 +1789,7 @@ if (Meteor.isServer) (() => {
       ]);
     });
 
-    
+
 
 Tinytest.addAsync("accounts emails - replace email", async test => {
   const origEmail = `originalemail@test.com`;
@@ -1811,7 +1811,7 @@ Tinytest.addAsync("accounts emails - replace email", async test => {
     { address: newEmail, verified: false }
   ]);
 })
-  
+
     Tinytest.addAsync("passwords - remove email",
     async test => {
       const origEmail = `${ Random.id() }@turing.com`;
@@ -1947,4 +1947,105 @@ Tinytest.addAsync("accounts emails - replace email", async test => {
       });
     }, 'already exists');
   });
+
+  Tinytest.addAsync('passwords - send email functions', async test => {
+    // Create a user with an unverified email
+    const username = Random.id();
+    const email = `${username}-intercept@example.com`;
+    const password = 'password';
+
+    const userId = await Accounts.createUserAsync({
+      username: username,
+      email: email,
+      password: password
+    });
+
+    test.isTrue(userId, 'User ID should be returned');
+
+    // Mock Email.sendAsync to track if it was called
+    const originalSendAsync = Email.sendAsync;
+    let emailSent = 0;
+    Email.sendAsync = async (options) => {
+      emailSent++;
+      return originalSendAsync(options);
+    };
+
+    try {
+      // Test sendVerificationEmail
+      const verificationResult = await Accounts.sendVerificationEmail(userId, email);
+
+      // Verify the result contains expected properties
+      test.isTrue(verificationResult, 'Result should be returned for verification email');
+      test.equal(verificationResult.email, email, 'Email in verification result should match');
+      test.isTrue(verificationResult.user, 'User object should be in verification result');
+      test.isTrue(verificationResult.token, 'Token should be in verification result');
+      test.isTrue(verificationResult.url, 'URL should be in verification result');
+      test.isTrue(verificationResult.options, 'Email options should be in verification result');
+
+      // Test sendEnrollmentEmail
+      const enrollmentResult = await Accounts.sendEnrollmentEmail(userId, email);
+
+      // Verify the result contains expected properties
+      test.isTrue(enrollmentResult, 'Result should be returned for enrollment email');
+      test.equal(enrollmentResult.email, email, 'Email in enrollment result should match');
+      test.isTrue(enrollmentResult.user, 'User object should be in enrollment result');
+      test.isTrue(enrollmentResult.token, 'Token should be in enrollment result');
+      test.isTrue(enrollmentResult.url, 'URL should be in enrollment result');
+      test.isTrue(enrollmentResult.options, 'Email options should be in enrollment result');
+
+      // Test sendResetPasswordEmail
+      const resetResult = await Accounts.sendResetPasswordEmail(userId, email);
+
+      // Verify the result contains expected properties
+      test.isTrue(resetResult, 'Result should be returned for reset password email');
+      test.equal(resetResult.email, email, 'Email in reset result should match');
+      test.isTrue(resetResult.user, 'User object should be in reset result');
+      test.isTrue(resetResult.token, 'Token should be in reset result');
+      test.isTrue(resetResult.url, 'URL should be in reset result');
+      test.isTrue(resetResult.options, 'Email options should be in reset result');
+
+      // Verify Email.sendAsync was called for all three emails
+      test.equal(emailSent, 3, 'Email.sendAsync should have been called three times');
+
+      // Get the intercepted emails
+      const interceptedEmails = await Meteor.callAsync("getInterceptedEmails", email);
+      test.equal(interceptedEmails.length, 3, 'Three emails should have been intercepted');
+
+      // Verify the verification email content
+      const verificationEmailOptions = interceptedEmails[0];
+      test.isTrue(verificationEmailOptions, 'Verification email should have been intercepted');
+      const verificationRe = new RegExp(`${Meteor.absoluteUrl()}#/verify-email/(\\S*)`);
+      const verificationMatch = verificationEmailOptions.text.match(verificationRe);
+      test.isTrue(verificationMatch, 'Verification email should contain verification URL');
+      const verificationTokenFromUrl = verificationMatch[1];
+      test.isTrue(verificationResult.url.includes(verificationTokenFromUrl), 'Verification URL in result should contain the token');
+
+      // Verify the enrollment email content
+      const enrollmentEmailOptions = interceptedEmails[1];
+      test.isTrue(enrollmentEmailOptions, 'Enrollment email should have been intercepted');
+      const enrollmentRe = new RegExp(`${Meteor.absoluteUrl()}#/enroll-account/(\\S*)`);
+      const enrollmentMatch = enrollmentEmailOptions.text.match(enrollmentRe);
+      test.isTrue(enrollmentMatch, 'Enrollment email should contain enrollment URL');
+      const enrollmentTokenFromUrl = enrollmentMatch[1];
+      test.isTrue(enrollmentResult.url.includes(enrollmentTokenFromUrl), 'Enrollment URL in result should contain the token');
+
+      // Verify the reset password email content
+      const resetEmailOptions = interceptedEmails[2];
+      test.isTrue(resetEmailOptions, 'Reset password email should have been intercepted');
+      const resetRe = new RegExp(`${Meteor.absoluteUrl()}#/reset-password/(\\S*)`);
+      const resetMatch = resetEmailOptions.text.match(resetRe);
+      test.isTrue(resetMatch, 'Reset password email should contain reset URL');
+      const resetTokenFromUrl = resetMatch[1];
+      test.isTrue(resetResult.url.includes(resetTokenFromUrl), 'Reset URL in result should contain the token');
+
+      // Verify email headers and from address for all emails
+      for (const emailOptions of interceptedEmails) {
+        test.equal(emailOptions.from, 'test@meteor.com', 'From address should match');
+        test.equal(emailOptions.headers['My-Custom-Header'], 'Cool', 'Custom header should be present');
+      }
+    } finally {
+      // Restore the original Email.sendAsync
+      Email.sendAsync = originalSendAsync;
+    }
+  });
 })();

From 981c37ed7784695a158ede5cd212aa1aa5a10c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 8 Aug 2025 12:04:02 +0200
Subject: [PATCH 03/45] add async URL resolution for Accounts url methods

---
 packages/accounts-base/accounts-base.d.ts     |  1 +
 packages/accounts-base/accounts_server.js     |  5 ++
 packages/accounts-base/accounts_tests.js      | 47 ++++++++++++++++++-
 packages/accounts-password/password_server.js |  7 ++-
 .../passwordless_server.js                    |  2 +-
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index 16be96cf03..63213e2769 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -6,6 +6,7 @@ import { DDP } from 'meteor/ddp';
 export interface URLS {
   resetPassword: (token: string) => string;
   verifyEmail: (token: string) => string;
+  loginToken: (token: string) => string;
   enrollAccount: (token: string) => string;
 }
 
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index ed45af5a0f..012b005100 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -84,6 +84,11 @@ export class AccountsServer extends AccountsCommon {
 
     this._skipCaseInsensitiveChecksForTest = {};
 
+    // Helper function to resolve promises if needed
+    this._resolvePromise = async (value) => {
+      return value instanceof Promise ? await value : value;
+    };
+
     this.urls = {
       resetPassword: (token, extraParams) => this.buildEmailUrl(`#/reset-password/${token}`, extraParams),
       verifyEmail: (token, extraParams) => this.buildEmailUrl(`#/verify-email/${token}`, extraParams),
diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index f6cdf49c71..26860656b1 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -775,8 +775,8 @@ if (Meteor.isServer) {
     });
   });
 
-  Tinytest.add(
-    'accounts - make sure that extra params to accounts urls are added',
+  Tinytest.addAsync(
+    'accounts - urls work with sync resolution',
     async test => {
       // No extra params
       const verifyEmailURL = new URL(Accounts.urls.verifyEmail('test'));
@@ -790,6 +790,49 @@ if (Meteor.isServer) {
       test.equal(enrollAccountURL.searchParams.get('test'), extraParams.test);
     }
   );
+
+  Tinytest.addAsync(
+    'accounts - urls work with async resolution',
+    async test => {
+      // Save original urls
+      const originalUrls = Accounts.urls;
+      try {
+        // Override urls methods to return Promises
+        Accounts.urls = {
+          resetPassword: (token, extraParams) =>
+            new Promise(resolve => resolve(originalUrls.resetPassword(token, extraParams))),
+          verifyEmail: (token, extraParams) =>
+            new Promise(resolve => resolve(originalUrls.verifyEmail(token, extraParams))),
+          loginToken: (selector, token, extraParams) =>
+            new Promise(resolve => resolve(originalUrls.loginToken(selector, token, extraParams))),
+          enrollAccount: (token, extraParams) =>
+            new Promise(resolve => resolve(originalUrls.enrollAccount(token, extraParams))),
+        };
+
+        // Test with no extra params
+        const verifyEmailUrl = await Accounts.urls.verifyEmail('test');
+        const verifyEmailURL = new URL(verifyEmailUrl);
+        test.equal(verifyEmailURL.searchParams.toString(), "");
+
+        // Test with extra params
+        const extraParams = { test: 'async-success' };
+        const resetPasswordUrl = await Accounts.urls.resetPassword('test', extraParams);
+        const resetPasswordURL = new URL(resetPasswordUrl);
+        test.equal(resetPasswordURL.searchParams.get('test'), extraParams.test);
+
+        const enrollAccountUrl = await Accounts.urls.enrollAccount('test', extraParams);
+        const enrollAccountURL = new URL(enrollAccountUrl);
+        test.equal(enrollAccountURL.searchParams.get('test'), extraParams.test);
+
+        const loginTokenUrl = await Accounts.urls.loginToken('email', 'token', extraParams);
+        const loginTokenURL = new URL(loginTokenUrl);
+        test.equal(loginTokenURL.searchParams.get('test'), extraParams.test);
+      } finally {
+        // Restore original urls
+        Accounts.urls = originalUrls;
+      }
+    }
+  );
 }
 
 Tinytest.addAsync('accounts - updateOrCreateUserFromExternalService - Facebook', async test => {
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index 6477bdcc3d..a4513aabb9 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -715,7 +715,7 @@ Accounts.sendResetPasswordEmail =
   async (userId, email, extraTokenData, extraParams) => {
     const { email: realEmail, user, token } =
       await Accounts.generateResetToken(userId, email, 'resetPassword', extraTokenData);
-    const url = Accounts.urls.resetPassword(token, extraParams);
+    const url = await Accounts._resolvePromise(Accounts.urls.resetPassword(token, extraParams));
     const options = await Accounts.generateOptionsForEmail(realEmail, user, url, 'resetPassword');
     await Email.sendAsync(options);
 
@@ -749,7 +749,7 @@ Accounts.sendEnrollmentEmail =
     const { email: realEmail, user, token } =
       await Accounts.generateResetToken(userId, email, 'enrollAccount', extraTokenData);
 
-    const url = Accounts.urls.enrollAccount(token, extraParams);
+    const url = await Accounts._resolvePromise(Accounts.urls.enrollAccount(token, extraParams));
 
     const options =
       await Accounts.generateOptionsForEmail(realEmail, user, url, 'enrollAccount');
@@ -938,7 +938,7 @@ Accounts.sendVerificationEmail =
 
     const { email: realEmail, user, token } =
       await Accounts.generateVerificationToken(userId, email, extraTokenData);
-    const url = Accounts.urls.verifyEmail(token, extraParams);
+    const url = await Accounts._resolvePromise(Accounts.urls.verifyEmail(token, extraParams));
     const options = await Accounts.generateOptionsForEmail(realEmail, user, url, 'verifyEmail');
     await Email.sendAsync(options);
     if (Meteor.isDevelopment && !Meteor.isPackageTest) {
@@ -1345,4 +1345,3 @@ await Meteor.users.createIndexAsync('services.password.reset.token',
   { unique: true, sparse: true });
 await Meteor.users.createIndexAsync('services.password.enroll.token',
   { unique: true, sparse: true });
-
diff --git a/packages/accounts-passwordless/passwordless_server.js b/packages/accounts-passwordless/passwordless_server.js
index 1ef908612c..20c23e17e8 100644
--- a/packages/accounts-passwordless/passwordless_server.js
+++ b/packages/accounts-passwordless/passwordless_server.js
@@ -220,7 +220,7 @@ Meteor.methods({
  */
 Accounts.sendLoginTokenEmail = async ({ userId, sequence, email, extra = {} }) => {
   const user = await getUserById(userId);
-  const url = Accounts.urls.loginToken(email, sequence, extra);
+  const url = await Accounts._resolvePromise(Accounts.urls.loginToken(email, sequence, extra));
   const options = await Accounts.generateOptionsForEmail(
     email,
     user,

From 67f3890a697f059e8317d774f361e19cdcddfd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 8 Aug 2025 12:25:56 +0200
Subject: [PATCH 04/45] enhance type definitions for SendEmailOptions and
 SendEmailResult

---
 packages/accounts-base/accounts-base.d.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/accounts-base/accounts-base.d.ts b/packages/accounts-base/accounts-base.d.ts
index 63213e2769..6aa2a58e2a 100644
--- a/packages/accounts-base/accounts-base.d.ts
+++ b/packages/accounts-base/accounts-base.d.ts
@@ -205,12 +205,21 @@ export namespace Accounts {
     options?: { fields?: Mongo.FieldSpecifier | undefined }
   ): Promise<Meteor.User | null | undefined>;
 
+  interface SendEmailOptions {
+    from: string;
+    to: string;
+    subject: string;
+    text: string;
+    html: string;
+    headers?: Header | undefined;
+  }
+
   interface SendEmailResult {
     email: string;
-    user: any;
+    user: Meteor.User;
     token: string;
     url: string;
-    options: any;
+    options: SendEmailOptions;
   }
 
   function sendEnrollmentEmail(

From 6574c3fdd7d6cd97bcb237446eb3d729d84a5182 Mon Sep 17 00:00:00 2001
From: Kelly Copley <copleykj@gmail.com>
Date: Wed, 23 Jul 2025 13:14:55 -0400
Subject: [PATCH 05/45] Move findUserByEmail method from accounts-password to
 accounts-base

#13834
---
 packages/accounts-base/accounts_server.js     | 24 ++++++++++++++
 packages/accounts-password/password_server.js | 31 -------------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 012b005100..3c3ac12e16 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -338,6 +338,30 @@ export class AccountsServer extends AccountsCommon {
     return user;
   }
 
+  /**
+   * @summary Find a user by one of their email addresses.
+   * @locus Server
+   * @param {String} email The email address to look for
+   * @param {Object} [options]
+   * @param {Object} options.fields Limit the fields to return from the user document
+   * @returns {Promise<Object>} A user if found, else null
+   * @importFromPackage accounts-base
+   */
+  findUserByEmail = async (email, options) =>
+    await this._findUserByQuery({ email }, options);
+
+  /**
+   * @summary Find a user by their username.
+   * @locus Server
+   * @param {String} username The username to look for
+   * @param {Object} [options]
+   * @param {Object} options.fields Limit the fields to return from the user document
+   * @returns {Promise<Object>} A user if found, else null
+   * @importFromPackage accounts-base
+   */
+  findUserByUsername = async (username, options) =>
+    await this._findUserByQuery({ username }, options);
+
   ///
   /// LOGIN METHODS
   ///
diff --git a/packages/accounts-password/password_server.js b/packages/accounts-password/password_server.js
index a4513aabb9..151f9c8d5f 100644
--- a/packages/accounts-password/password_server.js
+++ b/packages/accounts-password/password_server.js
@@ -287,37 +287,6 @@ Accounts._checkPasswordAsync = checkPasswordAsync;
 ///
 
 
-/**
- * @summary Finds the user asynchronously with the specified username.
- * First tries to match username case sensitively; if that fails, it
- * tries case insensitively; but if more than one user matches the case
- * insensitive search, it returns null.
- * @locus Server
- * @param {String} username The username to look for
- * @param {Object} [options]
- * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
- * @returns {Promise<Object>} A user if found, else null
- * @importFromPackage accounts-base
- */
-Accounts.findUserByUsername =
-  async (username, options) =>
-    await Accounts._findUserByQuery({ username }, options);
-
-/**
- * @summary Finds the user asynchronously with the specified email.
- * First tries to match email case sensitively; if that fails, it
- * tries case insensitively; but if more than one user matches the case
- * insensitive search, it returns null.
- * @locus Server
- * @param {String} email The email address to look for
- * @param {Object} [options]
- * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
- * @returns {Promise<Object>} A user if found, else null
- * @importFromPackage accounts-base
- */
-Accounts.findUserByEmail =
-  async (email, options) =>
-    await Accounts._findUserByQuery({ email }, options);
 
 // XXX maybe this belongs in the check package
 const NonEmptyString = Match.Where(x => {

From 26094b02c6bbd012071f108243115499e48c6ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 8 Aug 2025 14:25:45 +0200
Subject: [PATCH 06/45] add tests for LocalCollection operation results to
 match Meteor 2.x behavior

---
 packages/minimongo/local_collection.js       |  1 +
 packages/minimongo/minimongo_tests_client.js | 52 ++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/packages/minimongo/local_collection.js b/packages/minimongo/local_collection.js
index 590a6e9658..7d564ca564 100644
--- a/packages/minimongo/local_collection.js
+++ b/packages/minimongo/local_collection.js
@@ -678,6 +678,7 @@ export default class LocalCollection {
 
     return this.finishUpdate({
       options,
+      insertedId,
       updateCount,
       callback,
       selector,
diff --git a/packages/minimongo/minimongo_tests_client.js b/packages/minimongo/minimongo_tests_client.js
index e2aab4032c..074705f33c 100644
--- a/packages/minimongo/minimongo_tests_client.js
+++ b/packages/minimongo/minimongo_tests_client.js
@@ -4010,3 +4010,55 @@ Tinytest.addAsync('minimongo - asyncIterator', async (test) => {
   test.equal(itemIds.length, 2);
   test.equal(itemIds, ['a', 'b']);
 });
+
+Tinytest.add('minimongo - operation result fields (sync)', test => {
+  const c = new LocalCollection();
+
+  // Test insert
+  const insertedId = c.insert({name: 'doc1'});
+  test.isTrue(insertedId !== undefined, 'insert should return an ID');
+
+  // Test update
+  const updateResult = c.update({name: 'doc1'}, {$set: {value: 1}});
+  test.equal(updateResult, 1, 'update should return affected count');
+
+  // Test upsert (update case)
+  const upsertUpdateResult = c.upsert({name: 'doc1'}, {$set: {value: 2}});
+  test.equal(upsertUpdateResult.numberAffected, 1);
+  test.isFalse(upsertUpdateResult.hasOwnProperty('insertedId'));
+
+  // Test upsert (insert case)
+  const upsertInsertResult = c.upsert({name: 'doc2'}, {$set: {value: 3}});
+  test.equal(upsertInsertResult.numberAffected, 1);
+  test.isTrue(upsertInsertResult.hasOwnProperty('insertedId'));
+
+  // Test remove
+  const removeResult = c.remove({name: 'doc1'});
+  test.equal(removeResult, 1, 'remove should return removed count');
+});
+
+Tinytest.addAsync('minimongo - operation result fields (async)', async test => {
+  const c = new LocalCollection();
+
+  // Test insert
+  const insertedId = await c.insertAsync({name: 'doc1'});
+  test.isTrue(insertedId !== undefined, 'insert should return an ID');
+
+  // Test update
+  const updateResult = await c.updateAsync({name: 'doc1'}, {$set: {value: 1}});
+  test.equal(updateResult, 1, 'update should return affected count');
+
+  // Test upsert (update case)
+  const upsertUpdateResult = await c.upsertAsync({name: 'doc1'}, {$set: {value: 2}});
+  test.equal(upsertUpdateResult.numberAffected, 1);
+  test.isFalse(upsertUpdateResult.hasOwnProperty('insertedId'));
+
+  // Test upsert (insert case)
+  const upsertInsertResult = await c.upsertAsync({name: 'doc2'}, {$set: {value: 3}});
+  test.equal(upsertInsertResult.numberAffected, 1);
+  test.isTrue(upsertInsertResult.hasOwnProperty('insertedId'));
+
+  // Test remove
+  const removeResult = await c.removeAsync({name: 'doc1'});
+  test.equal(removeResult, 1, 'remove should return removed count');
+});

From da1b1963288a1821a8a827df6f9f83a6dc5c2057 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 7 Aug 2025 18:44:42 -0300
Subject: [PATCH 07/45] refactor: simplify error handling for MongoDB
 connection

---
 packages/npm-mongo/wrapper.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/npm-mongo/wrapper.js b/packages/npm-mongo/wrapper.js
index fd01b4fd0d..983b5b3868 100644
--- a/packages/npm-mongo/wrapper.js
+++ b/packages/npm-mongo/wrapper.js
@@ -1,9 +1,10 @@
-const { MongoClient, MongoCompatibilityError } = Npm.require('mongodb');
+const { MongoClient } = Npm.require('mongodb');
 
 function connect(client) {
   return client.connect()
     .catch(error => {
-      if (error.cause instanceof MongoCompatibilityError && error.message.includes('maximum wire version')) {
+      // we just check the message since multiples errors can be catch this situation, e.g: instanceof MongoServerSelectionError or MongoCompatibilityError
+      if (error.message.includes('maximum wire version')) {
       console.warn(`[DEPRECATION] Legacy MongoDB version detected, using mongo-legacy package: ${error.message}
         Warning: MongoDB versions <= 3.6 are deprecated. Some Meteor features may not work properly with this version.
         It is recommended to use MongoDB >= 4.`);

From a9edf9ee194efb0c3dc331c05e0a62f150d95182 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Mon, 28 Jul 2025 10:31:01 -0300
Subject: [PATCH 08/45] FIX: observeChanges[Async] should not crash the process
 on error

relates to: https://github.com/meteor/meteor/issues/13701
---
 packages/mongo/tests/mongo_livedata_tests.js | 97 ++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 0578665f80..9887344a07 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4489,6 +4489,103 @@ testAsyncMulti(
 );
 
 
+testAsyncMulti(
+  "mongo-livedata - observeChangesAsync callback errors should not crash the process",
+  [
+    async (test) => {
+      const Collection = new Mongo.Collection(
+        `observe_changes_async_error_async_method${test.runId()}`,
+        { resolverType: 'stub' }
+      );
+
+      return new Promise(async (resolve) => {
+        const obs = await Collection.find({}).observeChangesAsync({
+          async added(_id, fields) {
+            throw new Error('Test error in observeChangesAsync');
+          },
+        });
+        try {
+          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
+        } catch (e) {
+          // Expected error from the observeChangesAsync callback
+          test.equal(e.message, 'Test error in observeChangesAsync');
+          resolve();
+        }
+      });
+    },
+
+    async (test) => {
+      const Collection = new Mongo.Collection(
+        `observe_changes_async_error_sync_method${test.runId()}`,
+        { resolverType: 'stub' }
+      );
+
+      return new Promise(async (resolve) => {
+        const obs = await Collection.find({}).observeChangesAsync({
+          added(newDocument) {
+            throw new Error('Test error in observeChangesAsync');
+          },
+        });
+        try {
+          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
+        } catch (e) {
+          // Expected error from the observeChangesAsync callback
+          test.equal(e.message, 'Test error in observeChangesAsync');
+          resolve();
+        }
+      });
+    }
+  ]
+);
+
+testAsyncMulti(
+  "mongo-livedata - observeChanges callback errors should not crash the process",
+  [
+    async (test) => {
+      const Collection = new Mongo.Collection(
+        `observe_changes_error_async_method${test.runId()}`,
+        { resolverType: 'stub' }
+      );
+
+      return new Promise(async (resolve) => {
+        const obs = await Collection.find({}).observe({
+          async added(_id, fields) {
+            throw new Error('Test error in observeChanges');
+          },
+        });
+        try {
+          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
+        } catch (e) {
+          // Expected error from the observeChanges callback
+          test.equal(e.message, 'Test error in observeChanges');
+          resolve();
+        }
+      });
+    },
+    async (test) => {
+      const Collection = new Mongo.Collection(
+        `observe_changes_error_sync_method${test.runId()}`,
+        { resolverType: 'stub' }
+      );
+
+      return new Promise(async (resolve) => {
+        const obs = await Collection.find({}).observe({
+          added(newDocument) {
+            throw new Error('Test error in observeChanges');
+          },
+        });
+        try {
+          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
+        } catch (e) {
+          // Expected error from the observeChanges callback
+          test.equal(e.message, 'Test error in observeChanges');
+          resolve();
+        }
+      });
+    }
+  ]
+);
+
 Meteor.methods({
   [`methodThrowException`]: async () => {
     if (Meteor.isClient) {

From 9d32d862b38eeaeaed7227d504ab32903f2e8da4 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Thu, 31 Jul 2025 23:53:09 -0300
Subject: [PATCH 09/45] DEV: add catch and change to allSettled to solve error

---
 packages/mongo/observe_multiplex.ts          | 94 ++++++++++++++------
 packages/mongo/tests/mongo_livedata_tests.js | 48 ++++------
 2 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index a99d64d562..4d85165122 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -1,12 +1,17 @@
-import isEmpty from 'lodash.isempty';
-import { ObserveHandle } from './observe_handle';
+import isEmpty from "lodash.isempty";
+import { ObserveHandle } from "./observe_handle";
 
 interface ObserveMultiplexerOptions {
   ordered: boolean;
   onStop?: () => void;
 }
 
-export type ObserveHandleCallback = 'added' | 'addedBefore' | 'changed' | 'movedBefore' | 'removed';
+export type ObserveHandleCallback =
+  | "added"
+  | "addedBefore"
+  | "changed"
+  | "movedBefore"
+  | "removed";
 
 /**
  * Allows multiple identical ObserveHandles to be driven by a single observe driver.
@@ -29,8 +34,12 @@ export class ObserveMultiplexer {
     if (ordered === undefined) throw Error("must specify ordered");
 
     // @ts-ignore
-    Package['facts-base'] && Package['facts-base']
-        .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", 1);
+    Package["facts-base"] &&
+      Package["facts-base"].Facts.incrementServerFact(
+        "mongo-livedata",
+        "observe-multiplexers",
+        1
+      );
 
     this._ordered = ordered;
     this._onStop = onStop;
@@ -38,12 +47,14 @@ export class ObserveMultiplexer {
     this._handles = {};
     this._resolver = null;
     this._isReady = false;
-    this._readyPromise = new Promise(r => this._resolver = r).then(() => this._isReady = true);
+    this._readyPromise = new Promise((r) => (this._resolver = r)).then(
+      () => (this._isReady = true)
+    );
     // @ts-ignore
     this._cache = new LocalCollection._CachingChangeObserver({ ordered });
     this._addHandleTasksScheduledButNotPerformed = 0;
 
-    this.callbackNames().forEach(callbackName => {
+    this.callbackNames().forEach((callbackName) => {
       (this as any)[callbackName] = (...args: any[]) => {
         this._applyCallback(callbackName, args);
       };
@@ -58,14 +69,19 @@ export class ObserveMultiplexer {
     ++this._addHandleTasksScheduledButNotPerformed;
 
     // @ts-ignore
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-      "mongo-livedata", "observe-handles", 1);
+    Package["facts-base"] &&
+      Package["facts-base"].Facts.incrementServerFact(
+        "mongo-livedata",
+        "observe-handles",
+        1
+      );
 
     await this._queue.runTask(async () => {
       this._handles![handle._id] = handle;
       await this._sendAdds(handle);
       --this._addHandleTasksScheduledButNotPerformed;
     });
+
     await this._readyPromise;
   }
 
@@ -76,11 +92,17 @@ export class ObserveMultiplexer {
     delete this._handles![id];
 
     // @ts-ignore
-    Package['facts-base'] && Package['facts-base'].Facts.incrementServerFact(
-      "mongo-livedata", "observe-handles", -1);
+    Package["facts-base"] &&
+      Package["facts-base"].Facts.incrementServerFact(
+        "mongo-livedata",
+        "observe-handles",
+        -1
+      );
 
-    if (isEmpty(this._handles) &&
-      this._addHandleTasksScheduledButNotPerformed === 0) {
+    if (
+      isEmpty(this._handles) &&
+      this._addHandleTasksScheduledButNotPerformed === 0
+    ) {
       await this._stop();
     }
   }
@@ -92,8 +114,12 @@ export class ObserveMultiplexer {
     await this._onStop();
 
     // @ts-ignore
-    Package['facts-base'] && Package['facts-base']
-        .Facts.incrementServerFact("mongo-livedata", "observe-multiplexers", -1);
+    Package["facts-base"] &&
+      Package["facts-base"].Facts.incrementServerFact(
+        "mongo-livedata",
+        "observe-multiplexers",
+        -1
+      );
 
     this._handles = null;
   }
@@ -144,8 +170,11 @@ export class ObserveMultiplexer {
       if (!this._handles) return;
 
       await this._cache.applyChange[callbackName].apply(null, args);
-      if (!this._ready() &&
-        (callbackName !== 'added' && callbackName !== 'addedBefore')) {
+      if (
+        !this._ready() &&
+        callbackName !== "added" &&
+        callbackName !== "addedBefore"
+      ) {
         throw new Error(`Got ${callbackName} during initial adds`);
       }
 
@@ -158,10 +187,12 @@ export class ObserveMultiplexer {
 
         if (!callback) continue;
 
-        handle.initialAddsSent.then(callback.apply(
-          null,
-          handle.nonMutatingCallbacks ? args : EJSON.clone(args)
-        ))
+        handle.initialAddsSent.then(
+          callback.apply(
+            null,
+            handle.nonMutatingCallbacks ? args : EJSON.clone(args)
+          )
+        );
       }
     });
   }
@@ -170,24 +201,31 @@ export class ObserveMultiplexer {
     const add = this._ordered ? handle._addedBefore : handle._added;
     if (!add) return;
 
-    const addPromises: Promise<void>[] = [];
+    const addPromises: (Promise<void> | void)[] = [];
 
+    // note: docs may be an _IdMap or an OrderedDict
     this._cache.docs.forEach((doc: any, id: string) => {
       if (!(handle._id in this._handles!)) {
         throw Error("handle got removed before sending initial adds!");
       }
 
-      const { _id, ...fields } = handle.nonMutatingCallbacks ? doc : EJSON.clone(doc);
+      const { _id, ...fields } = handle.nonMutatingCallbacks
+        ? doc
+        : EJSON.clone(doc);
 
-      const promise = this._ordered ?
-        add(id, fields, null) :
-        add(id, fields);
+      const promise = this._ordered ? add(id, fields, null) : add(id, fields);
 
       addPromises.push(promise);
     });
 
-    await Promise.all(addPromises);
+    await Promise.allSettled(addPromises).then((p) => {
+      p.forEach((result) => {
+        if (result.status === "rejected") {
+          console.error(`Error in adds for handle: ${result.reason}`);
+        }
+      });
+    });
 
     handle.initialAddsSentResolver();
   }
-}
\ No newline at end of file
+}
diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 9887344a07..3e40004aa0 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4504,13 +4504,9 @@ testAsyncMulti(
             throw new Error('Test error in observeChangesAsync');
           },
         });
-        try {
-          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
-        } catch (e) {
-          // Expected error from the observeChangesAsync callback
-          test.equal(e.message, 'Test error in observeChangesAsync');
-          resolve();
-        }
+        await Collection.insertAsync({ foo: { bar: 123 } });
+        test.equal(1,1); // ensure process did not crash
+        resolve();
       });
     },
 
@@ -4526,13 +4522,10 @@ testAsyncMulti(
             throw new Error('Test error in observeChangesAsync');
           },
         });
-        try {
-          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
-        } catch (e) {
-          // Expected error from the observeChangesAsync callback
-          test.equal(e.message, 'Test error in observeChangesAsync');
-          resolve();
-        }
+        await Collection.insertAsync({ foo: { bar: 123 } });
+        test.equal(1,1); // ensure process did not crash
+        resolve();
+
       });
     }
   ]
@@ -4543,23 +4536,18 @@ testAsyncMulti(
   [
     async (test) => {
       const Collection = new Mongo.Collection(
-        `observe_changes_error_async_method${test.runId()}`,
-        { resolverType: 'stub' }
+        `observe_changes_error_async_method${test.runId()}`
       );
 
       return new Promise(async (resolve) => {
-        const obs = await Collection.find({}).observe({
+        const obs = await Collection.find({}).observeChanges({
           async added(_id, fields) {
             throw new Error('Test error in observeChanges');
           },
         });
-        try {
-          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
-        } catch (e) {
-          // Expected error from the observeChanges callback
-          test.equal(e.message, 'Test error in observeChanges');
-          resolve();
-        }
+        await Collection.insertAsync({ foo: { bar: 123 } });
+        test.equal(1,1); // ensure process did not crash
+        resolve();
       });
     },
     async (test) => {
@@ -4569,18 +4557,14 @@ testAsyncMulti(
       );
 
       return new Promise(async (resolve) => {
-        const obs = await Collection.find({}).observe({
+        const obs = await Collection.find({}).observeChanges({
           added(newDocument) {
             throw new Error('Test error in observeChanges');
           },
         });
-        try {
-          await Collection.insertAsync({ _id: 'a', foo: { bar: 123 } });
-        } catch (e) {
-          // Expected error from the observeChanges callback
-          test.equal(e.message, 'Test error in observeChanges');
-          resolve();
-        }
+        await Collection.insertAsync({  foo: { bar: 123 } });
+        test.equal(1,1); // ensure process did not crash
+        resolve();
       });
     }
   ]

From aa1e6fba727301335830e5205907bc249b569be7 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 1 Aug 2025 00:15:43 -0300
Subject: [PATCH 10/45] dev: handled non promise cases

---
 packages/mongo/observe_multiplex.ts | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 4d85165122..2d40621bde 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -187,12 +187,20 @@ export class ObserveMultiplexer {
 
         if (!callback) continue;
 
-        handle.initialAddsSent.then(
-          callback.apply(
-            null,
-            handle.nonMutatingCallbacks ? args : EJSON.clone(args)
-          )
+        const p = callback.apply(
+          null,
+          handle.nonMutatingCallbacks ? args : EJSON.clone(args)
         );
+
+        if (p && Meteor._isPromise(p)) {
+          p.catch((error) => {
+            console.error(
+              `Error in observeChanges callback ${callbackName}:`,
+              error
+            );
+          });
+        }
+        handle.initialAddsSent.then(p);
       }
     });
   }
@@ -213,7 +221,14 @@ export class ObserveMultiplexer {
         ? doc
         : EJSON.clone(doc);
 
-      const promise = this._ordered ? add(id, fields, null) : add(id, fields);
+      const promise = new Promise<void>((resolve, reject) => {
+        try {
+          const r = this._ordered ? add(id, fields, null) : add(id, fields);
+          resolve(r);
+        } catch (error) {
+          reject(error);
+        }
+      });
 
       addPromises.push(promise);
     });

From 3fa9188e125dcb11c542d191b8c542c6cdeed221 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 1 Aug 2025 00:22:37 -0300
Subject: [PATCH 11/45] DEV: it does not make sense test this case for
 observeChanges(sync)

---
 packages/mongo/tests/mongo_livedata_tests.js | 39 --------------------
 1 file changed, 39 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 3e40004aa0..89b1624992 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4531,45 +4531,6 @@ testAsyncMulti(
   ]
 );
 
-testAsyncMulti(
-  "mongo-livedata - observeChanges callback errors should not crash the process",
-  [
-    async (test) => {
-      const Collection = new Mongo.Collection(
-        `observe_changes_error_async_method${test.runId()}`
-      );
-
-      return new Promise(async (resolve) => {
-        const obs = await Collection.find({}).observeChanges({
-          async added(_id, fields) {
-            throw new Error('Test error in observeChanges');
-          },
-        });
-        await Collection.insertAsync({ foo: { bar: 123 } });
-        test.equal(1,1); // ensure process did not crash
-        resolve();
-      });
-    },
-    async (test) => {
-      const Collection = new Mongo.Collection(
-        `observe_changes_error_sync_method${test.runId()}`,
-        { resolverType: 'stub' }
-      );
-
-      return new Promise(async (resolve) => {
-        const obs = await Collection.find({}).observeChanges({
-          added(newDocument) {
-            throw new Error('Test error in observeChanges');
-          },
-        });
-        await Collection.insertAsync({  foo: { bar: 123 } });
-        test.equal(1,1); // ensure process did not crash
-        resolve();
-      });
-    }
-  ]
-);
-
 Meteor.methods({
   [`methodThrowException`]: async () => {
     if (Meteor.isClient) {

From a498eb002b02c63540cddd4ac38a2f997afe924b Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Fri, 1 Aug 2025 10:43:10 -0300
Subject: [PATCH 12/45] DEV: removed unused constant

---
 packages/mongo/tests/mongo_livedata_tests.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 89b1624992..3f68300739 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4499,7 +4499,7 @@ testAsyncMulti(
       );
 
       return new Promise(async (resolve) => {
-        const obs = await Collection.find({}).observeChangesAsync({
+        await Collection.find({}).observeChangesAsync({
           async added(_id, fields) {
             throw new Error('Test error in observeChangesAsync');
           },
@@ -4517,7 +4517,7 @@ testAsyncMulti(
       );
 
       return new Promise(async (resolve) => {
-        const obs = await Collection.find({}).observeChangesAsync({
+        await Collection.find({}).observeChangesAsync({
           added(newDocument) {
             throw new Error('Test error in observeChangesAsync');
           },

From 986dd0b51ad4a0571a226814b785f83928bc6aec Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Aug 2025 19:58:39 -0300
Subject: [PATCH 13/45] DEV: updated variable name

---
 packages/mongo/observe_multiplex.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/mongo/observe_multiplex.ts b/packages/mongo/observe_multiplex.ts
index 2d40621bde..1aec5ede95 100644
--- a/packages/mongo/observe_multiplex.ts
+++ b/packages/mongo/observe_multiplex.ts
@@ -187,20 +187,20 @@ export class ObserveMultiplexer {
 
         if (!callback) continue;
 
-        const p = callback.apply(
+        const result = callback.apply(
           null,
           handle.nonMutatingCallbacks ? args : EJSON.clone(args)
         );
 
-        if (p && Meteor._isPromise(p)) {
-          p.catch((error) => {
+        if (result && Meteor._isPromise(result)) {
+          result.catch((error) => {
             console.error(
               `Error in observeChanges callback ${callbackName}:`,
               error
             );
           });
         }
-        handle.initialAddsSent.then(p);
+        handle.initialAddsSent.then(result);
       }
     });
   }

From d1e879935f81d8b4b9d30fd372f1d4e7d3103162 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Aug 2025 19:59:10 -0300
Subject: [PATCH 14/45] DEV: changed how test runs

---
 packages/mongo/tests/mongo_livedata_tests.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 3f68300739..f8ac17b5df 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4498,16 +4498,17 @@ testAsyncMulti(
         { resolverType: 'stub' }
       );
 
-      return new Promise(async (resolve) => {
-        await Collection.find({}).observeChangesAsync({
-          async added(_id, fields) {
-            throw new Error('Test error in observeChangesAsync');
-          },
-        });
-        await Collection.insertAsync({ foo: { bar: 123 } });
-        test.equal(1,1); // ensure process did not crash
-        resolve();
+      let insertId;
+      await Collection.find({}).observeChangesAsync({
+        async added(_id, fields) {
+          insertId = _id;
+          throw new Error('Test error in async added observeChangesAsync');
+        },
       });
+
+      return Collection.insertAsync({ foo: { bar: 123 } }).finally((id, bad) => {
+        test.equal(insertId, id);
+      })
     },
 
     async (test) => {

From 643aab36f6c47745f883ffcc3d6748d1a590a513 Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Aug 2025 19:59:22 -0300
Subject: [PATCH 15/45] DEV: updated both tests

---
 packages/mongo/tests/mongo_livedata_tests.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index f8ac17b5df..e3b70f8626 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4517,17 +4517,17 @@ testAsyncMulti(
         { resolverType: 'stub' }
       );
 
-      return new Promise(async (resolve) => {
-        await Collection.find({}).observeChangesAsync({
-          added(newDocument) {
-            throw new Error('Test error in observeChangesAsync');
-          },
-        });
-        await Collection.insertAsync({ foo: { bar: 123 } });
-        test.equal(1,1); // ensure process did not crash
-        resolve();
-
+      let insertId;
+      await Collection.find({}).observeChangesAsync({
+        added(id) {
+          insertId = _id;
+          throw new Error('Test error in sync added observeChangesAsync');
+        },
       });
+
+      return Collection.insertAsync({ foo: { bar: 123 } }).finally((id, bad) => {
+        test.equal(insertId, id);
+      })
     }
   ]
 );

From 4e5e9a68b499b74530cd797ce03b68ad75c006ca Mon Sep 17 00:00:00 2001
From: Gabriel Grubba <gabriel@discourse.org>
Date: Wed, 13 Aug 2025 19:59:36 -0300
Subject: [PATCH 16/45] DEV: tests should only run in server

---
 packages/mongo/tests/mongo_livedata_tests.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index e3b70f8626..5a8ca22ee2 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4489,7 +4489,7 @@ testAsyncMulti(
 );
 
 
-testAsyncMulti(
+Meteor.isServer && testAsyncMulti(
   "mongo-livedata - observeChangesAsync callback errors should not crash the process",
   [
     async (test) => {

From 998f2036a070159ee3a973b18375e13bb4b5a3cb Mon Sep 17 00:00:00 2001
From: graemepyle <graeme@graemep.me>
Date: Sat, 26 Jul 2025 15:01:26 +0400
Subject: [PATCH 17/45] Enable modern browser support for Cordova unless
 explicitly disabled

---
 packages/babel-compiler/babel-compiler.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index 10749cd588..a4d039b9c4 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -263,6 +263,11 @@ BCp.processOneFileForTarget = function (inputFile, source) {
       features.nodeMajorVersion = parseInt(process.versions.node, 10);
     } else if (arch === "web.browser") {
       features.modernBrowsers = true;
+    } else if (arch === "web.cordova") {
+
+      if (process.env["METEOR_CORDOVA_DISABLE_MODERN_BROWSERS"] != "Y")
+        features.modernBrowsers = true;
+
     }
 
     features.topLevelAwait = inputFile.supportsTopLevelAwait &&

From edc45a176c222c7186913dc3d3d4e8265ea1d93d Mon Sep 17 00:00:00 2001
From: graemepyle <graeme@graemep.me>
Date: Sat, 26 Jul 2025 17:57:54 +0400
Subject: [PATCH 18/45] Update the Cordova docs to include the change to modern
 browsers.

---
 v3-docs/docs/about/cordova.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/v3-docs/docs/about/cordova.md b/v3-docs/docs/about/cordova.md
index db3c359044..b17161ac1b 100644
--- a/v3-docs/docs/about/cordova.md
+++ b/v3-docs/docs/about/cordova.md
@@ -261,3 +261,13 @@ After building your Cordova project with Meteor, you can use **Android Studio**
 5. Go to **Product > Archive** to create an archive of your app
 6. In the **Organizer** window, click **Distribute App** and follow the prompts to configure signing and export the IPA file.
 7. Upload the IPA file to the App Store or distribute via TestFlight.
+
+# Legacy device support
+
+Meteor distinguishes between legacy and modern browsers - see the [modern browsers package](../packages/modern-browsers). Web apps include different code bundles for each, but Cordova apps only have a single code bundle. From Meteor 3.4 onwards, the default code bundle changed from legacy to modern.
+
+You can force Meteor to use the legacy browser code bundle by setting the environment variable `METEOR_CORDOVA_DISABLE_MODERN_BROWSERS` to `Y` when running or building your app. For example:
+
+```METEOR_CORDOVA_DISABLE_MODERN_BROWSERS=Y meteor run ios```
+
+Both the App Store and Google Play will only publish new and updated apps for a certain minimum mobile OS version. As of 2025, these minimum OS versions support the  modern browser code bundle. 

From 278bcb2b69071fb7b87acbcfd4619f903945db11 Mon Sep 17 00:00:00 2001
From: graemepyle <graeme@graemep.me>
Date: Thu, 7 Aug 2025 14:29:43 +0400
Subject: [PATCH 19/45] Switch to getting Cordova modern browsers flag from
 package.json instead of env var

---
 packages/babel-compiler/babel-compiler.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js
index a4d039b9c4..5606e78665 100644
--- a/packages/babel-compiler/babel-compiler.js
+++ b/packages/babel-compiler/babel-compiler.js
@@ -264,10 +264,7 @@ BCp.processOneFileForTarget = function (inputFile, source) {
     } else if (arch === "web.browser") {
       features.modernBrowsers = true;
     } else if (arch === "web.cordova") {
-
-      if (process.env["METEOR_CORDOVA_DISABLE_MODERN_BROWSERS"] != "Y")
-        features.modernBrowsers = true;
-
+      features.modernBrowsers = ! getMeteorConfig()?.cordova?.disableModern;
     }
 
     features.topLevelAwait = inputFile.supportsTopLevelAwait &&

From 05d8363841ccfefe973d25d30a09ed9945fe074a Mon Sep 17 00:00:00 2001
From: graemepyle <graeme@graemep.me>
Date: Thu, 7 Aug 2025 14:32:05 +0400
Subject: [PATCH 20/45] Fix doco to say the change will be effective from
 Meteor 3.3.2. I don't know where I got 3.4 from.

---
 v3-docs/docs/about/cordova.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/about/cordova.md b/v3-docs/docs/about/cordova.md
index b17161ac1b..b3336ae648 100644
--- a/v3-docs/docs/about/cordova.md
+++ b/v3-docs/docs/about/cordova.md
@@ -264,7 +264,7 @@ After building your Cordova project with Meteor, you can use **Android Studio**
 
 # Legacy device support
 
-Meteor distinguishes between legacy and modern browsers - see the [modern browsers package](../packages/modern-browsers). Web apps include different code bundles for each, but Cordova apps only have a single code bundle. From Meteor 3.4 onwards, the default code bundle changed from legacy to modern.
+Meteor distinguishes between legacy and modern browsers - see the [modern browsers package](../packages/modern-browsers). Web apps include different code bundles for each, but Cordova apps only have a single code bundle. From Meteor 3.3.2 onwards, the default code bundle changed from legacy to modern.
 
 You can force Meteor to use the legacy browser code bundle by setting the environment variable `METEOR_CORDOVA_DISABLE_MODERN_BROWSERS` to `Y` when running or building your app. For example:
 

From da936d38521574e9cbca6d132573a42b95790410 Mon Sep 17 00:00:00 2001
From: graemepyle <graeme@graemep.me>
Date: Thu, 7 Aug 2025 14:35:43 +0400
Subject: [PATCH 21/45] Update the docs to reflect the change to fetching the
 modern browser setting from package.json instead of an environment variable.

---
 v3-docs/docs/about/cordova.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/v3-docs/docs/about/cordova.md b/v3-docs/docs/about/cordova.md
index b3336ae648..362ba86f26 100644
--- a/v3-docs/docs/about/cordova.md
+++ b/v3-docs/docs/about/cordova.md
@@ -266,8 +266,14 @@ After building your Cordova project with Meteor, you can use **Android Studio**
 
 Meteor distinguishes between legacy and modern browsers - see the [modern browsers package](../packages/modern-browsers). Web apps include different code bundles for each, but Cordova apps only have a single code bundle. From Meteor 3.3.2 onwards, the default code bundle changed from legacy to modern.
 
-You can force Meteor to use the legacy browser code bundle by setting the environment variable `METEOR_CORDOVA_DISABLE_MODERN_BROWSERS` to `Y` when running or building your app. For example:
+You can force Meteor to use the legacy browser code bundle by setting the variable `cordova.disableModern` to `true` in `package.json` when running or building your app. For example:
 
-```METEOR_CORDOVA_DISABLE_MODERN_BROWSERS=Y meteor run ios```
+```
+  "meteor": {
+    "mainModule": { ... },
+    "testModule": { ... },
+    "cordova": { "disableModern":  true}
+  }
+```
 
 Both the App Store and Google Play will only publish new and updated apps for a certain minimum mobile OS version. As of 2025, these minimum OS versions support the  modern browser code bundle. 

From d1f02f9bec5fead9f8afe71389b0caa108a3adb3 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Fri, 15 Aug 2025 19:15:00 -0300
Subject: [PATCH 22/45] DEV: add user lookup methods for email and username

---
 packages/accounts-base/server_main.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/accounts-base/server_main.js b/packages/accounts-base/server_main.js
index dde1781f82..53086e529a 100644
--- a/packages/accounts-base/server_main.js
+++ b/packages/accounts-base/server_main.js
@@ -7,6 +7,30 @@ import { AccountsServer } from "./accounts_server.js";
 Accounts = new AccountsServer(Meteor.server, { ...Meteor.settings.packages?.accounts, ...Meteor.settings.packages?.['accounts-base'] });
 // TODO[FIBERS]: I need TLA
 Accounts.init().then();
+
+/**
+ * @summary Find a user by one of their email addresses.
+ * @locus Server
+ * @param {String} email The email address to look for
+ * @param {Object} [options]
+ * @param {Object} options.fields Limit the fields to return from the user document
+ * @returns {Promise<Object>} A user if found, else null
+ * @memberof Accounts
+ * @importFromPackage accounts-base
+ */
+Accounts.findUserByEmail = Accounts.findUserByEmail;
+
+/**
+ * @summary Find a user by their username.
+ * @locus Server
+ * @param {String} username The username to look for
+ * @param {Object} [options]
+ * @param {Object} options.fields Limit the fields to return from the user document
+ * @returns {Promise<Object>} A user if found, else null
+ * @memberof Accounts
+ * @importFromPackage accounts-base
+ */
+Accounts.findUserByUsername = Accounts.findUserByUsername;
 // Users table. Don't use the normal autopublish, since we want to hide
 // some fields. Code to autopublish this is in accounts_server.js.
 // XXX Allow users to configure this collection name.

From 4e608f94bdcdff3daec8acff2ccda8b10f922605 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 18 Aug 2025 11:21:56 -0300
Subject: [PATCH 23/45] fix: correct assignment of findUserByEmail to use
 AccountsServer method

---
 packages/accounts-base/server_main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/server_main.js b/packages/accounts-base/server_main.js
index 53086e529a..02b2419e69 100644
--- a/packages/accounts-base/server_main.js
+++ b/packages/accounts-base/server_main.js
@@ -18,7 +18,7 @@ Accounts.init().then();
  * @memberof Accounts
  * @importFromPackage accounts-base
  */
-Accounts.findUserByEmail = Accounts.findUserByEmail;
+Accounts.findUserByEmail = AccountsServer.findUserByEmail;
 
 /**
  * @summary Find a user by their username.

From 4fa26b8c085eb1d1084b4aa2fe787e80a942160f Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 19 Aug 2025 09:25:20 -0300
Subject: [PATCH 24/45] DEV: update Accounts namespace to directly reference
 user lookup methods in AccountsServer

---
 packages/accounts-base/accounts_server.js |  2 ++
 packages/accounts-base/server_main.js     | 23 -----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index 3c3ac12e16..d88a231e18 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -345,6 +345,7 @@ export class AccountsServer extends AccountsCommon {
    * @param {Object} [options]
    * @param {Object} options.fields Limit the fields to return from the user document
    * @returns {Promise<Object>} A user if found, else null
+   * @memberof Accounts
    * @importFromPackage accounts-base
    */
   findUserByEmail = async (email, options) =>
@@ -357,6 +358,7 @@ export class AccountsServer extends AccountsCommon {
    * @param {Object} [options]
    * @param {Object} options.fields Limit the fields to return from the user document
    * @returns {Promise<Object>} A user if found, else null
+   * @memberof Accounts
    * @importFromPackage accounts-base
    */
   findUserByUsername = async (username, options) =>
diff --git a/packages/accounts-base/server_main.js b/packages/accounts-base/server_main.js
index 02b2419e69..a9ed15c950 100644
--- a/packages/accounts-base/server_main.js
+++ b/packages/accounts-base/server_main.js
@@ -8,29 +8,6 @@ Accounts = new AccountsServer(Meteor.server, { ...Meteor.settings.packages?.acco
 // TODO[FIBERS]: I need TLA
 Accounts.init().then();
 
-/**
- * @summary Find a user by one of their email addresses.
- * @locus Server
- * @param {String} email The email address to look for
- * @param {Object} [options]
- * @param {Object} options.fields Limit the fields to return from the user document
- * @returns {Promise<Object>} A user if found, else null
- * @memberof Accounts
- * @importFromPackage accounts-base
- */
-Accounts.findUserByEmail = AccountsServer.findUserByEmail;
-
-/**
- * @summary Find a user by their username.
- * @locus Server
- * @param {String} username The username to look for
- * @param {Object} [options]
- * @param {Object} options.fields Limit the fields to return from the user document
- * @returns {Promise<Object>} A user if found, else null
- * @memberof Accounts
- * @importFromPackage accounts-base
- */
-Accounts.findUserByUsername = Accounts.findUserByUsername;
 // Users table. Don't use the normal autopublish, since we want to hide
 // some fields. Code to autopublish this is in accounts_server.js.
 // XXX Allow users to configure this collection name.

From f90b37c9bbb408bd2ab462f7ed0cc39ebda59f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Fri, 22 Aug 2025 10:44:57 +0200
Subject: [PATCH 25/45] use common helper to detect promises

---
 packages/accounts-base/accounts_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index d88a231e18..6f0ba2098e 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -86,7 +86,7 @@ export class AccountsServer extends AccountsCommon {
 
     // Helper function to resolve promises if needed
     this._resolvePromise = async (value) => {
-      return value instanceof Promise ? await value : value;
+      return Meteor._isPromise(value) ? await value : value;
     };
 
     this.urls = {

From 5730e44f7ff8151286b7d72177e985f92d079f40 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 12 Aug 2025 03:44:49 -0300
Subject: [PATCH 26/45] Add early validation for query selectors in
 MongoConnection

---
 packages/mongo/mongo_connection.js | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index b093bcfa00..98ecad6b32 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -850,6 +850,9 @@ Object.assign(MongoConnection.prototype, {
     const oplogOptions = self?._oplogHandle?._oplogOptions || {};
     const { includeCollections, excludeCollections } = oplogOptions;
     if (firstHandle) {
+      // Validate query selector to catch MongoDB errors early
+      new Minimongo.Matcher(cursorDescription.selector);
+
       var matcher, sorter;
       var canUseOplog = [
         function () {
@@ -878,21 +881,6 @@ Object.assign(MongoConnection.prototype, {
           }
           return true;
         },
-        function () {
-          // We need to be able to compile the selector. Fall back to polling for
-          // some newfangled $selector that minimongo doesn't support yet.
-          try {
-            matcher = new Minimongo.Matcher(cursorDescription.selector);
-            return true;
-          } catch (e) {
-            // XXX make all compilation errors MinimongoError or something
-            //     so that this doesn't ignore unrelated exceptions
-            if (e instanceof MiniMongoQueryError) {
-              throw e;
-            }
-            return false;
-          }
-        },
         function () {
           // ... and the selector itself needs to support oplog.
           return OplogObserveDriver.cursorSupported(cursorDescription, matcher);

From 5050c00b80356d040b85952e5d52ffe11f8fb1b6 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 12 Aug 2025 12:17:19 -0300
Subject: [PATCH 27/45] Remove early validation of query selector in
 MongoConnection to streamline cursor handling

---
 packages/mongo/mongo_connection.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index 98ecad6b32..0bba18e881 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -850,8 +850,6 @@ Object.assign(MongoConnection.prototype, {
     const oplogOptions = self?._oplogHandle?._oplogOptions || {};
     const { includeCollections, excludeCollections } = oplogOptions;
     if (firstHandle) {
-      // Validate query selector to catch MongoDB errors early
-      new Minimongo.Matcher(cursorDescription.selector);
 
       var matcher, sorter;
       var canUseOplog = [

From 4ab4396045125753a35473f184b5e5ab1346cab2 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 12 Aug 2025 12:23:21 -0300
Subject: [PATCH 28/45] Add error handling for selector compilation in
 MongoConnection

---
 packages/mongo/mongo_connection.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index 0bba18e881..ab6eb52653 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -879,6 +879,18 @@ Object.assign(MongoConnection.prototype, {
           }
           return true;
         },
+        function () {
+          // We need to be able to compile the selector. Fall back to polling for
+          // some newfangled $selector that minimongo doesn't support yet.
+          try {
+            matcher = new Minimongo.Matcher(cursorDescription.selector);
+            return true;
+          } catch (e) {
+            // XXX make all compilation errors MinimongoError or something
+            //     so that this doesn't ignore unrelated exceptions
+            return false;
+          }
+        },
         function () {
           // ... and the selector itself needs to support oplog.
           return OplogObserveDriver.cursorSupported(cursorDescription, matcher);

From 5e230cc57ffebdb49d275ad3979e22b57eb91361 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 18 Aug 2025 19:34:57 -0300
Subject: [PATCH 29/45] Add tests for $geoIntersects operator and improve error
 handling in Minimongo

---
 packages/minimongo/minimongo_tests.js         | 28 ++++++++++
 packages/mongo/mongo_connection.js            |  3 ++
 packages/mongo/tests/mongo_livedata_tests.js  | 54 +++++++++++++++++++
 packages/mongo/tests/observe_changes_tests.js | 13 ++---
 4 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 9f16b1c9a3..9801384815 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -58,3 +58,31 @@ Tinytest.add('minimongo - wrapTransform', test => {
   });
   handle.stop();
 });
+
+if (Meteor.isClient) {
+  Tinytest.add('minimongo - $geoIntersects should throw error', function(test) {
+    const collection = new LocalCollection();
+    collection.insert({ _id: 'a', loc: { type: 'Point', coordinates: [0, 0] } });
+
+    const query = {
+      loc: {
+        $geoIntersects: {
+          $geometry: {
+            type: 'Polygon',
+            coordinates: [
+              [
+                [0, 0], [0, 1], [1, 1], [1, 0], [0, 0]
+              ]
+            ]
+          }
+        }
+      }
+    };
+
+    test.throws(
+      () => collection.findOne(query),
+      /Unrecognized operator: \$geoIntersects/,
+      'Should throw error for $geoIntersects in Minimongo'
+    );
+  });
+}
\ No newline at end of file
diff --git a/packages/mongo/mongo_connection.js b/packages/mongo/mongo_connection.js
index ab6eb52653..c0aace0973 100644
--- a/packages/mongo/mongo_connection.js
+++ b/packages/mongo/mongo_connection.js
@@ -888,6 +888,9 @@ Object.assign(MongoConnection.prototype, {
           } catch (e) {
             // XXX make all compilation errors MinimongoError or something
             //     so that this doesn't ignore unrelated exceptions
+            if (Meteor.isClient && e instanceof MiniMongoQueryError) {
+              throw e;
+            }
             return false;
           }
         },
diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 5a8ca22ee2..e8322229bc 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4559,3 +4559,57 @@ Tinytest.addAsync(
     }
   },
 );
+
+const geoPolygonSchema = {
+  type: 'Polygon',
+  coordinates: Match.Where(coords =>
+    Array.isArray(coords) &&
+    coords.length > 0 &&
+    coords.every(
+      ring => Array.isArray(ring) && ring.every(
+        point => Array.isArray(point) && point.length === 2 &&
+          typeof point[0] === 'number' && typeof point[1] === 'number'
+      )
+    )
+  )
+};
+
+if(Meteor.isServer) {
+  Meteor.publish('testGeoPolygon', function(viewport) {
+    check(viewport, Match.ObjectIncluding({ bounds: geoPolygonSchema }));
+    // return an empty collection for the test
+    return new Mongo.Collection('test').find();
+  });
+}
+
+Tinytest.addAsync('mongo-livedata - publish with geoPolygonSchema does not throw', async function(test, onComplete) {
+    if (Meteor.isClient) {
+      // Simulate valid viewport
+      const viewport = {
+        bounds: {
+          type: 'Polygon',
+          coordinates: [
+            [
+              [0, 0], [0, 1], [1, 1], [1, 0], [0, 0]
+            ]
+          ]
+        }
+      };
+      let error = null;
+      try {
+        await new Promise((resolve) => {
+          Meteor.subscribe('testGeoPolygon', viewport, {
+            onReady: resolve,
+            onError: function(e) {
+              error = e;
+              resolve();
+            }
+          });
+        });
+      } catch (e) {
+        error = e;
+      }
+      test.isNull(error, 'shouldnt throw error for valid viewport');
+    }
+    onComplete();
+});
diff --git a/packages/mongo/tests/observe_changes_tests.js b/packages/mongo/tests/observe_changes_tests.js
index 0fe94d2ebf..8dd50eed5d 100644
--- a/packages/mongo/tests/observe_changes_tests.js
+++ b/packages/mongo/tests/observe_changes_tests.js
@@ -545,6 +545,7 @@ if (Meteor.isServer) {
 }
 
 
+// Those errors should throw since mongo doent support {$in: null}
 testAsyncMulti("observeChanges - bad query", [
   async function (test, expect) {
     var c = makeCollection();
@@ -563,15 +564,9 @@ testAsyncMulti("observeChanges - bad query", [
       return;
     }
 
-    const p1 = new Promise(r => {
-      observeThrows().finally(() => r());
-    });
-    const p2 = new Promise(r => {
-      observeThrows().finally(() => r());
-    });
-
-    await p1;
-    await p2;
+    await test.throwsAsync(async function () {
+        await c.find({__id: {$in: null}}).countAsync();
+    }, '$in needs an array');
   }
 ]);
 

From 56bf338de500abe6de4df65444a9b8352b9bae2f Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 18 Aug 2025 20:10:51 -0300
Subject: [PATCH 30/45] Add debug logging for error handling in
 geoPolygonSchema test

---
 packages/mongo/tests/mongo_livedata_tests.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index e8322229bc..5cc520d835 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4607,6 +4607,7 @@ Tinytest.addAsync('mongo-livedata - publish with geoPolygonSchema does not throw
           });
         });
       } catch (e) {
+        console.log('ERRO-DEBUG]', e);
         error = e;
       }
       test.isNull(error, 'shouldnt throw error for valid viewport');

From cd8f247d0ccdd916e67e9a86d7f381067c11754e Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 18 Aug 2025 20:55:15 -0300
Subject: [PATCH 31/45] Refactor error handling in geoPolygonSchema test to
 assert null error instead of using console log

---
 packages/mongo/tests/mongo_livedata_tests.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 5cc520d835..100c088645 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4607,10 +4607,9 @@ Tinytest.addAsync('mongo-livedata - publish with geoPolygonSchema does not throw
           });
         });
       } catch (e) {
-        console.log('ERRO-DEBUG]', e);
         error = e;
       }
-      test.isNull(error, 'shouldnt throw error for valid viewport');
+      test.equal(error, null)
     }
     onComplete();
 });

From 758d1715aec471df8ce5fd9479652be8232ec054 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 19 Aug 2025 10:10:11 -0300
Subject: [PATCH 32/45] Update testGeoPolygon publication to return a
 collection with a random ID

---
 packages/mongo/tests/mongo_livedata_tests.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 100c088645..635ba386f0 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4578,7 +4578,8 @@ if(Meteor.isServer) {
   Meteor.publish('testGeoPolygon', function(viewport) {
     check(viewport, Match.ObjectIncluding({ bounds: geoPolygonSchema }));
     // return an empty collection for the test
-    return new Mongo.Collection('test').find();
+    const randomId = Random.id();
+    return new Mongo.Collection(randomId).find();
   });
 }
 

From b5c9644382eeb210381bb3d7c93cf07aa8d08da5 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 19 Aug 2025 10:48:04 -0300
Subject: [PATCH 33/45] Add publication and test for  in mongo-livedata

---
 packages/mongo/tests/mongo_livedata_tests.js | 54 +++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 635ba386f0..7a72b27129 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4583,9 +4583,61 @@ if(Meteor.isServer) {
   });
 }
 
+if (Meteor.isServer) {
+  Meteor.publish('testGeoIntersects', function(viewport) {
+    check(viewport, Match.ObjectIncluding({ bounds: geoPolygonSchema }));
+    const Features = new Mongo.Collection('Features_' + this.connection.id);
+    return Features.find({
+      hull: { $geoIntersects: { $geometry: viewport.bounds } },
+    });
+  });
+}
+
+Tinytest.addAsync('mongo-livedata - publish with $geoIntersects returns correct docs', async function(test, onComplete) {
+  if (Meteor.isServer) {
+    const Features = new Mongo.Collection('Features_' + Random.id());
+    const insidePoly = {
+      _id: 'inside',
+      hull: {
+        type: 'Polygon',
+        coordinates: [
+          [ [0.2,0.2], [0.2,0.8], [0.8,0.8], [0.8,0.2], [0.2,0.2] ]
+        ]
+      }
+    };
+    const outsidePoly = {
+      _id: 'outside',
+      hull: {
+        type: 'Polygon',
+        coordinates: [
+          [ [2,2], [2,3], [3,3], [3,2], [2,2] ]
+        ]
+      }
+    };
+    await Features.insertAsync(insidePoly);
+    await Features.insertAsync(outsidePoly);
+
+    const viewport = {
+      bounds: {
+        type: 'Polygon',
+        coordinates: [
+          [ [0,0], [0,1], [1,1], [1,0], [0,0] ]
+        ]
+      }
+    };
+    const cursor = Features.find({ hull: { $geoIntersects: { $geometry: viewport.bounds } } });
+    const docs = await cursor.fetchAsync();
+    test.equal(docs.length, 1);
+    test.equal(docs[0]._id, 'inside');
+    onComplete();
+  }
+  if (Meteor.isClient) {
+    onComplete();
+  }
+});
+
 Tinytest.addAsync('mongo-livedata - publish with geoPolygonSchema does not throw', async function(test, onComplete) {
     if (Meteor.isClient) {
-      // Simulate valid viewport
       const viewport = {
         bounds: {
           type: 'Polygon',

From 4f683252a928debeedc17b6bf1c18d0fed04e24c Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 19 Aug 2025 10:51:22 -0300
Subject: [PATCH 34/45] Refactor mongo-livedata tests for improved clarity and
 maintainability

---
 packages/mongo/tests/mongo_livedata_tests.js | 42 +-------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index 7a72b27129..aebec8c7ff 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4574,15 +4574,6 @@ const geoPolygonSchema = {
   )
 };
 
-if(Meteor.isServer) {
-  Meteor.publish('testGeoPolygon', function(viewport) {
-    check(viewport, Match.ObjectIncluding({ bounds: geoPolygonSchema }));
-    // return an empty collection for the test
-    const randomId = Random.id();
-    return new Mongo.Collection(randomId).find();
-  });
-}
-
 if (Meteor.isServer) {
   Meteor.publish('testGeoIntersects', function(viewport) {
     check(viewport, Match.ObjectIncluding({ bounds: geoPolygonSchema }));
@@ -4634,35 +4625,4 @@ Tinytest.addAsync('mongo-livedata - publish with $geoIntersects returns correct
   if (Meteor.isClient) {
     onComplete();
   }
-});
-
-Tinytest.addAsync('mongo-livedata - publish with geoPolygonSchema does not throw', async function(test, onComplete) {
-    if (Meteor.isClient) {
-      const viewport = {
-        bounds: {
-          type: 'Polygon',
-          coordinates: [
-            [
-              [0, 0], [0, 1], [1, 1], [1, 0], [0, 0]
-            ]
-          ]
-        }
-      };
-      let error = null;
-      try {
-        await new Promise((resolve) => {
-          Meteor.subscribe('testGeoPolygon', viewport, {
-            onReady: resolve,
-            onError: function(e) {
-              error = e;
-              resolve();
-            }
-          });
-        });
-      } catch (e) {
-        error = e;
-      }
-      test.equal(error, null)
-    }
-    onComplete();
-});
+});
\ No newline at end of file

From 6d2f4c52f76af7014fcf3b0a378fd706d23c4a47 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Tue, 19 Aug 2025 14:18:55 -0300
Subject: [PATCH 35/45] Remove server-side publication for 'testGeoIntersects'
 from geoPolygonSchema

---
 packages/mongo/tests/mongo_livedata_tests.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/mongo/tests/mongo_livedata_tests.js b/packages/mongo/tests/mongo_livedata_tests.js
index aebec8c7ff..af69aee7b4 100644
--- a/packages/mongo/tests/mongo_livedata_tests.js
+++ b/packages/mongo/tests/mongo_livedata_tests.js
@@ -4574,16 +4574,6 @@ const geoPolygonSchema = {
   )
 };
 
-if (Meteor.isServer) {
-  Meteor.publish('testGeoIntersects', function(viewport) {
-    check(viewport, Match.ObjectIncluding({ bounds: geoPolygonSchema }));
-    const Features = new Mongo.Collection('Features_' + this.connection.id);
-    return Features.find({
-      hull: { $geoIntersects: { $geometry: viewport.bounds } },
-    });
-  });
-}
-
 Tinytest.addAsync('mongo-livedata - publish with $geoIntersects returns correct docs', async function(test, onComplete) {
   if (Meteor.isServer) {
     const Features = new Mongo.Collection('Features_' + Random.id());

From 519fe862a49ae2768406e3810ebabb3b46282f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Italo=20Jos=C3=A9?= <italo.i@live.com>
Date: Fri, 22 Aug 2025 14:03:46 -0300
Subject: [PATCH 36/45] remove lodash.template dependency (#13898)

---
 packages/boilerplate-generator/package.js  |   5 +-
 packages/boilerplate-generator/template.js | 144 +++++++++++++++++++--
 2 files changed, 134 insertions(+), 15 deletions(-)

diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js
index b1bed1ae86..de1d8f8e40 100644
--- a/packages/boilerplate-generator/package.js
+++ b/packages/boilerplate-generator/package.js
@@ -1,11 +1,10 @@
 Package.describe({
   summary: "Generates the boilerplate html from program's manifest",
-  version: '2.0.1',
+  version: '2.0.2',
 });
 
 Npm.depends({
-  "combined-stream2": "1.1.2",
-  "lodash.template": "4.5.0"
+  "combined-stream2": "1.1.2"
 });
 
 Package.onUse(api => {
diff --git a/packages/boilerplate-generator/template.js b/packages/boilerplate-generator/template.js
index 5f38837c42..f1656bf16e 100644
--- a/packages/boilerplate-generator/template.js
+++ b/packages/boilerplate-generator/template.js
@@ -1,14 +1,134 @@
-import lodashTemplate from 'lodash.template';
+/**
+ * Internal full-featured implementation of lodash.template (inspired by v4.5.0)
+ * embedded to eliminate the external dependency while preserving functionality.
+ *
+ * MIT License (c) JS Foundation and other contributors <https://js.foundation/>
+ * Adapted for Meteor boilerplate-generator (only the pieces required by template were extracted).
+ */
 
-// As identified in issue #9149, when an application overrides the default
-// _.template settings using _.templateSettings, those new settings are
-// used anywhere _.template is used, including within the
-// boilerplate-generator. To handle this, _.template settings that have
-// been verified to work are overridden here on each _.template call.
-export default function template(text) {
-  return lodashTemplate(text, null, {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g,
+// ---------------------------------------------------------------------------
+// Utility & regex definitions (mirroring lodash pieces used by template)
+// ---------------------------------------------------------------------------
+
+const reEmptyStringLeading = /\b__p \+= '';/g;
+const reEmptyStringMiddle = /\b(__p \+=) '' \+/g;
+const reEmptyStringTrailing = /(__e\(.*?\)|\b__t\)) \+\n'';/g;
+
+const reEscape = /<%-([\s\S]+?)%>/g;              // escape delimiter
+const reEvaluate = /<%([\s\S]+?)%>/g;              // evaluate delimiter
+const reInterpolate = /<%=([\s\S]+?)%>/g;          // interpolate delimiter
+const reEsTemplate = /\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g; // ES6 template literal capture
+const reUnescapedString = /['\\\n\r\u2028\u2029]/g; // string literal escapes
+
+// HTML escape
+const htmlEscapes = { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' };
+const reHasUnescapedHtml = /[&<>"']/;
+
+function escapeHtml(string) {
+  return string && reHasUnescapedHtml.test(string)
+    ? string.replace(/[&<>"']/g, chr => htmlEscapes[chr])
+    : (string || '');
+}
+
+// Escape characters for inclusion into a string literal
+const escapes = { "'": "'", '\\': '\\', '\n': 'n', '\r': 'r', '\u2028': 'u2028', '\u2029': 'u2029' };
+function escapeStringChar(match) { return '\\' + escapes[match]; }
+
+// Basic Object helpers ------------------------------------------------------
+function isObject(value) { return value != null && typeof value === 'object'; }
+function toStringSafe(value) { return value == null ? '' : (value + ''); }
+function baseValues(object, props) { return props.map(k => object[k]); }
+
+
+function attempt(fn) {
+  try { return fn(); } catch (e) { return e; }
+}
+function isError(value) { return value instanceof Error || (isObject(value) && value.name === 'Error'); }
+
+
+// ---------------------------------------------------------------------------
+// Main template implementation
+// ---------------------------------------------------------------------------
+let templateCounter = -1; // used for sourceURL generation
+
+function _template(string) {
+  string = toStringSafe(string);
+
+  const imports = { '_': { escape: escapeHtml } };
+  const importKeys = Object.keys(imports);
+  const importValues = baseValues(imports, importKeys);
+
+  let index = 0;
+  let isEscaping;
+  let isEvaluating;
+  let source = "__p += '";
+
+
+  // Build combined regex of delimiters
+  const reDelimiters = RegExp(
+    reEscape.source + '|' +
+    reInterpolate.source + '|' +
+    reEsTemplate.source + '|' +
+    reEvaluate.source + '|$'
+  , 'g');
+
+  const sourceURL = `//# sourceURL=lodash.templateSources[${++templateCounter}]\n`;
+
+  // Tokenize
+  string.replace(reDelimiters, function(match, escapeValue, interpolateValue, esTemplateValue, evaluateValue, offset) {
+    interpolateValue || (interpolateValue = esTemplateValue);
+    // Append preceding string portion with escaped literal chars
+    source += string.slice(index, offset).replace(reUnescapedString, escapeStringChar);
+    if (escapeValue) {
+      isEscaping = true;
+      source += "' +\n__e(" + escapeValue + ") +\n'";
+    }
+    if (evaluateValue) {
+      isEvaluating = true;
+      source += "';\n" + evaluateValue + ";\n__p += '";
+    }
+    if (interpolateValue) {
+      source += "' +\n((__t = (" + interpolateValue + ")) == null ? '' : __t) +\n'";
+    }
+    index = offset + match.length;
+    return match;
   });
-};
\ No newline at end of file
+
+  source += "';\n";
+
+  source = 'with (obj) {\n' + source + '\n}\n';
+
+  // Remove unnecessary concatenations
+  source = (isEvaluating ? source.replace(reEmptyStringLeading, '') : source)
+    .replace(reEmptyStringMiddle, '$1')
+    .replace(reEmptyStringTrailing, '$1;');
+
+  // Frame as function body
+  source = 'function(obj) {\n' +
+    'obj || (obj = {});\n' +
+    "var __t, __p = ''" +
+    (isEscaping ? ', __e = _.escape' : '') +
+    (isEvaluating
+      ? ', __j = Array.prototype.join;\nfunction print() { __p += __j.call(arguments, \'\') }\n'
+      : ';\n'
+    ) +
+    source +
+    'return __p\n}';
+
+  // Actual compile step
+  const result = attempt(function() {
+    return Function(importKeys, sourceURL + 'return ' + source).apply(undefined, importValues); // eslint-disable-line no-new-func
+  });
+
+  if (isError(result)) {
+    result.source = source; // expose for debugging if error
+    throw result;
+  }
+  // Expose compiled source
+  result.source = source;
+  return result;
+}
+
+export default function template(text) {
+  return _template(text);
+}

From 40ab299fe864ead0ab5b86ede30966137c50df0e Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Wed, 27 Aug 2025 18:46:47 -0300
Subject: [PATCH 37/45] Bump package versions for accounts-base,
 accounts-password, accounts-passwordless, babel-compiler, minimongo, mongo,
 and npm-mongo

---
 packages/accounts-base/package.js         | 2 +-
 packages/accounts-password/package.js     | 2 +-
 packages/accounts-passwordless/package.js | 2 +-
 packages/babel-compiler/package.js        | 2 +-
 packages/minimongo/package.js             | 2 +-
 packages/mongo/package.js                 | 2 +-
 packages/npm-mongo/package.js             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
index 31711cdf33..4190011694 100644
--- a/packages/accounts-base/package.js
+++ b/packages/accounts-base/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "A user account system",
-  version: "3.1.1",
+  version: "3.1.2",
 });
 
 Package.onUse((api) => {
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 447bfbefc0..f41e5b8127 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -5,7 +5,7 @@ Package.describe({
   // 2.2.x in the future. The version was also bumped to 2.0.0 temporarily
   // during the Meteor 1.5.1 release process, so versions 2.0.0-beta.2
   // through -beta.5 and -rc.0 have already been published.
-  version: "3.2.0",
+  version: "3.2.1",
 });
 
 Npm.depends({
diff --git a/packages/accounts-passwordless/package.js b/packages/accounts-passwordless/package.js
index c9da46ee47..060171cd54 100644
--- a/packages/accounts-passwordless/package.js
+++ b/packages/accounts-passwordless/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'No-password login/sign-up support for accounts',
-  version: '3.0.1',
+  version: '3.0.2',
 });
 
 Package.onUse(api => {
diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js
index 4fdba21272..2e69cdc028 100644
--- a/packages/babel-compiler/package.js
+++ b/packages/babel-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: "babel-compiler",
   summary: "Parser/transpiler for ECMAScript 2015+ syntax",
-  version: '7.12.1',
+  version: '7.12.2',
 });
 
 Npm.depends({
diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
index d29b90c5ac..b3ff2000be 100644
--- a/packages/minimongo/package.js
+++ b/packages/minimongo/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
-  version: "2.0.3",
+  version: "2.0.4",
 });
 
 Package.onUse((api) => {
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index de5ab8e6f6..c0ff30242f 100644
--- a/packages/mongo/package.js
+++ b/packages/mongo/package.js
@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: "2.1.3",
+  version: "2.1.4",
 });
 
 Npm.depends({
diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js
index be29b54a9a..2c99201181 100644
--- a/packages/npm-mongo/package.js
+++ b/packages/npm-mongo/package.js
@@ -3,7 +3,7 @@
 
 Package.describe({
   summary: "Wrapper around the mongo npm package",
-  version: "6.16.0",
+  version: "6.16.1",
   documentation: null,
 });
 

From 9e5db613c461946a68771e96d3447801302ccc30 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 28 Aug 2025 10:19:41 -0300
Subject: [PATCH 38/45] Bump bundle_version + package versions that uses
 babel-compiler

---
 meteor                                             | 2 +-
 packages/ecmascript/package.js                     | 2 +-
 packages/minifier-js/package.js                    | 2 +-
 packages/non-core/coffeescript-compiler/package.js | 2 +-
 packages/shell-server/package.js                   | 2 +-
 packages/typescript/package.js                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meteor b/meteor
index 65372bf258..517e4bd0fe 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.18.0.2
+BUNDLE_VERSION=22.18.0.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index 3236405da8..e21ed27f59 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.12',
+  version: '0.16.14',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index 22d44ba09e..788cf783b6 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: '3.0.3',
+  version: '3.0.4',
 });
 
 Npm.depends({
diff --git a/packages/non-core/coffeescript-compiler/package.js b/packages/non-core/coffeescript-compiler/package.js
index c0ff2e50d8..8899f67cf7 100644
--- a/packages/non-core/coffeescript-compiler/package.js
+++ b/packages/non-core/coffeescript-compiler/package.js
@@ -3,7 +3,7 @@ Package.describe({
   summary: 'Compiler for CoffeeScript code, supporting the coffeescript package',
   // This version of NPM `coffeescript` module, with _1, _2 etc.
   // If you change this, make sure to also update ../coffeescript/package.js to match.
-  version: '2.4.2',
+  version: '2.4.3',
 });
 
 Npm.depends({
diff --git a/packages/shell-server/package.js b/packages/shell-server/package.js
index 3bdcb189ed..1dd7551714 100644
--- a/packages/shell-server/package.js
+++ b/packages/shell-server/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: "shell-server",
-  version: '0.6.1',
+  version: '0.6.2',
   summary: "Server-side component of the `meteor shell` command.",
   documentation: "README.md"
 });
diff --git a/packages/typescript/package.js b/packages/typescript/package.js
index 2f4d514837..2a4372edf4 100644
--- a/packages/typescript/package.js
+++ b/packages/typescript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'typescript',
-  version: '5.6.5',
+  version: '5.6.6',
   summary:
     'Compiler plugin that compiles TypeScript and ECMAScript in .ts and .tsx files',
   documentation: 'README.md',

From f22f871c431f34e5ed163019a5608faf1fdf9288 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Wed, 27 Aug 2025 18:21:56 -0300
Subject: [PATCH 39/45] Update meteor-node-stubs to version 1.2.23 and add
 sha.js as a dependency

---
 .../meteor-node-stubs/package-lock.json       | 20 +++++++++----
 npm-packages/meteor-node-stubs/package.json   | 30 +++++++++++++++++--
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index a727d323f2..46a8e49c09 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "meteor-node-stubs",
-      "version": "1.2.13",
+      "version": "1.2.21",
       "bundleDependencies": [
         "@meteorjs/crypto-browserify",
         "assert",
@@ -50,6 +50,7 @@
         "punycode": "^1.4.1",
         "querystring-es3": "^0.2.1",
         "readable-stream": "^3.6.2",
+        "sha.js": "^2.4.12",
         "stream-browserify": "^3.0.0",
         "stream-http": "^3.2.0",
         "string_decoder": "^1.3.0",
@@ -1646,17 +1647,24 @@
       "license": "MIT"
     },
     "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "version": "2.4.12",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz",
+      "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==",
       "inBundle": true,
       "license": "(MIT AND BSD-3-Clause)",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "safe-buffer": "^5.2.1",
+        "to-buffer": "^1.2.0"
       },
       "bin": {
         "sha.js": "bin.js"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/shebang-command": {
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index 1468f2df9a..7b11e07de4 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -2,7 +2,7 @@
   "name": "meteor-node-stubs",
   "author": "Ben Newman <ben@meteor.com>",
   "description": "Stub implementations of Node built-in modules, a la Browserify",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",
@@ -27,6 +27,7 @@
     "punycode": "^1.4.1",
     "querystring-es3": "^0.2.1",
     "readable-stream": "^3.6.2",
+    "sha.js": "^2.4.12",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "string_decoder": "^1.3.0",
@@ -81,5 +82,30 @@
   ],
   "bugs": {
     "url": "https://github.com/meteor/node-stubs/issues"
-  }
+  },
+  "bundleDependencies": [
+    "@meteorjs/crypto-browserify",
+    "assert",
+    "browserify-zlib",
+    "buffer",
+    "console-browserify",
+    "constants-browserify",
+    "domain-browser",
+    "events",
+    "https-browserify",
+    "os-browserify",
+    "path-browserify",
+    "process",
+    "punycode",
+    "querystring-es3",
+    "readable-stream",
+    "stream-browserify",
+    "stream-http",
+    "string_decoder",
+    "timers-browserify",
+    "tty-browserify",
+    "url",
+    "util",
+    "vm-browserify"
+  ]
 }

From 05c4b72092b83c725624ee571d6d498993509135 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 28 Aug 2025 10:34:35 -0300
Subject: [PATCH 40/45] Revert BUNDLE_VERSION to 22.18.0.2 and fix ecmascript
 package version to 0.16.13

---
 meteor                         | 2 +-
 packages/ecmascript/package.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meteor b/meteor
index 517e4bd0fe..65372bf258 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.18.0.3
+BUNDLE_VERSION=22.18.0.2
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js
index e21ed27f59..dcc86c7f0b 100644
--- a/packages/ecmascript/package.js
+++ b/packages/ecmascript/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ecmascript',
-  version: '0.16.14',
+  version: '0.16.13',
   summary: 'Compiler plugin that supports ES2015+ in all .js files',
   documentation: 'README.md',
 });

From 39f3ee0dccba81136b16b342aeeb6056709abd08 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 28 Aug 2025 13:21:07 -0300
Subject: [PATCH 41/45] Bump BUNDLE_VERSION to 22.18.0.3

---
 meteor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meteor b/meteor
index 65372bf258..517e4bd0fe 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=22.18.0.2
+BUNDLE_VERSION=22.18.0.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.

From 9ebd283f4d5c0a7c9115e6536c890a717dd38536 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 28 Aug 2025 13:40:07 -0300
Subject: [PATCH 42/45] Update meteor-node-stubs to version 1.2.24 and remove
 elliptic dependency

---
 .../meteor-node-stubs/package-lock.json       | 26 ++-----------------
 npm-packages/meteor-node-stubs/package.json   |  3 +--
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/npm-packages/meteor-node-stubs/package-lock.json b/npm-packages/meteor-node-stubs/package-lock.json
index 46a8e49c09..960afee14a 100644
--- a/npm-packages/meteor-node-stubs/package-lock.json
+++ b/npm-packages/meteor-node-stubs/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "meteor-node-stubs",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "meteor-node-stubs",
-      "version": "1.2.21",
+      "version": "1.2.23",
       "bundleDependencies": [
         "@meteorjs/crypto-browserify",
         "assert",
@@ -41,7 +41,6 @@
         "console-browserify": "^1.2.0",
         "constants-browserify": "^1.0.0",
         "domain-browser": "^4.23.0",
-        "elliptic": "^6.6.1",
         "events": "^3.3.0",
         "https-browserify": "^1.0.0",
         "os-browserify": "^0.3.0",
@@ -696,27 +695,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/elliptic": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
-      "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
-      "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.2",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
-      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
-      "license": "MIT"
-    },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
diff --git a/npm-packages/meteor-node-stubs/package.json b/npm-packages/meteor-node-stubs/package.json
index 7b11e07de4..3e2867429e 100644
--- a/npm-packages/meteor-node-stubs/package.json
+++ b/npm-packages/meteor-node-stubs/package.json
@@ -2,7 +2,7 @@
   "name": "meteor-node-stubs",
   "author": "Ben Newman <ben@meteor.com>",
   "description": "Stub implementations of Node built-in modules, a la Browserify",
-  "version": "1.2.23",
+  "version": "1.2.24",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",
@@ -18,7 +18,6 @@
     "console-browserify": "^1.2.0",
     "constants-browserify": "^1.0.0",
     "domain-browser": "^4.23.0",
-    "elliptic": "^6.6.1",
     "events": "^3.3.0",
     "https-browserify": "^1.0.0",
     "os-browserify": "^0.3.0",

From 7a125ab3bab767a4f68f2ec09c797227971a81a6 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Thu, 28 Aug 2025 17:10:31 -0300
Subject: [PATCH 43/45] Meteor version to 3.3.2 :comet:

---
 scripts/admin/meteor-release-official.json    |  2 +-
 .../generators/changelog/versions/3.3.2.md    | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.3.2.md

diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json
index 3b26432a73..7b89d5c0a6 100644
--- a/scripts/admin/meteor-release-official.json
+++ b/scripts/admin/meteor-release-official.json
@@ -1,6 +1,6 @@
 {
   "track": "METEOR",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "recommended": false,
   "official": true,
   "description": "The Official Meteor Distribution"
diff --git a/v3-docs/docs/generators/changelog/versions/3.3.2.md b/v3-docs/docs/generators/changelog/versions/3.3.2.md
new file mode 100644
index 0000000000..4b0bf25ea0
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.3.2.md
@@ -0,0 +1,69 @@
+## v3.3.2, 05-08-2025
+
+### Highlights
+
+- Async-compatible account URLs and email-sending coverage [#13740](https://github.com/meteor/meteor/pull/13740)
+- Move `findUserByEmail` method from `accounts-password` to `accounts-base` [#13859](https://github.com/meteor/meteor/pull/13859)
+- Return `insertedId` on client `upsert` to match Meteor 2.x behavior [#13891](https://github.com/meteor/meteor/pull/13891)
+- Unrecognized operator bug fixed [#13895](https://github.com/meteor/meteor/pull/13895)
+- Security fix for `sha.js` [#13908](https://github.com/meteor/meteor/pull/13908)
+
+
+All Merged PRs@[GitHub PRs 3.3.2](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3.2)
+
+#### Breaking Changes
+
+N/A
+
+##### Cordova Upgrade
+
+- Enable modern browser support for Cordova unless explicitly disabled [#13896](https://github.com/meteor/meteor/pull/13896)
+
+####  Internal API changes
+
+- lodash.template dependency was removed [#13898](https://github.com/meteor/meteor/pull/13898)
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+meteor update --release 3.3.2
+```
+
+---
+
+If you find any issues, please report them to the [Meteor issues tracker](https://github.com/meteor/meteor).
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.2
+- accounts-password@3.2.1
+- accounts-passwordless@3.0.2
+- meteor-node-stubs@1.2.24
+- babel-compiler@7.12.2
+- boilerplate-generator@2.0.2
+- ecmascript@0.16.13
+- minifier@3.0.4
+- minimongo@2.0.4
+- mongo@2.1.4
+- coffeescript-compiler@2.4.3
+- npm-mongo@6.16.1
+- shell-server@0.6.2
+- typescript@5.6.6
+
+#### Bumped NPM Packages
+
+- meteor-node-stubs@1.2.23
+
+#### Special thanks to
+
+✨✨✨
+
+- [@italojs](https://github.com/italojs)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@graemian](https://github.com/graemian)
+- [@Grubba27](https://github.com/Grubba27)
+- [@copleykj](https://github.com/copleykj)
+
+✨✨✨
\ No newline at end of file

From d3de3eb50e10ef6edda754a717ce4f5b11d83b67 Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 1 Sep 2025 11:48:16 -0300
Subject: [PATCH 44/45] Update release date for version 3.3.2 in changelog

---
 v3-docs/docs/generators/changelog/versions/3.3.2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3-docs/docs/generators/changelog/versions/3.3.2.md b/v3-docs/docs/generators/changelog/versions/3.3.2.md
index 4b0bf25ea0..eeffe6468e 100644
--- a/v3-docs/docs/generators/changelog/versions/3.3.2.md
+++ b/v3-docs/docs/generators/changelog/versions/3.3.2.md
@@ -1,4 +1,4 @@
-## v3.3.2, 05-08-2025
+## v3.3.2, 01-09-2025
 
 ### Highlights
 

From 1ff94404ddf8c25010d38f20bce67d8fda47c6be Mon Sep 17 00:00:00 2001
From: italo jose <italo.i@live.com>
Date: Mon, 1 Sep 2025 12:26:20 -0300
Subject: [PATCH 45/45] DOCS: Add release notes for version 3.3.2

---
 docs/history.md | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/docs/history.md b/docs/history.md
index 2f932f7780..cde5b8b41f 100644
--- a/docs/history.md
+++ b/docs/history.md
@@ -8,6 +8,76 @@
 
 [//]: # (go to meteor/docs/generators/changelog/docs)
 
+## v3.3.2, 01-09-2025
+
+### Highlights
+
+- Async-compatible account URLs and email-sending coverage [#13740](https://github.com/meteor/meteor/pull/13740)
+- Move `findUserByEmail` method from `accounts-password` to `accounts-base` [#13859](https://github.com/meteor/meteor/pull/13859)
+- Return `insertedId` on client `upsert` to match Meteor 2.x behavior [#13891](https://github.com/meteor/meteor/pull/13891)
+- Unrecognized operator bug fixed [#13895](https://github.com/meteor/meteor/pull/13895)
+- Security fix for `sha.js` [#13908](https://github.com/meteor/meteor/pull/13908)
+
+
+All Merged PRs@[GitHub PRs 3.3.2](https://github.com/meteor/meteor/pulls?q=is%3Apr+is%3Amerged+base%3Arelease-3.3.2)
+
+#### Breaking Changes
+
+N/A
+
+##### Cordova Upgrade
+
+- Enable modern browser support for Cordova unless explicitly disabled [#13896](https://github.com/meteor/meteor/pull/13896)
+
+####  Internal API changes
+
+- lodash.template dependency was removed [#13898](https://github.com/meteor/meteor/pull/13898)
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+meteor update --release 3.3.2
+```
+
+---
+
+If you find any issues, please report them to the [Meteor issues tracker](https://github.com/meteor/meteor).
+
+#### Bumped Meteor Packages
+
+- accounts-base@3.1.2
+- accounts-password@3.2.1
+- accounts-passwordless@3.0.2
+- meteor-node-stubs@1.2.24
+- babel-compiler@7.12.2
+- boilerplate-generator@2.0.2
+- ecmascript@0.16.13
+- minifier@3.0.4
+- minimongo@2.0.4
+- mongo@2.1.4
+- coffeescript-compiler@2.4.3
+- npm-mongo@6.16.1
+- shell-server@0.6.2
+- typescript@5.6.6
+
+#### Bumped NPM Packages
+
+- meteor-node-stubs@1.2.23
+
+#### Special thanks to
+
+✨✨✨
+
+- [@italojs](https://github.com/italojs)
+- [@nachocodoner](https://github.com/nachocodoner)
+- [@graemian](https://github.com/graemian)
+- [@Grubba27](https://github.com/Grubba27)
+- [@copleykj](https://github.com/copleykj)
+
+✨✨✨
+
 ## v3.3.1, 05-08-2025
 
 ### Highlights