diff --git a/guide/source/3.0-migration.md b/guide/source/3.0-migration.md
index 7591356327..946dfcec26 100644
--- a/guide/source/3.0-migration.md
+++ b/guide/source/3.0-migration.md
@@ -3,19 +3,27 @@ title: Migrating to Meteor 3.0
description: How to migrate your application to Meteor 3.0.
---
-> **This guide will be created as we get closer to the Meteor 3.0 beta release.** We are also evaluating new documentation platforms to improve our users' experience.
+> This guide will be created as we approach the Meteor 3.0 release.
+> We're in the process of moving our documentation to Vitepress,
+> and updating the Meteor API docs for version 3.0. For the latest updates,
+> visit https://v3-docs.meteor.com/.
## What's the status of version 3.0?
-**Latest version:** `3.0-beta.0`
-**Node.js version:** `20.9.0 LTS`
+**Latest version:** `3.0-beta.6`
+**Node.js version:** `20.11.1 LTS`
+**NPM version:** `10.2.4`
-Meteor 3.0 is in alpha and not recommended for production. You can check the "[Release 3.0 Pull Request](https://github.com/meteor/meteor/pull/12359)" to see what is being changed.
+Meteor 3.0 is in beta and not recommended for production. You can check the "[Release 3.0 Pull Request](https://github.com/meteor/meteor/pull/12359)" to see what is being changed.
## How to prepare for version 3.0?
You can follow the guide "[How to migrate to Meteor Async in Meteor 2.x](/prepare-meteor-3.0.html)" to help you prepare your application for the new version by starting to use async methods.
+## How to follow the progress on version 3?
+
+The best way to follow the progress is by checking the "[What's left until an official Meteor 3.0?](https://github.com/meteor/meteor/discussions/12865)" discussion. We have also been sharing constant updates on [this topic](https://forums.meteor.com/t/fibers-public-roadmap-and-meteor-3-0/59627/84) in our forum.
+
## Frequently Asked Questions
### What is Fibers?
@@ -112,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.0
+meteor create my-new-project --release 3.0-beta.6
```
### How to update from version 2?
@@ -120,13 +128,9 @@ meteor create my-new-project --release 3.0-beta.0
You can update your Meteor 2.x project by running the command below inside your project folder:
```bash
-meteor update --release 3.0-beta.0
+meteor update --release 3.0-beta.6
```
-### How to follow the progress on version 3?
-
-The best way to follow the progress is by checking the "[What's left until an official Meteor 3.0?](https://github.com/meteor/meteor/discussions/12865)" discussion. We have also been sharing constant updates on [this topic](https://forums.meteor.com/t/fibers-public-roadmap-and-meteor-3-0/59627/84) in our forum.
-
### When will Meteor 3.0 be ready?
We plan to release the beta version by the end of Q4 2023. An official version will depend a lot on user feedback, but we aim to release it by the end of Q1 2024.
diff --git a/packages/deprecated/appcache/README.md b/packages/deprecated/appcache/README.md
index d0d10221ca..e5e08a8a52 100644
--- a/packages/deprecated/appcache/README.md
+++ b/packages/deprecated/appcache/README.md
@@ -1,5 +1,5 @@
# appcache
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/appcache) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/appcache)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/appcache) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/appcache)
***
The `appcache` package, part of
diff --git a/packages/deprecated/code-prettify/README.md b/packages/deprecated/code-prettify/README.md
index 783efebed3..c4d909d3cd 100644
--- a/packages/deprecated/code-prettify/README.md
+++ b/packages/deprecated/code-prettify/README.md
@@ -1,5 +1,5 @@
# code-prettify
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/code-prettify) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/code-prettify)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/code-prettify) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/code-prettify)
***
This internal Meteor package is now unnecessary and has been deprecated. To
diff --git a/packages/deprecated/deps/README.md b/packages/deprecated/deps/README.md
index ee8dff27cf..52103c7880 100644
--- a/packages/deprecated/deps/README.md
+++ b/packages/deprecated/deps/README.md
@@ -1,5 +1,5 @@
# deps
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deps) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deps)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/deps) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/deps)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/facebook/README.md b/packages/deprecated/facebook/README.md
index 33a61e7d96..cf055c9b61 100644
--- a/packages/deprecated/facebook/README.md
+++ b/packages/deprecated/facebook/README.md
@@ -1,5 +1,5 @@
# facebook
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/facebook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/facebook)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/facebook) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/facebook)
***
** Deprecated, use facebook-oauth instead**
diff --git a/packages/deprecated/facts/README.md b/packages/deprecated/facts/README.md
index d6ca4f5445..32c4320704 100644
--- a/packages/deprecated/facts/README.md
+++ b/packages/deprecated/facts/README.md
@@ -1,5 +1,5 @@
# facts
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/facts) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/facts)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/facts) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/facts)
***
This is a legacy internal Meteor package. Use facts-ui or facts-base instead.
diff --git a/packages/deprecated/fastclick/README.md b/packages/deprecated/fastclick/README.md
index e5a1cf6bca..91623a5cae 100644
--- a/packages/deprecated/fastclick/README.md
+++ b/packages/deprecated/fastclick/README.md
@@ -1,5 +1,5 @@
# fastclick
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/fastclick) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/fastclick)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/fastclick) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/fastclick)
***
> **Warning:** As of late 2015 most mobile browsers - notably Chrome and Safari - no longer have a 300ms touch delay, so fastclick offers no benefit on newer browsers, and risks introducing [bugs](https://github.com/ftlabs/fastclick/issues) into your application. Consider carefully whether you really need to use it.
diff --git a/packages/deprecated/github/README.md b/packages/deprecated/github/README.md
index f485e8f45f..59a7fcbde5 100644
--- a/packages/deprecated/github/README.md
+++ b/packages/deprecated/github/README.md
@@ -1,5 +1,5 @@
# github
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/github) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/github)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/github) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/github)
***
**Deprecated, use github-oauth instead.**
diff --git a/packages/deprecated/google/README.md b/packages/deprecated/google/README.md
index dd09ba9bad..5bda6ee6d7 100644
--- a/packages/deprecated/google/README.md
+++ b/packages/deprecated/google/README.md
@@ -1,5 +1,5 @@
# google-oauth
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/google) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/google)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/google) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/google)
***
** Deprecated, use google-oauth instead**
diff --git a/packages/deprecated/handlebars/README.md b/packages/deprecated/handlebars/README.md
index b5883dc56f..51057c558f 100644
--- a/packages/deprecated/handlebars/README.md
+++ b/packages/deprecated/handlebars/README.md
@@ -1,5 +1,5 @@
# handlebars
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/handlebars) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/handlebars)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/handlebars) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/handlebars)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/jquery-waypoints/README.md b/packages/deprecated/jquery-waypoints/README.md
index c850cf0394..84d71a3383 100644
--- a/packages/deprecated/jquery-waypoints/README.md
+++ b/packages/deprecated/jquery-waypoints/README.md
@@ -1,7 +1,7 @@
# jquery-waypoints
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jquery-waypoints) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jquery-waypoints)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/jquery-waypoints) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/jquery-waypoints)
***
This is a wrapper package for the JQuery Waypoints library. You can use it to add callbacks that fire when the user scrolls to certain elements on a page, for example to implement table of contents highlighting.
-See the [JQuery Waypoints docs](http://imakewebthings.com/jquery-waypoints/) for more details.
\ No newline at end of file
+See the [JQuery Waypoints docs](http://imakewebthings.com/jquery-waypoints/) for more details.
diff --git a/packages/deprecated/jshint/README.md b/packages/deprecated/jshint/README.md
index ea0757e1fc..1c9738962b 100644
--- a/packages/deprecated/jshint/README.md
+++ b/packages/deprecated/jshint/README.md
@@ -1,5 +1,5 @@
# jshint
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jshint) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jshint)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/jshint) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/jshint)
***
JSHint for Meteor
diff --git a/packages/deprecated/jsparse/README.md b/packages/deprecated/jsparse/README.md
index 2ccdb1cb84..12fcf377d6 100644
--- a/packages/deprecated/jsparse/README.md
+++ b/packages/deprecated/jsparse/README.md
@@ -1,7 +1,7 @@
# jsparse
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/jsparse) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/jsparse)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/jsparse) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/jsparse)
***
This internal Meteor package is now unnecessary and has been deprecated. To
continue to use a working version of this package, please pin your package
-version to 1.0.10 (e.g. meteor add jsparse@=1.0.10)
\ No newline at end of file
+version to 1.0.10 (e.g. meteor add jsparse@=1.0.10)
diff --git a/packages/deprecated/livedata/README.md b/packages/deprecated/livedata/README.md
index c5e4fd6b2d..2bd20df45a 100644
--- a/packages/deprecated/livedata/README.md
+++ b/packages/deprecated/livedata/README.md
@@ -1,5 +1,5 @@
# livedata
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/livedata) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/livedata)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/livedata) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/livedata)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/meetup/README.md b/packages/deprecated/meetup/README.md
index 5f4c0147d9..6a943e5c9b 100644
--- a/packages/deprecated/meetup/README.md
+++ b/packages/deprecated/meetup/README.md
@@ -1,5 +1,5 @@
# meetup
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meetup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meetup)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/meetup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/meetup)
***
**Deprecated, use meetup-oauth instead.**
diff --git a/packages/deprecated/meteor-developer/README.md b/packages/deprecated/meteor-developer/README.md
index ba79687e90..21130abddb 100644
--- a/packages/deprecated/meteor-developer/README.md
+++ b/packages/deprecated/meteor-developer/README.md
@@ -1,5 +1,5 @@
# meteor-developer
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor-developer) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor-developer)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/meteor-developer) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/meteor-developer)
***
**Deprecated, use meteor-developer-oauth instead.**
diff --git a/packages/deprecated/meteor-platform/README.md b/packages/deprecated/meteor-platform/README.md
index b1832af856..e6e450ca42 100644
--- a/packages/deprecated/meteor-platform/README.md
+++ b/packages/deprecated/meteor-platform/README.md
@@ -1,5 +1,5 @@
# meteor-platform
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meteor-platform) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meteor-platform)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/meteor-platform) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/meteor-platform)
***
This package used to be added to every app by `meteor create`, but is now deprecated in favor of `meteor-base` and a carefully chosen set of other packages.
diff --git a/packages/deprecated/meyerweb-reset/README.md b/packages/deprecated/meyerweb-reset/README.md
index 74c06454b4..863f7bef68 100644
--- a/packages/deprecated/meyerweb-reset/README.md
+++ b/packages/deprecated/meyerweb-reset/README.md
@@ -1,7 +1,7 @@
# meyerweb-reset
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/meyerweb-reset) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/meyerweb-reset)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/meyerweb-reset) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/meyerweb-reset)
***
This internal Meteor package is now unnecessary and has been deprecated. To
continue to use a working version of this package, please pin your package
-version to 1.0.7 (e.g. meteor add meyerweb-reset@=1.0.7)
\ No newline at end of file
+version to 1.0.7 (e.g. meteor add meyerweb-reset@=1.0.7)
diff --git a/packages/deprecated/npm-bcrypt/README.md b/packages/deprecated/npm-bcrypt/README.md
index 3f4ac59fff..4f621256c3 100644
--- a/packages/deprecated/npm-bcrypt/README.md
+++ b/packages/deprecated/npm-bcrypt/README.md
@@ -1,4 +1,4 @@
# npm-bcrypt
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/npm-bcrypt) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/npm-bcrypt)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/npm-bcrypt) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/npm-bcrypt)
***
diff --git a/packages/deprecated/preserve-inputs/README.md b/packages/deprecated/preserve-inputs/README.md
index b9f29d421f..1a3118f6a2 100644
--- a/packages/deprecated/preserve-inputs/README.md
+++ b/packages/deprecated/preserve-inputs/README.md
@@ -1,5 +1,5 @@
# preserve-inputs
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/preserve-inputs) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/preserve-inputs)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/preserve-inputs) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/preserve-inputs)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/showdown/README.md b/packages/deprecated/showdown/README.md
index e2d39d3b2f..f5e5a96cb8 100644
--- a/packages/deprecated/showdown/README.md
+++ b/packages/deprecated/showdown/README.md
@@ -1,5 +1,5 @@
# showdown
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/showdown) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/showdown)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/showdown) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/showdown)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/spiderable/README.md b/packages/deprecated/spiderable/README.md
index 03b7071564..1060b2d917 100644
--- a/packages/deprecated/spiderable/README.md
+++ b/packages/deprecated/spiderable/README.md
@@ -1,5 +1,5 @@
# spiderable
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/spiderable) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/spiderable)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/spiderable) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/spiderable)
***
`spiderable` is part of [Webapp](https://github.com/meteor/meteor/tree/master/packages/webapp). It's one possible way to allow web search engines to index a Meteor application. It uses the [AJAX Crawling specification](https://developers.google.com/webmasters/ajax-crawling/) published by Google to serve HTML to compatible spiders (Google, Bing, Yandex, and more).
diff --git a/packages/deprecated/srp/README.md b/packages/deprecated/srp/README.md
index 10570e3063..15df1c25bf 100644
--- a/packages/deprecated/srp/README.md
+++ b/packages/deprecated/srp/README.md
@@ -1,5 +1,5 @@
# srp
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/srp) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/srp)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/srp) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/srp)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/standard-app-packages/README.md b/packages/deprecated/standard-app-packages/README.md
index 4a584a3324..418e023b1c 100644
--- a/packages/deprecated/standard-app-packages/README.md
+++ b/packages/deprecated/standard-app-packages/README.md
@@ -1,5 +1,5 @@
# standard-app-packages
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/standard-app-packages) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/standard-app-packages)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/standard-app-packages) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/standard-app-packages)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/startup/README.md b/packages/deprecated/startup/README.md
index 838fc22489..a5a205aab0 100644
--- a/packages/deprecated/startup/README.md
+++ b/packages/deprecated/startup/README.md
@@ -1,5 +1,5 @@
# startup
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/startup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/startup)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/startup) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/startup)
***
-This is an internal Meteor package.
\ No newline at end of file
+This is an internal Meteor package.
diff --git a/packages/deprecated/stylus/README.md b/packages/deprecated/stylus/README.md
index 4d5893cbcd..f539bf10ab 100644
--- a/packages/deprecated/stylus/README.md
+++ b/packages/deprecated/stylus/README.md
@@ -1,5 +1,5 @@
# stylus
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/stylus) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/stylus)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/stylus) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/stylus)
***
**DEPRECATED:** This package is no longer supported/maintained as part of the
diff --git a/packages/deprecated/twitter/README.md b/packages/deprecated/twitter/README.md
index fa2c64ba7b..ddcce4cf90 100644
--- a/packages/deprecated/twitter/README.md
+++ b/packages/deprecated/twitter/README.md
@@ -1,5 +1,5 @@
# twitter
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/twitter) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/twitter)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/twitter) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/twitter)
***
** Deprecated, use twitter-oauth instead**
diff --git a/packages/deprecated/weibo/README.md b/packages/deprecated/weibo/README.md
index c79dc40873..6e3f99d86d 100644
--- a/packages/deprecated/weibo/README.md
+++ b/packages/deprecated/weibo/README.md
@@ -1,5 +1,5 @@
# weibo
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/weibo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/weibo)
+[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/deprecated/weibo) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/deprecated/weibo)
***
** Deprecated, use weibo-oauth instead**
diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js
index f3be28c466..1639ba281b 100644
--- a/packages/mongo/mongo_driver.js
+++ b/packages/mongo/mongo_driver.js
@@ -172,6 +172,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": "//filename.pem"
@@ -788,7 +791,7 @@ MongoConnection.prototype.upsert = function (collectionName, selector, mod,
var self = this;
-
+
if (typeof options === "function" && ! callback) {
callback = options;
options = {};
@@ -844,7 +847,7 @@ MongoConnection.prototype.createIndexAsync = function (collectionName, index,
MongoConnection.prototype.createIndex = function (collectionName, index,
options) {
var self = this;
-
+
return Future.fromPromise(self.createIndexAsync(collectionName, index, options));
};
@@ -866,7 +869,7 @@ MongoConnection.prototype._ensureIndex = MongoConnection.prototype.createIndex;
MongoConnection.prototype._dropIndex = function (collectionName, index) {
var self = this;
-
+
// This function is only used by test code, not within a method, so we don't
// interact with the write fence.
var collection = self.rawCollection(collectionName);
diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js
index e2d5d7b52c..57a987a573 100644
--- a/packages/mongo/oplog_tailing.js
+++ b/packages/mongo/oplog_tailing.js
@@ -206,12 +206,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
// tailing won't ever find anything!
diff --git a/packages/mongo/package.js b/packages/mongo/package.js
index ef44543d61..5fd1d27c2d 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: '1.16.8',
+ version: '1.16.9',
});
Npm.depends({
diff --git a/packages/non-core/blaze b/packages/non-core/blaze
index c5e2cac242..adc11c9a8b 160000
--- a/packages/non-core/blaze
+++ b/packages/non-core/blaze
@@ -1 +1 @@
-Subproject commit c5e2cac242f4889972fb253401fbea5ddbfaee4d
+Subproject commit adc11c9a8bd5d638100d8ff7fb6dc3dc095671e4
diff --git a/packages/underscore/package.js b/packages/underscore/package.js
index 84f8474611..d93e0bb600 100644
--- a/packages/underscore/package.js
+++ b/packages/underscore/package.js
@@ -1,7 +1,7 @@
Package.describe({
summary: "Collection of small helpers: _.map, _.each, ...",
- version: '1.6.0',
+ version: '1.6.1',
});
Npm.depends({
diff --git a/packages/underscore/underscore.js b/packages/underscore/underscore.js
index b7788b3a4b..6a9e39fe09 100644
--- a/packages/underscore/underscore.js
+++ b/packages/underscore/underscore.js
@@ -529,7 +529,7 @@
var rest = slice.call(arguments, 1);
return _.filter(_.uniq(array), function(item) {
return _.every(rest, function(other) {
- return _.contains(other, item) >= 0;
+ return _.contains(other, item);
});
});
};