Merge branch 'devel' into release-2.3

History.md

@@ -12,6 +12,10 @@
 
 * Updated `ddp-server@2.3.3` and `socket-stream-client@0.3.2` dependencies which removes Node's HTTP deprecation warning.
 
+* Released `ddp-client@2.4.1` re-ordering fields in DDP message for better client readability.
+
+* Released `mongo@1.11.1` fixing a `Timestamp.ONE is undefined` bug.
+
 * Released `accounts-server@1.7.1` to better test password format & limit password to 256 characters, you can change this limit by setting `Meteor.settings.packages.accounts.passwordMaxLength`
 
 ## v2.2, 2021-04-15

packages/ddp-client/common/livedata_connection.js

@@ -692,9 +692,9 @@ export class Connection {
     // wrote.
     const message = {
       msg: 'method',
+      id: methodId,
       method: name,
-      params: args,
-      id: methodId
+      params: args
     };
 
     // If an exception occurred in a stub, and we're ignoring it

packages/ddp-client/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Meteor's latency-compensated distributed data client",
-  version: '2.4.0',
+  version: '2.4.1',
   documentation: null
 });
 

packages/mongo/oplog_tailing.js

@@ -1,7 +1,7 @@
 var Future = Npm.require('fibers/future');
 
 import { NpmModuleMongodb } from "meteor/npm-mongo";
-const { Timestamp } = NpmModuleMongodb;
+const { Long } = NpmModuleMongodb;
 
 OPLOG_COLLECTION = 'oplog.rs';
 
@@ -278,7 +278,7 @@ _.extend(OplogHandle.prototype, {
               // See https://github.com/meteor/meteor/issues/10420.
               if (!op.ts) {
                 op.ts = nextTimestamp;
-                nextTimestamp = nextTimestamp.add(Timestamp.ONE);
+                nextTimestamp = nextTimestamp.add(Long.ONE);
               }
               handleDoc(op);
             });

packages/mongo/package.js

@@ -9,7 +9,7 @@
 
 Package.describe({
   summary: "Adaptor for using MongoDB and Minimongo over DDP",
-  version: '1.11.0'
+  version: '1.11.1'
 });
 
 Npm.depends({

tools/cli/default-npm-deps.js

@@ -13,7 +13,8 @@ export function install(appDir, options) {
   const needTempPackageJson = ! statOrNull(packageJsonPath);
 
   if (needTempPackageJson) {
-    const { dependencies } = require("../static-assets/skel-minimal/package.json");
+    // NOTE we need skel-minimal to pull in jQuery which right now is required for Blaze
+    const { dependencies } = require("../static-assets/skel-blaze/package.json");
 
     // Write a minimial package.json with the same dependencies as the
     // default new-app package.json file.