github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.4' into feature/email-2-2

Browse Source
This commit is contained in:
Jan Dvorak
2021-07-23 18:01:47 +02:00
parent 7d90503b48 3c35a95972
commit 16ad3dff85
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meteor
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
BUNDLE_VERSION=14.17.3.2
BUNDLE_VERSION=14.17.3.3
# OS Check. Put here because here is where we download the precompiled
# bundles that are arch specific.

15
packages/meteor/.npm/package/npm-shrinkwrap.json generated
View File

@@ -1,17 +1,10 @@
{
"lockfileVersion": 1,
"dependencies": {
"meteor-deque": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/meteor-deque/-/meteor-deque-2.1.0.tgz",
"integrity": "sha1-VZCvQksH7d1gJuIGzHquVnRHBDk=",
"dependencies": {
"double-ended-queue": {
"version": "2.1.0-0",
"resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
"integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
}
}
"double-ended-queue": {
"version": "2.1.0-0",
"resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
"integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw="
}
}
}

2
packages/meteor/fiber_helpers.js
View File

@@ -13,7 +13,7 @@ Meteor._noYieldsAllowed = function (f) {
}
};
Meteor._DoubleEndedQueue = Npm.require('meteor-deque');
Meteor._DoubleEndedQueue = Npm.require('double-ended-queue');
// Meteor._SynchronousQueue is a queue which runs task functions serially.
// Tasks are assumed to be synchronous: ie, it's assumed that they are

6
packages/meteor/package.js
View File

@@ -2,7 +2,7 @@
Package.describe({
summary: "Core Meteor environment",
version: '1.9.3'
version: '1.10.0-beta240.1'
});
Package.registerBuildPlugin({
@@ -11,7 +11,7 @@ Package.registerBuildPlugin({
});
Npm.depends({
"meteor-deque": "2.1.0"
"double-ended-queue": "2.1.0-0"
});
Package.onUse(function (api) {
@@ -40,7 +40,7 @@ Package.onUse(function (api) {
api.addFiles('debug.js', ['client', 'server']);
api.addFiles('string_utils.js', ['client', 'server']);
api.addFiles('test_environment.js', ['client', 'server']);
// dynamic variables, bindEnvironment
// XXX move into a separate package?
api.addFiles('dynamics_browser.js', 'client');

2
packages/mongo/oplog_tailing.js
View File

@@ -85,7 +85,7 @@ OplogHandle = function (oplogUrl, dbName) {
self._startTailing();
};
_.extend(OplogHandle.prototype, {
Object.assign(OplogHandle.prototype, {
stop: function () {
var self = this;
if (self._stopped)