Merge pull request #13083 from meteor/merging-devel-to-3.0

Merging devel to 3.0

guide/source/3.0-migration.md

@@ -10,7 +10,7 @@ description: How to migrate your application to Meteor 3.0.
 
 ## What's the status of version 3.0?
 
-**Latest version:** `3.0-beta.6` <br/>
+**Latest version:** `3.0-beta.7` <br/>
 **Node.js version:** `20.11.1 LTS` <br />
 **NPM version:** `10.2.4`
 
@@ -120,7 +120,7 @@ findOne is not available on the server. Please use findOneAsync instead.
 You can create a new Meteor 3.0 project by running the command below:
 
 ```bash
-meteor create my-new-project --release 3.0-beta.6
+meteor create my-new-project --release 3.0-beta.7
 ```
 
 or alternatively, you can use `npx`
@@ -136,7 +136,7 @@ npx meteor@beta
 You can update your Meteor 2.x project by running the command below inside your project folder:
 
 ```bash
-meteor update --release 3.0-beta.6
+meteor update --release 3.0-beta.7
 ```
 
 ### When will Meteor 3.0 be ready?

npm-packages/meteor-node-stubs/CHANGELOG.md

@@ -1,3 +1,6 @@
+v1.2.8 - 2024-04-01
+* Add new dependency `@meteorjs/crypto-browserify` to replace `crypto-browserify` as it had unsafe dependencies.
+
 v1.2.1 - 2022-03-17
 
 * Fix the missing dependencies.

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.7",
+  "version": "1.2.9",
   "main": "index.js",
   "license": "MIT",
   "homepage": "https://github.com/meteor/meteor/blob/devel/npm-packages/meteor-node-stubs/README.md",
@@ -11,12 +11,12 @@
     "prepare": "node scripts/build-deps.js"
   },
   "dependencies": {
+    "@meteorjs/crypto-browserify": "^3.12.1",
     "assert": "^2.1.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^5.7.1",
     "console-browserify": "^1.2.0",
     "constants-browserify": "^1.0.0",
-    "crypto-browserify": "^3.12.0",
     "domain-browser": "^4.23.0",
     "elliptic": "^6.5.4",
     "events": "^3.3.0",
@@ -37,12 +37,12 @@
     "vm-browserify": "^1.1.2"
   },
   "bundledDependencies": [
+    "@meteorjs/crypto-browserify",
     "assert",
     "browserify-zlib",
     "buffer",
     "console-browserify",
     "constants-browserify",
-    "crypto-browserify",
     "domain-browser",
     "events",
     "https-browserify",

npm-packages/meteor-node-stubs/wrappers/crypto.js

@@ -1,2 +1,2 @@
 global.Buffer = global.Buffer || require("buffer").Buffer;
-module.exports = require("crypto-browserify");
+module.exports = require("@meteorjs/crypto-browserify");

packages/mongo/mongo_driver.js

@@ -175,6 +175,9 @@ MongoConnection = function (url, options) {
     // set it for replSet, it will be ignored if we're not using a replSet.
     mongoOptions.maxPoolSize = options.maxPoolSize;
   }
+  if (_.has(options, 'minPoolSize')) {
+    mongoOptions.minPoolSize = options.minPoolSize;
+  }
 
   // Transform options like "tlsCAFileAsset": "filename.pem" into
   // "tlsCAFile": "/<fullpath>/filename.pem"
@@ -722,6 +725,13 @@ var simulateUpsertWithInsertedId = async function (collection, selector, mod, op
 MongoConnection.prototype.upsertAsync = async function (collectionName, selector, mod, options) {
   var self = this;
 
+
+
+  if (typeof options === "function" && ! callback) {
+    callback = options;
+    options = {};
+  }
+
   return self.updateAsync(collectionName, selector, mod,
                      _.extend({}, options, {
                        upsert: true,
@@ -1047,7 +1057,7 @@ class AsynchronousCursor {
 
     this._visitedIds = new LocalCollection._IdMap;
   }
-  
+
   [Symbol.asyncIterator]() {
     var cursor = this;
     return {

packages/mongo/oplog_tailing.js

@@ -214,12 +214,12 @@ Object.assign(OplogHandle.prototype, {
     // The tail connection will only ever be running a single tail command, so
     // it only needs to make one underlying TCP connection.
     self._oplogTailConnection = new MongoConnection(
-        self._oplogUrl, {maxPoolSize: 1});
+        self._oplogUrl, {maxPoolSize: 1, minPoolSize: 1});
     // XXX better docs, but: it's to get monotonic results
     // XXX is it safe to say "if there's an in flight query, just use its
     //     results"? I don't think so but should consider that
     self._oplogLastEntryConnection = new MongoConnection(
-        self._oplogUrl, {maxPoolSize: 1});
+        self._oplogUrl, {maxPoolSize: 1, minPoolSize: 1});
 
 
     // Now, make sure that there actually is a repl set here. If not, oplog