From 5de06ad9adec0b4bf1f725cd2af1781249e5e5a0 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 23 Jun 2015 14:00:03 -0400 Subject: [PATCH] Use a wrapper NPM package for double-ended-queue. Most immediately, this techique serves as a workaround for https://github.com/npm/read-installed/issues/40, since the latest version of [double-ended-queue](https://www.npmjs.com/package/double-ended-queue) is still a prerelease version. This issue is going to rear its head the next time we rebuild node for the dev bundle, and it will be very difficult to diagnose the problem later if we don't fix it now. Longer-term, we could move things like `Meteor._SynchronousQueue` into the meteor-deque package, but that's a discussion for a different commit. --- packages/meteor/.npm/package/npm-shrinkwrap.json | 9 +++++++-- packages/meteor/fiber_helpers.js | 2 +- packages/meteor/package.js | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/meteor/.npm/package/npm-shrinkwrap.json b/packages/meteor/.npm/package/npm-shrinkwrap.json index f8a7b67c808..ccd3c77e58a 100644 --- a/packages/meteor/.npm/package/npm-shrinkwrap.json +++ b/packages/meteor/.npm/package/npm-shrinkwrap.json @@ -1,7 +1,12 @@ { "dependencies": { - "double-ended-queue": { - "version": "2.1.0-0" + "meteor-deque": { + "version": "2.1.0", + "dependencies": { + "double-ended-queue": { + "version": "2.1.0-0" + } + } } } } diff --git a/packages/meteor/fiber_helpers.js b/packages/meteor/fiber_helpers.js index 9732a79c3af..abcc364f336 100644 --- a/packages/meteor/fiber_helpers.js +++ b/packages/meteor/fiber_helpers.js @@ -14,7 +14,7 @@ Meteor._noYieldsAllowed = function (f) { } }; -Meteor._DoubleEndedQueue = Npm.require('double-ended-queue'); +Meteor._DoubleEndedQueue = Npm.require('meteor-deque'); // Meteor._SynchronousQueue is a queue which runs task functions serially. // Tasks are assumed to be synchronous: ie, it's assumed that they are diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 061479955d0..dce77d3b8be 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -11,7 +11,7 @@ Package.registerBuildPlugin({ }); Npm.depends({ - "double-ended-queue": "2.1.0-0" + "meteor-deque": "2.1.0" }); Package.onUse(function (api) {