From 6bb10c8693ade3982bdb39bd52c324d10a1700c1 Mon Sep 17 00:00:00 2001 From: Zack Date: Tue, 20 Apr 2021 09:21:42 -0400 Subject: [PATCH 1/5] Update oplog_tailing.js Switch Timestamp.ONE to Long.ONE --- packages/mongo/oplog_tailing.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js index 7d2b2fea10..698e9ce4c0 100644 --- a/packages/mongo/oplog_tailing.js +++ b/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); }); From 66f0467caacd18a552264f5d5b70029c32e5c8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Miernik?= Date: Mon, 26 Apr 2021 08:51:57 +0200 Subject: [PATCH 2/5] Reordered fields in DDP method call. --- packages/ddp-client/common/livedata_connection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ddp-client/common/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js index 740a7f4abb..f3992944c2 100644 --- a/packages/ddp-client/common/livedata_connection.js +++ b/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 From 18acb613a38cc003e1b744d013693074710020b7 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Thu, 29 Apr 2021 19:38:05 +0200 Subject: [PATCH 3/5] Bump ddp-client version and add history entry --- History.md | 2 ++ packages/ddp-client/package.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index ac14a8813e..185e615953 100644 --- a/History.md +++ b/History.md @@ -4,6 +4,8 @@ * 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. + ## v2.2, 2021-04-15 #### Highlights diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 1d5b5a5bcd..ff13d25b8e 100644 --- a/packages/ddp-client/package.js +++ b/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 }); From 0b9feae1640aeddd256c59b9c52bc9c61cc28e27 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Fri, 30 Apr 2021 17:25:52 +0200 Subject: [PATCH 4/5] Published mongo@1.11.1 --- History.md | 2 ++ packages/mongo/package.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index 185e615953..3405f4f551 100644 --- a/History.md +++ b/History.md @@ -6,6 +6,8 @@ * 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. + ## v2.2, 2021-04-15 #### Highlights diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 8be1541d3f..3a7807aca0 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.11.0' + version: '1.11.1' }); Npm.depends({ From 65a3be9065227ba11ab0680f85c109d99b860bb4 Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Sun, 2 May 2021 14:34:31 +0200 Subject: [PATCH 5/5] Fix test-packages in browser testing --- tools/cli/default-npm-deps.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cli/default-npm-deps.js b/tools/cli/default-npm-deps.js index b7a3392434..d34c1a702e 100644 --- a/tools/cli/default-npm-deps.js +++ b/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.