From 8eba20f55e31967604b2c55e6eea393d84f6c2d2 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Fri, 21 Oct 2022 12:13:59 +0200
Subject: [PATCH 01/16] [webapp] Remove underscore

---
 packages/webapp/package.js       |  4 ++--
 packages/webapp/webapp_server.js | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/webapp/package.js b/packages/webapp/package.js
index 5464ea7dc8..7459ba1903 100644
--- a/packages/webapp/package.js
+++ b/packages/webapp/package.js
@@ -15,6 +15,7 @@ Npm.depends({
   qs: '6.10.1',
   useragent: '2.3.0',
   '@vlasky/whomst': '0.1.7',
+  'lodash.has': '4.5.2'
 });
 
 Npm.strip({
@@ -32,7 +33,6 @@ Package.onUse(function(api) {
   api.use(
     [
       'logging',
-      'underscore',
       'routepolicy',
       'modern-browsers',
       'boilerplate-generator',
@@ -60,7 +60,7 @@ Package.onUse(function(api) {
 });
 
 Package.onTest(function(api) {
-  api.use(['tinytest', 'ecmascript', 'webapp', 'http', 'underscore']);
+  api.use(['tinytest', 'ecmascript', 'webapp', 'http']);
   api.addFiles('webapp_tests.js', 'server');
   api.addFiles('webapp_client_tests.js', 'client');
   api.addFiles('socket_file_tests.js', 'server');
diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 03d6de971b..8ad6c220d1 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -20,6 +20,7 @@ import {
 } from './socket_file.js';
 import cluster from 'cluster';
 import whomst from '@vlasky/whomst';
+import has from 'lodash.has';
 
 var SHORT_SOCKET_TIMEOUT = 5 * 1000;
 var LONG_SOCKET_TIMEOUT = 120 * 1000;
@@ -194,12 +195,12 @@ WebApp.categorizeRequest = function(req) {
 var htmlAttributeHooks = [];
 var getHtmlAttributes = function(request) {
   var combinedAttributes = {};
-  _.each(htmlAttributeHooks || [], function(hook) {
+  (htmlAttributeHooks || []).forEach(function(hook) {
     var attributes = hook(request);
     if (attributes === null) return;
     if (typeof attributes !== 'object')
       throw Error('HTML attribute hook must return null or object');
-    _.extend(combinedAttributes, attributes);
+    Object.assign(combinedAttributes, attributes);
   });
   return combinedAttributes;
 };
@@ -282,7 +283,7 @@ WebApp._timeoutAdjustmentRequestCallback = function(req, res) {
   res.on('finish', function() {
     res.setTimeout(SHORT_SOCKET_TIMEOUT);
   });
-  _.each(finishListeners, function(l) {
+  finishListeners.forEach(function(l) {
     res.on('finish', l);
   });
 };
@@ -435,13 +436,14 @@ function getBoilerplateAsync(request, arch) {
     });
   });
   runtimeConfig.isUpdatedByArch[arch] = false;
+  const { dynamicHead, dynamicBody } = request;
   const data = Object.assign(
     {},
     boilerplate.baseData,
     {
       htmlAttributes: getHtmlAttributes(request),
     },
-    _.pick(request, 'dynamicHead', 'dynamicBody')
+    { dynamicHead, dynamicBody }
   );
 
   let madeChanges = false;
@@ -524,9 +526,8 @@ WebAppInternals.generateBoilerplateInstance = function(
           return pathJoin(archPath[arch], itemPath);
         },
         baseDataExtension: {
-          additionalStaticJs: _.map(additionalStaticJs || [], function(
-            contents,
-            pathname
+          additionalStaticJs: (Object.entries(additionalStaticJs) || []).map(function(
+            [pathname, contents]
           ) {
             return {
               pathname: pathname,
@@ -603,7 +604,7 @@ WebAppInternals.staticFilesMiddleware = async function(
   };
 
   if (
-    _.has(additionalStaticJs, pathname) &&
+    has(additionalStaticJs, pathname) &&
     !WebAppInternals.inlineScriptsAllowed()
   ) {
     serveStaticJs(additionalStaticJs[pathname]);
@@ -1338,7 +1339,7 @@ function runWebAppServer() {
   });
 
   // start up app
-  _.extend(WebApp, {
+  Object.assign(WebApp, {
     connectHandlers: packageAndAppHandlers,
     rawConnectHandlers: rawConnectHandlers,
     httpServer: httpServer,

From a410b87752247e272a9876ec7e6c81a9aa4c9d8b Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Fri, 21 Oct 2022 13:21:13 +0200
Subject: [PATCH 02/16] [test-helpers] Remove underscore

---
 packages/test-helpers/async_multi.js          | 24 +++++++++----------
 packages/test-helpers/callback_logger.js      | 19 ++++++++-------
 packages/test-helpers/connection.js           |  4 +++-
 packages/test-helpers/event_simulation.js     |  4 ++--
 packages/test-helpers/package.js              |  9 +++++--
 packages/test-helpers/try_all_permutations.js |  2 +-
 .../test-helpers/try_all_permutations_test.js |  4 ++--
 7 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/packages/test-helpers/async_multi.js b/packages/test-helpers/async_multi.js
index e5ec3cb43c..22e15576bd 100644
--- a/packages/test-helpers/async_multi.js
+++ b/packages/test-helpers/async_multi.js
@@ -52,32 +52,32 @@ var ExpectationManager = function (test, onComplete) {
   self.outstanding = 0;
 };
 
-_.extend(ExpectationManager.prototype, {
-  expect: function (/* arguments */) {
+Object.assign(ExpectationManager.prototype, {
+  expect: function (...args) {
     var self = this;
 
-    if (typeof arguments[0] === "function")
-      var expected = arguments[0];
+    if (typeof args[0] === "function")
+      var expected = args[0];
     else
-      var expected = _.toArray(arguments);
+      var expected = args;
 
     if (self.closed)
       throw new Error("Too late to add more expectations to the test");
     self.outstanding++;
 
-    return function (/* arguments */) {
+    return function (...args) {
       if (self.dead)
         return;
 
       if (typeof expected === "function") {
         try {
-          expected.apply({}, arguments);
+          expected.apply({}, args);
         } catch (e) {
           if (self.cancel())
             self.test.exception(e);
         }
       } else {
-        self.test.equal(_.toArray(arguments), expected);
+        self.test.equal(args, expected);
       }
 
       self.outstanding--;
@@ -115,12 +115,12 @@ testAsyncMulti = function (name, funcs, { isOnly = false } = {}) {
 
   const addFunction = isOnly ? Tinytest.onlyAsync : Tinytest.addAsync;
   addFunction(name, function (test, onComplete) {
-    var remaining = _.clone(funcs);
+    var remaining = Object.assign({}, funcs);
     var context = {};
     var i = 0;
 
     var runNext = function () {
-      var func = remaining.shift();
+      var func = Object.values(remaining).shift();
       if (!func) {
         delete test.extraDetails.asyncBlock;
         onComplete();
@@ -142,7 +142,7 @@ testAsyncMulti = function (name, funcs, { isOnly = false } = {}) {
         test.extraDetails.asyncBlock = i++;
 
         new Promise(resolve => {
-          resolve(func.apply(context, [test, _.bind(em.expect, em)]));
+          resolve(func.apply(context, [test, em.expect.bind(em)]));
         }).then(result => {
           em.done();
         }, exception => {
@@ -190,4 +190,4 @@ pollUntil = function (expect, f, timeout, step, noFail) {
     timeout,
     step
   );
-};
+};
\ No newline at end of file
diff --git a/packages/test-helpers/callback_logger.js b/packages/test-helpers/callback_logger.js
index fb4f30ee07..4f6e661baf 100644
--- a/packages/test-helpers/callback_logger.js
+++ b/packages/test-helpers/callback_logger.js
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash.isempty';
+import isEqual from 'lodash.isequal';
+
 // This file allows you to write tests that expect certain callbacks to be
 // called in certain orders, or optionally in groups where the order does not
 // matter.  It can be set up in either a synchronous manner, so that each
@@ -19,7 +22,7 @@ withCallbackLogger = function (test, callbackNames, async, fun) {
   if (async) {
     if (!Fiber)
       throw new Error("Fiber is not available");
-    logger.fiber = Fiber(_.bind(fun, null, logger));
+    logger.fiber = Fiber(fun.bind(null, logger));
     logger.fiber.run();
   } else {
     fun(logger);
@@ -31,9 +34,9 @@ var CallbackLogger = function (test, callbackNames) {
   self._log = [];
   self._test = test;
   self._yielded = false;
-  _.each(callbackNames, function (callbackName) {
+  callbackNames.forEach(function (callbackName) {
     self[callbackName] = function () {
-      var args = _.toArray(arguments);
+      var args = Array.from(arguments);
       self._log.push({callback: callbackName, args: args});
       if (self.fiber) {
         setTimeout(function () {
@@ -56,7 +59,7 @@ CallbackLogger.prototype._yield = function (arg) {
 CallbackLogger.prototype.expectResult = function (callbackName, args) {
   var self = this;
   self._waitForLengthOrTimeout(1);
-  if (_.isEmpty(self._log)) {
+  if (isEmpty(self._log)) {
     self._test.fail(["Expected callback " + callbackName + " got none"]);
     return;
   }
@@ -93,13 +96,13 @@ CallbackLogger.prototype.expectResultUnordered = function (list) {
 
   self._waitForLengthOrTimeout(list.length);
 
-  list = _.clone(list); // shallow copy.
+  list = [...list]; // shallow copy.
   var i = list.length;
   while (i > 0) {
     var found = false;
     var dequeued = self._log.shift();
     for (var j = 0; j < list.length; j++) {
-      if (_.isEqual(list[j], dequeued)) {
+      if (isEqual(list[j], dequeued)) {
         list.splice(j, 1);
         found = true;
         break;
@@ -131,11 +134,11 @@ CallbackLogger.prototype.expectNoResult = function (fn) {
       self.fiber.run(handle);
     }, TIMEOUT);
     var foo = self._yield();
-    while (_.isEmpty(self._log) && foo !== handle) {
+    while (isEmpty(self._log) && foo !== handle) {
       foo = self._yield();
     }
     clearTimeout(handle);
   }
 
   self._expectNoResultImpl();
-};
+};
\ No newline at end of file
diff --git a/packages/test-helpers/connection.js b/packages/test-helpers/connection.js
index a78c3dab46..6d597bb0a3 100644
--- a/packages/test-helpers/connection.js
+++ b/packages/test-helpers/connection.js
@@ -1,3 +1,5 @@
+import isString from 'lodash.isstring';
+
 // Establish a connection from the server to the server, and wait
 // until the client side of the connection has received the session
 // id.  On success call `succeeded` with two arguments, the client
@@ -13,7 +15,7 @@ makeTestConnection = function (test, succeeded, failed) {
 
   // Add incoming connections to `serverConns`.
   var onConnectionHandle = Meteor.onConnection(function (serverConn) {
-    test.isTrue(_.isString(serverConn.id), "connection handle id exists and is a string");
+    test.isTrue(isString(serverConn.id), "connection handle id exists and is a string");
     if (serverConns[serverConn.id]) {
       test.fail("onConnection callback called multiple times for same session id");
       failed();
diff --git a/packages/test-helpers/event_simulation.js b/packages/test-helpers/event_simulation.js
index cf4ed8b3af..c4f8cc1086 100644
--- a/packages/test-helpers/event_simulation.js
+++ b/packages/test-helpers/event_simulation.js
@@ -9,11 +9,11 @@ simulateEvent = function (node, event, args, options) {
   if (document.createEvent) {
     var e = document.createEvent("Event");
     e.initEvent(event, bubbles, true);
-    _.extend(e, args);
+    Object.assign(e, args);
     node.dispatchEvent(e);
   } else {
     var e = document.createEventObject();
-    _.extend(e, args);
+    Object.assign(e, args);
     node.fireEvent("on" + event, e);
   }
 };
diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js
index 17b6e0f37a..6a2e6992f3 100644
--- a/packages/test-helpers/package.js
+++ b/packages/test-helpers/package.js
@@ -3,10 +3,15 @@ Package.describe({
   version: '1.3.0'
 });
 
+Npm.depends({
+  'lodash.isequal': '4.5.0',
+  'lodash.isempty': '4.4.0',
+  'lodash.isstring': '4.0.1'
+});
+
 Package.onUse(function (api) {
   api.use([
     'ecmascript',
-    'underscore',
     'tracker',
     'ejson',
     'tinytest',
@@ -45,7 +50,7 @@ Package.onUse(function (api) {
 
 Package.onTest(function (api) {
   api.use('tinytest');
-  api.use(['test-helpers', 'underscore']);
+  api.use(['test-helpers']);
   api.addFiles('try_all_permutations_test.js', 'client');
   api.addFiles('seeded_random_test.js');
 });
diff --git a/packages/test-helpers/try_all_permutations.js b/packages/test-helpers/try_all_permutations.js
index 2276c10a01..5b60aa62b9 100644
--- a/packages/test-helpers/try_all_permutations.js
+++ b/packages/test-helpers/try_all_permutations.js
@@ -39,7 +39,7 @@ try_all_permutations = function () {
 
   var expand_next_set = function () {
     if (current_set === args.length) {
-      _.each(chosen, function (f) { f(); });
+      chosen.forEach(function (f) { f(); });
     } else {
       var set = args[current_set];
       if (typeof set === "function")
diff --git a/packages/test-helpers/try_all_permutations_test.js b/packages/test-helpers/try_all_permutations_test.js
index f9bebffea9..4c9b451fff 100644
--- a/packages/test-helpers/try_all_permutations_test.js
+++ b/packages/test-helpers/try_all_permutations_test.js
@@ -61,7 +61,7 @@ Tinytest.add("test-helpers - try_all_permutations", function (test) {
     var seen = {};
 
     for (var i = 0; i < n; i++)
-      fs.push(_.bind(function (x) { seq += x + "_"; }, null, i));
+      fs.push(function (x) { seq += x + "_"; }.bind(null, i));
     try_all_permutations(
       function () {seq = "";},
       fs,
@@ -75,7 +75,7 @@ Tinytest.add("test-helpers - try_all_permutations", function (test) {
     var expected_count = 1;
     for (var i = n; i >= 1; i--)
       expected_count *= i;
-    test.equal(_.keys(seen).length, expected_count);
+    test.equal(Object.keys(seen).length, expected_count);
   };
 
   for (var i = 1; i <= 5; i++)

From 605b47cb2a4e9b961647417f7020c93d02ab7870 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 22 Oct 2022 09:46:40 +0200
Subject: [PATCH 03/16] [boilerplate-generator-tests] Remove underscore

---
 packages/boilerplate-generator-tests/package.js           | 1 -
 packages/boilerplate-generator-tests/web.browser-tests.js | 5 -----
 packages/boilerplate-generator-tests/web.cordova-tests.js | 5 +----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/packages/boilerplate-generator-tests/package.js b/packages/boilerplate-generator-tests/package.js
index 7878ff66f2..ec3a817612 100644
--- a/packages/boilerplate-generator-tests/package.js
+++ b/packages/boilerplate-generator-tests/package.js
@@ -14,7 +14,6 @@ Npm.depends({
 Package.onTest(function (api) {
   api.use('ecmascript');
   api.use([
-    'underscore',
     'tinytest',
     'boilerplate-generator'
   ], 'server');
diff --git a/packages/boilerplate-generator-tests/web.browser-tests.js b/packages/boilerplate-generator-tests/web.browser-tests.js
index 915e2f6ebf..48c0d06fd8 100644
--- a/packages/boilerplate-generator-tests/web.browser-tests.js
+++ b/packages/boilerplate-generator-tests/web.browser-tests.js
@@ -1,6 +1,5 @@
 import { parse, serialize } from 'parse5';
 import { generateHTMLForArch } from './test-lib';
-import { _ } from 'meteor/underscore';
 
 Tinytest.addAsync(
   "boilerplate-generator-tests - web.browser - basic output",
@@ -66,10 +65,6 @@ Tinytest.addAsync(
   async function (test) {
     const newHtml = await generateHTMLForArch("web.browser", false);
 
-    _.templateSettings = {
-      interpolate: /\{\{(.+?)\}\}/g
-    };
-
     test.matches(newHtml, /foo="foobar"/);
     test.matches(newHtml, /<link[^<>]*href="[^<>]*bootstrap[^<>]*">/);
     test.matches(newHtml, /<script[^<>]*src="[^<>]*templating[^<>]*">/);
diff --git a/packages/boilerplate-generator-tests/web.cordova-tests.js b/packages/boilerplate-generator-tests/web.cordova-tests.js
index 04eb249ac5..ffe954105e 100644
--- a/packages/boilerplate-generator-tests/web.cordova-tests.js
+++ b/packages/boilerplate-generator-tests/web.cordova-tests.js
@@ -1,6 +1,5 @@
 import { parse, serialize } from 'parse5';
 import { generateHTMLForArch } from './test-lib';
-import { _ } from 'meteor/underscore';
 
 Tinytest.addAsync(
   "boilerplate-generator-tests - web.cordova - basic output",
@@ -60,9 +59,7 @@ Tinytest.addAsync(
   async function (test) {
     const newHtml = await generateHTMLForArch('web.cordova', false);
 
-    _.templateSettings = {
-      interpolate: /\{\{(.+?)\}\}/g
-    };
+    
     test.matches(newHtml, /<link[^<>]*href="[^<>]*bootstrap[^<>]*">/);
     test.matches(newHtml, /<script[^<>]*src="[^<>]*templating[^<>]*">/);
     test.matches(newHtml, /<script>var a/);

From 4f2ab13f2ae766c47abea600d6f87811b01754fc Mon Sep 17 00:00:00 2001
From: Harry Adel <harryadelb@gmail.com>
Date: Sun, 2 Apr 2023 18:19:44 +0200
Subject: [PATCH 04/16] Loop over finishListeners keys

---
 packages/webapp/webapp_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 935f54445b..a5430d09a7 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -283,7 +283,7 @@ WebApp._timeoutAdjustmentRequestCallback = function(req, res) {
   res.on('finish', function() {
     res.setTimeout(SHORT_SOCKET_TIMEOUT);
   });
-  finishListeners.forEach(function(l) {
+  Object.keys(finishListeners).forEach(function(l) {
     res.on('finish', l);
   });
 };

From b5e818e13216ef7037ed89ffdf8a1e08b0ec00d6 Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Sat, 6 May 2023 14:01:02 +0300
Subject: [PATCH 05/16] Iterate over values instead of keys for finishListeners

---
 packages/webapp/webapp_server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js
index 500110d92e..ca174ae8cd 100644
--- a/packages/webapp/webapp_server.js
+++ b/packages/webapp/webapp_server.js
@@ -283,7 +283,7 @@ WebApp._timeoutAdjustmentRequestCallback = function(req, res) {
   res.on('finish', function() {
     res.setTimeout(SHORT_SOCKET_TIMEOUT);
   });
-  Object.keys(finishListeners).forEach(function(l) {
+  Object.values(finishListeners).forEach(function(l) {
     res.on('finish', l);
   });
 };

From 7bed14385ed1f3133c802344dcabff3888e6e20e Mon Sep 17 00:00:00 2001
From: harryadel <harryadelb@gmail.com>
Date: Mon, 20 Nov 2023 13:35:29 +0200
Subject: [PATCH 06/16] [webapp] Fix tests

---
 .../webapp/.npm/package/npm-shrinkwrap.json   | 78 +++++++++++++------
 packages/webapp/webapp_tests.js               |  7 +-
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json
index a57899427e..bfdde477d2 100644
--- a/packages/webapp/.npm/package/npm-shrinkwrap.json
+++ b/packages/webapp/.npm/package/npm-shrinkwrap.json
@@ -7,9 +7,9 @@
       "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="
     },
     "@types/node": {
-      "version": "18.13.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
-      "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg=="
+      "version": "20.9.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.2.tgz",
+      "integrity": "sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg=="
     },
     "@vlasky/whomst": {
       "version": "0.1.7",
@@ -32,9 +32,9 @@
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
     },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+      "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="
     },
     "compressible": {
       "version": "2.0.18",
@@ -83,6 +83,11 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
     },
+    "define-data-property": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+      "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="
+    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -141,30 +146,45 @@
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
+      "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="
     },
     "get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="
+    },
+    "has-property-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
+      "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="
+    },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
     },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
+    "hasown": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
+      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="
+    },
     "http-errors": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -190,6 +210,11 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
+    "lodash.has": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz",
+      "integrity": "sha512-rnYUdIo6xRCJnQmbVFEwcxF144erlD+M3YcJUVesflU9paQaE8p+fJDcIQrlMYbxoANFL+AB9hZrzSBBk5PL+g=="
+    },
     "lru-cache": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -225,11 +250,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
-    },
     "negotiator": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -241,9 +261,9 @@
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="
     },
     "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "on-finished": {
       "version": "2.3.0",
@@ -312,6 +332,11 @@
         }
       }
     },
+    "set-function-length": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+      "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ=="
+    },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
@@ -362,6 +387,11 @@
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
diff --git a/packages/webapp/webapp_tests.js b/packages/webapp/webapp_tests.js
index fce54981f1..2555b6a6fb 100644
--- a/packages/webapp/webapp_tests.js
+++ b/packages/webapp/webapp_tests.js
@@ -46,16 +46,15 @@ MockResponse.prototype.getBody = function () {
 
 Tinytest.add("webapp - content-type header", function (test) {
   const staticFiles = WebAppInternals.staticFilesByArch["web.browser"];
+  const staticFilesKeys = Object.keys(staticFiles);
 
-  const cssResource = _.find(
-    _.keys(staticFiles),
+  const cssResource = staticFilesKeys.find(
     function (url) {
       return staticFiles[url].type === "css";
     }
   );
 
-  const jsResource = _.find(
-    _.keys(staticFiles),
+  const jsResource = staticFilesKeys.find(
     function (url) {
       return staticFiles[url].type === "js";
     }

From 2feca06288baf4b0c42a299c76f6722cacdbbd87 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Tue, 23 Jul 2024 14:27:22 -0400
Subject: [PATCH 07/16] only run windows test on push for devel/v2 and on all
 pull requests

---
 .github/workflows/meteor-selftest-windows.yml | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/meteor-selftest-windows.yml

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
new file mode 100644
index 0000000000..d78f633ec3
--- /dev/null
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -0,0 +1,54 @@
+name: Meteor Selftest Windows
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+  push:
+    branches:
+      - devel
+      - 2.x.x
+
+env:
+  METEOR_PRETTY_OUTPUT: 0
+  SELF_TEST_TOOL_NODE_FLAGS: ' '
+  TOOL_NODE_FLAGS: --expose-gc
+  TIMEOUT_SCALE_FACTOR: 20
+  METEOR_HEADLESS: true
+  SELF_TEST_EXCLUDE: '^NULL-LEAVE-THIS-HERE-NULL$'
+
+jobs:
+  test:
+    runs-on: windows-2019-meteor
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 20.x
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\install.ps1
+
+      - name: Run tests
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\test.ps1
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            .\dev_bundle
+            .\.babel-cache
+            .\.meteor
+          key: ${{ runner.os }}-meteor-${{ hashFiles('**/package-lock.json') }}

From 046490f7ff7af5cbbcc4d2d96fd2fae7d9b44167 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 29 Jul 2024 09:27:43 -0400
Subject: [PATCH 08/16] add up-to-date windows scripts

---
 scripts/windows/{appveyor => ci}/install.ps1 |  5 ++---
 scripts/windows/{appveyor => ci}/test.ps1    | 17 ++---------------
 2 files changed, 4 insertions(+), 18 deletions(-)
 rename scripts/windows/{appveyor => ci}/install.ps1 (94%)
 rename scripts/windows/{appveyor => ci}/test.ps1 (53%)

diff --git a/scripts/windows/appveyor/install.ps1 b/scripts/windows/ci/install.ps1
similarity index 94%
rename from scripts/windows/appveyor/install.ps1
rename to scripts/windows/ci/install.ps1
index ced6023ad5..77b03a2de0 100644
--- a/scripts/windows/appveyor/install.ps1
+++ b/scripts/windows/ci/install.ps1
@@ -1,4 +1,4 @@
-# Appveyor already sets $PLATFORM to exactly what we don't want, so
+# Appveyor already sets $PLATFORM to exactly what we don't want, so
 # we'll prepend it with 'windows_' if that seems to be the case.
 If ($env:PLATFORM -Match '^x86|x64$') {
   $env:PLATFORM = "windows_${env:PLATFORM}"
@@ -32,9 +32,8 @@ while ($attempt -gt 0 -and -not $success) {
   } else {
     $attempt--
   }
-
 }
 
 If ($LASTEXITCODE -ne 0) {
   throw "Running .\meteor --get-ready failed three times."
-}
+}
\ No newline at end of file
diff --git a/scripts/windows/appveyor/test.ps1 b/scripts/windows/ci/test.ps1
similarity index 53%
rename from scripts/windows/appveyor/test.ps1
rename to scripts/windows/ci/test.ps1
index f8ef08707d..fb813d33fa 100644
--- a/scripts/windows/appveyor/test.ps1
+++ b/scripts/windows/ci/test.ps1
@@ -1,4 +1,4 @@
-# For now, we only have one script.
+# For now, we only have one script.
 $jUnit = Join-Path $env:TEMP 'self-test-junit-0.xml'
 
 $tests = @(
@@ -25,19 +25,6 @@ If ($selfTestExitCode -eq 0) {
   Write-Host "FAILURE! (Exit: $selfTestExitCode)" -ForegroundColor Red
 }
 
-Write-Host "Uploading JUnit test results..." -ForegroundColor Magenta
-$wc = New-Object 'System.Net.WebClient'
-Get-ChildItem $env:TEMP 'self-test-junit-*.xml' | Foreach-Object {
-  Write-Host " - $($_.FullName)" -ForegroundColor Magenta
-  Write-Host "   - as Artifact..." -ForegroundColor Magenta
-  Push-AppveyorArtifact $_.FullName
-  Write-Host "   - as Test Results..." -ForegroundColor Magenta
-  $artifactPostUrl = `
-    "https://ci.appveyor.com/api/testresults/junit/",
-    $env:APPVEYOR_JOB_ID -Join ''
-  $wc.UploadFile($artifactPostUrl, ($_.FullName))
-}
-
 If ($selfTestExitCode -ne 0) {
   Exit $selfTestExitCode
-}
+}
\ No newline at end of file

From 052ba5241cb972bd6a21272447deb6ebd01a42cd Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Mon, 29 Jul 2024 09:35:11 -0400
Subject: [PATCH 09/16] git reset

---
 .github/workflows/meteor-selftest-windows.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index d78f633ec3..ff6655b02a 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -32,6 +32,12 @@ jobs:
         with:
           node-version: 20.x
 
+      - name: Git Reset Hard
+        shell: pwsh
+        run: |
+          git reset --hard
+          git clean -fdx
+
       - name: Install dependencies
         shell: pwsh
         run: |

From 0ff7948fe2f69f096f365dd98bdcbfc35ef95fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 16:00:14 +0200
Subject: [PATCH 10/16] ensure to git reset checkout before updating git
 submodule

---
 scripts/windows/ci/install.ps1 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/windows/ci/install.ps1 b/scripts/windows/ci/install.ps1
index 77b03a2de0..6abbda1114 100644
--- a/scripts/windows/ci/install.ps1
+++ b/scripts/windows/ci/install.ps1
@@ -7,6 +7,9 @@ If ($env:PLATFORM -Match '^x86|x64$') {
 $dirCheckout = (Get-Item $PSScriptRoot).parent.parent.parent.FullName
 $meteorBat = Join-Path $dirCheckout 'meteor.bat'
 
+Write-Host "Resetting git checkout..." -ForegroundColor Magenta
+& git.exe -C "$dirCheckout" reset --hard
+
 Write-Host "Updating submodules recursively..." -ForegroundColor Magenta
 # Appveyor suggests -q flag for 'git submodule...' https://goo.gl/4TFAHm
 & git.exe -C "$dirCheckout" submodule -q update --init --recursive
@@ -36,4 +39,4 @@ while ($attempt -gt 0 -and -not $success) {
 
 If ($LASTEXITCODE -ne 0) {
   throw "Running .\meteor --get-ready failed three times."
-}
\ No newline at end of file
+}

From fdb9bcce168047705782a00634d9fd87debe4d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 16:06:23 +0200
Subject: [PATCH 11/16] ensure to git reset checkout on all submodules as well

---
 scripts/windows/ci/install.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/windows/ci/install.ps1 b/scripts/windows/ci/install.ps1
index 6abbda1114..ecb7c9194c 100644
--- a/scripts/windows/ci/install.ps1
+++ b/scripts/windows/ci/install.ps1
@@ -9,6 +9,7 @@ $meteorBat = Join-Path $dirCheckout 'meteor.bat'
 
 Write-Host "Resetting git checkout..." -ForegroundColor Magenta
 & git.exe -C "$dirCheckout" reset --hard
+& git.exe -C "$dirCheckout" submodule foreach --recursive 'git reset --hard'
 
 Write-Host "Updating submodules recursively..." -ForegroundColor Magenta
 # Appveyor suggests -q flag for 'git submodule...' https://goo.gl/4TFAHm

From ade224551f8014898d3ba2f869551654b50112b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 16:09:02 +0200
Subject: [PATCH 12/16] dont need to git reset on the pipeline level

---
 .github/workflows/meteor-selftest-windows.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/meteor-selftest-windows.yml b/.github/workflows/meteor-selftest-windows.yml
index ff6655b02a..d78f633ec3 100644
--- a/.github/workflows/meteor-selftest-windows.yml
+++ b/.github/workflows/meteor-selftest-windows.yml
@@ -32,12 +32,6 @@ jobs:
         with:
           node-version: 20.x
 
-      - name: Git Reset Hard
-        shell: pwsh
-        run: |
-          git reset --hard
-          git clean -fdx
-
       - name: Install dependencies
         shell: pwsh
         run: |

From aad7666f9668263a53c73208fc047058c8f493a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Tue, 30 Jul 2024 17:24:26 +0200
Subject: [PATCH 13/16] remove app veyor as not needed

---
 appveyor.yml | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index de63e8fd72..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-version: '{build}'
-
-branches:
-  except:
-    - /^dev-bundle-/
-
-skip_branch_with_pr: true
-
-clone_folder: C:\projects\meteor
-image: Visual Studio 2019
-
-environment:
-  METEOR_PRETTY_OUTPUT: 0
-  SELF_TEST_TOOL_NODE_FLAGS: " "
-  TOOL_NODE_FLAGS: --expose-gc
-  TIMEOUT_SCALE_FACTOR: 8
-  METEOR_HEADLESS: true
-  SELF_TEST_EXCLUDE: "^NULL-LEAVE-THIS-HERE-NULL$"
-platform:
-  - x64
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - platform: x64
-
-# We don't need the actual "build", just the tests.
-build: off
-
-install:
-  - ps: C:\projects\meteor\scripts\windows\appveyor\install.ps1
-
-test_script:
-  - ps: C:\projects\meteor\scripts\windows\appveyor\test.ps1
-
-on_failure:
-    - ps: |
-        $npmLogsDir = "$($Env:AppData)\npm-cache\_logs"
-        If (Test-Path "$npmLogsDir") {
-          Get-ChildItem "${npmLogsDir}\*.log" |
-            % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-        }
-
-cache:
-  - dev_bundle -> meteor
-  - .babel-cache -> meteor
-  - .meteor

From 08258246aec317ffe15eb35c8d4c7bee558127fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Codo=C3=B1er?= <igcogi@gmail.com>
Date: Mon, 12 Aug 2024 16:16:58 +0200
Subject: [PATCH 14/16] Fix Meteor.promisify (2.x) (#13291)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix Meteor.promisify and add a test for it (#13284)

This fixes a regression introduced in commit 87f8697941.

Co-authored-by: Nacho Codoñer <igcogi@gmail.com>

* fix syntax check

---------

Co-authored-by: Oleksandr Chekhovskyi <oleksandr.chekhovskyi@favro.com>
Co-authored-by: Leonardo Venturini <leovenbag@gmail.com>
---
 packages/meteor/helpers.js      |  8 +++++---
 packages/meteor/helpers_test.js | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/packages/meteor/helpers.js b/packages/meteor/helpers.js
index 851f1967f2..4a1b802494 100644
--- a/packages/meteor/helpers.js
+++ b/packages/meteor/helpers.js
@@ -86,6 +86,10 @@ Meteor.promisify = function (fn, context, errorFirst) {
   }
 
   return function () {
+    var self = this;
+    var filteredArgs = Array.prototype.slice.call(arguments)
+      .filter(function (i) { return i !== undefined; });
+
     return new Promise(function (resolve, reject) {
       var callback = Meteor.bindEnvironment(function (error, result) {
         var _error = error, _result = result;
@@ -101,11 +105,9 @@ Meteor.promisify = function (fn, context, errorFirst) {
         resolve(_result);
       });
 
-      var filteredArgs = Array.prototype.slice.call(arguments)
-        .filter(function (i) { return i !== undefined; });
       filteredArgs.push(callback);
 
-      return fn.apply(context || this, filteredArgs);
+      return fn.apply(context || self, filteredArgs);
     });
   };
 };
diff --git a/packages/meteor/helpers_test.js b/packages/meteor/helpers_test.js
index 78c968fffb..7e7cf633df 100644
--- a/packages/meteor/helpers_test.js
+++ b/packages/meteor/helpers_test.js
@@ -100,3 +100,29 @@ Tinytest.add("environment - startup", function (test) {
   });
   test.isTrue(called);
 });
+
+Tinytest.addAsync("environment - promisify", function (test, done) {
+  function TestClass(value) {
+    this.value = value;
+  }
+
+  TestClass.prototype.method = function (arg1, arg2, callback) {
+    var value = this.value;
+    setTimeout(function () {
+      callback(null, arg1 + arg2 + value);
+    }, 0);
+  };
+
+  TestClass.prototype.methodAsync = Meteor.promisify(TestClass.prototype.method);
+
+  var instance = new TestClass(5);
+  var asyncMethodWithContext = Meteor.promisify(instance.method, instance);
+
+  Promise.all([
+    instance.methodAsync(1, 2),
+    asyncMethodWithContext(2, 3),
+  ]).then(function (results) {
+    test.equal(results, [8, 10]);
+    done();
+  });
+});

From 67fbd9553916ee856c413ea1ba4cf91802ebc577 Mon Sep 17 00:00:00 2001
From: denihs <denilsonh2014@gmail.com>
Date: Tue, 17 Sep 2024 10:41:49 -0400
Subject: [PATCH 15/16] start release-3.1.0 branch

---
 .../generators/changelog/versions/3.1.0.md    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 v3-docs/docs/generators/changelog/versions/3.1.0.md

diff --git a/v3-docs/docs/generators/changelog/versions/3.1.0.md b/v3-docs/docs/generators/changelog/versions/3.1.0.md
new file mode 100644
index 0000000000..f7d6ce4f7f
--- /dev/null
+++ b/v3-docs/docs/generators/changelog/versions/3.1.0.md
@@ -0,0 +1,33 @@
+## v3.1.0, 2024-xx-xx
+
+### Highlights
+
+N/A
+
+#### Breaking Changes
+
+N/A
+
+####  Internal API changes
+
+N/A
+
+#### Migration Steps
+
+Please run the following command to update your project:
+
+```bash
+
+meteor update --release 3.1.0
+
+```
+
+
+
+#### Meteor Version Release
+
+N/A
+
+#### Special thanks to
+
+N/A

From c03737c67bcf691d16aed0549133bfd732585315 Mon Sep 17 00:00:00 2001
From: Leonardo Venturini <leovenbag@gmail.com>
Date: Wed, 16 Oct 2024 14:44:34 -0400
Subject: [PATCH 16/16] bump to stable version

---
 packages/deprecated/http/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/deprecated/http/package.js b/packages/deprecated/http/package.js
index 405387d200..b19ac4248e 100644
--- a/packages/deprecated/http/package.js
+++ b/packages/deprecated/http/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Make HTTP calls to remote servers",
-  version: '3.0.0-beta300.7',
+  version: '3.0.0',
   deprecated: 'Please use the fetch package'
 });