From deb33a7b8925c98db96f30d58fa574364d96a9e8 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 27 Apr 2016 13:13:37 -0400 Subject: [PATCH 001/144] Upgrade fstream dev bundle dependency to version 1.0.8. --- scripts/dev-bundle-tool-package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 9886ecbbbe..af32addb6b 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -29,7 +29,7 @@ var packageJson = { "source-map-support": "https://github.com/meteor/node-source-map-support/tarball/1912478769d76e5df4c365e147f25896aee6375e", semver: "4.1.0", request: "2.47.0", - fstream: "https://github.com/meteor/fstream/tarball/d11b9ec4a13918447c8af7559c243c190744dd1c", + fstream: "https://github.com/meteor/fstream/tarball/cf4ea6c175355cec7bee38311e170d08c4078a5d", tar: "1.0.2", kexec: "2.0.2", "source-map": "0.5.3", From 4d596c1e731f3528d16a3ebeecdc1bdd7d26f7c9 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 27 Apr 2016 19:48:33 -0400 Subject: [PATCH 002/144] Upgrade node-inspector to the latest version. --- scripts/dev-bundle-tool-package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index af32addb6b..9063c8857b 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -34,7 +34,7 @@ var packageJson = { kexec: "2.0.2", "source-map": "0.5.3", "browserstack-webdriver": "2.41.1", - "node-inspector": "0.7.4", + "node-inspector": "0.12.8", chalk: "0.5.1", sqlite3: "3.1.3", netroute: "1.0.2", From f9c43a67f444c1f8f3d1928418d6cfac84e8896b Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 10 May 2016 13:16:40 -0400 Subject: [PATCH 003/144] Use a wrapper package for node-aes-gcm. This package specifies a "main" module in its package.json that has a .node file extension, which is currently not something Meteor supports. This needs to be fixed on Meteor's side, but in the meantime I wanted this package to continue working with Meteor 1.3. --- .../.npm/package/npm-shrinkwrap.json | 23 ++++++++++++------- packages/non-core/npm-node-aes-gcm/.versions | 3 --- packages/non-core/npm-node-aes-gcm/package.js | 5 ++-- packages/non-core/npm-node-aes-gcm/wrapper.js | 6 ++--- 4 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 packages/non-core/npm-node-aes-gcm/.versions diff --git a/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json b/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json index 555c3cca84..eb10313104 100644 --- a/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json +++ b/packages/non-core/npm-node-aes-gcm/.npm/package/npm-shrinkwrap.json @@ -1,14 +1,21 @@ { "dependencies": { - "node-aes-gcm": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/node-aes-gcm/-/node-aes-gcm-0.1.5.tgz", - "from": "node-aes-gcm@0.1.5", + "meteor-node-aes-gcm": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/meteor-node-aes-gcm/-/meteor-node-aes-gcm-0.1.7.tgz", + "from": "meteor-node-aes-gcm@0.1.7", "dependencies": { - "nan": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.9.0.tgz", - "from": "nan@>=1.7.0 <2.0.0" + "node-aes-gcm": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/node-aes-gcm/-/node-aes-gcm-0.1.7.tgz", + "from": "node-aes-gcm@0.1.7", + "dependencies": { + "nan": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.3.tgz", + "from": "nan@>=2.3.0 <2.4.0" + } + } } } } diff --git a/packages/non-core/npm-node-aes-gcm/.versions b/packages/non-core/npm-node-aes-gcm/.versions deleted file mode 100644 index f2db2efd7a..0000000000 --- a/packages/non-core/npm-node-aes-gcm/.versions +++ /dev/null @@ -1,3 +0,0 @@ -meteor@1.1.15 -npm-node-aes-gcm@0.1.5_1 -underscore@1.0.9 diff --git a/packages/non-core/npm-node-aes-gcm/package.js b/packages/non-core/npm-node-aes-gcm/package.js index 0e3b80a322..20a82e1adc 100644 --- a/packages/non-core/npm-node-aes-gcm/package.js +++ b/packages/non-core/npm-node-aes-gcm/package.js @@ -1,14 +1,15 @@ Package.describe({ summary: "Wrapper around the node-aes-gcm npm package", - version: '0.1.5_1', + version: '0.1.7_4', documentation: null }); Npm.depends({ - 'node-aes-gcm': '0.1.5' + 'meteor-node-aes-gcm': '0.1.7' }); Package.onUse(function (api) { + api.use("modules@0.6.1"); api.export('NpmModuleNodeAesGcm', 'server'); api.addFiles('wrapper.js', 'server'); }); diff --git a/packages/non-core/npm-node-aes-gcm/wrapper.js b/packages/non-core/npm-node-aes-gcm/wrapper.js index 252d8c612d..9e944ded31 100644 --- a/packages/non-core/npm-node-aes-gcm/wrapper.js +++ b/packages/non-core/npm-node-aes-gcm/wrapper.js @@ -1,14 +1,14 @@ try { - NpmModuleNodeAesGcm = Npm.require('node-aes-gcm'); + NpmModuleNodeAesGcm = require('meteor-node-aes-gcm'); } catch (err) { if (process.platform === "win32" && err.message.match(/specified module could not be found/)) { // the user probably doesn't have OpenSSL installed. throw new Error( -"Couldn't load the package 'npm-node-aes-gcm'. This is probably because you " + +"Couldn't load the package 'meteor-node-aes-gcm'. This is probably because you " + "don't have OpenSSL installed. See the README for details and directions: " + "https://github.com/meteor/meteor/blob/devel/packages/non-core/npm-node-aes-gcm/README.md"); } else { throw err; } -} \ No newline at end of file +} From 8e8303d76fd5df42ab18787fad31d79cdfde0129 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 10 May 2016 13:28:00 -0400 Subject: [PATCH 004/144] Update oauth-encryption to use npm-node-aes-gcm@0.1.7_4. --- packages/oauth-encryption/package.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index d9eb03d5e6..cdc642e184 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,10 +1,10 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.12' + version: '1.0.13' }); Package.onUse(function (api) { - api.use("npm-node-aes-gcm@=0.1.5_1"); + api.use("npm-node-aes-gcm@=0.1.7_4"); api.export("OAuthEncryption", ["server"]); api.use([ From 6fac3d2ec720ca4cbc7f88a3bfe0761230029150 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 7 May 2016 13:03:39 -0400 Subject: [PATCH 005/144] Comment about http 'finish' and (unused) 'prefinish' events. --- packages/webapp/webapp_server.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index 4da8eb4b24..130258d876 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -218,8 +218,10 @@ WebApp._timeoutAdjustmentRequestCallback = function (req, res) { // Insert our new finish listener to run BEFORE the existing one which removes // the response from the socket. var finishListeners = res.listeners('finish'); - // XXX Apparently in Node 0.12 this event is now called 'prefinish'. + // XXX Apparently in Node 0.12 this event was called 'prefinish'. // https://github.com/joyent/node/commit/7c9b6070 + // But it has switched back to 'finish' in Node v4: + // https://github.com/nodejs/node/pull/1411 res.removeAllListeners('finish'); res.on('finish', function () { res.setTimeout(SHORT_SOCKET_TIMEOUT); From 08f074d2fe3f61a19ae99af7a188d51008b65706 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 7 May 2016 13:08:57 -0400 Subject: [PATCH 006/144] Cope with asynchronous ChildProcess.prototype.send in Node v4. https://github.com/nodejs/node/pull/2620 Part of #6921. --- tools/runners/run-app.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/runners/run-app.js b/tools/runners/run-app.js index e0a5fb0082..1b7432d665 100644 --- a/tools/runners/run-app.js +++ b/tools/runners/run-app.js @@ -843,8 +843,14 @@ _.extend(AppRunner.prototype, { // Notify the server that new client assets have been added to the // build. self._refreshing = true; - appProcess.proc.send({ refresh: 'client' }); - self._refreshing = false; + // ChildProcess.prototype.send used to be synchronous, but is now + // asynchronous: https://github.com/nodejs/node/pull/2620 + appProcess.proc.send({ + refresh: 'client' + }, err => { + self._refreshing = false; + if (err) throw err; + }); // Establish a watcher on the new files. setupClientWatcher(); From bf2d2dcc9b653bde522f4eb39c74a1843900624f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 7 May 2016 13:10:24 -0400 Subject: [PATCH 007/144] Use native path.isAbsolute in Node v4. Part of #6921. --- tools/static-assets/server/mini-files.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/static-assets/server/mini-files.js b/tools/static-assets/server/mini-files.js index e76d4f9d65..1bbf95349b 100644 --- a/tools/static-assets/server/mini-files.js +++ b/tools/static-assets/server/mini-files.js @@ -1,6 +1,7 @@ var _ = require("underscore"); var os = require("os"); var path = require("path"); +var assert = require("assert"); // All of these functions are attached to files.js for the tool; // they live here because we need them in boot.js as well to avoid duplicating @@ -73,6 +74,8 @@ var convertToStandardLineEndings = function (fileContents) { // forward slashes) var wrapPathFunction = function (name, partialPaths) { var f = path[name]; + assert.strictEqual(typeof f, "function"); + return function (/* args */) { if (process.platform === 'win32') { var args = _.toArray(arguments); @@ -95,12 +98,11 @@ files.pathResolve = wrapPathFunction("resolve"); files.pathDirname = wrapPathFunction("dirname"); files.pathBasename = wrapPathFunction("basename"); files.pathExtname = wrapPathFunction("extname"); +// The path.isAbsolute function is implemented in Node v4. +files.pathIsAbsolute = wrapPathFunction("isAbsolute"); files.pathSep = '/'; files.pathDelimiter = ':'; files.pathOsDelimiter = path.delimiter; -files.pathIsAbsolute = function (path) { - return toPosixPath(path).charAt(0) === '/'; -}; files.convertToStandardPath = convertToStandardPath; files.convertToOSPath = convertToOSPath; From 9d613651157014ab7bce1f28cff2e8fc46da2e85 Mon Sep 17 00:00:00 2001 From: Nathan Muir Date: Sun, 6 Mar 2016 12:21:48 +1000 Subject: [PATCH 008/144] DebugEntry - Make debugging work with node-inspector v0.12.5. The matching of the `debug listening on port` message was broken when v0.12.5 of node-inspector changed the capitalisation of "debug" to "Debug". The matching is now case-insensitive. --- tools/inspector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/inspector.js b/tools/inspector.js index f9f625ab80..b4265c8b72 100644 --- a/tools/inspector.js +++ b/tools/inspector.js @@ -145,7 +145,7 @@ DEp.connectToChildProcess = function connectToChildProcess(child) { // port (not debugPort!), and create a connection to that port so that // the child process can communicate with node-inspector. child.stderr.on("data", function onData(buffer) { - var match = /debugger listening on port (\d+)/ + var match = /debugger listening on port (\d+)/i .exec(buffer.toString("utf8")); if (match) { child.stderr.removeListener("data", onData); From 767449b52cba05d7363b786a6ac6aff76728dad3 Mon Sep 17 00:00:00 2001 From: Nathan Muir Date: Sat, 23 Jan 2016 18:08:42 +1000 Subject: [PATCH 009/144] Isopack - Fix pre-linked source-maps (Bad instantiation of `Buffer`). --- tools/isobuild/isopack.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js index 539095f539..1f8da417a7 100644 --- a/tools/isobuild/isopack.js +++ b/tools/isobuild/isopack.js @@ -1617,6 +1617,19 @@ _.extend(Isopack.prototype, { servePath: prelinkFile.servePath || undefined }; if (prelinkFile.sourceMap) { + // It appears in node v0.10.x, `new Buffer({someobject: 1})` + // would be silently swallowed. (leaving an empty buffer) + // In node v4+ this same code throws an error. + // XX - Not 100% sure what prelinkFile.sourceMap _can_ be, + // so here's some exhaustive checking of things buffer + // _will_ accept. + var acceptedByBuffer = _.isString(prelinkFile.sourceMap) + || _.isNumber(prelinkFile.sourceMap) + || _.isArray(prelinkFile.sourceMap) + || (prelinkFile.sourceMap instanceof Buffer); + if (!acceptedByBuffer) { + prelinkFile.sourceMap = JSON.stringify(prelinkFile.sourceMap); + } // Write the source map. if (typeof prelinkFile.sourceMap !== "string") { From 558394d757349c99141c0c44fba8e59f0b288dd7 Mon Sep 17 00:00:00 2001 From: Nathan Muir Date: Sat, 23 Jan 2016 17:23:31 +1000 Subject: [PATCH 010/144] ddp-server - Fix usage of incorrect usage of `Promise.resolve()`. --- packages/ddp-server/livedata_server_tests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/ddp-server/livedata_server_tests.js b/packages/ddp-server/livedata_server_tests.js index bfaf84d64a..88c85dd69b 100644 --- a/packages/ddp-server/livedata_server_tests.js +++ b/packages/ddp-server/livedata_server_tests.js @@ -160,7 +160,7 @@ Tinytest.addAsync( Meteor.methods({ testResolvedPromise(arg) { const invocation1 = DDP._CurrentInvocation.get(); - return new Promise.resolve(arg).then(result => { + return Promise.resolve(arg).then(result => { const invocation2 = DDP._CurrentInvocation.get(); // This equality holds because Promise callbacks are bound to the // dynamic environment where .then was called. @@ -172,7 +172,7 @@ Meteor.methods({ }, testRejectedPromise(arg) { - return new Promise.resolve(arg).then(result => { + return Promise.resolve(arg).then(result => { throw new Meteor.Error(result + " raised Meteor.Error"); }); } From aeac26160e8cee9fd93316c44b3a2d2ce5889a6e Mon Sep 17 00:00:00 2001 From: Nathan Muir Date: Sat, 23 Jan 2016 17:40:35 +1000 Subject: [PATCH 011/144] ddp-client - Enable SNI when establishing a DDP connection. --- packages/ddp-client/stream_client_nodejs.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/ddp-client/stream_client_nodejs.js b/packages/ddp-client/stream_client_nodejs.js index 79a52f7395..b343cbea5b 100644 --- a/packages/ddp-client/stream_client_nodejs.js +++ b/packages/ddp-client/stream_client_nodejs.js @@ -136,7 +136,10 @@ _.extend(LivedataTest.ClientStream.prototype, { var targetUrl = toWebsocketUrl(self.endpoint); var fayeOptions = { headers: self.headers, - extensions: [deflate] + extensions: [deflate], + tls: { + servername: Npm.require('url').parse(self.endpoint).hostname + } }; fayeOptions = _.extend(fayeOptions, self.npmFayeOptions); var proxyUrl = self._getProxyUrl(targetUrl); From 4860f30c41ba3ad9ba34dfeb2696725848160e53 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 7 May 2016 13:29:01 -0400 Subject: [PATCH 012/144] Upgrade faye-websocket dependency of ddp-client to latest version. --- .../ddp-client/.npm/package/npm-shrinkwrap.json | 16 ++++++++-------- packages/ddp-client/package.js | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/ddp-client/.npm/package/npm-shrinkwrap.json b/packages/ddp-client/.npm/package/npm-shrinkwrap.json index 33aa36859e..9007897712 100644 --- a/packages/ddp-client/.npm/package/npm-shrinkwrap.json +++ b/packages/ddp-client/.npm/package/npm-shrinkwrap.json @@ -1,19 +1,19 @@ { "dependencies": { "faye-websocket": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz", - "from": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz", + "from": "faye-websocket@0.11.0", "dependencies": { "websocket-driver": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.4.tgz", - "from": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.4.tgz", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.4.tgz", + "from": "websocket-driver@>=0.5.1", "dependencies": { "websocket-extensions": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz", - "from": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz" + "from": "websocket-extensions@>=0.1.1" } } } @@ -27,7 +27,7 @@ "permessage-deflate": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.3.tgz", - "from": "https://registry.npmjs.org/permessage-deflate/-/permessage-deflate-0.1.3.tgz" + "from": "permessage-deflate@0.1.3" } } } diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 91c48045b3..cc0cb2a6d3 100644 --- a/packages/ddp-client/package.js +++ b/packages/ddp-client/package.js @@ -1,11 +1,11 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data client", - version: '1.2.8_1', + version: '1.3.0', documentation: null }); Npm.depends({ - "faye-websocket": "0.9.4", + "faye-websocket": "0.11.0", "lolex": "1.4.0", "permessage-deflate": "0.1.3" }); From be2cc3c6362745d2f695148b91db6df692db3e82 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 8 May 2016 13:11:58 -0400 Subject: [PATCH 013/144] Revert "ddp-client - Enable SNI when establishing a DDP connection." This reverts commit 3221b53196bd20551dc22d0ea010a94ec7c87c17. @nathan-muir says this is no longer necessary with faye-websocket@0.11.0 --- packages/ddp-client/stream_client_nodejs.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/ddp-client/stream_client_nodejs.js b/packages/ddp-client/stream_client_nodejs.js index b343cbea5b..79a52f7395 100644 --- a/packages/ddp-client/stream_client_nodejs.js +++ b/packages/ddp-client/stream_client_nodejs.js @@ -136,10 +136,7 @@ _.extend(LivedataTest.ClientStream.prototype, { var targetUrl = toWebsocketUrl(self.endpoint); var fayeOptions = { headers: self.headers, - extensions: [deflate], - tls: { - servername: Npm.require('url').parse(self.endpoint).hostname - } + extensions: [deflate] }; fayeOptions = _.extend(fayeOptions, self.npmFayeOptions); var proxyUrl = self._getProxyUrl(targetUrl); From ec5d15f13131df37ce6036d09d3ce85b656041b6 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 9 May 2016 12:34:10 -0400 Subject: [PATCH 014/144] Fix exit code for source maps test. --- tools/tests/source-maps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/source-maps.js b/tools/tests/source-maps.js index 2e6432559f..dcc52a0320 100644 --- a/tools/tests/source-maps.js +++ b/tools/tests/source-maps.js @@ -82,7 +82,7 @@ selftest.define("source maps from built meteor tool", ['checkout', 'custom-wareh var run = s.run("throw-error"); run.matchErr(matchPathRegexp('\\(/tools/cli/commands\\.js:' + lineNumber)); - run.expectExit(8); + run.expectExit(1); }); selftest.define("source maps from a build plugin implementation", ['checkout', 'custom-warehouse'], function () { From 2f997ea074fede0f76b8a511495fe5628a2cd503 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 16 May 2016 11:57:43 -0400 Subject: [PATCH 015/144] Run Travis CI tests with g++ 4.8, and using Node v4. --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e41c369129..5ec40272b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "0.10" + - "4.0" cache: directories: - "dev_bundle" @@ -9,3 +9,11 @@ cache: install: ./meteor --get-ready script: TEST_PACKAGES_EXCLUDE="less" ./packages/test-in-console/run.sh sudo: false +env: + - CXX=g++-4.8 +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 From 906f82e4d911c71303086662e0b166233ac7fe98 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 14:16:02 -0400 Subject: [PATCH 016/144] Upgrade Node to v4.4.5. http://nodejs.org/en/blog/release/v4.4.5/ --- scripts/build-dev-bundle-common.sh | 2 +- scripts/generate-dev-bundle.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index db938b6a60..9092fb6f38 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,7 +5,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) -NODE_VERSION=0.10.45 +NODE_VERSION=4.4.5 NPM_VERSION=3.9.6 if [ "$UNAME" == "Linux" ] ; then diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index 8c4f8b0407..ad40ef44f3 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -2,7 +2,7 @@ # use 32bit by default $PLATFORM = "windows_x86" $MONGO_VERSION = "2.6.7" -$NODE_VERSION = "0.10.45" +$NODE_VERSION = "4.4.5" $NPM_VERSION = "3.9.6" $PYTHON_VERSION = "2.7.10" # For node-gyp @@ -37,7 +37,7 @@ $shell = New-Object -com shell.application # download node # same node on 32bit vs 64bit? -$node_link = "http://nodejs.org/dist/v${NODE_VERSION}/node.exe" +$node_link = "http://nodejs.org/dist/v${NODE_VERSION}/win-x86/node.exe" $webclient.DownloadFile($node_link, "$DIR\bin\node.exe") # On Windows we provide a reliable version of python.exe for use by From 703e773568517c2c288efd7e4416e4d446b812bc Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 18 May 2016 12:20:23 -0300 Subject: [PATCH 017/144] Add upsert tests to help mantain API compatibility --- packages/mongo/package.js | 1 + packages/mongo/upsert_compatibility_test.js | 153 ++++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 packages/mongo/upsert_compatibility_test.js diff --git a/packages/mongo/package.js b/packages/mongo/package.js index dbcfec4a04..92f0540b96 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -84,6 +84,7 @@ Package.onTest(function (api) { // XXX test order dependency: the allow_tests "partial allow" test // fails if it is run before mongo_livedata_tests. api.addFiles('mongo_livedata_tests.js', ['client', 'server']); + api.addFiles('upsert_compatibility_test.js', ['server']); api.addFiles('allow_tests.js', ['client', 'server']); api.addFiles('collection_tests.js', ['client', 'server']); api.addFiles('observe_changes_tests.js', ['client', 'server']); diff --git a/packages/mongo/upsert_compatibility_test.js b/packages/mongo/upsert_compatibility_test.js new file mode 100644 index 0000000000..8c608eb836 --- /dev/null +++ b/packages/mongo/upsert_compatibility_test.js @@ -0,0 +1,153 @@ +if (Meteor.isServer) { + Tinytest.add('mongo livedata - native upsert - id type MONGO with MODIFIERS update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); + + coll.insert({foo: 1}); + var result = coll.upsert({foo: 1}, {$set: {foo:2}}); + var updated = coll.findOne({foo: 2}); + + test.equal(result.insertedId, undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(updated._id instanceof Mongo.ObjectID); + + delete updated['_id']; + test.equal(EJSON.equals(updated, {foo: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type MONGO with MODIFIERS insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); + + var result = coll.upsert({foo: 1}, {$set: {bar:2}}); + var inserted = coll.findOne({foo: 1}); + + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(inserted._id instanceof Mongo.ObjectID); + test.equal(inserted._id, result.insertedId) + + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {foo: 1, bar: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type MONGO PLAIN OBJECT update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); + + coll.insert({foo: 1, baz: 42}); + var result = coll.upsert({foo: 1}, {bar:2}); + var updated = coll.findOne({bar: 2}); + + test.isTrue(result.insertedId === undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(updated._id instanceof Mongo.ObjectID); + + delete updated['_id']; + test.equal(EJSON.equals(updated, {bar: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type MONGO PLAIN OBJECT insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); + + var result = coll.upsert({foo: 1}, {bar:2}); + var inserted = coll.findOne({bar: 2}); + + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(inserted._id instanceof Mongo.ObjectID); + test.isTrue(result.insertedId instanceof Mongo.ObjectID); + test.equal(inserted._id, result.insertedId); + + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {bar: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type STRING with MODIFIERS update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); + + coll.insert({foo: 1}); + var result = coll.upsert({foo: 1}, {$set: {foo:2}}); + var updated = coll.findOne({foo: 2}); + + test.equal(result.insertedId, undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(typeof updated._id === 'string'); + + delete updated['_id']; + test.equal(EJSON.equals(updated, {foo: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type STRING with MODIFIERS insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); + + var result = coll.upsert({foo: 1}, {$set: {bar:2}}); + var inserted = coll.findOne({foo: 1}); + + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(typeof inserted._id === 'string'); + test.equal(inserted._id, result.insertedId); + + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {foo: 1, bar: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type STRING PLAIN OBJECT update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); + + coll.insert({foo: 1, baz: 42}); + var result = coll.upsert({foo: 1}, {bar:2}); + var updated = coll.findOne({bar: 2}); + + test.isTrue(result.insertedId === undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(typeof updated._id === 'string'); + + delete updated['_id']; + test.equal(EJSON.equals(updated, {bar: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - id type STRING PLAIN OBJECT insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); + + var result = coll.upsert({foo: 1}, {bar:2}); + var inserted = coll.findOne({bar: 2}); + + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); + + test.isTrue(typeof inserted._id === 'string'); + test.equal(inserted._id, result.insertedId); + + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {bar: 2}), true); + }); + + Tinytest.add('mongo livedata - native upsert - MONGO passing id insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); + + var result = coll.upsert({foo: 1}, {_id: 'meu id'}); + var inserted = coll.findOne({_id: 'meu id'}); + + test.equal(result.insertedId, 'meu id'); + test.equal(result.numberAffected, 1); + + test.isTrue(typeof inserted._id === 'string'); + + test.equal(EJSON.equals(inserted, {_id: 'meu id'}), true); + }); +} From 46c91814b965dfff915565c2cbde38160bdb8e7f Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 18 May 2016 12:23:23 -0300 Subject: [PATCH 018/144] Change npm-mongodb-native to 2.1.18 --- .../.npm/package/npm-shrinkwrap.json | 66 +++++++++++-------- packages/npm-mongo/package.js | 2 +- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index eba8926eec..776e3af114 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -1,26 +1,48 @@ { "dependencies": { "mongodb": { - "version": "1.4.39", - "resolved": "https://github.com/meteor/node-mongodb-native/tarball/9c7441e87fbec059dc0b70bbb70734404b994d71", - "from": "https://github.com/meteor/node-mongodb-native/tarball/9c7441e87fbec059dc0b70bbb70734404b994d71", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz", + "from": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz", "dependencies": { - "bson": { - "version": "0.2.18", - "resolved": "https://github.com/meteor/js-bson/tarball/0103b53", - "from": "https://github.com/meteor/js-bson/tarball/0103b53", + "es6-promise": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz" + }, + "mongodb-core": { + "version": "1.3.18", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz", + "from": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz", "dependencies": { - "nan": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-1.5.1.tgz", - "from": "https://registry.npmjs.org/nan/-/nan-1.5.1.tgz" + "bson": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz", + "from": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz" + }, + "require_optional": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", + "from": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", + "dependencies": { + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "from": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz" + }, + "semver": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz", + "from": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" + } + } } } }, "readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", + "version": "1.0.31", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", + "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", "dependencies": { "core-util-is": { "version": "1.0.2", @@ -33,24 +55,14 @@ "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" }, "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "from": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" - }, - "process-nextick-args": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz", - "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz" + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" } } } diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 0ec82ab8d8..bcb893d127 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -13,7 +13,7 @@ Npm.depends({ // publish-for-arch dance every time we make a Meteor release. // XXX move the npm dependency into a non-core versioned package and allow // it to use C++ bson - mongodb: "https://github.com/meteor/node-mongodb-native/tarball/9c7441e87fbec059dc0b70bbb70734404b994d71" + mongodb: "2.1.18" }); Package.onUse(function (api) { From 91975f1e6f2f442e7f4bc8f88b488aa07c4ea92c Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 18 May 2016 12:26:24 -0300 Subject: [PATCH 019/144] Fix finding primary server --- packages/mongo/mongo_driver.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js index 9c17458fee..ed01848b13 100644 --- a/packages/mongo/mongo_driver.js +++ b/packages/mongo/mongo_driver.js @@ -180,8 +180,10 @@ MongoConnection = function (url, options) { } // First, figure out what the current primary is, if any. - if (db.serverConfig._state.master) - self._primary = db.serverConfig._state.master.name; + if (db.serverConfig.isMasterDoc) { + self._primary = db.serverConfig.isMasterDoc.primary; + } + db.serverConfig.on( 'joined', Meteor.bindEnvironment(function (kind, doc) { if (kind === 'primary') { From 327882021ecb7d23af09bf3f3a74ee068307235d Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 18 May 2016 12:27:40 -0300 Subject: [PATCH 020/144] Fix test asserting wrong version --- packages/mongo/mongo_livedata_tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js index 1ebb537e12..ae45ef3bfd 100644 --- a/packages/mongo/mongo_livedata_tests.js +++ b/packages/mongo/mongo_livedata_tests.js @@ -3236,7 +3236,7 @@ Meteor.isServer && Tinytest.add( Meteor.isServer && Tinytest.add("mongo-livedata - npm modules", function (test) { // Make sure the version number looks like a version number. - test.matches(MongoInternals.NpmModules.mongodb.version, /^1\.(\d+)\.(\d+)/); + test.matches(MongoInternals.NpmModules.mongodb.version, /^2\.(\d+)\.(\d+)/); test.equal(typeof(MongoInternals.NpmModules.mongodb.module), 'function'); test.equal(typeof(MongoInternals.NpmModules.mongodb.module.connect), 'function'); From 72fb8690c0cb69d0453a7df91979c7d0d80020d1 Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 18 May 2016 15:08:26 -0300 Subject: [PATCH 021/144] Fix the result passing from mongo driver --- packages/mongo/mongo_driver.js | 71 ++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 16 deletions(-) diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js index ed01848b13..36d608e127 100644 --- a/packages/mongo/mongo_driver.js +++ b/packages/mongo/mongo_driver.js @@ -410,8 +410,11 @@ MongoConnection.prototype._remove = function (collection_name, selector, try { var collection = self.rawCollection(collection_name); + var wrappedCallback = function(err, driverResult) { + callback(err, transformResult(driverResult).numberAffected); + }; collection.remove(replaceTypes(selector, replaceMeteorAtomWithMongo), - {safe: true}, callback); + {safe: true}, wrappedCallback); } catch (e) { write.committed(); throw e; @@ -555,19 +558,24 @@ MongoConnection.prototype._update = function (collection_name, selector, mod, } else { collection.update( mongoSelector, mongoMod, mongoOpts, - bindEnvironmentForWrite(function (err, result, extra) { + bindEnvironmentForWrite(function (err, result) { if (! err) { - if (result && options._returnObject) { - result = { numberAffected: result }; + var meteorResult = transformResult(result); + if (meteorResult && options._returnObject) { // If this was an upsert() call, and we ended up // inserting a new doc and we know its id, then // return that id as well. - if (options.upsert && knownId && - ! extra.updatedExisting) - result.insertedId = knownId; + + if (options.upsert && meteorResult.insertedId && knownId) { + meteorResult.insertedId = knownId; + } + callback(err, meteorResult); + } else { + callback(err, meteorResult.numberAffected); } + } else { + callback(err); } - callback(err, result); })); } } catch (e) { @@ -593,6 +601,36 @@ var isModificationMod = function (mod) { return isModify; }; +var transformResult = function (driverResult) { + var meteorResult = { numberAffected: 0 }; + if (driverResult) { + mongoResult = driverResult.result; + + // The remove call, returns only {ok: 1, n: [number of removed documents]} + // while, the update apis return the nModified with the number of + // changed documents. + if (mongoResult.nModified != null) { + meteorResult.numberAffected += mongoResult.nModified; + } else if (mongoResult.n) { + meteorResult.numberAffected += mongoResult.n; + } + + // On updates with upsert:true, the inserted values come as a list of + // upserted values -- even with options.multi, when the upsert does insert, + // it only inserts one element. + if (mongoResult.upserted) { + meteorResult.numberAffected += mongoResult.upserted.length; + + if (mongoResult.upserted.length == 1) { + meteorResult.insertedId = mongoResult.upserted[0]._id; + } + } + } + + return meteorResult; +}; + + var NUM_OPTIMISTIC_TRIES = 3; // exposed for testing @@ -601,13 +639,13 @@ MongoConnection._isCannotChangeIdError = function (err) { // checks should work, but just to be safe... if (err.code === 13596) return true; - if (err.err.indexOf("cannot change _id of a document") === 0) + if (err.errmsg.indexOf("cannot change _id of a document") === 0) return true; // Now look for what it looks like in Mongo 2.6. We don't use the error code // here, because the error code we observed it producing (16837) appears to be // a far more generic error code based on examining the source. - if (err.err.indexOf("The _id field cannot be changed") === 0) + if (err.errmsg.indexOf("The _id field cannot be changed") === 0) return true; return false; @@ -693,14 +731,15 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod, } else { collection.update(selector, mod, mongoOptsForUpdate, bindEnvironmentForWrite(function (err, result) { - if (err) + if (err) { callback(err); - else if (result) + } else if (result && result.result.nModified != 0) { callback(null, { - numberAffected: result + numberAffected: result.result.nModified }); - else + } else { doConditionalInsert(); + } })); } }; @@ -722,8 +761,8 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod, } } else { callback(null, { - numberAffected: result, - insertedId: insertedId + numberAffected: result.result.upserted.length, + insertedId: insertedId, }); } })); From e04d5f1adaac291dd05ef88d191a552a513e327a Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 18 May 2016 15:27:39 -0300 Subject: [PATCH 022/144] Fix accounts error handling --- packages/accounts-base/accounts_server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js index dbffd61e64..b81dd40482 100644 --- a/packages/accounts-base/accounts_server.js +++ b/packages/accounts-base/accounts_server.js @@ -1260,9 +1260,9 @@ Ap.insertUserDoc = function (options, user) { // https://jira.mongodb.org/browse/SERVER-3069 will get fixed one day if (e.name !== 'MongoError') throw e; if (e.code !== 11000) throw e; - if (e.err.indexOf('emails.address') !== -1) + if (e.errmsg.indexOf('emails.address') !== -1) throw new Meteor.Error(403, "Email already exists."); - if (e.err.indexOf('username') !== -1) + if (e.errmsg.indexOf('username') !== -1) throw new Meteor.Error(403, "Username already exists."); // XXX better error reporting for services.facebook.id duplicate, etc throw e; From 9f32c7a2447f50b71b0e37a7af07eeab08b5e8ac Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Fri, 20 May 2016 14:47:24 -0300 Subject: [PATCH 023/144] Fix connection with oplog --- packages/mongo/oplog_tailing.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js index faa7712ad5..a5511556dd 100644 --- a/packages/mongo/oplog_tailing.js +++ b/packages/mongo/oplog_tailing.js @@ -207,12 +207,13 @@ _.extend(OplogHandle.prototype, { // Now, make sure that there actually is a repl set here. If not, oplog // tailing won't ever find anything! + // More on the isMasterDoc https://docs.mongodb.com/manual/reference/command/isMaster/ var f = new Future; self._oplogLastEntryConnection.db.admin().command( { ismaster: 1 }, f.resolver()); var isMasterDoc = f.wait(); - if (!(isMasterDoc && isMasterDoc.documents && isMasterDoc.documents[0] && - isMasterDoc.documents[0].setName)) { + + if (!(isMasterDoc && isMasterDoc.setName)) { throw Error("$MONGO_OPLOG_URL must be set to the 'local' database of " + "a Mongo replica set"); } From 8e5ad645ab05eebfa85177399186e38b53b1f3c4 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Fri, 20 May 2016 14:59:44 -0700 Subject: [PATCH 024/144] Update dev bundle Mongo to 3.2 Also, just use the vanilla Mongo from mongodb.com. We used to ship a version with SSL statically compiled in so that `meteor mongo` to Mother worked. This isn't a thing any more. --- scripts/build-mongo-for-dev-bundle.sh | 83 --------------------------- scripts/generate-dev-bundle.ps1 | 2 +- scripts/generate-dev-bundle.sh | 25 ++++---- 3 files changed, 14 insertions(+), 96 deletions(-) delete mode 100755 scripts/build-mongo-for-dev-bundle.sh diff --git a/scripts/build-mongo-for-dev-bundle.sh b/scripts/build-mongo-for-dev-bundle.sh deleted file mode 100755 index 4d47ec7d23..0000000000 --- a/scripts/build-mongo-for-dev-bundle.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -u - -MONGO_VERSION="2.6.7" - -source "$(dirname $0)/build-dev-bundle-common.sh" -echo CHECKOUT DIR IS "$CHECKOUT_DIR" -echo BUILDING MONGO "v$MONGO_VERSION" IN "$DIR" - -# Checkout and build mongodb. -# We want to build a binary that includes SSL support but does not depend on a -# particular version of openssl on the host system. - -OPENSSL="openssl-1.0.2" -OPENSSL_URL="http://www.openssl.org/source/$OPENSSL.tar.gz" -wget $OPENSSL_URL || curl -O $OPENSSL_URL -tar xzf $OPENSSL.tar.gz - -cd $OPENSSL -if [ "$UNAME" == "Linux" ]; then - ./config --prefix="$DIR/build/openssl-out" no-shared -else - # This configuration line is taken from Homebrew formula: - # https://github.com/mxcl/homebrew/blob/master/Library/Formula/openssl.rb - ./Configure no-shared zlib-dynamic --prefix="$DIR/build/openssl-out" darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 -fi -make install - -# To see the mongo changelog, go to http://www.mongodb.org/downloads, -# click 'changelog' under the current version, then 'release notes' in -# the upper right. -cd "$DIR/build" - -# We use Meteor fork since we added some changes to the building script. -# Our patches allow us to link most of the libraries statically. -git clone --branch "ssl-r$MONGO_VERSION" --depth 1 \ - git://github.com/meteor/mongo.git -cd mongo -rm -rf .git - -# Compile - -MONGO_FLAGS="--ssl --release -j4 " -MONGO_FLAGS+="--cpppath=$DIR/build/openssl-out/include --libpath=$DIR/build/openssl-out/lib " - -if [ "$OS" == "osx" ]; then - # NOTE: '--64' option breaks the compilation, even it is on by default on x64 mac: https://jira.mongodb.org/browse/SERVER-5575 - MONGO_FLAGS+="--openssl=$DIR/build/openssl-out/lib " - /usr/local/bin/scons $MONGO_FLAGS mongo mongod -elif [ "$OS" == "linux" ]; then - MONGO_FLAGS+="--no-glibc-check --prefix=./ " - if [ "$ARCH" == "x86_64" ]; then - MONGO_FLAGS+="--64" - fi - scons $MONGO_FLAGS mongo mongod -else - echo "We don't know how to compile mongo for this platform" - exit 1 -fi - -echo "Done with scons build" - -# Copy binaries -mkdir -p "$DIR/mongodb/bin" -cp mongo "$DIR/mongodb/bin/" -cp mongod "$DIR/mongodb/bin/" - -# Copy mongodb distribution information -find ./distsrc -maxdepth 1 -type f -exec cp '{}' ../mongodb \; - -cd "$DIR" -stripBinary mongodb/bin/mongo -stripBinary mongodb/bin/mongod - -echo BUNDLING - -cd "$DIR" -rm -rf build -tar czvf "${CHECKOUT_DIR}/mongo_${PLATFORM}_v${MONGO_VERSION}.tar.gz" . - -echo DONE diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index ad40ef44f3..ca9bcae85d 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -1,7 +1,7 @@ # determine the platform # use 32bit by default $PLATFORM = "windows_x86" -$MONGO_VERSION = "2.6.7" +$MONGO_VERSION = "3.2.6" $NODE_VERSION = "4.4.5" $NPM_VERSION = "3.9.6" $PYTHON_VERSION = "2.7.10" # For node-gyp diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh index 3d55b7e6a9..64a44c1aa2 100755 --- a/scripts/generate-dev-bundle.sh +++ b/scripts/generate-dev-bundle.sh @@ -24,18 +24,19 @@ NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/${NODE_TGZ}" echo "Downloading Node from ${NODE_URL}" curl "${NODE_URL}" | tar zx --strip-components 1 -# Update these values after building the dev-bundle-mongo Jenkins project. -# Also make sure to update MONGO_VERSION in generate-dev-bundle.ps1. -MONGO_VERSION=2.6.7 -MONGO_BUILD_NUMBER=6 -MONGO_TGZ="mongo_${PLATFORM}_v${MONGO_VERSION}.tar.gz" -if [ -f "${CHECKOUT_DIR}/${MONGO_TGZ}" ] ; then - tar zxf "${CHECKOUT_DIR}/${MONGO_TGZ}" -else - MONGO_URL="https://${S3_HOST}/dev-bundle-mongo-${MONGO_BUILD_NUMBER}/${MONGO_TGZ}" - echo "Downloading Mongo from ${MONGO_URL}" - curl "${MONGO_URL}" | tar zx -fi +# Download Mongo from mongodb.com +MONGO_VERSION=3.2.6 +MONGO_NAME="mongodb-${OS}-${ARCH}-${MONGO_VERSION}" +MONGO_TGZ="${MONGO_NAME}.tgz" +MONGO_URL="http://fastdl.mongodb.org/${OS}/${MONGO_TGZ}" +echo "Downloading Mongo from ${MONGO_URL}" +curl "${MONGO_URL}" | tar zx + +# Put Mongo binaries in the right spot (mongodb/bin) +mkdir -p mongodb/bin +mv "${MONGO_NAME}/bin/mongod" mongodb/bin +mv "${MONGO_NAME}/bin/mongo" mongodb/bin +rm -rf "${MONGO_NAME}" # export path so we use the downloaded node and npm export PATH="$DIR/bin:$PATH" From 6273e74ff6537ba583a7a65f74f5b28add3c46f1 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Fri, 20 May 2016 22:42:18 -0700 Subject: [PATCH 025/144] Updated run-mongo code for 3.2 messages --- tools/runners/run-mongo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 7bc2810ddb..dcad06d9df 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -521,7 +521,7 @@ var launchMongo = function (options) { var stdoutOnData = fiberHelpers.bindEnvironment(function (data) { // note: don't use "else ifs" in this, because 'data' can have multiple // lines - if (/config from self or any seed \(EMPTYCONFIG\)/.test(data)) { + if (/\[initandlisten\] Did not find local replica set configuration document at startup/.test(data)) { replSetReadyToBeInitiated = true; maybeReadyToTalk(); } @@ -531,7 +531,7 @@ var launchMongo = function (options) { maybeReadyToTalk(); } - if (/ \[rsMgr\] replSet (PRIMARY|SECONDARY)/.test(data)) { + if (/ \[rsSync\] transition to primary complete/.test(data)) { replSetReady = true; maybeReadyToTalk(); } From ed04b5619ff0541318ab6c48d4d15e1d6b69ad14 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Sat, 21 May 2016 14:26:18 -0700 Subject: [PATCH 026/144] Fixed a bunch of problems with `test-packages-with-mongo-versions.rb` --- packages/test-in-console/run.sh | 2 +- scripts/admin/test-packages-with-mongo-versions.rb | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/test-in-console/run.sh b/packages/test-in-console/run.sh index 4fe7da73ab..c1922dd9d1 100755 --- a/packages/test-in-console/run.sh +++ b/packages/test-in-console/run.sh @@ -10,7 +10,7 @@ export PATH=$METEOR_HOME:$PATH export URL='http://localhost:4096/' -exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclude $TEST_PACKAGES_EXCLUDE) +exec 3< <(meteor test-packages --driver-package test-in-console -p 4096 --exclude ${TEST_PACKAGES_EXCLUDE:-''}) EXEC_PID=$! sed '/test-in-console listening$/q' <&3 diff --git a/scripts/admin/test-packages-with-mongo-versions.rb b/scripts/admin/test-packages-with-mongo-versions.rb index 959b5eb80e..84232854c1 100755 --- a/scripts/admin/test-packages-with-mongo-versions.rb +++ b/scripts/admin/test-packages-with-mongo-versions.rb @@ -16,12 +16,14 @@ mongo_port = "12345" dirname = File.dirname(__FILE__) path_to_test_in_console = File.realpath File.join dirname, "..", "..", "packages", "test-in-console", "run.sh" -path_to_output = File.realpath File.join dirname, "..", "..", "mongo-test-output" +path_to_output = File.join dirname, "..", "..", "mongo-test-output" -unless Dir[path_to_output] +unless Dir[path_to_output] != [] Dir.mkdir path_to_output end +path_to_output = File.realpath path_to_output + puts "Putting output in: #{path_to_output}/" ["3.0.5", "2.6.10", "2.4.14"].each do |mongo_version| From 1970ee875f53a089a31d0554c989495efaed359e Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Sun, 22 May 2016 20:25:59 -0300 Subject: [PATCH 027/144] Fix oplog tests --- packages/mongo/oplog_tailing.js | 11 ++++++++++- packages/mongo/oplog_tests.js | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/mongo/oplog_tailing.js b/packages/mongo/oplog_tailing.js index a5511556dd..c4f3ddc237 100644 --- a/packages/mongo/oplog_tailing.js +++ b/packages/mongo/oplog_tailing.js @@ -207,7 +207,8 @@ _.extend(OplogHandle.prototype, { // Now, make sure that there actually is a repl set here. If not, oplog // tailing won't ever find anything! - // More on the isMasterDoc https://docs.mongodb.com/manual/reference/command/isMaster/ + // More on the isMasterDoc + // https://docs.mongodb.com/manual/reference/command/isMaster/ var f = new Future; self._oplogLastEntryConnection.db.admin().command( { ismaster: 1 }, f.resolver()); @@ -322,5 +323,13 @@ _.extend(OplogHandle.prototype, { var sequencer = self._catchingUpFutures.shift(); sequencer.future.return(); } + }, + + //Methods used on tests to dinamically change TOO_FAR_BEHIND + _defineTooFarBehind: function(value) { + TOO_FAR_BEHIND = value; + }, + _resetTooFarBehind: function() { + TOO_FAR_BEHIND = process.env.METEOR_OPLOG_TOO_FAR_BEHIND || 2000; } }); diff --git a/packages/mongo/oplog_tests.js b/packages/mongo/oplog_tests.js index f41f437a23..4ea2958835 100644 --- a/packages/mongo/oplog_tests.js +++ b/packages/mongo/oplog_tests.js @@ -63,6 +63,14 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( // Fill collection with lots of irrelevant objects (red cats) and some // relevant ones (blue dogs). + + // After updating to mongo 3.2 with the 2.1.18 driver it was no longer + // possible to make this test fail with TOO_FAR_BEHIND = 2000. + // The documents waiting to be processed would hardly go beyond 1000 + // using mongo 3.2 with WiredTiger + MongoInternals.defaultRemoteCollectionDriver().mongo + ._oplogHandle._defineTooFarBehind(800); + self.IRRELEVANT_SIZE = 15000; self.RELEVANT_SIZE = 10; var docs = []; @@ -140,6 +148,10 @@ process.env.MONGO_OPLOG_URL && testAsyncMulti( var self = this; test.isTrue(self.skipped); + //This gets the TOO_FAR_BEHIND back to its initial value + MongoInternals.defaultRemoteCollectionDriver().mongo + ._oplogHandle._resetTooFarBehind(); + self.skipHandle.stop(); self.subHandle.stop(); self.collection.remove({}); From 25b7d3f585cab12ef492a6ef61d66983f927eb14 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Mon, 23 May 2016 14:05:57 -0700 Subject: [PATCH 028/144] Update mongo tests to check for 3.2 --- tools/tests/mongo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/mongo.js b/tools/tests/mongo.js index 1e3f2b0029..eafc5fecd3 100644 --- a/tools/tests/mongo.js +++ b/tools/tests/mongo.js @@ -36,7 +36,7 @@ var testMeteorMongo = function (appDir) { mongoRun.match('connecting to: 127.0.0.1'); // Note: when mongo shell's input is not a tty, there is no prompt. mongoRun.write('db.version()\n'); - mongoRun.match(/2\.6\.\d+/); + mongoRun.match(/3\.2\.\d+/); mongoRun.stop(); run.stop(); From 381064e4bb4ae103513c24b3166e18614b05e8eb Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 25 May 2016 16:52:05 -0400 Subject: [PATCH 029/144] Run mongod with mmapv1 instead of wiredTiger on Windows. --- tools/runners/run-mongo.js | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index dcad06d9df..7888d4614b 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -36,24 +36,30 @@ var runMongoShell = function (url) { }; // Start mongod with a dummy replSet and wait for it to listen. -var spawnMongod = function (mongodPath, port, dbPath, replSetName) { - var child_process = require('child_process'); +function spawnMongod(mongodPath, port, dbPath, replSetName) { + const child_process = require('child_process'); mongodPath = files.convertToOSPath(mongodPath); dbPath = files.convertToOSPath(dbPath); - return child_process.spawn(mongodPath, [ - // nb: cli-test.sh and findMongoPids make strong assumptions about the - // order of the arguments! Check them before changing any arguments. - '--bind_ip', '127.0.0.1', - '--smallfiles', - '--port', port, - '--dbpath', dbPath, - // Use an 8MB oplog rather than 256MB. Uses less space on disk and - // initializes faster. (Not recommended for production!) - '--oplogSize', '8', - '--replSet', replSetName - ], { + const args = [ + // nb: cli-test.sh and findMongoPids make strong assumptions about the + // order of the arguments! Check them before changing any arguments. + '--bind_ip', '127.0.0.1', + '--smallfiles', + '--port', port, + '--dbpath', dbPath, + // Use an 8MB oplog rather than 256MB. Uses less space on disk and + // initializes faster. (Not recommended for production!) + '--oplogSize', '8', + '--replSet', replSetName + ]; + + if (process.platform === "win32") { + args.push('--storageEngine', 'mmapv1'); + } + + return child_process.spawn(mongodPath, args, { // Apparently in some contexts, Mongo crashes if your locale isn't set up // right. I wasn't able to reproduce it, but many people on #4019 // were. Let's default a couple environment variables to English UTF-8 if @@ -65,7 +71,7 @@ var spawnMongod = function (mongodPath, port, dbPath, replSetName) { LC_ALL: 'en_US.UTF-8' }, process.env) }); -}; +} // Find all running Mongo processes that were started by this program // (even by other simultaneous runs of this program). If passed, From 49d7afabca2a60d2156a4620a63fdcb7e0f4c9cb Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 25 May 2016 17:44:47 -0700 Subject: [PATCH 030/144] Added a warning when running the tool against a mmapv1 database --- tools/runners/run-mongo.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 7888d4614b..47b5fd99c7 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -7,6 +7,7 @@ var child_process = require('child_process'); var _ = require('underscore'); var isopackets = require('../tool-env/isopackets.js'); +var Console = require('../console/console.js').Console; // Given a Mongo URL, open an interative Mongo shell on this terminal // on that database. @@ -546,6 +547,19 @@ var launchMongo = function (options) { detectedErrors.freeSpace = true; } + // Running against a old mmapv1 engine, probably from pre-mongo-3.2 Meteor + if (/created by the 'mmapv1' storage engine, so setting the active storage engine to 'mmapv1'/.test(data)) { + Console.warn(); + Console.warn('Your development database is using mmapv1, ' + + 'the old, pre-MongoDB 3.0 database engine. ' + + 'You should consider upgrading to Wired Tiger, the new engine. ' + + 'The easiest way to do so in development is to run ' + + Console.command('meteor reset') + '. ' + + "If you'd like to migrate your database, please consult " + + Console.url('https://docs.mongodb.org/v3.0/release-notes/3.0-upgrade/')) + Console.warn(); + } + if (/Invalid or no user locale set/.test(data)) { detectedErrors.badLocale = true; } From bcfe072d5233be5892f715d27ca9dce69089242d Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 26 May 2016 11:59:28 -0700 Subject: [PATCH 031/144] Turn off journal for wired tiger in development --- tools/runners/run-mongo.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 47b5fd99c7..da370dfc42 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -47,7 +47,6 @@ function spawnMongod(mongodPath, port, dbPath, replSetName) { // nb: cli-test.sh and findMongoPids make strong assumptions about the // order of the arguments! Check them before changing any arguments. '--bind_ip', '127.0.0.1', - '--smallfiles', '--port', port, '--dbpath', dbPath, // Use an 8MB oplog rather than 256MB. Uses less space on disk and @@ -56,8 +55,12 @@ function spawnMongod(mongodPath, port, dbPath, replSetName) { '--replSet', replSetName ]; + // Use mmapv1 on windows, as our binary doesn't support WT if (process.platform === "win32") { - args.push('--storageEngine', 'mmapv1'); + args.push('--storageEngine', 'mmapv1', '--smallfiles'); + } else { + // The WT journal seems to be at least 300MB, which is just too much + args.push('--nojournal'); } return child_process.spawn(mongodPath, args, { From 4a5d4b7d683db43b68541c9d44be58cc43c8ac0c Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Sun, 29 May 2016 17:50:38 -0300 Subject: [PATCH 032/144] Fix initializing and running mongod --- tools/runners/run-mongo.js | 41 +++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index da370dfc42..1062e16942 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -611,35 +611,41 @@ var launchMongo = function (options) { }); } - var initiateResult = yieldingMethod( - db.admin(), 'command', {replSetInitiate: configuration}); + var initiateResult; + try { + initiateResult = yieldingMethod( + db.admin(), 'command', {replSetInitiate: configuration}); + } catch (e) { + if (e.message !== 'already initialized') { + throw Error("rs.initiate error: " + e.message); + } + } + if (stopped) { return; } - // why this isn't in the error is unclear. - if (initiateResult && initiateResult.documents - && initiateResult.documents[0] - && initiateResult.documents[0].errmsg) { - var err = initiateResult.documents[0].errmsg; - if (err !== "already initialized") { - throw Error("rs.initiate error: " + - initiateResult.documents[0].errmsg); - } - } + // XXX timeout eventually? while (!stopped) { - var status = yieldingMethod(db.admin(), 'command', - {replSetGetStatus: 1}); - if (!(status && status.documents && status.documents[0])) { + var status; + try{ + var status = yieldingMethod(db.admin(), 'command', + {replSetGetStatus: 1}); + } catch (e) { + //Some of the expected results, come as errors. + status = e; + } + + if (!status) { throw status; } - status = status.documents[0]; + if (!status.ok) { if (status.startupStatus === 6) { // "SOON" utils.sleepMs(20); continue; } - throw status.errmsg; + throw status.message; } // See http://docs.mongodb.org/manual/reference/replica-states/ // for information about the various states. @@ -823,7 +829,6 @@ _.extend(MRp, { self.suppressExitMessage = false; }, }); - // It has successfully started up, so if it exits after this point, that // actually is an interesting fact and we shouldn't suppress it. self.suppressExitMessage = false; From 711c50291c0eadeb3a37f991dc2d0130b9f98d84 Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Thu, 2 Jun 2016 15:02:56 -0300 Subject: [PATCH 033/144] Improves on error handling during replicaSet setup --- tools/runners/run-mongo.js | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 1062e16942..7fdc26ca66 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -611,9 +611,8 @@ var launchMongo = function (options) { }); } - var initiateResult; try { - initiateResult = yieldingMethod( + var initiateResult = yieldingMethod( db.admin(), 'command', {replSetInitiate: configuration}); } catch (e) { if (e.message !== 'already initialized') { @@ -629,26 +628,20 @@ var launchMongo = function (options) { while (!stopped) { var status; try{ - var status = yieldingMethod(db.admin(), 'command', + status = yieldingMethod(db.admin(), 'command', {replSetGetStatus: 1}); } catch (e) { - //Some of the expected results, come as errors. - status = e; - } - - if (!status) { - throw status; - } - - if (!status.ok) { - if (status.startupStatus === 6) { // "SOON" + // See https://docs.mongodb.com/manual/reference/replica-states/ + // for information on various states + if (e.myState === 6) { + // UNKNOWN(6) some of the other replicas are in an UNKNOWN + // state from this replica perspective. utils.sleepMs(20); continue; + } else { + throw e; } - throw status.message; } - // See http://docs.mongodb.org/manual/reference/replica-states/ - // for information about the various states. // Are any of the members starting up or recovering? if (_.any(status.members, function (member) { @@ -662,7 +655,6 @@ var launchMongo = function (options) { // Is the intended primary currently a secondary? (It passes through // that phase briefly.) - if (status.members[0].stateStr === 'SECONDARY') { utils.sleepMs(20); continue; From 7aa58f3ee5670608e16e3b09d4995b8e7449e52a Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Thu, 2 Jun 2016 23:48:12 -0300 Subject: [PATCH 034/144] Fix MasterDocDetection --- tools/tests/apps/failover-test/server/failover-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/apps/failover-test/server/failover-test.js b/tools/tests/apps/failover-test/server/failover-test.js index b3e7df64a1..fcb10ad7bf 100644 --- a/tools/tests/apps/failover-test/server/failover-test.js +++ b/tools/tests/apps/failover-test/server/failover-test.js @@ -23,7 +23,7 @@ var originalMasterName = null; steps.initialized = function () { // Great, we got the first thing. Let's get another thing. C.insert({step: 'next'}); - var master = C.rawDatabase().serverConfig._state.master; + var master = C.rawDatabase().serverConfig.isMasterDoc; if (!master) { console.log("No master in initialized?"); process.exit(1); @@ -49,7 +49,7 @@ steps.next = function () { steps.steppedDown = function () { console.log("Write succeeded after stepdown."); - var master = C.rawDatabase().serverConfig._state.master; + var master = C.rawDatabase().serverConfig.isMasterDoc; if (!master) { console.log("No master in steppedDown?"); process.exit(1); From 52ae06c7717502d3dd08071d9a2439f0b45b02b2 Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Fri, 3 Jun 2016 01:49:17 -0300 Subject: [PATCH 035/144] Fix get master name on test --- tools/tests/apps/failover-test/server/failover-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tests/apps/failover-test/server/failover-test.js b/tools/tests/apps/failover-test/server/failover-test.js index fcb10ad7bf..a194df44a8 100644 --- a/tools/tests/apps/failover-test/server/failover-test.js +++ b/tools/tests/apps/failover-test/server/failover-test.js @@ -28,7 +28,7 @@ steps.initialized = function () { console.log("No master in initialized?"); process.exit(1); } - originalMasterName = master.name; + originalMasterName = master.primary; console.log("Master starts as", originalMasterName); }; @@ -54,11 +54,11 @@ steps.steppedDown = function () { console.log("No master in steppedDown?"); process.exit(1); } - if (master.name === originalMasterName) { + if (master.primary === originalMasterName) { console.log("Master didn't change?"); process.exit(1); } - console.log("Master ended as", master.name); + console.log("Master ended as", master.primary); console.log("SUCCESS"); process.exit(0); }; From 0c5e19bf702a4be62b280e3dca9b5d2166e9302d Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Fri, 3 Jun 2016 02:30:00 -0300 Subject: [PATCH 036/144] Removing error handling no longer needed --- tools/runners/run-mongo.js | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/tools/runners/run-mongo.js b/tools/runners/run-mongo.js index 7fdc26ca66..d666c17c7a 100644 --- a/tools/runners/run-mongo.js +++ b/tools/runners/run-mongo.js @@ -626,22 +626,11 @@ var launchMongo = function (options) { // XXX timeout eventually? while (!stopped) { - var status; - try{ - status = yieldingMethod(db.admin(), 'command', - {replSetGetStatus: 1}); - } catch (e) { - // See https://docs.mongodb.com/manual/reference/replica-states/ - // for information on various states - if (e.myState === 6) { - // UNKNOWN(6) some of the other replicas are in an UNKNOWN - // state from this replica perspective. - utils.sleepMs(20); - continue; - } else { - throw e; - } - } + var status = yieldingMethod( + db.admin(), 'command', {replSetGetStatus: 1}); + + // See https://docs.mongodb.com/manual/reference/replica-states/ + // for information on various states // Are any of the members starting up or recovering? if (_.any(status.members, function (member) { From e44e9447908b7b4de73d43338169ca657bab662d Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Fri, 3 Jun 2016 15:40:33 +1000 Subject: [PATCH 037/144] Added Mongo 3.2.6 to tested mongo versions --- scripts/admin/test-packages-with-mongo-versions.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/admin/test-packages-with-mongo-versions.rb b/scripts/admin/test-packages-with-mongo-versions.rb index 84232854c1..4bc9cf1c08 100755 --- a/scripts/admin/test-packages-with-mongo-versions.rb +++ b/scripts/admin/test-packages-with-mongo-versions.rb @@ -7,6 +7,7 @@ require 'tmpdir' mongo_install_urls = { + "3.2.6" => "https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-3.2.6.tgz", "3.0.5" => "https://fastdl.mongodb.org/osx/mongodb-osx-x86_64-3.0.5.tgz", "2.6.10" => "http://downloads.mongodb.org/osx/mongodb-osx-x86_64-2.6.10.tgz", "2.4.14" => "http://downloads.mongodb.org/osx/mongodb-osx-x86_64-2.4.14.tgz" @@ -26,7 +27,7 @@ path_to_output = File.realpath path_to_output puts "Putting output in: #{path_to_output}/" -["3.0.5", "2.6.10", "2.4.14"].each do |mongo_version| +["3.2.6", "3.0.5", "2.6.10", "2.4.14"].each do |mongo_version| puts "Installing and testing with Mongo #{mongo_version}..." Dir.mktmpdir "mongo_install" do |mongo_install_dir| From 4e96b8153774a1d1c863848a2c6fda822f4307b1 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Fri, 3 Jun 2016 20:23:39 +1000 Subject: [PATCH 038/144] Update test-packages-with-mongo script to exclude less --- scripts/admin/test-packages-with-mongo-versions.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/admin/test-packages-with-mongo-versions.rb b/scripts/admin/test-packages-with-mongo-versions.rb index 4bc9cf1c08..6343991281 100755 --- a/scripts/admin/test-packages-with-mongo-versions.rb +++ b/scripts/admin/test-packages-with-mongo-versions.rb @@ -27,6 +27,8 @@ path_to_output = File.realpath path_to_output puts "Putting output in: #{path_to_output}/" +test_env = "TEST_PACKAGES_EXCLUDE=\"less\"" + ["3.2.6", "3.0.5", "2.6.10", "2.4.14"].each do |mongo_version| puts "Installing and testing with Mongo #{mongo_version}..." @@ -46,7 +48,7 @@ puts "Putting output in: #{path_to_output}/" puts "Running test-in-console from: #{path_to_test_in_console}" puts "Passing #{mongo_env}" - `#{mongo_env} bash #{path_to_test_in_console} > #{path_to_output}/#{mongo_version}.txt` + `#{test_env} #{mongo_env} bash #{path_to_test_in_console} > #{path_to_output}/#{mongo_version}.txt` # Kill Mongo Process.kill "TERM", pid From 6ca5f1f12124cb4b27a3eacc08d40375660e3296 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Mon, 6 Jun 2016 16:00:06 +1000 Subject: [PATCH 039/144] Added history entry about Mongo 3.2 --- History.md | 18 +++++++++++++++++- packages/npm-mongo/package.js | 5 ----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/History.md b/History.md index 9cefcccaf3..6f5648058d 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,20 @@ -## v.NEXT +## v1.4 + +* Meteor has been upgraded to support Mongo 3.2 by default (the bundled version + used by `meteor run` has been upgraded). Internally it now uses the 2.1.18 + version of the `mongodb` npm driver, and has been tested against at Mongo 3.2 + server. [Issue #6957](https://github.com/meteor/meteor/issues/6957) + + Mongo 3.2 defaults to the new WiredTiger storage engine. You can update your + database following the instructions here: + https://docs.mongodb.com/v3.0/release-notes/3.0-upgrade/. + In development, you can also just use `meteor reset` to remove your old + database, and Meteor will create a new WiredTiger database for you. The Mongo + driver will continue to work with the old MMAPv1 storage engine however. + + The new version of the Mongo driver has been tested with MongoDB versions from + 2.6 up. Mongo 2.4 has now reached end-of-life + (https://www.mongodb.com/support-policy), and is no longer supported. ## v1.3.4.1 diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index bcb893d127..fded6dead0 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -8,11 +8,6 @@ Package.describe({ }); Npm.depends({ - // 1.4.32 (and bson 0.2.18) with optional native dependencies (bson native - // piece and kerberos) ripped out, which means we don't have to do the - // publish-for-arch dance every time we make a Meteor release. - // XXX move the npm dependency into a non-core versioned package and allow - // it to use C++ bson mongodb: "2.1.18" }); From 9c45d01259841390d85b577ab68b45be79f6591a Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 14:21:03 -0400 Subject: [PATCH 040/144] Change update/upsert to return nModified as numberAffected --- packages/mongo/mongo_driver.js | 13 +--- packages/mongo/mongo_livedata_tests.js | 84 ++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 10 deletions(-) diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js index 36d608e127..0fd822b037 100644 --- a/packages/mongo/mongo_driver.js +++ b/packages/mongo/mongo_driver.js @@ -606,15 +606,6 @@ var transformResult = function (driverResult) { if (driverResult) { mongoResult = driverResult.result; - // The remove call, returns only {ok: 1, n: [number of removed documents]} - // while, the update apis return the nModified with the number of - // changed documents. - if (mongoResult.nModified != null) { - meteorResult.numberAffected += mongoResult.nModified; - } else if (mongoResult.n) { - meteorResult.numberAffected += mongoResult.n; - } - // On updates with upsert:true, the inserted values come as a list of // upserted values -- even with options.multi, when the upsert does insert, // it only inserts one element. @@ -624,6 +615,8 @@ var transformResult = function (driverResult) { if (mongoResult.upserted.length == 1) { meteorResult.insertedId = mongoResult.upserted[0]._id; } + } else { + meteorResult.numberAffected = mongoResult.n; } } @@ -735,7 +728,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod, callback(err); } else if (result && result.result.nModified != 0) { callback(null, { - numberAffected: result.result.nModified + numberAffected: result.result.n }); } else { doConditionalInsert(); diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js index ae45ef3bfd..83a82e674b 100644 --- a/packages/mongo/mongo_livedata_tests.js +++ b/packages/mongo/mongo_livedata_tests.js @@ -3345,3 +3345,87 @@ if (Meteor.isClient) { } }); } + +if (Meteor.isServer) { + Tinytest.add('mongo update/upsert - returns nMatched as numberAffected', function (test, onComplete) { + var collName = Random.id(); + var coll = new Mongo.Collection('update_nmatched'+collName); + + coll.insert({animal: 'cat', legs: 4}); + coll.insert({animal: 'dog', legs: 4}); + coll.insert({animal: 'echidna', legs: 4}); + coll.insert({animal: 'platypus', legs: 4}); + coll.insert({animal: 'starfish', legs: 5}); + + var affected = coll.update({legs: 4}, {$set: {category: 'quadruped'}}) + test.equal(affected, 1); + + //Changes only 3 but matched 4 documents + var affected = coll.update({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true}) + test.equal(affected, 4); + + //Again, changes nothing but returns nModified + var affected = coll.update({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true}) + test.equal(affected, 4); + + //upsert:true changes nothing, 4 modified + var affected = coll.update({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true, upsert:true}) + test.equal(affected, 4); + + //upsert method works as upsert:true + var result = coll.upsert({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true}) + test.equal(result.numberAffected, 4); + }); + + Tinytest.addAsync('mongo livedata - update/upsert callback returns nMatched as numberAffected', function (test, onComplete) { + var collName = Random.id(); + var coll = new Mongo.Collection('update_nmatched'+collName); + + coll.insert({animal: 'cat', legs: 4}); + coll.insert({animal: 'dog', legs: 4}); + coll.insert({animal: 'echidna', legs: 4}); + coll.insert({animal: 'platypus', legs: 4}); + coll.insert({animal: 'starfish', legs: 5}); + + var test1 = function () { + coll.update({legs: 4}, {$set: {category: 'quadruped'}}, function (err, result) { + test.equal(result, 1); + test2(); + }) + } + + var test2 = function () { + //Changes only 3 but matched 4 documents + coll.update({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true}, function (err, result) { + test.equal(result, 4); + test3(); + }); + } + + var test3 = function () { + //Again, changes nothing but returns nModified + coll.update({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true}, function (err, result) { + test.equal(result, 4); + test4(); + }); + } + + var test4 = function () { + //upsert:true changes nothing, 4 modified + coll.update({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true, upsert:true}, function (err, result) { + test.equal(result, 4); + test5(); + }); + } + + var test5 = function () { + //upsert method works as upsert:true + coll.upsert({legs: 4}, {$set: {category: 'quadruped'}}, {multi: true}, function (err, result) { + test.equal(result.numberAffected, 4); + onComplete(); + }); + } + + test1(); + }); +} From 6cf6db36b9d5c11dc3e087b785fa3be445f07e84 Mon Sep 17 00:00:00 2001 From: Fabricio Nascimento Date: Wed, 8 Jun 2016 11:26:52 -0300 Subject: [PATCH 041/144] Fix a bug with upserting documents that did not changed --- packages/mongo/mongo_driver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js index 0fd822b037..009776cf5f 100644 --- a/packages/mongo/mongo_driver.js +++ b/packages/mongo/mongo_driver.js @@ -726,7 +726,7 @@ var simulateUpsertWithInsertedId = function (collection, selector, mod, bindEnvironmentForWrite(function (err, result) { if (err) { callback(err); - } else if (result && result.result.nModified != 0) { + } else if (result && result.result.n != 0) { callback(null, { numberAffected: result.result.n }); From 016a6d8930fd509a20ac1b1d169a521ba74e97c7 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 9 Jun 2016 10:27:56 +1000 Subject: [PATCH 042/144] Update update docs to describe return value properly. For #6967 --- packages/mongo/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js index 253a71d754..518883637e 100644 --- a/packages/mongo/collection.js +++ b/packages/mongo/collection.js @@ -537,7 +537,7 @@ Mongo.Collection.prototype.insert = function insert(doc, callback) { } /** - * @summary Modify one or more documents in the collection. Returns the number of affected documents. + * @summary Modify one or more documents in the collection. Returns the number of matched documents. * @locus Anywhere * @method update * @memberOf Mongo.Collection From 748ebd3d3a4f3c1eb3944205889514509a03f814 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 9 Jun 2016 13:30:13 -0400 Subject: [PATCH 043/144] Remove Meteor.isServer conditional block around upsert tests. --- packages/mongo/package.js | 2 +- packages/mongo/upsert_compatibility_test.js | 216 ++++++++++---------- 2 files changed, 108 insertions(+), 110 deletions(-) diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 92f0540b96..d6eb2342d0 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -84,7 +84,7 @@ Package.onTest(function (api) { // XXX test order dependency: the allow_tests "partial allow" test // fails if it is run before mongo_livedata_tests. api.addFiles('mongo_livedata_tests.js', ['client', 'server']); - api.addFiles('upsert_compatibility_test.js', ['server']); + api.addFiles('upsert_compatibility_test.js', 'server'); api.addFiles('allow_tests.js', ['client', 'server']); api.addFiles('collection_tests.js', ['client', 'server']); api.addFiles('observe_changes_tests.js', ['client', 'server']); diff --git a/packages/mongo/upsert_compatibility_test.js b/packages/mongo/upsert_compatibility_test.js index 8c608eb836..4ed4c7e5a4 100644 --- a/packages/mongo/upsert_compatibility_test.js +++ b/packages/mongo/upsert_compatibility_test.js @@ -1,153 +1,151 @@ -if (Meteor.isServer) { - Tinytest.add('mongo livedata - native upsert - id type MONGO with MODIFIERS update', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); +Tinytest.add('mongo livedata - native upsert - id type MONGO with MODIFIERS update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); - coll.insert({foo: 1}); - var result = coll.upsert({foo: 1}, {$set: {foo:2}}); - var updated = coll.findOne({foo: 2}); + coll.insert({foo: 1}); + var result = coll.upsert({foo: 1}, {$set: {foo:2}}); + var updated = coll.findOne({foo: 2}); - test.equal(result.insertedId, undefined); - test.equal(result.numberAffected, 1); + test.equal(result.insertedId, undefined); + test.equal(result.numberAffected, 1); - test.isTrue(updated._id instanceof Mongo.ObjectID); + test.isTrue(updated._id instanceof Mongo.ObjectID); - delete updated['_id']; - test.equal(EJSON.equals(updated, {foo: 2}), true); - }); + delete updated['_id']; + test.equal(EJSON.equals(updated, {foo: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type MONGO with MODIFIERS insert', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); +Tinytest.add('mongo livedata - native upsert - id type MONGO with MODIFIERS insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); - var result = coll.upsert({foo: 1}, {$set: {bar:2}}); - var inserted = coll.findOne({foo: 1}); + var result = coll.upsert({foo: 1}, {$set: {bar:2}}); + var inserted = coll.findOne({foo: 1}); - test.isTrue(result.insertedId !== undefined); - test.equal(result.numberAffected, 1); + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); - test.isTrue(inserted._id instanceof Mongo.ObjectID); - test.equal(inserted._id, result.insertedId) + test.isTrue(inserted._id instanceof Mongo.ObjectID); + test.equal(inserted._id, result.insertedId) - delete inserted['_id']; - test.equal(EJSON.equals(inserted, {foo: 1, bar: 2}), true); - }); + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {foo: 1, bar: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type MONGO PLAIN OBJECT update', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); +Tinytest.add('mongo livedata - native upsert - id type MONGO PLAIN OBJECT update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); - coll.insert({foo: 1, baz: 42}); - var result = coll.upsert({foo: 1}, {bar:2}); - var updated = coll.findOne({bar: 2}); + coll.insert({foo: 1, baz: 42}); + var result = coll.upsert({foo: 1}, {bar:2}); + var updated = coll.findOne({bar: 2}); - test.isTrue(result.insertedId === undefined); - test.equal(result.numberAffected, 1); + test.isTrue(result.insertedId === undefined); + test.equal(result.numberAffected, 1); - test.isTrue(updated._id instanceof Mongo.ObjectID); + test.isTrue(updated._id instanceof Mongo.ObjectID); - delete updated['_id']; - test.equal(EJSON.equals(updated, {bar: 2}), true); - }); + delete updated['_id']; + test.equal(EJSON.equals(updated, {bar: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type MONGO PLAIN OBJECT insert', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); +Tinytest.add('mongo livedata - native upsert - id type MONGO PLAIN OBJECT insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); - var result = coll.upsert({foo: 1}, {bar:2}); - var inserted = coll.findOne({bar: 2}); + var result = coll.upsert({foo: 1}, {bar:2}); + var inserted = coll.findOne({bar: 2}); - test.isTrue(result.insertedId !== undefined); - test.equal(result.numberAffected, 1); + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); - test.isTrue(inserted._id instanceof Mongo.ObjectID); - test.isTrue(result.insertedId instanceof Mongo.ObjectID); - test.equal(inserted._id, result.insertedId); + test.isTrue(inserted._id instanceof Mongo.ObjectID); + test.isTrue(result.insertedId instanceof Mongo.ObjectID); + test.equal(inserted._id, result.insertedId); - delete inserted['_id']; - test.equal(EJSON.equals(inserted, {bar: 2}), true); - }); + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {bar: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type STRING with MODIFIERS update', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); +Tinytest.add('mongo livedata - native upsert - id type STRING with MODIFIERS update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); - coll.insert({foo: 1}); - var result = coll.upsert({foo: 1}, {$set: {foo:2}}); - var updated = coll.findOne({foo: 2}); + coll.insert({foo: 1}); + var result = coll.upsert({foo: 1}, {$set: {foo:2}}); + var updated = coll.findOne({foo: 2}); - test.equal(result.insertedId, undefined); - test.equal(result.numberAffected, 1); + test.equal(result.insertedId, undefined); + test.equal(result.numberAffected, 1); - test.isTrue(typeof updated._id === 'string'); + test.isTrue(typeof updated._id === 'string'); - delete updated['_id']; - test.equal(EJSON.equals(updated, {foo: 2}), true); - }); + delete updated['_id']; + test.equal(EJSON.equals(updated, {foo: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type STRING with MODIFIERS insert', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); +Tinytest.add('mongo livedata - native upsert - id type STRING with MODIFIERS insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); - var result = coll.upsert({foo: 1}, {$set: {bar:2}}); - var inserted = coll.findOne({foo: 1}); + var result = coll.upsert({foo: 1}, {$set: {bar:2}}); + var inserted = coll.findOne({foo: 1}); - test.isTrue(result.insertedId !== undefined); - test.equal(result.numberAffected, 1); + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); - test.isTrue(typeof inserted._id === 'string'); - test.equal(inserted._id, result.insertedId); + test.isTrue(typeof inserted._id === 'string'); + test.equal(inserted._id, result.insertedId); - delete inserted['_id']; - test.equal(EJSON.equals(inserted, {foo: 1, bar: 2}), true); - }); + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {foo: 1, bar: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type STRING PLAIN OBJECT update', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); +Tinytest.add('mongo livedata - native upsert - id type STRING PLAIN OBJECT update', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); - coll.insert({foo: 1, baz: 42}); - var result = coll.upsert({foo: 1}, {bar:2}); - var updated = coll.findOne({bar: 2}); + coll.insert({foo: 1, baz: 42}); + var result = coll.upsert({foo: 1}, {bar:2}); + var updated = coll.findOne({bar: 2}); - test.isTrue(result.insertedId === undefined); - test.equal(result.numberAffected, 1); + test.isTrue(result.insertedId === undefined); + test.equal(result.numberAffected, 1); - test.isTrue(typeof updated._id === 'string'); + test.isTrue(typeof updated._id === 'string'); - delete updated['_id']; - test.equal(EJSON.equals(updated, {bar: 2}), true); - }); + delete updated['_id']; + test.equal(EJSON.equals(updated, {bar: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - id type STRING PLAIN OBJECT insert', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); +Tinytest.add('mongo livedata - native upsert - id type STRING PLAIN OBJECT insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'STRING'}); - var result = coll.upsert({foo: 1}, {bar:2}); - var inserted = coll.findOne({bar: 2}); + var result = coll.upsert({foo: 1}, {bar:2}); + var inserted = coll.findOne({bar: 2}); - test.isTrue(result.insertedId !== undefined); - test.equal(result.numberAffected, 1); + test.isTrue(result.insertedId !== undefined); + test.equal(result.numberAffected, 1); - test.isTrue(typeof inserted._id === 'string'); - test.equal(inserted._id, result.insertedId); + test.isTrue(typeof inserted._id === 'string'); + test.equal(inserted._id, result.insertedId); - delete inserted['_id']; - test.equal(EJSON.equals(inserted, {bar: 2}), true); - }); + delete inserted['_id']; + test.equal(EJSON.equals(inserted, {bar: 2}), true); +}); - Tinytest.add('mongo livedata - native upsert - MONGO passing id insert', function (test) { - var collName = Random.id(); - var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); +Tinytest.add('mongo livedata - native upsert - MONGO passing id insert', function (test) { + var collName = Random.id(); + var coll = new Mongo.Collection('native_upsert_'+collName, {idGeneration: 'MONGO'}); - var result = coll.upsert({foo: 1}, {_id: 'meu id'}); - var inserted = coll.findOne({_id: 'meu id'}); + var result = coll.upsert({foo: 1}, {_id: 'meu id'}); + var inserted = coll.findOne({_id: 'meu id'}); - test.equal(result.insertedId, 'meu id'); - test.equal(result.numberAffected, 1); + test.equal(result.insertedId, 'meu id'); + test.equal(result.numberAffected, 1); - test.isTrue(typeof inserted._id === 'string'); + test.isTrue(typeof inserted._id === 'string'); - test.equal(EJSON.equals(inserted, {_id: 'meu id'}), true); - }); -} + test.equal(EJSON.equals(inserted, {_id: 'meu id'}), true); +}); From 4e0b8f7718ac3d5c949f5bd72c8798d374bd76c0 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 15 Jun 2016 15:14:21 -0400 Subject: [PATCH 044/144] Help node-gyp find its build tools when building Windows dev bundle. --- scripts/generate-dev-bundle.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index ca9bcae85d..959667f7ea 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -67,6 +67,10 @@ rm -Recurse -Force $npm_zip # add bin to the front of the path so we can use our own node for building $env:PATH = "${DIR}\bin;${env:PATH}" +# Make sure node-gyp knows how to find its build tools. +$env:PYTHON = "${DIR}\python\python.exe" +$env:GYP_MSVS_VERSION = "2015" + # Install the version of npm that we're actually going to expose from the # dev bundle. Note that we use npm@1.4.12 to install npm@${NPM_VERSION}. cd "${DIR}\lib" From a25a23803ca9534718c4a71122d114cfce0e883e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 14:21:31 -0400 Subject: [PATCH 045/144] Bump $BUNDLE_VERSION to 4.0.11 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 9139642f5b..0123dbfd3e 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=0.6.15 +BUNDLE_VERSION=4.0.11 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 25e9ff93fc5fa7217f88dbd522ca63e3b8024b07 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 15:11:33 -0400 Subject: [PATCH 046/144] Bump package versions for 1.4-beta.0 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 187699576e..8006f29ef5 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.8" + version: "1.2.9-beta.0" }); Package.onUse(function (api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 3894997db8..98bf5c6461 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.0.10" + version: "1.1.11-beta.0" }); Package.onUse(function(api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index c40bcb4ee0..fba9744dc4 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.8.3' + version: '6.8.4-beta.0' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 5999385441..c7472c5b92 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.9_1', + version: '0.1.10-beta.0', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 92240494ee..7a92259e69 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.5_1', + version: '1.0.6-beta.0', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index a6112a6d46..9f0331a877 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.2_1" + version: "1.1.3-beta.0" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index cc0cb2a6d3..4b1ad9ad9e 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: '1.3.0', + version: '1.3.0-beta.0', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 433ead690f..096f9c5d13 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.8_1', + version: '1.2.9-beta.0', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 94724afa6e..956756c3e3 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.11_1", + version: "0.2.12-beta.0", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 6a23de12a7..d71dccc652 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.6_1', + version: '0.4.7-beta.0', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 09d05445ca..79f92b0fff 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.14_1" + version: "1.0.15-beta.0" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index d864fa2ca9..fb8f6c7cb5 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.12_1", + version: "4.5.13-beta.0", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 825793ef26..9180a714bc 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.7' + version: '1.1.8-beta.0' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 6409f12e66..fc7e1cf1a1 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.4_1', + version: '1.0.5-beta.0', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 5e5cc5a476..7ffea65cf7 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.3_1', + version: '2.6.4-beta.0', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 45bb224d4b..b7fa40fbf8 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.13_1' + version: '1.0.14-beta.0' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 93093b54c6..7faa85ef97 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.3.4_1' + version: '1.4.0-beta.0' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 5b1b1d8bd9..2ac386823b 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.15_1' + version: '1.1.16-beta.0' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index aaf9d3ed27..f3857f05af 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.12_1" + version: "1.1.13-beta.0" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 5bb8902e4a..457377afb7 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.12_1" + version: "1.1.13-beta.0" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index e2651c7211..fb9fba8a8b 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.4_1", + version: "0.6.5-beta.0", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index f445ac250c..91ad87b03b 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.4", + version: "0.6.5-beta.0", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index d6eb2342d0..d9d1d5d01c 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.1.9_1' + version: '1.1.10-beta.0' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index fded6dead0..336e5114f5 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.44_1', + version: '1.4.45-beta.0', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index cdc642e184..55f0fbb4df 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13' + version: '1.0.13-beta.0' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 189d24f428..7ec5342472 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.2_1", + version: "0.7.3-beta.0", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 5600f5fb95..7b3b5f6aa9 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.7_1', + version: '1.0.8-beta.0', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index d10d2a480b..a50f71666b 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.7_1', + version: '1.0.8-beta.0', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index c09b5d2489..991791374d 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.10_1', + version: '1.0.11-beta.0', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 6d5a7f2275..c02c671196 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.3_1" + version: "2.512.4-beta.0" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 16e65aa0ee..a43b0a6b90 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.12_1' + version: '1.1.13-beta.0' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 0c461ddbe4..52385c18c3 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.11' + version: '1.1.12-beta.0' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index b30bf0fbfc..39f77abd0b 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.9_1' + version: '1.2.10-beta.0' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 500938e317..d3e9f0fe25 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.12_1' + version: '2.4.13-beta.0' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index c98c9733a2..65463c3296 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.3.4.1-rc.0", + "version": "1.4-beta.0", "recommended": false, "official": false, "description": "Meteor" From 03516c142ab22b01512480f90b1fd3c203e2c13a Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 17:02:43 -0400 Subject: [PATCH 047/144] Tolerate non-string results from path.* functions. In particular, path.isAbsolute returns a boolean value. --- tools/static-assets/server/mini-files.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/static-assets/server/mini-files.js b/tools/static-assets/server/mini-files.js index 1bbf95349b..3d29cc5549 100644 --- a/tools/static-assets/server/mini-files.js +++ b/tools/static-assets/server/mini-files.js @@ -84,10 +84,16 @@ var wrapPathFunction = function (name, partialPaths) { // forget about conversion of absolute paths for Windows return toDosPath(p, partialPaths); }); - return toPosixPath(f.apply(path, args), partialPaths); - } else { - return f.apply(path, arguments); + + var result = f.apply(path, args); + if (typeof result === "string") { + result = toPosixPath(result, partialPaths); + } + + return result; } + + return f.apply(path, arguments); }; }; From 4d1310b5cdc6bdf9102cd87032effa1b897d083f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 17:05:08 -0400 Subject: [PATCH 048/144] Bump package versions for 1.4-beta.1 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 8006f29ef5..fc268fa01e 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.0" + version: "1.2.9-beta.1" }); Package.onUse(function (api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 98bf5c6461..58f8ea8100 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.0" + version: "1.1.11-beta.1" }); Package.onUse(function(api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index fba9744dc4..37999d1ef1 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.8.4-beta.0' + version: '6.8.4-beta.1' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index c7472c5b92..7258c3c3ac 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.0', + version: '0.1.10-beta.1', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 7a92259e69..14bd770d05 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.0', + version: '1.0.6-beta.1', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 9f0331a877..838282a95f 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.0" + version: "1.1.3-beta.1" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 4b1ad9ad9e..0a48c657a4 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: '1.3.0-beta.0', + version: '1.3.0-beta.1', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 096f9c5d13..7693468878 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.0', + version: '1.2.9-beta.1', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 956756c3e3..e81570b0ef 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.0", + version: "0.2.12-beta.1", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index d71dccc652..31a83fd610 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.0', + version: '0.4.7-beta.1', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 79f92b0fff..67c81702ad 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.0" + version: "1.0.15-beta.1" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index fb8f6c7cb5..5023a12937 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.0", + version: "4.5.13-beta.1", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 9180a714bc..f792604ba5 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.0' + version: '1.1.8-beta.1' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index fc7e1cf1a1..48965a2e0d 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.0', + version: '1.0.5-beta.1', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 7ffea65cf7..6cfa8c3844 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.0', + version: '2.6.4-beta.1', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index b7fa40fbf8..bab0d3e7d7 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.0' + version: '1.0.14-beta.1' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 7faa85ef97..f010a78a6e 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.0' + version: '1.4.0-beta.1' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 2ac386823b..5dd9ed8a61 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.0' + version: '1.1.16-beta.1' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index f3857f05af..c7e0f0fc6d 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.0" + version: "1.1.13-beta.1" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 457377afb7..8c29f767d3 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.0" + version: "1.1.13-beta.1" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index fb9fba8a8b..d3550a1903 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.0", + version: "0.6.5-beta.1", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 91ad87b03b..fa8f342ea4 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.0", + version: "0.6.5-beta.1", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index d9d1d5d01c..c70f51176e 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.1.10-beta.0' + version: '1.1.10-beta.1' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 336e5114f5..1a9c302ca9 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.0', + version: '1.4.45-beta.1', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 55f0fbb4df..8f009bb8ae 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.0' + version: '1.0.13-beta.1' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 7ec5342472..fcd0163068 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.0", + version: "0.7.3-beta.1", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 7b3b5f6aa9..06e997f492 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.0', + version: '1.0.8-beta.1', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index a50f71666b..87ebfa13bd 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.0', + version: '1.0.8-beta.1', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 991791374d..99fc3daf81 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.0', + version: '1.0.11-beta.1', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index c02c671196..812bda84a5 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.0" + version: "2.512.4-beta.1" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index a43b0a6b90..d70a6b3410 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.0' + version: '1.1.13-beta.1' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 52385c18c3..44443df9ec 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.0' + version: '1.1.12-beta.1' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 39f77abd0b..f63d731182 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.0' + version: '1.2.10-beta.1' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index d3e9f0fe25..b7aa4d7032 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.0' + version: '2.4.13-beta.1' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 65463c3296..1bcc3adcb8 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.0", + "version": "1.4-beta.1", "recommended": false, "official": false, "description": "Meteor" From 2654fe68be7d212c2ed2ec0c94333fde79648dd0 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 23 Jun 2016 14:01:15 +0000 Subject: [PATCH 049/144] Merge pull request #7277 from dburles/mongo-connection-options User-defined Mongo.setConnectionOptions API for #6958. --- packages/mongo/connection_options.js | 10 ++++++++++ packages/mongo/mongo_driver.js | 7 ++++--- packages/mongo/package.js | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 packages/mongo/connection_options.js diff --git a/packages/mongo/connection_options.js b/packages/mongo/connection_options.js new file mode 100644 index 0000000000..c061513e0f --- /dev/null +++ b/packages/mongo/connection_options.js @@ -0,0 +1,10 @@ +/** + * @summary Allows for user specified connection options + * @example http://mongodb.github.io/node-mongodb-native/2.1/reference/connecting/connection-settings/ + * @locus Server + * @param {Object} options User specified Mongo connection options + */ +Mongo.setConnectionOptions = function setConnectionOptions (options) { + check(options, Object); + Mongo._connectionOptions = options; +} diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js index 009776cf5f..8435dc523a 100644 --- a/packages/mongo/mongo_driver.js +++ b/packages/mongo/mongo_driver.js @@ -130,7 +130,8 @@ MongoConnection = function (url, options) { self._observeMultiplexers = {}; self._onFailoverHook = new Hook; - var mongoOptions = {db: {safe: true}, server: {}, replSet: {}}; + var mongoOptions = _.extend({db: {safe: true}, server: {}, replSet: {}}, + Mongo._connectionOptions); // Set autoReconnect to true, unless passed on the URL. Why someone // would want to set autoReconnect to false, I'm not really sure, but @@ -151,8 +152,8 @@ MongoConnection = function (url, options) { mongoOptions.db.native_parser = false; } - // XXX maybe we should have a better way of allowing users to configure the - // underlying Mongo driver + // Internally the oplog connections specify their own poolSize + // which we don't want to overwrite with any user defined value if (_.has(options, 'poolSize')) { // If we just set this for "server", replSet will override it. If we just // set it for replSet, it will be ignored if we're not using a replSet. diff --git a/packages/mongo/package.js b/packages/mongo/package.js index c70f51176e..83076499aa 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -74,6 +74,7 @@ Package.onUse(function (api) { api.addFiles('local_collection_driver.js', ['client', 'server']); api.addFiles('remote_collection_driver.js', 'server'); api.addFiles('collection.js', ['client', 'server']); + api.addFiles('connection_options.js', 'server'); }); Package.onTest(function (api) { From d0950a3045aab2623d15d011e490cfbd547afb04 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 26 Jun 2016 19:15:13 -0400 Subject: [PATCH 050/144] Mention Mongo.setConnectionOptions in History.md. --- History.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.md b/History.md index 6f5648058d..508f4af9d9 100644 --- a/History.md +++ b/History.md @@ -16,6 +16,10 @@ 2.6 up. Mongo 2.4 has now reached end-of-life (https://www.mongodb.com/support-policy), and is no longer supported. +* Custom Mongo options can now be specified using the + `Mongo.setConnectionOptions(options)` API. + [#7277](https://github.com/meteor/meteor/pull/7277) + ## v1.3.4.1 * Increased the default HTTP timeout for requests made by the `meteor` From d02446eb01b6a01e86303542501e9cf986760330 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 26 Jun 2016 19:04:56 -0400 Subject: [PATCH 051/144] Upgrade Node to 4.4.6. https://nodejs.org/en/blog/release/v4.4.6/ --- History.md | 2 ++ scripts/build-dev-bundle-common.sh | 2 +- scripts/generate-dev-bundle.ps1 | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/History.md b/History.md index 508f4af9d9..dd012ab956 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,7 @@ ## v1.4 +* Node has been upgraded to 4.4.6. + * Meteor has been upgraded to support Mongo 3.2 by default (the bundled version used by `meteor run` has been upgraded). Internally it now uses the 2.1.18 version of the `mongodb` npm driver, and has been tested against at Mongo 3.2 diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 9092fb6f38..0aa30b81ac 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,7 +5,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) -NODE_VERSION=4.4.5 +NODE_VERSION=4.4.6 NPM_VERSION=3.9.6 if [ "$UNAME" == "Linux" ] ; then diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index 959667f7ea..ba5f2624ad 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -2,7 +2,7 @@ # use 32bit by default $PLATFORM = "windows_x86" $MONGO_VERSION = "3.2.6" -$NODE_VERSION = "4.4.5" +$NODE_VERSION = "4.4.6" $NPM_VERSION = "3.9.6" $PYTHON_VERSION = "2.7.10" # For node-gyp From a0da7b94baaf5e188b24f2cf1fca4de394ec70e3 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 26 Jun 2016 19:06:03 -0400 Subject: [PATCH 052/144] Bump $BUNDLE_VERSION to 4.0.12 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 0123dbfd3e..e4ca7fbf97 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.0.11 +BUNDLE_VERSION=4.0.12 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 9e140cdedb6bf95cbdbe6ca576c3853a92e9426e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 26 Jun 2016 20:04:58 -0400 Subject: [PATCH 053/144] Peg dev_bundle/lib/node_modules/babylon to v6.8.1. --- scripts/dev-bundle-tool-package.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 9063c8857b..bbc536a9bb 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -20,6 +20,9 @@ var packageJson = { promise: "7.1.1", // So that Babel 6 can emit require("babel-runtime/helpers/...") calls. "babel-runtime": "6.9.2", + // Peg babylon at 6.8.1 since 6.8.2 appears to have a bug that causes + // an endless loop when parsing packages/logic-solver/minisat.js. + "babylon": "6.8.1", // For various ES2015 polyfills, such as Map and Set. "meteor-ecmascript-runtime": "0.2.6", // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done From 54d5ea5652a140c7030f3913dbe3769d7e00bcd4 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 26 Jun 2016 20:05:10 -0400 Subject: [PATCH 054/144] Bump $BUNDLE_VERSION to 4.0.13 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index e4ca7fbf97..d98d573033 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.0.12 +BUNDLE_VERSION=4.0.13 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 41a4a141bcf9ffe77ba0ffe3f51cb8b6f5107669 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 26 Jun 2016 19:10:05 -0400 Subject: [PATCH 055/144] Bump package versions for 1.4-beta.2 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index fc268fa01e..1e0c0865a8 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.1" + version: "1.2.9-beta.2" }); Package.onUse(function (api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 58f8ea8100..a88d2d1651 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.1" + version: "1.1.11-beta.2" }); Package.onUse(function(api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 37999d1ef1..b1597b436e 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.8.4-beta.1' + version: '6.8.4-beta.2' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 7258c3c3ac..e324dc452f 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.1', + version: '0.1.10-beta.2', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 14bd770d05..b15b33d13e 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.1', + version: '1.0.6-beta.2', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 838282a95f..9870764ee9 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.1" + version: "1.1.3-beta.2" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 0a48c657a4..9c3f15d7da 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: '1.3.0-beta.1', + version: '1.3.0-beta.2', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 7693468878..225f7d952c 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.1', + version: '1.2.9-beta.2', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index e81570b0ef..62f2031c9b 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.1", + version: "0.2.12-beta.2", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 31a83fd610..05e42719f2 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.1', + version: '0.4.7-beta.2', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 67c81702ad..0d245cf891 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.1" + version: "1.0.15-beta.2" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 5023a12937..4cf702d8f1 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.1", + version: "4.5.13-beta.2", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index f792604ba5..07961fc060 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.1' + version: '1.1.8-beta.2' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 48965a2e0d..4f7af8086b 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.1', + version: '1.0.5-beta.2', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 6cfa8c3844..c6ac63633d 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.1', + version: '2.6.4-beta.2', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index bab0d3e7d7..c24abb9fb3 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.1' + version: '1.0.14-beta.2' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index f010a78a6e..a3722e5f82 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.1' + version: '1.4.0-beta.2' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 5dd9ed8a61..98e2c4d8f2 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.1' + version: '1.1.16-beta.2' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index c7e0f0fc6d..1014845d6a 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.1" + version: "1.1.13-beta.2" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 8c29f767d3..c0a79cb904 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.1" + version: "1.1.13-beta.2" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index d3550a1903..f1c3eba160 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.1", + version: "0.6.5-beta.2", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index fa8f342ea4..08216fe6b2 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.1", + version: "0.6.5-beta.2", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 83076499aa..dade7bfcab 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.1.10-beta.1' + version: '1.1.10-beta.2' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 1a9c302ca9..e2555021a9 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.1', + version: '1.4.45-beta.2', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 8f009bb8ae..1bb3b15568 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.1' + version: '1.0.13-beta.2' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index fcd0163068..533deae6f4 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.1", + version: "0.7.3-beta.2", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 06e997f492..474f78bd7d 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.1', + version: '1.0.8-beta.2', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 87ebfa13bd..c70a95d088 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.1', + version: '1.0.8-beta.2', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 99fc3daf81..a46a0f4b03 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.1', + version: '1.0.11-beta.2', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 812bda84a5..ade3923be3 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.1" + version: "2.512.4-beta.2" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index d70a6b3410..d1865a4ec1 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.1' + version: '1.1.13-beta.2' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 44443df9ec..ae3bbb912c 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.1' + version: '1.1.12-beta.2' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index f63d731182..637c74e283 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.1' + version: '1.2.10-beta.2' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index b7aa4d7032..0b123476fa 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.1' + version: '2.4.13-beta.2' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 1bcc3adcb8..731d4d09ec 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.1", + "version": "1.4-beta.2", "recommended": false, "official": false, "description": "Meteor" From 81986f18945fe5816bd77a5c697768656b678bcc Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 27 Jun 2016 10:02:37 -0400 Subject: [PATCH 056/144] Don't call nonexistent writeHead method of net.Socket objects. --- tools/runners/run-proxy.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/runners/run-proxy.js b/tools/runners/run-proxy.js index 8b4075e5b2..1be4d33dd6 100644 --- a/tools/runners/run-proxy.js +++ b/tools/runners/run-proxy.js @@ -174,9 +174,11 @@ _.extend(Proxy.prototype, { try { return fn(); } catch (e) { - resOrSocket.writeHead(400, { - 'Content-Type': 'text/plain' - }); + if (typeof resOrSocket.writeHead === "function") { + resOrSocket.writeHead(400, { + 'Content-Type': 'text/plain' + }); + } resOrSocket.end("Bad request\n"); } } From 27b1d38a5e7c1c515aac5bb0cf8136fb522d60c1 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 27 Jun 2016 18:32:18 -0400 Subject: [PATCH 057/144] Upgrade npm-bcrypt npm version to 0.8.7. --- packages/non-core/npm-bcrypt/.versions | 6 +++--- packages/non-core/npm-bcrypt/package.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/non-core/npm-bcrypt/.versions b/packages/non-core/npm-bcrypt/.versions index c9d2e15446..d129ff9b64 100644 --- a/packages/non-core/npm-bcrypt/.versions +++ b/packages/non-core/npm-bcrypt/.versions @@ -1,3 +1,3 @@ -meteor@1.1.14-rc.0 -npm-bcrypt@0.8.5 -underscore@1.0.8-rc.0 +meteor@1.1.15_1 +npm-bcrypt@0.8.7 +underscore@1.0.9 diff --git a/packages/non-core/npm-bcrypt/package.js b/packages/non-core/npm-bcrypt/package.js index dea6c48ab7..ecaa1f8af1 100644 --- a/packages/non-core/npm-bcrypt/package.js +++ b/packages/non-core/npm-bcrypt/package.js @@ -1,11 +1,11 @@ Package.describe({ summary: "Wrapper around the bcrypt npm package", - version: '0.8.6_1', + version: '0.8.7', documentation: null }); Npm.depends({ - bcrypt: '0.8.6' + bcrypt: '0.8.7' }); Package.onUse(function (api) { From 7a202dedabe7c1246e7dcf51a539b436302ac611 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 27 Jun 2016 18:40:59 -0400 Subject: [PATCH 058/144] Use npm-bcrypt@0.8.7 in accounts-password. --- packages/accounts-password/package.js | 4 +-- .../.npm/package/npm-shrinkwrap.json | 28 +++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 21cad79fc1..7453a144f7 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,10 +1,10 @@ Package.describe({ summary: "Password support for accounts", - version: "1.1.11" + version: "1.1.12" }); Package.onUse(function(api) { - api.use('npm-bcrypt@0.8.6_1'); + api.use('npm-bcrypt@0.8.7'); api.use([ 'accounts-base', diff --git a/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json b/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json index 3fe83751fc..9f8bfdb477 100644 --- a/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json +++ b/packages/non-core/npm-bcrypt/.npm/package/npm-shrinkwrap.json @@ -1,21 +1,19 @@ { "dependencies": { "bcrypt": { - "version": "0.8.6", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.6.tgz", - "from": "bcrypt@0.8.6", - "dependencies": { - "bindings": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "from": "bindings@1.2.1" - }, - "nan": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz", - "from": "nan@2.2.1" - } - } + "version": "0.8.7", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz", + "from": "bcrypt@0.8.7" + }, + "bindings": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", + "from": "bindings@1.2.1" + }, + "nan": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz", + "from": "nan@2.3.5" } } } From fec8688b5f6c5396b7c015bf13291893b3b6ef9e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 27 Jun 2016 18:46:45 -0400 Subject: [PATCH 059/144] Bump package versions for 1.4-beta.3 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 1e0c0865a8..897bf88760 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.2" + version: "1.2.9-beta.3" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 7453a144f7..b383f193d4 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.1.12" + version: "1.1.12-beta.3" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index a88d2d1651..22306ca6ae 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.2" + version: "1.1.11-beta.3" }); Package.onUse(function(api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index b1597b436e..fa56df5836 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.8.4-beta.2' + version: '6.8.4-beta.3' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index e324dc452f..8234c7ad0b 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.2', + version: '0.1.10-beta.3', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index b15b33d13e..ce1a40893d 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.2', + version: '1.0.6-beta.3', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 9870764ee9..60450e1e45 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.2" + version: "1.1.3-beta.3" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 9c3f15d7da..557edd3ed9 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: '1.3.0-beta.2', + version: '1.3.0-beta.3', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 225f7d952c..c32e827d04 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.2', + version: '1.2.9-beta.3', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 62f2031c9b..083cadcd21 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.2", + version: "0.2.12-beta.3", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 05e42719f2..8e0368052e 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.2', + version: '0.4.7-beta.3', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 0d245cf891..5c0bbbe5f5 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.2" + version: "1.0.15-beta.3" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 4cf702d8f1..caecd0be78 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.2", + version: "4.5.13-beta.3", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 07961fc060..b7050101e9 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.2' + version: '1.1.8-beta.3' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 4f7af8086b..f29d0f0d3a 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.2', + version: '1.0.5-beta.3', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index c6ac63633d..89be8afb3e 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.2', + version: '2.6.4-beta.3', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index c24abb9fb3..015770396f 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.2' + version: '1.0.14-beta.3' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index a3722e5f82..90614fb3c8 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.2' + version: '1.4.0-beta.3' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 98e2c4d8f2..6054deca42 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.2' + version: '1.1.16-beta.3' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 1014845d6a..c3a9beac04 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.2" + version: "1.1.13-beta.3" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index c0a79cb904..8dcff9c955 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.2" + version: "1.1.13-beta.3" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index f1c3eba160..cbdf8df8b6 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.2", + version: "0.6.5-beta.3", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 08216fe6b2..402e2a1425 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.2", + version: "0.6.5-beta.3", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index dade7bfcab..2dcc8f864c 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.1.10-beta.2' + version: '1.1.10-beta.3' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index e2555021a9..f71d609784 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.2', + version: '1.4.45-beta.3', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 1bb3b15568..b188fde23f 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.2' + version: '1.0.13-beta.3' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 533deae6f4..0582076403 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.2", + version: "0.7.3-beta.3", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 474f78bd7d..1a8f65582d 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.2', + version: '1.0.8-beta.3', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index c70a95d088..f36c9336ba 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.2', + version: '1.0.8-beta.3', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index a46a0f4b03..d22debcf5b 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.2', + version: '1.0.11-beta.3', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index ade3923be3..46e4c3ecda 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.2" + version: "2.512.4-beta.3" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index d1865a4ec1..b7775184ce 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.2' + version: '1.1.13-beta.3' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index ae3bbb912c..b2ab59c66e 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.2' + version: '1.1.12-beta.3' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 637c74e283..5ca1e0bbd2 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.2' + version: '1.2.10-beta.3' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 0b123476fa..409526e0f4 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.2' + version: '2.4.13-beta.3' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 731d4d09ec..8980a40a26 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.2", + "version": "1.4-beta.3", "recommended": false, "official": false, "description": "Meteor" From 699cf1f38e9b2a074169515d23983f74148c7223 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 10:20:13 -0400 Subject: [PATCH 060/144] Enable nested `import` declarations for package code as well. The new ES2015 module compiler was previously enabled only for application modules. With Meteor 1.4, it will be the default compiler for all Meteor code, though of course developers who depend on the legacy behavior can still add "babel-plugin-transform-es2015-modules-commonjs" to the "plugins" section of their .babelrc files. --- packages/babel-compiler/babel-compiler.js | 16 ---------------- packages/babel-compiler/package.js | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/packages/babel-compiler/babel-compiler.js b/packages/babel-compiler/babel-compiler.js index f930615f59..6937a5b1f2 100644 --- a/packages/babel-compiler/babel-compiler.js +++ b/packages/babel-compiler/babel-compiler.js @@ -76,22 +76,6 @@ BCp.processOneFileForTarget = function (inputFile, source) { extraFeatures.jscript = targetCouldBeInternetExplorer8; } - if (inputFile.isPackageFile()) { - // When compiling package files, handle import/export syntax using - // the official Babel plugin, so that package authors won't publish - // code that relies on module.import and module.export, because such - // code would fail on Meteor versions before 1.3.3. When compiling - // application files, however, it's fine to rely on module.import - // and module.export, and the developer experience will be much - // better for it: faster compilation, real variables, import - // statements inside conditional statements, etc. - // - // TODO Remove this once we are confident enough developers have - // updated to a version of Meteor that supports module.import and - // module.export. - extraFeatures.legacyModules = true; - } - var babelOptions = Babel.getDefaultOptions(extraFeatures); this.inferExtraBabelOptions(inputFile, babelOptions, cacheDeps); diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index fa56df5836..b70563f0fa 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.8.4-beta.3' + version: '6.9.0-beta.3' }); Npm.depends({ From 315f6ee74c04e7dfad4718ba9f9f1fc54d735362 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 11:08:36 -0400 Subject: [PATCH 061/144] Compute prodPackageNames lazily. --- tools/isobuild/bundler.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index c67725b690..4274186cd0 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -1890,8 +1890,7 @@ class JsImage { }; if (nmd.local) { - var prodPackageNames = - meteorNpm.getProdPackageNames(nmd.sourcePath); + let prodPackageNames; // When copying a local node_modules directory, ignore any npm // package directories not in the list of production package @@ -1906,8 +1905,15 @@ class JsImage { copyOptions.directoryFilter = function (dir) { var base = files.pathBasename(dir); var parentBase = files.pathBasename(files.pathDirname(dir)); - return parentBase !== "node_modules" || - _.has(prodPackageNames, base); + if (parentBase !== "node_modules") { + return true; + } + + // Compute prodPackageNames lazily. + prodPackageNames = prodPackageNames || + meteorNpm.getProdPackageNames(nmd.sourcePath); + + return _.has(prodPackageNames, base); }; } From e229c3546ce5be96182f5d53616e4e35081b7a3d Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 11:59:11 -0400 Subject: [PATCH 062/144] Symlink .meteor/local/plugin-cache in temporary test directory. Because the cache directories are shared instead of copied, the results now have a chance of surviving multiple invocations of `meteor test`. This significantly reduces rebuild times when testing a large app; for example, the meteor/tools/tests/apps/modules app now takes less than 10 seconds to rebuild (after restarting the process, not after a file change) instead of 60 seconds or more. --- tools/cli/commands.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index 55af0cd049..dbad70cca2 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -1611,23 +1611,30 @@ function doTestCommand(options) { projectContextOptions.projectLocalDir = files.pathJoin(testRunnerAppDir, '.meteor', 'local'); // Copy the existing build and isopacks to speed up the initial start - const copyDirIntoTestRunnerApp = (...parts) => { + function copyDirIntoTestRunnerApp(allowSymlink, ...parts) { // Depending on whether the user has run `meteor run` or other commands, they // may or may not exist yet const appDirPath = files.pathJoin(options.appDir, ...parts); - if (files.exists(appDirPath)) { - files.cp_r( - appDirPath, - files.pathJoin(testRunnerAppDir, ...parts), - {preserveSymlinks: true} - ); + const testDirPath = files.pathJoin(testRunnerAppDir, ...parts); + + files.mkdir_p(appDirPath); + files.mkdir_p(files.pathDirname(testDirPath)); + + if (allowSymlink) { + // Windows can create junction links without administrator + // privileges since both paths refer to directories. + files.symlink(appDirPath, testDirPath, "junction"); + } else { + files.cp_r(appDirPath, testDirPath, { + preserveSymlinks: true + }); } } - copyDirIntoTestRunnerApp('.meteor', 'local', 'build'); - copyDirIntoTestRunnerApp('.meteor', 'local', 'bundler-cache'); - copyDirIntoTestRunnerApp('.meteor', 'local', 'isopacks'); - copyDirIntoTestRunnerApp('.meteor', 'local', 'plugin-cache'); + copyDirIntoTestRunnerApp(false, '.meteor', 'local', 'build'); + copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'bundler-cache'); + copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'isopacks'); + copyDirIntoTestRunnerApp(true, '.meteor', 'local', 'plugin-cache'); projectContext = new projectContextModule.ProjectContext(projectContextOptions); From 31fbe9a306bb275b97120767dd6dec1889704313 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 14:26:54 -0400 Subject: [PATCH 063/144] Upgrade meteor-babel and reify to latest versions. --- .../.npm/package/npm-shrinkwrap.json | 61 +++++++++++-------- packages/babel-compiler/package.js | 2 +- .../modules/.npm/package/npm-shrinkwrap.json | 14 ++--- packages/modules/package.js | 2 +- scripts/dev-bundle-tool-package.js | 5 +- 5 files changed, 44 insertions(+), 40 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index f66daaaa31..7ca8edd8db 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -21,13 +21,13 @@ "from": "ansi-styles@>=2.2.1 <3.0.0" }, "ast-types": { - "version": "0.8.16", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.16.tgz", + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.17.tgz", "from": "ast-types@>=0.8.16 <0.9.0" }, "babel-code-frame": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.8.0.tgz", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.11.0.tgz", "from": "babel-code-frame@>=6.8.0 <7.0.0" }, "babel-core": { @@ -36,8 +36,8 @@ "from": "babel-core@>=6.9.1 <6.10.0" }, "babel-generator": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.10.2.tgz", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.11.0.tgz", "from": "babel-generator@>=6.9.0 <7.0.0" }, "babel-helper-builder-react-jsx": { @@ -216,8 +216,8 @@ "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.8.0 <7.0.0" }, "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.8.0.tgz", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz", "from": "babel-plugin-transform-es2015-unicode-regex@>=6.8.0 <7.0.0" }, "babel-plugin-transform-es3-member-expression-literals": { @@ -271,9 +271,9 @@ "from": "babel-plugin-transform-strict-mode@>=6.8.0 <7.0.0" }, "babel-preset-meteor": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.11.0.tgz", - "from": "babel-preset-meteor@>=6.11.0 <6.12.0" + "version": "6.11.1", + "resolved": "https://registry.npmjs.org/babel-preset-meteor/-/babel-preset-meteor-6.11.1.tgz", + "from": "babel-preset-meteor@6.11.1" }, "babel-preset-react": { "version": "6.5.0", @@ -308,7 +308,7 @@ "babylon": { "version": "6.8.1", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.1.tgz", - "from": "babylon@>=6.8.1 <6.9.0" + "from": "babylon@6.8.1" }, "balanced-match": { "version": "0.4.1", @@ -391,9 +391,9 @@ "from": "is-finite@>=1.0.0 <2.0.0" }, "js-tokens": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.3.tgz", - "from": "js-tokens@>=1.0.2 <2.0.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz", + "from": "js-tokens@>=2.0.0 <3.0.0" }, "jsesc": { "version": "0.5.0", @@ -413,17 +413,24 @@ "loose-envify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.2.0.tgz", - "from": "loose-envify@>=1.0.0 <2.0.0" + "from": "loose-envify@>=1.0.0 <2.0.0", + "dependencies": { + "js-tokens": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.3.tgz", + "from": "js-tokens@>=1.0.1 <2.0.0" + } + } }, "magic-string": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.1.tgz", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.2.tgz", "from": "magic-string@>=0.15.0 <0.16.0" }, "meteor-babel": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.11.6.tgz", - "from": "meteor-babel@0.11.6" + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/meteor-babel/-/meteor-babel-0.11.7.tgz", + "from": "meteor-babel@0.11.7" }, "meteor-babel-helpers": { "version": "0.0.3", @@ -493,9 +500,9 @@ "from": "regenerator-runtime@>=0.9.5 <0.10.0" }, "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "from": "regexpu-core@>=1.0.0 <2.0.0" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", + "from": "regexpu-core@>=2.0.0 <3.0.0" }, "regjsgen": { "version": "0.2.0", @@ -508,9 +515,9 @@ "from": "regjsparser@>=0.1.4 <0.2.0" }, "reify": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.4.tgz", - "from": "reify@>=0.3.4 <0.4.0" + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.6.tgz", + "from": "reify@>=0.3.6 <0.4.0" }, "repeating": { "version": "1.1.3", diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index b70563f0fa..185a2b4f92 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -10,7 +10,7 @@ Package.describe({ }); Npm.depends({ - 'meteor-babel': '0.11.6', + 'meteor-babel': '0.11.7', }); Package.onUse(function (api) { diff --git a/packages/modules/.npm/package/npm-shrinkwrap.json b/packages/modules/.npm/package/npm-shrinkwrap.json index 8ae0614a2f..c13812da88 100644 --- a/packages/modules/.npm/package/npm-shrinkwrap.json +++ b/packages/modules/.npm/package/npm-shrinkwrap.json @@ -6,19 +6,19 @@ "from": "acorn@>=3.2.0 <3.3.0" }, "ast-types": { - "version": "0.8.16", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.16.tgz", + "version": "0.8.17", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.8.17.tgz", "from": "ast-types@>=0.8.16 <0.9.0" }, "magic-string": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.1.tgz", + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.15.2.tgz", "from": "magic-string@>=0.15.0 <0.16.0" }, "reify": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.4.tgz", - "from": "reify@0.3.4" + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/reify/-/reify-0.3.6.tgz", + "from": "reify@0.3.6" }, "vlq": { "version": "0.2.1", diff --git a/packages/modules/package.js b/packages/modules/package.js index 402e2a1425..fa8c04a474 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -6,7 +6,7 @@ Package.describe({ }); Npm.depends({ - reify: "0.3.4" + reify: "0.3.6" }); Package.onUse(function(api) { diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index bbc536a9bb..538bb5ba06 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -14,15 +14,12 @@ var packageJson = { npm: "3.9.6", "node-gyp": "3.3.1", "node-pre-gyp": "0.6.26", - "meteor-babel": "0.11.6", + "meteor-babel": "0.11.7", "meteor-promise": "0.7.2", fibers: "1.0.13", promise: "7.1.1", // So that Babel 6 can emit require("babel-runtime/helpers/...") calls. "babel-runtime": "6.9.2", - // Peg babylon at 6.8.1 since 6.8.2 appears to have a bug that causes - // an endless loop when parsing packages/logic-solver/minisat.js. - "babylon": "6.8.1", // For various ES2015 polyfills, such as Map and Set. "meteor-ecmascript-runtime": "0.2.6", // Not yet upgrading Underscore from 1.5.2 to 1.7.0 (which should be done From 89ac409990ccddeeb4ff0a40735e4ce64b64968e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 14:27:56 -0400 Subject: [PATCH 064/144] Bump $BUNDLE_VERSION to 4.0.14 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index d98d573033..1707d352d0 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.0.13 +BUNDLE_VERSION=4.0.14 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 4fc74839c6eff811cdd020b10ec1be08475bc3bc Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 14:32:58 -0400 Subject: [PATCH 065/144] Bump package versions for 1.4-beta.4 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 897bf88760..767a119aff 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.3" + version: "1.2.9-beta.4" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index b383f193d4..320c9a0223 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.1.12-beta.3" + version: "1.1.12-beta.4" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 22306ca6ae..63ca51ed1b 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.3" + version: "1.1.11-beta.4" }); Package.onUse(function(api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 185a2b4f92..9a5d097592 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.3' + version: '6.9.0-beta.4' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 8234c7ad0b..2a48346405 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.3', + version: '0.1.10-beta.4', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index ce1a40893d..31439daa2d 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.3', + version: '1.0.6-beta.4', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 60450e1e45..840da455d4 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.3" + version: "1.1.3-beta.4" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 557edd3ed9..85f97fb002 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: '1.3.0-beta.3', + version: '1.3.0-beta.4', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index c32e827d04..19d7d95571 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.3', + version: '1.2.9-beta.4', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 083cadcd21..c11ae647de 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.3", + version: "0.2.12-beta.4", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 8e0368052e..f6978dbde0 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.3', + version: '0.4.7-beta.4', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 5c0bbbe5f5..71fc19cd88 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.3" + version: "1.0.15-beta.4" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index caecd0be78..b32fb349e2 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.3", + version: "4.5.13-beta.4", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index b7050101e9..50fbb7483e 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.3' + version: '1.1.8-beta.4' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index f29d0f0d3a..8ffdc5d8a2 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.3', + version: '1.0.5-beta.4', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 89be8afb3e..f4977a53b5 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.3', + version: '2.6.4-beta.4', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 015770396f..8ae046c529 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.3' + version: '1.0.14-beta.4' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 90614fb3c8..927db3c535 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.3' + version: '1.4.0-beta.4' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 6054deca42..4bec6a487c 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.3' + version: '1.1.16-beta.4' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index c3a9beac04..b8408a4d53 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.3" + version: "1.1.13-beta.4" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 8dcff9c955..08d0bcb84d 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.3" + version: "1.1.13-beta.4" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index cbdf8df8b6..501d6e29eb 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.3", + version: "0.6.5-beta.4", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index fa8c04a474..7074e7b937 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.3", + version: "0.6.5-beta.4", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 2dcc8f864c..c921857e50 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.1.10-beta.3' + version: '1.1.10-beta.4' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index f71d609784..c022218079 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.3', + version: '1.4.45-beta.4', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index b188fde23f..5f589d2636 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.3' + version: '1.0.13-beta.4' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 0582076403..0a9e1cbebf 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.3", + version: "0.7.3-beta.4", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 1a8f65582d..f730c36120 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.3', + version: '1.0.8-beta.4', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index f36c9336ba..a0885e4c06 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.3', + version: '1.0.8-beta.4', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index d22debcf5b..079f42ba6e 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.3', + version: '1.0.11-beta.4', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 46e4c3ecda..e4b0cb667a 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.3" + version: "2.512.4-beta.4" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index b7775184ce..17e978c468 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.3' + version: '1.1.13-beta.4' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index b2ab59c66e..82f1622964 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.3' + version: '1.1.12-beta.4' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 5ca1e0bbd2..de02386dae 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.3' + version: '1.2.10-beta.4' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 409526e0f4..88663ca37f 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.3' + version: '2.4.13-beta.4' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 8980a40a26..c738f0a70c 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.3", + "version": "1.4-beta.4", "recommended": false, "official": false, "description": "Meteor" From 79d6c89723adff796e330ca91507fe37fdf754c6 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 15:47:30 -0400 Subject: [PATCH 066/144] Update History.md to reflect changes through 1.4-beta.4. --- History.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/History.md b/History.md index dd012ab956..364747bcff 100644 --- a/History.md +++ b/History.md @@ -2,6 +2,15 @@ * Node has been upgraded to 4.4.6. +* The `meteor-babel` npm package has been upgraded to 0.11.7. + +* The `reify` npm package has been upgraded to 0.3.6. + +* The `bcrypt` npm package has been upgraded to 0.8.7. + +* Nested `import` declarations are now enabled for package code as well as + application code. 699cf1f38e9b2a074169515d23983f74148c7223 + * Meteor has been upgraded to support Mongo 3.2 by default (the bundled version used by `meteor run` has been upgraded). Internally it now uses the 2.1.18 version of the `mongodb` npm driver, and has been tested against at Mongo 3.2 @@ -22,6 +31,11 @@ `Mongo.setConnectionOptions(options)` API. [#7277](https://github.com/meteor/meteor/pull/7277) +* When running `meteor test`, shared directories are symlinked (or + junction-linked on Windows) into the temporary test directory, not + copied, leading to much faster test start times after the initial build. + The directories: `.meteor/local/{bundler-cache,isopacks,plugin-cache}` + ## v1.3.4.1 * Increased the default HTTP timeout for requests made by the `meteor` From 4ebd0b2710db2e1af3fe744cda6913442068ca07 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 20:49:04 -0400 Subject: [PATCH 067/144] Use ES2015 syntax to import JsFile and CssFile. --- tools/isobuild/bundler.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index 4274186cd0..c13ad758a1 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -157,6 +157,7 @@ var compiler = require('./compiler.js'); var PackageSource = require('./package-source.js'); import Builder from './builder.js'; var compilerPluginModule = require('./compiler-plugin.js'); +import { JsFile, CssFile } from './minifier-plugin.js'; var meteorNpm = require('./meteor-npm.js'); var files = require('../fs/files.js'); @@ -1057,11 +1058,8 @@ class Target { // Minify the JS in this target minifyJs(minifierDef, minifyMode) { - // Avoid circular deps from top-level import. - const minifierPluginModule = require('./minifier-plugin.js'); - const sources = _.map(this.js, function (file) { - return new minifierPluginModule.JsFile(file, { + return new JsFile(file, { arch: this.arch }); }); @@ -1235,11 +1233,8 @@ class ClientTarget extends Target { // Minify the CSS in this target minifyCss(minifierDef, minifyMode) { - // Avoid circular deps from top-level import. - const minifierPluginModule = require('./minifier-plugin.js'); - const sources = this.css.map((file) => { - return new minifierPluginModule.CssFile(file, { + return new CssFile(file, { arch: this.arch }); }); From 61c32e94b4c065dd885fa3d86cb296f1128b133d Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 28 Jun 2016 20:50:15 -0400 Subject: [PATCH 068/144] Make sure `meteor shell` options JSON is parsed separately. Also don't ignore the `error` parameter passed to the readJSONFromStream callback function. Fixes #7312. --- tools/shell-client.js | 2 +- tools/static-assets/server/shell-server.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/shell-client.js b/tools/shell-client.js index e59ebc2a52..35071377b5 100644 --- a/tools/shell-client.js +++ b/tools/shell-client.js @@ -134,7 +134,7 @@ Cp.setUpSocket = function setUpSocket(sock, key) { sock.write(JSON.stringify({ terminal: ! process.env.EMACS, key: key - })); + }) + "\n"); process.stderr.write(shellBanner()); process.stdin.pipe(sock); diff --git a/tools/static-assets/server/shell-server.js b/tools/static-assets/server/shell-server.js index ad5044ac19..3e93047ab2 100644 --- a/tools/static-assets/server/shell-server.js +++ b/tools/static-assets/server/shell-server.js @@ -161,6 +161,12 @@ Sp.onConnection = function onConnection(socket) { readJSONFromStream(socket, function (error, options, replInputSocket) { clearTimeout(timeout); + if (error) { + socket = null; + console.error(error.stack); + return; + } + if (options.key !== self.key) { if (socket) { socket.end(EXITING_MESSAGE + "\n"); From 9943ae365bef4e451311d45a1a7591477085aa03 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 29 Jun 2016 10:17:49 -0400 Subject: [PATCH 069/144] Upgrade Node to 4.4.7. https://nodejs.org/en/blog/release/v4.4.7/ --- History.md | 2 +- scripts/build-dev-bundle-common.sh | 2 +- scripts/generate-dev-bundle.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index 862275c240..1dff7eef0e 100644 --- a/History.md +++ b/History.md @@ -1,6 +1,6 @@ ## v1.4 -* Node has been upgraded to 4.4.6. +* Node has been upgraded to 4.4.7. * The `meteor-babel` npm package has been upgraded to 0.11.7. diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 0aa30b81ac..6b110af711 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,7 +5,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) -NODE_VERSION=4.4.6 +NODE_VERSION=4.4.7 NPM_VERSION=3.9.6 if [ "$UNAME" == "Linux" ] ; then diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index ba5f2624ad..8c698c8032 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -2,7 +2,7 @@ # use 32bit by default $PLATFORM = "windows_x86" $MONGO_VERSION = "3.2.6" -$NODE_VERSION = "4.4.6" +$NODE_VERSION = "4.4.7" $NPM_VERSION = "3.9.6" $PYTHON_VERSION = "2.7.10" # For node-gyp From ef1d818a97c1b0627129a11841eb4ce58638d2f3 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 29 Jun 2016 10:19:36 -0400 Subject: [PATCH 070/144] Upgrade npm to 3.10.2. --- History.md | 2 ++ scripts/build-dev-bundle-common.sh | 2 +- scripts/dev-bundle-tool-package.js | 2 +- scripts/generate-dev-bundle.ps1 | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/History.md b/History.md index 1dff7eef0e..691567deaa 100644 --- a/History.md +++ b/History.md @@ -2,6 +2,8 @@ * Node has been upgraded to 4.4.7. +* The `npm` tool has been upgraded to 3.10.2. + * The `meteor-babel` npm package has been upgraded to 0.11.7. * The `reify` npm package has been upgraded to 0.3.6. diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 6b110af711..9ead53ed2a 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -6,7 +6,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) NODE_VERSION=4.4.7 -NPM_VERSION=3.9.6 +NPM_VERSION=3.10.2 if [ "$UNAME" == "Linux" ] ; then if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 538bb5ba06..69f31f0cba 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -11,7 +11,7 @@ var packageJson = { dependencies: { // Explicit dependency because we are replacing it with a bundled version // and we want to make sure there are no dependencies on a higher version - npm: "3.9.6", + npm: "3.10.2", "node-gyp": "3.3.1", "node-pre-gyp": "0.6.26", "meteor-babel": "0.11.7", diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index 8c698c8032..11c1718edd 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -3,7 +3,7 @@ $PLATFORM = "windows_x86" $MONGO_VERSION = "3.2.6" $NODE_VERSION = "4.4.7" -$NPM_VERSION = "3.9.6" +$NPM_VERSION = "3.10.2" $PYTHON_VERSION = "2.7.10" # For node-gyp # take it form the environment if exists From 4b85f50269da124078cb628795ed9d745317e912 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 29 Jun 2016 10:20:40 -0400 Subject: [PATCH 071/144] Bump $BUNDLE_VERSION to 4.0.15 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 1707d352d0..64bfda82f7 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.0.14 +BUNDLE_VERSION=4.0.15 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From eaef03607c84bbadffb0255931dc085ab12a1d04 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 29 Jun 2016 10:41:46 -0400 Subject: [PATCH 072/144] Bump package versions for 1.4-beta.5 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 767a119aff..3d4b648ae8 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.4" + version: "1.2.9-beta.5" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 320c9a0223..bea92e4848 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.1.12-beta.4" + version: "1.1.12-beta.5" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 63ca51ed1b..0e18a59980 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.4" + version: "1.1.11-beta.5" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index ad8e00c742..d2aa7db43d 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.2.10' + version: '1.2.11-beta.5' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 9a5d097592..6d74372f3c 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.4' + version: '6.9.0-beta.5' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 2a48346405..f6300175c6 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.4', + version: '0.1.10-beta.5', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 31439daa2d..79f7f6868d 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.4', + version: '1.0.6-beta.5', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 840da455d4..8f61f3d865 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.4" + version: "1.1.3-beta.5" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 85f97fb002..5e13294aa2 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: '1.3.0-beta.4', + version: '1.3.0-beta.5', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 19d7d95571..86018905e3 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.4', + version: '1.2.9-beta.5', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index c11ae647de..4b500cfc9e 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.4", + version: "0.2.12-beta.5", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index f6978dbde0..b89309ccb9 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.4', + version: '0.4.7-beta.5', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 71fc19cd88..345233f541 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.4" + version: "1.0.15-beta.5" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index b32fb349e2..7f63ac2f09 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.4", + version: "4.5.13-beta.5", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 50fbb7483e..e0779e2ab9 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.4' + version: '1.1.8-beta.5' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 8ffdc5d8a2..1cf4bc4123 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.4', + version: '1.0.5-beta.5', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index f4977a53b5..23a518a128 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.4', + version: '2.6.4-beta.5', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 8ae046c529..3b15210d38 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.4' + version: '1.0.14-beta.5' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 927db3c535..f6595ce684 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.4' + version: '1.4.0-beta.5' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 4bec6a487c..563754a19d 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.4' + version: '1.1.16-beta.5' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index b8408a4d53..45b4beb7a1 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.4" + version: "1.1.13-beta.5" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 08d0bcb84d..a24017ae69 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.4" + version: "1.1.13-beta.5" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 501d6e29eb..baf8e18f3e 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.4", + version: "0.6.5-beta.5", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 7074e7b937..1fdd28a725 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.4", + version: "0.6.5-beta.5", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index c921857e50..22a8071740 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.1.10-beta.4' + version: '1.1.10-beta.5' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index c022218079..4757925574 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.4', + version: '1.4.45-beta.5', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 5f589d2636..38a9f889a8 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.4' + version: '1.0.13-beta.5' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 0a9e1cbebf..a2fe9b2723 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.4", + version: "0.7.3-beta.5", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index f730c36120..79364aae36 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.4', + version: '1.0.8-beta.5', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index a0885e4c06..c0f2bffdfd 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.4', + version: '1.0.8-beta.5', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 079f42ba6e..24ca78e64d 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.4', + version: '1.0.11-beta.5', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index e4b0cb667a..fba1983096 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.4" + version: "2.512.4-beta.5" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 17e978c468..4b59efb712 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.4' + version: '1.1.13-beta.5' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 82f1622964..00010bf0e4 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.4' + version: '1.1.12-beta.5' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index de02386dae..c631d73933 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.4' + version: '1.2.10-beta.5' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 88663ca37f..c7935332a4 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.4' + version: '2.4.13-beta.5' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index c738f0a70c..2e62c97e45 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.4", + "version": "1.4-beta.5", "recommended": false, "official": false, "description": "Meteor" From 63f131163081a260f060f42b3572b371c047ed78 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 11 May 2016 16:59:20 -0700 Subject: [PATCH 073/144] First version of release constraint unpinning For #7004. Still working on the self test but it appears to work :) --- tools/cli/commands-packages.js | 111 ++++-------------- tools/project-context.js | 29 ----- .../.meteor/.gitignore | 1 + .../.meteor/packages | 6 + .../.meteor/release | 1 + .../simple.html | 7 ++ tools/tests/update-tests.js | 28 +++++ 7 files changed, 67 insertions(+), 116 deletions(-) create mode 100644 tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/.gitignore create mode 100644 tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/packages create mode 100644 tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/release create mode 100644 tools/tests/apps/very-simple-app-with-no-package-constraints/simple.html create mode 100644 tools/tests/update-tests.js diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js index b1aa082b42..d9a93ab3dd 100644 --- a/tools/cli/commands-packages.js +++ b/tools/cli/commands-packages.js @@ -1405,10 +1405,12 @@ var maybeUpdateRelease = function (options) { // mention that fact. // XXX error handling. - // Figuring out which release to use to update the app is slightly more - // complicated, because we have to run the constraint solver. So, we need to - // try multiple releases, defined by the various options passed in. - var releaseVersionsToTry; + // Previously we attempted to figure out the newest release that is compatible + // with the users non-core version constraints. Now we simply update them + // to the newest and if they get a conflict, they are left with a + // .meteor/packages to work on to get a resolution (with more useful info) + + var releaseVersion; if (options.patch) { // Can't make a patch update if you are not running from a current // release. In fact, you are doing something wrong, so we should tell you @@ -1448,20 +1450,20 @@ var maybeUpdateRelease = function (options) { } // Great, we found a patch version. You can only have one latest patch for // a string of releases, so there is just one release to try. - releaseVersionsToTry = [updateTo]; + releaseVersion = updateTo; } else if (release.explicit) { // You have explicitly specified a release, and we have springboarded to // it. So, we will use that release to update you to itself, if we can. - releaseVersionsToTry = [release.current.getReleaseVersion()]; + releaseVersion = release.current.getReleaseVersion(); } else { // We are not doing a patch update, or a specific release update, so we need // to try all recommended releases on our track, whose order key is greater // than the app's. - releaseVersionsToTry = getLaterReleaseVersions( + releaseVersion = getLaterReleaseVersions( projectContext.releaseFile.releaseTrack, - projectContext.releaseFile.releaseVersion); + projectContext.releaseFile.releaseVersion)[0]; - if (! releaseVersionsToTry.length) { + if (! releaseVersion) { // We could not find any releases newer than the one that we are on, on // that track, so we are done. Console.info( @@ -1472,48 +1474,7 @@ var maybeUpdateRelease = function (options) { } } - var didPrintMessages = false; - var solutionReleaseVersion = _.find(releaseVersionsToTry, function (versionToTry) { - var releaseRecord = catalog.official.getReleaseVersion( - releaseTrack, versionToTry); - if (!releaseRecord) { - throw Error("missing release record?"); - } - - // Reset the project context and pretend we're using the potential release. - projectContext.reset({ releaseForConstraints: releaseRecord }); - var messages = buildmessage.capture(function () { - projectContext.resolveConstraints(); - }); - if (messages.hasMessages()) { - // To avoid overloading the user, we only print messages for the first - // release version we try (which should be the latest) - if (!didPrintMessages) { - Console.info( - "Update to release", releaseTrack + "@" + versionToTry, - "is impossible:"); - Console.info(messages.formatMessages()); - didPrintMessages = true; - } - // Nope, this release didn't work. - return false; - } - - // Yay, it worked! - return true; - }); - - var newerAvailable = false; - if (! solutionReleaseVersion) { - Console.info( - "This project is at the latest release which is compatible with your " + - "current package constraints."); - return 0; - } else if (solutionReleaseVersion !== releaseVersionsToTry[0]) { - newerAvailable = true; - } - - var solutionReleaseName = releaseTrack + '@' + solutionReleaseVersion; + var releaseName = `${releaseTrack}@${releaseVersion}`; // We could at this point springboard to solutionRelease (which is no newer // than the release we are currently running), but there's no super-clear @@ -1524,6 +1485,17 @@ var maybeUpdateRelease = function (options) { var upgraders = require('../upgraders.js'); var upgradersToRun = upgraders.upgradersToRun(projectContext); + // Update every package in .meteor/packages to be (semver)>= the version + // set for that package in the release we are updating to + var releaseRecord = catalog.official.getReleaseVersion(releaseTrack, releaseVersion); + projectContext.projectConstraintsFile.addConstraints( + _.compact(_.map(releaseRecord.packages, function(version, packageName) { + if (projectContext.projectConstraintsFile.getConstraint(packageName)) { + return utils.parsePackageConstraint(packageName + '@' + version); + } + })) + ); + // Download and build packages and write the new versions to .meteor/versions. // XXX It's a little weird that we do a full preparation for build // (downloading packages, building packages, etc) when we might be about @@ -1534,7 +1506,7 @@ var maybeUpdateRelease = function (options) { projectContext.prepareProjectForBuild(); }); // Write the new release to .meteor/release. - projectContext.releaseFile.write(solutionReleaseName); + projectContext.releaseFile.write(releaseName); projectContext.packageMapDelta.displayOnConsole({ title: ("Changes to your project's package version selections from " + "updating the release:") @@ -1542,11 +1514,6 @@ var maybeUpdateRelease = function (options) { Console.info(files.pathBasename(options.appDir) + ": updated to " + projectContext.releaseFile.displayReleaseName + "."); - if (newerAvailable) { - Console.info( - "(Newer releases are available but are not compatible with your " + - "current package constraints.)"); - } // Now run the upgraders. // XXX should we also run upgraders on other random commands, in case there @@ -1649,27 +1616,9 @@ main.registerCommand({ } else { upgradePackageNames = options.args; } - // We want to use the project's release for constraints even if we are - // currently running a newer release (eg if we ran 'meteor update --patch' and - // updated to an older patch release). (If the project has release 'none' - // because this is just 'updating packages', this can be null. Also, if we're - // running from a checkout this should be null even if the file doesn't say - // 'none'.) - var releaseRecordForConstraints = null; - if (!files.inCheckout() - && projectContext.releaseFile.normalReleaseSpecified()) { - releaseRecordForConstraints = catalog.official.getReleaseVersion( - projectContext.releaseFile.releaseTrack, - projectContext.releaseFile.releaseVersion); - if (! releaseRecordForConstraints) { - throw Error("unknown release " + - projectContext.releaseFile.displayReleaseName); - } - } // Try to resolve constraints, allowing the given packages to be upgraded. projectContext.reset({ - releaseForConstraints: releaseRecordForConstraints, upgradePackageNames: upgradePackageNames, upgradeIndirectDepPatchVersions: upgradeIndirectDepPatchVersions }); @@ -1717,21 +1666,9 @@ main.registerCommand({ topLevelPkgSet[constraint.package] = true; }); - var releaseConstrainedPkgSet = {}; // pinned core packages (to skip) - // check releaseRecordForConstraints is not null, e.g. possible - // when running meteor from checkout - if (releaseRecordForConstraints) { - _.each(releaseRecordForConstraints.packages, function (v, packageName) { - releaseConstrainedPkgSet[packageName] = true; - }); - } - var nonlatestDirectDeps = []; var nonlatestIndirectDeps = []; projectContext.packageMap.eachPackage(function (name, info) { - if (_.has(releaseConstrainedPkgSet, name)) { - return; - } var selectedVersion = info.version; var catalog = projectContext.projectCatalog; var latestVersion = getNewerVersion(name, selectedVersion, catalog); diff --git a/tools/project-context.js b/tools/project-context.js index 2f3c7e9582..42284eb7e5 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -139,21 +139,6 @@ _.extend(ProjectContext.prototype, { // to using the web.browser slice instead or make a common 'web' slice). self._forceIncludeCordovaUnibuild = options.forceIncludeCordovaUnibuild; - // If explicitly specified as null, use no release for constraints. - // If specified non-null, should be a release version catalog record. - // If not specified, defaults to release.current. - // - // Note that NONE of these cases are "use the release from - // self.releaseFile"; after all, if you are explicitly running `meteor - // --release foo` it will override what is found in .meteor/releases. - if (_.has(options, 'releaseForConstraints')) { - self._releaseForConstraints = options.releaseForConstraints || null; - } else if (release.current.isCheckout()) { - self._releaseForConstraints = null; - } else { - self._releaseForConstraints = release.current.getCatalogReleaseData(); - } - if (resetOptions.preservePackageMap && self.packageMap) { self._cachedVersionsBeforeReset = self.packageMap.toVersionMap(); // packageMapFile should always exist if packageMap does @@ -639,7 +624,6 @@ _.extend(ProjectContext.prototype, { self._addAppConstraints(depsAndConstraints); self._addLocalPackageConstraints(depsAndConstraints); - self._addReleaseConstraints(depsAndConstraints); return depsAndConstraints; }, @@ -666,19 +650,6 @@ _.extend(ProjectContext.prototype, { }); }, - _addReleaseConstraints: function (depsAndConstraints) { - var self = this; - if (! self._releaseForConstraints) - return; - _.each(self._releaseForConstraints.packages, function (version, packageName) { - var constraint = utils.parsePackageConstraint( - packageName + "@=" + version); - // Add a constraint ("this is the only version available") but no - // dependency (we don't automatically use all local packages!) - depsAndConstraints.constraints.push(constraint); - }); - }, - _getAnticipatedPrereleases: function (rootConstraints, cachedVersions) { var self = this; diff --git a/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/.gitignore b/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/.gitignore new file mode 100644 index 0000000000..4083037423 --- /dev/null +++ b/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/.gitignore @@ -0,0 +1 @@ +local diff --git a/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/packages b/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/packages new file mode 100644 index 0000000000..25e81bdfaa --- /dev/null +++ b/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/packages @@ -0,0 +1,6 @@ +# Meteor packages used by this project, one per line. +# +# 'meteor add' and 'meteor remove' will edit this file for you, +# but you can also edit it by hand. + +meteor-base # Packages every Meteor app needs to have diff --git a/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/release b/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/release new file mode 100644 index 0000000000..621e94f0ec --- /dev/null +++ b/tools/tests/apps/very-simple-app-with-no-package-constraints/.meteor/release @@ -0,0 +1 @@ +none diff --git a/tools/tests/apps/very-simple-app-with-no-package-constraints/simple.html b/tools/tests/apps/very-simple-app-with-no-package-constraints/simple.html new file mode 100644 index 0000000000..5eefc206cc --- /dev/null +++ b/tools/tests/apps/very-simple-app-with-no-package-constraints/simple.html @@ -0,0 +1,7 @@ + + Hello + + + +

Welcome to Meteor!

+ diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js new file mode 100644 index 0000000000..2054aefda1 --- /dev/null +++ b/tools/tests/update-tests.js @@ -0,0 +1,28 @@ +import selftest, { Sandbox } from '../tool-testing/selftest.js'; +import catalog from '../packaging/catalog/catalog.js'; + +const DEFAULT_RELEASE_TRACK = catalog.DEFAULT_TRACK; +const SIMPLE_WAREHOUSE = { + v1: { }, + v2: { recommended: true } +}; + +selftest.define("'meteor update' alters `.meteor/packages`", () => { + const s = new Sandbox({ + warehouse: SIMPLE_WAREHOUSE, + fakeMongo: true + }); + + s.createApp("myapp", "very-simple-app-with-no-package-constraints"); + s.cd("myapp"); + + s.write('.meteor/release', DEFAULT_RELEASE_TRACK + '@v1'); + run = s.run("update"); + run.match("updated to Meteor v2"); + run.expectExit(0); + + const packages = s.read(".meteor/packages"); + if (!packages.match('meteor-base@')) { + selftest.fail("Failed to add a version specifier to `meteor-base` package"); + } +}); From 7519c6b5472a5003324761dc57c6f52f6cf98561 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 19 May 2016 10:57:07 -0700 Subject: [PATCH 074/144] Updated update test to work properly --- tools/tests/update-tests.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js index 2054aefda1..4bf406f7cf 100644 --- a/tools/tests/update-tests.js +++ b/tools/tests/update-tests.js @@ -13,10 +13,11 @@ selftest.define("'meteor update' alters `.meteor/packages`", () => { fakeMongo: true }); - s.createApp("myapp", "very-simple-app-with-no-package-constraints"); + s.createApp("myapp", "very-simple-app-with-no-package-constraints", { + release: DEFAULT_RELEASE_TRACK + '@v1' + }); s.cd("myapp"); - s.write('.meteor/release', DEFAULT_RELEASE_TRACK + '@v1'); run = s.run("update"); run.match("updated to Meteor v2"); run.expectExit(0); From add36ae322ca60b05b98f316a47d0cc8efce4b2d Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 19 May 2016 11:27:11 -0700 Subject: [PATCH 075/144] Added test to check *updating* constraints --- tools/tests/update-tests.js | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js index 4bf406f7cf..97956b3df1 100644 --- a/tools/tests/update-tests.js +++ b/tools/tests/update-tests.js @@ -7,7 +7,7 @@ const SIMPLE_WAREHOUSE = { v2: { recommended: true } }; -selftest.define("'meteor update' alters `.meteor/packages`", () => { +selftest.define("'meteor update' adds constraints to `.meteor/packages`", () => { const s = new Sandbox({ warehouse: SIMPLE_WAREHOUSE, fakeMongo: true @@ -27,3 +27,27 @@ selftest.define("'meteor update' alters `.meteor/packages`", () => { selftest.fail("Failed to add a version specifier to `meteor-base` package"); } }); + +selftest.define("'meteor update' alters constraints in `.meteor/packages`", () => { + const s = new Sandbox({ + warehouse: SIMPLE_WAREHOUSE, + fakeMongo: true + }); + + s.createApp("myapp", "very-simple-app-with-no-package-constraints", { + release: DEFAULT_RELEASE_TRACK + '@v1' + }); + s.cd("myapp"); + + // change the package file to be an old version + s.write('.meteor/packages', 'meteor-base@0.0.1'); + + run = s.run("update"); + run.match("updated to Meteor v2"); + run.expectExit(0); + + const packages = s.read(".meteor/packages"); + if (packages.match('meteor-base@0.0.1')) { + selftest.fail("Failed to update the version specifier for the `meteor-base` package"); + } +}); From d2d1455f4027fc731603bc6ae7d1f927e507ad0f Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 19 May 2016 14:15:06 -0700 Subject: [PATCH 076/144] Updated `meteor create` to write package versions --- tools/cli/commands-packages.js | 8 +------- tools/cli/commands.js | 9 +++++++++ tools/project-context.js | 15 +++++++++++++-- tools/tests/autoupdate.js | 2 +- tools/tests/create.js | 12 ++++++++++-- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js index d9a93ab3dd..9a978afbd9 100644 --- a/tools/cli/commands-packages.js +++ b/tools/cli/commands-packages.js @@ -1488,13 +1488,7 @@ var maybeUpdateRelease = function (options) { // Update every package in .meteor/packages to be (semver)>= the version // set for that package in the release we are updating to var releaseRecord = catalog.official.getReleaseVersion(releaseTrack, releaseVersion); - projectContext.projectConstraintsFile.addConstraints( - _.compact(_.map(releaseRecord.packages, function(version, packageName) { - if (projectContext.projectConstraintsFile.getConstraint(packageName)) { - return utils.parsePackageConstraint(packageName + '@' + version); - } - })) - ); + projectContext.projectConstraintsFile.updateReleaseConstraints(releaseRecord); // Download and build packages and write the new versions to .meteor/versions. // XXX It's a little weird that we do a full preparation for build diff --git a/tools/cli/commands.js b/tools/cli/commands.js index dbad70cca2..b5a0f2672e 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -703,6 +703,15 @@ main.registerCommand({ return; } + // Also, write package version constraints from the current release + // If we are on a checkout, we don't need to do this as running from + // checkout still pins all package versions and if the user updates + // to a real release, the packages file will subsequently get updated + if (!release.current.isCheckout()) { + projectContext.projectConstraintsFile + .updateReleaseConstraints(release.current._manifest); + } + // Any upgrader that is in this version of Meteor doesn't need to be run on // this project. var upgraders = require('../upgraders.js'); diff --git a/tools/project-context.js b/tools/project-context.js index 42284eb7e5..9ed926ec46 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -60,8 +60,7 @@ var STAGE = { _.extend(ProjectContext.prototype, { reset: function (moreOptions, resetOptions) { var self = this; - // Allow overriding some options until the next call to reset; used by - // 'meteor update' code to try various values of releaseForConstraints. + // Allow overriding some options until the next call to reset; var options = _.extend({}, self.originalOptions, moreOptions); // This is options that are actually directed at reset itself. resetOptions = resetOptions || {}; @@ -943,6 +942,18 @@ _.extend(exports.ProjectConstraintsFile.prototype, { })); }, + // For every package we already have, update the constraint to be semver>= + // the constraint from the release + updateReleaseConstraints: function (releaseRecord) { + this.addConstraints( + _.compact(_.map(releaseRecord.packages, (version, packageName) => { + if (this.getConstraint(packageName)) { + return utils.parsePackageConstraint(packageName + '@' + version); + } + })) + ); + }, + // The packages in packagesToRemove are expected to actually be in the file; // if you want to provide different output for packages in the file vs not, // you should have already done that. diff --git a/tools/tests/autoupdate.js b/tools/tests/autoupdate.js index 7bf7a1d6a5..486a8c3e64 100644 --- a/tools/tests/autoupdate.js +++ b/tools/tests/autoupdate.js @@ -34,7 +34,7 @@ var recommend = function (sandbox, version) { selftest.define("autoupdate", ['checkout', 'custom-warehouse'], function () { var s = new Sandbox({ warehouse: { - v1: { recommended: true}, + v1: { recommended: true }, v2: { recommended: true }, v3: { }, v4: { } diff --git a/tools/tests/create.js b/tools/tests/create.js index d3f7cb83c1..270112ef30 100644 --- a/tools/tests/create.js +++ b/tools/tests/create.js @@ -1,8 +1,10 @@ var selftest = require('../tool-testing/selftest.js'); var Sandbox = selftest.Sandbox; +const SIMPLE_WAREHOUSE = { v1: { recommended: true } }; selftest.define("create", function () { - var s = new Sandbox; + // We need a warehouse so the tool doesn't think we are running from checkout + var s = new Sandbox({ warehouse: SIMPLE_WAREHOUSE }); // Can we create an app? Yes! var run = s.run("create", "foobar"); @@ -11,8 +13,14 @@ selftest.define("create", function () { run.match("To run your new app"); run.expectExit(0); - // Now, can we run it? + // Test that the release constraints have been written to .meteor/packages s.cd("foobar"); + const packages = s.read(".meteor/packages"); + if (!packages.match('meteor-base@')) { + selftest.fail("Failed to add a version specifier to `meteor-base` package"); + } + + // Now, can we run it? run = s.run(); run.waitSecs(15); run.match("foobar"); From e9666f2aa0ab2144847e2722fccad9b35191fa7b Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Fri, 20 May 2016 12:26:56 -0700 Subject: [PATCH 077/144] Remove "running" check from autoupdate test The issue was the order of the two matches kept changing due to ..?.. (various factors I guess). --- tools/tests/autoupdate.js | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/tests/autoupdate.js b/tools/tests/autoupdate.js index 486a8c3e64..9eca15ab0f 100644 --- a/tools/tests/autoupdate.js +++ b/tools/tests/autoupdate.js @@ -58,7 +58,6 @@ selftest.define("autoupdate", ['checkout', 'custom-warehouse'], function () { run = s.run("--port", "21000"); run.waitSecs(30); run.match("New hotness v2 being downloaded"); - run.match("running at"); require('../utils/utils.js').sleepMs(500); run.stop(); From 28dcab5849b8e8e1d98383be0ad1a8412a97b310 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 29 Jun 2016 14:29:51 -0400 Subject: [PATCH 078/144] Bump package versions for 1.4-beta.6 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 3d4b648ae8..8a8d875b29 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.5" + version: "1.2.9-beta.6" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index bea92e4848..7c0d514de8 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.1.12-beta.5" + version: "1.1.12-beta.6" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 0e18a59980..84e393fdbb 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.5" + version: "1.1.11-beta.6" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index d2aa7db43d..828c21ed5a 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.2.11-beta.5' + version: '1.2.11-beta.6' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 6d74372f3c..2dda3642d9 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.5' + version: '6.9.0-beta.6' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index f6300175c6..5f4af14436 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.5', + version: '0.1.10-beta.6', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 79f7f6868d..cbd21718f0 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.5', + version: '1.0.6-beta.6', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 8f61f3d865..af63b4bfac 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.5" + version: "1.1.3-beta.6" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 5e13294aa2..5decdb166f 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: '1.3.0-beta.5', + version: '1.3.0-beta.6', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 86018905e3..9f2a0ddd14 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.5', + version: '1.2.9-beta.6', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 4b500cfc9e..82b7b098fc 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.5", + version: "0.2.12-beta.6", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index b89309ccb9..4741a11459 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.5', + version: '0.4.7-beta.6', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 345233f541..31f78bb3f8 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.5" + version: "1.0.15-beta.6" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 7f63ac2f09..ebc90a7cd5 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.5", + version: "4.5.13-beta.6", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index e0779e2ab9..8e60a8530b 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.5' + version: '1.1.8-beta.6' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 1cf4bc4123..821eb830c5 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.5', + version: '1.0.5-beta.6', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 23a518a128..1cddd3bba4 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.5', + version: '2.6.4-beta.6', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 3b15210d38..a1a43d4b36 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.5' + version: '1.0.14-beta.6' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index f6595ce684..b783023d18 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.5' + version: '1.4.0-beta.6' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 563754a19d..ba0f47ea51 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.5' + version: '1.1.16-beta.6' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 45b4beb7a1..6dd42198e1 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.5" + version: "1.1.13-beta.6" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index a24017ae69..ac335c0062 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.5" + version: "1.1.13-beta.6" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index baf8e18f3e..534227331b 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.5", + version: "0.6.5-beta.6", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 1fdd28a725..321b9e8401 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.5", + version: "0.6.5-beta.6", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 22a8071740..490a04330e 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.1.10-beta.5' + version: '1.1.10-beta.6' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 4757925574..b172bd9b9c 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.5', + version: '1.4.45-beta.6', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 38a9f889a8..b9959757fc 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.5' + version: '1.0.13-beta.6' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index a2fe9b2723..9a584ade7a 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.5", + version: "0.7.3-beta.6", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 79364aae36..0b85e86a39 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.5', + version: '1.0.8-beta.6', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index c0f2bffdfd..965e9fa3c4 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.5', + version: '1.0.8-beta.6', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 24ca78e64d..d98474bf3a 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.5', + version: '1.0.11-beta.6', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index fba1983096..20b610504e 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.5" + version: "2.512.4-beta.6" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 4b59efb712..d079db234b 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.5' + version: '1.1.13-beta.6' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 00010bf0e4..81cc371200 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.5' + version: '1.1.12-beta.6' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index c631d73933..3a407a1c59 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.5' + version: '1.2.10-beta.6' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index c7935332a4..25d5705a8a 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.5' + version: '2.4.13-beta.6' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 2e62c97e45..601400f307 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.5", + "version": "1.4-beta.6", "recommended": false, "official": false, "description": "Meteor" From 3b9a44383f955e57e7cae7a477d8b99269c0d38d Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 30 Jun 2016 14:33:14 -0400 Subject: [PATCH 079/144] Only write .meteor-portable files in npm package directories. Also clean up any existing misplaced .meteor-portable files. Fixes #7296. --- tools/isobuild/meteor-npm.js | 62 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js index 71b429a310..4192f1a712 100644 --- a/tools/isobuild/meteor-npm.js +++ b/tools/isobuild/meteor-npm.js @@ -161,7 +161,7 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) { files.readdir(nodeModulesDir).forEach(function (pkg) { const pkgPath = files.pathJoin(nodeModulesDir, pkg); - if (isPortable(pkgPath, true)) { + if (isPortable(pkgPath)) { return; } @@ -239,33 +239,24 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) { return true; }); -function isPortable(dir, shouldCache) { - if (! files.lstat(dir).isDirectory()) { - return true; +function isPortable(dir) { + const lstat = files.lstat(dir); + if (! lstat.isDirectory()) { + // Non-directory files are portable unless they end with .node. + return ! dir.endsWith(".node"); } - return files.readdir(dir).every(itemName => { - const item = files.pathJoin(dir, itemName); + const pkgJsonStat = files.statOrNull(files.pathJoin(dir, "package.json")); + const canCache = pkgJsonStat && pkgJsonStat.isFile(); + const portableFile = files.pathJoin(dir, ".meteor-portable"); - if (! files.lstat(item).isDirectory()) { - // Non-directory files are portable unless they end with .node. - return ! itemName.endsWith(".node"); - } - - if (! shouldCache) { - // Once we stop caching, we keep calling isPortable recursively - // without caching. - return isPortable(item); - } - - // Cache previous results by writing a boolean value to a hidden - // file called .meteor-portable. Although it's tempting to write - // this file once for the whole node_modules directory, it's - // important that we put separate files in the individual top-level - // package directories so that they will get cleared away the next - // time those packages are (re)installed. - - const portableFile = files.pathJoin(item, ".meteor-portable"); + if (canCache) { + // Cache previous results by writing a boolean value to a hidden file + // called .meteor-portable. Although it's tempting to write this file + // once for the whole node_modules directory, it's important that we + // put .meteor-portable files only in the individual top-level package + // directories, so that they will get cleared away the next time those + // packages are (re)installed. try { return JSON.parse(files.readFile(portableFile)); } catch (e) { @@ -274,20 +265,29 @@ function isPortable(dir, shouldCache) { throw e; } } + } else { + // Clean up any .meteor-portable files we mistakenly wrote in + // directories that do not contain package.json files. #7296 + fs.unlink(portableFile, error => {}); + } - const result = isPortable(item); + const result = files.readdir(dir).every( + // Ignore files that start with a ".", such as .bin directories. + itemName => itemName.startsWith(".") || + isPortable(files.pathJoin(dir, itemName))); + if (canCache) { // Write the .meteor-portable file asynchronously, and don't worry // if it fails, e.g. because the file system is read-only (#6591). // Failing to write the file only means more work next time. fs.writeFile( portableFile, JSON.stringify(result) + "\n", - (error) => {} + error => {}, ); + } - return result; - }); + return result; } // Return true if all of a package's npm dependencies are portable @@ -310,7 +310,7 @@ meteorNpm.dependenciesArePortable = function (nodeModulesDir) { // Only check/write .meteor-portable files in each of the top-level // package directories. - return isPortable(nodeModulesDir, true); + return isPortable(nodeModulesDir); }; var makeNewPackageNpmDir = function (newPackageNpmDir) { @@ -721,7 +721,7 @@ var installNpmModule = function (name, version, dir) { } const pkgDir = files.pathJoin(dir, "node_modules", name); - if (! isPortable(pkgDir, true)) { + if (! isPortable(pkgDir)) { recordLastRebuildVersions(pkgDir); } From f38725e0b240049d83ceb5b4140e34930d4a03f1 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 1 Jul 2016 10:00:09 -0400 Subject: [PATCH 080/144] Infer dev_bundle for `meteor {npm,node}` from .meteor/release. Fixes #7338. Fixes #7297. --- tools/cli/dev-bundle-bin-commands.js | 35 +++-- tools/cli/dev-bundle-bin-helpers.js | 67 ++++++---- tools/cli/dev-bundle.js | 187 +++++++++++++++++++++++++++ tools/index.js | 16 ++- tools/isobuild/meteor-npm.js | 43 +++--- 5 files changed, 291 insertions(+), 57 deletions(-) create mode 100644 tools/cli/dev-bundle.js diff --git a/tools/cli/dev-bundle-bin-commands.js b/tools/cli/dev-bundle-bin-commands.js index f8316377a2..51a98bf63b 100644 --- a/tools/cli/dev-bundle-bin-commands.js +++ b/tools/cli/dev-bundle-bin-commands.js @@ -1,6 +1,8 @@ // Note that this file is required before we install our Babel hooks in // ../tool-env/install-babel.js, so we can't use ES2015+ syntax here. +var Promise = global.Promise || require("promise/lib/es6-extensions"); + var win32Extensions = { node: ".exe", npm: ".cmd" @@ -10,25 +12,38 @@ var win32Extensions = { // command, as in `meteor npm` or `meteor node`, because we don't want to // require("./main.js") for these commands. var devBundleBinCommand = process.argv[2]; +var args = process.argv.slice(3); + +function getChildProcess() { + if (! win32Extensions.hasOwnProperty(devBundleBinCommand)) { + return Promise.resolve(null); + } -if (win32Extensions.hasOwnProperty(devBundleBinCommand)) { var helpers = require("./dev-bundle-bin-helpers.js"); if (process.platform === "win32") { devBundleBinCommand += win32Extensions[devBundleBinCommand]; } - var cmd = helpers.getCommandPath(devBundleBinCommand); - var args = process.argv.slice(3); + return Promise.all([ + helpers.getCommandPath(devBundleBinCommand), + helpers.getEnv() + ]).then(function (cmdAndEnv) { + var cmd = cmdAndEnv[0]; + var env = cmdAndEnv[1]; + var child = require("child_process").spawn(cmd, args, { + stdio: "inherit", + env: env + }); - exports.process = require("child_process").spawn(cmd, args, { - stdio: "inherit", - env: helpers.getEnv() - }); + require("./flush-buffers-on-exit-in-windows.js"); - require("./flush-buffers-on-exit-in-windows.js"); + child.on("exit", function (exitCode) { + process.exit(exitCode); + }); - exports.process.on("exit", function (exitCode) { - process.exit(exitCode); + return child; }); } + +module.exports = getChildProcess(); diff --git a/tools/cli/dev-bundle-bin-helpers.js b/tools/cli/dev-bundle-bin-helpers.js index ee9f49c85f..11b55ae849 100644 --- a/tools/cli/dev-bundle-bin-helpers.js +++ b/tools/cli/dev-bundle-bin-helpers.js @@ -1,43 +1,54 @@ +var fs = require("fs"); var path = require("path"); -var devBundleDir = path.resolve(__dirname, "..", "..", "dev_bundle"); -var binDir = path.join(devBundleDir, "bin"); +var devBundlePromise = require("./dev-bundle.js"); +var Promise = devBundlePromise.constructor; +var binDirPromise = devBundlePromise.then(function (devBundleDir) { + return path.join(devBundleDir, "bin"); +}); exports.getCommandPath = function (command) { - return path.join(binDir, command); + return binDirPromise.then(function (binDir) { + return path.join(binDir, command); + }); }; -exports.getEnv = function () { - var env = Object.create(process.env); - var paths = [ +exports.getEnv = function() { + return Promise.all([ // When npm looks for node, it must find dev_bundle/bin/node. - binDir, + binDirPromise, + devBundlePromise + ]).then(function (paths) { + var devBundleDir = paths[1]; + // Also make available any scripts installed by packages in // dev_bundle/lib/node_modules, such as node-gyp. - path.join(devBundleDir, "lib", "node_modules", ".bin"), - ]; + paths[1] = path.join(devBundleDir, "lib", "node_modules", ".bin"); - var PATH = env.PATH || env.Path; - if (PATH) { - paths.push(PATH); - } + var env = Object.create(process.env); - env.PATH = paths.join(path.delimiter); + var PATH = env.PATH || env.Path; + if (PATH) { + paths.push(PATH); + } - if (process.platform === "win32") { - // On Windows we provide a reliable version of python.exe for use by - // node-gyp (the tool that rebuilds binary node modules). #WinPy - env.PYTHON = env.PYTHON || path.join( - devBundleDir, "python", "python.exe"); + env.PATH = paths.join(path.delimiter); - // We don't try to install a compiler toolchain on the developer's - // behalf, but setting GYP_MSVS_VERSION helps select the right one. - env.GYP_MSVS_VERSION = env.GYP_MSVS_VERSION || "2015"; + if (process.platform === "win32") { + // On Windows we provide a reliable version of python.exe for use by + // node-gyp (the tool that rebuilds binary node modules). #WinPy + env.PYTHON = env.PYTHON || path.join( + devBundleDir, "python", "python.exe"); - // While the original process.env object allows for case insensitive - // access on Windows, Object.create interferes with that behavior, so - // here we ensure env.PATH === env.Path on Windows. - env.Path = env.PATH; - } + // We don't try to install a compiler toolchain on the developer's + // behalf, but setting GYP_MSVS_VERSION helps select the right one. + env.GYP_MSVS_VERSION = env.GYP_MSVS_VERSION || "2015"; - return env; + // While the original process.env object allows for case insensitive + // access on Windows, Object.create interferes with that behavior, + // so here we ensure env.PATH === env.Path on Windows. + env.Path = env.PATH; + } + + return env; + }); }; diff --git a/tools/cli/dev-bundle.js b/tools/cli/dev-bundle.js new file mode 100644 index 0000000000..48c07257dc --- /dev/null +++ b/tools/cli/dev-bundle.js @@ -0,0 +1,187 @@ +// Note that this file is required before we install our Babel hooks in +// ../tool-env/install-babel.js, so we can't use ES2015+ syntax here. + +// This file replicates some functionality from elsewhere in tools code, +// but that's unavoidable if we don't want to install Babel and load all +// the rest of the code every time we run `meteor npm` or `meteor node`. + +var fs = require("fs"); +var path = require("path"); +var rootDir = path.resolve(__dirname, "..", ".."); +var Promise = global.Promise || require("promise/lib/es6-extensions"); +var defaultDevBundlePromise = + Promise.resolve(path.join(rootDir, "dev_bundle")); + +function getDevBundleDir() { + var dotGitStat = statOrNull( + path.join(rootDir, ".git"), + "isDirectory" + ); + + if (dotGitStat) { + return defaultDevBundlePromise; + } + + var release = getReleaseForCurrentApp(); + if (release) { + return getDevBundleForRelease(release); + } + + return defaultDevBundlePromise; +} + +function getReleaseForCurrentApp() { + var releaseFile = find( + process.cwd(), + makeStatTest("isFile"), + ".meteor", "release" + ); + + if (releaseFile) { + var release = fs.readFileSync( + releaseFile, "utf8" + ).replace(/^\s+|\s+$/g, ""); + + if (/^METEOR@\d+/.test(release)) { + return release; + } + } +} + +function getDevBundleForRelease(release) { + var parts = release.split("@"); + if (parts.length < 2) { + return defaultDevBundlePromise; + } + + var track = parts[0]; + var version = parts.slice(1).join("@"); + + var packageMetadataDir = find( + rootDir, + makeStatTest("isDirectory"), + ".meteor", "package-metadata" + ); + + if (! packageMetadataDir) { + return defaultDevBundlePromise; + } + + var meteorToolDir = path.resolve( + packageMetadataDir, + "..", "packages", "meteor-tool" + ); + + var meteorToolStat = statOrNull(meteorToolDir, "isDirectory"); + if (! meteorToolStat) { + return defaultDevBundlePromise; + } + + var dbPath = path.join( + packageMetadataDir, + "v2.0.1", + "packages.data.db" + ); + + var dbStat = statOrNull(dbPath, "isFile"); + if (! dbStat) { + return defaultDevBundlePromise; + } + + var sqlite3 = require("sqlite3"); + var db = new sqlite3.Database(dbPath); + + return new Promise(function (resolve, reject) { + db.get( + "SELECT content FROM releaseVersions WHERE track=? AND version=?", + [track, version], + function (error, data) { + if (error) { + reject(error); + } else { + var tool = JSON.parse(data.content).tool; + var devBundleDir = path.join( + meteorToolDir, + tool.split("@").slice(1).join("@"), + "mt-" + getHostArch(), + "dev_bundle" + ); + + var devBundleStat = statOrNull(devBundleDir, "isDirectory"); + if (devBundleStat) { + console.log(devBundleDir); + resolve(devBundleDir); + } else { + resolve(defaultDevBundlePromise); + } + } + } + ); + }); +} + +function statOrNull(path, statMethod) { + try { + var stat = fs.statSync(path); + } catch (e) { + if (e.code !== "ENOENT") { + throw e; + } + } + + if (stat) { + if (typeof statMethod === "string") { + if (stat[statMethod]()) { + return stat; + } + } else { + return stat; + } + } + + return null; +} + +function find(dir, predicate) { + var joinArgs = Array.prototype.slice.call(arguments, 2); + joinArgs.unshift(null); + + while (true) { + joinArgs[0] = dir; + var joined = path.join.apply(path, joinArgs); + if (predicate(joined)) { + return joined; + } + + var parentDir = path.dirname(dir); + if (parentDir === dir) break; + dir = parentDir; + } + + return null; +} + +function makeStatTest(method) { + return function (file) { + return statOrNull(file, method); + }; +} + +function getHostArch() { + if (process.platform === "win32") { + return "os.windows.x86_32"; + } + + if (process.platform === "linux") { + if (process.arch === "x64") { + return "os.linux.x86_64"; + } + return "os.linux.x86_32"; + } + + if (process.platform === "darwin") { + return "os.osx.x86_64"; + } +} + +module.exports = getDevBundleDir(); diff --git a/tools/index.js b/tools/index.js index f582834589..cc1a1f6544 100644 --- a/tools/index.js +++ b/tools/index.js @@ -1,4 +1,18 @@ -if (! require('./cli/dev-bundle-bin-commands.js').process) { +require("./cli/dev-bundle-bin-commands.js").then(function (child) { + if (! child) { + // Use process.nextTick here to prevent the Promise from swallowing + // errors from the rest of the setup code. + process.nextTick(continueSetup); + } + // If we spawned a process to handle a dev_bundle/bin command like + // `meteor npm` or `meteor node`, then don't run any other tool code. +}, function (error) { + process.nextTick(function () { + throw error; + }); +}); + +function continueSetup() { // Set up the Babel transpiler require('./tool-env/install-babel.js'); diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js index 4192f1a712..19c1cc27a5 100644 --- a/tools/isobuild/meteor-npm.js +++ b/tools/isobuild/meteor-npm.js @@ -14,6 +14,7 @@ var buildmessage = require('../utils/buildmessage.js'); var utils = require('../utils/utils.js'); var runLog = require('../runners/run-log.js'); var Profile = require('../tool-env/profile.js').Profile; +import { execFileAsync } from "../utils/processes.js"; var meteorNpm = exports; @@ -546,28 +547,34 @@ Profile("meteorNpm.runNpmCommand", function (args, cwd) { cwd = files.convertToOSPath(cwd); } - const env = require("../cli/dev-bundle-bin-helpers.js").getEnv(); + var getEnv = require("../cli/dev-bundle-bin-helpers.js").getEnv; - // Make sure we don't honor any user-provided configuration files. - env.npm_config_userconfig = npmUserConfigFile; + return getEnv().then(env => { + // Make sure we don't honor any user-provided configuration files. + env.npm_config_userconfig = npmUserConfigFile; - var opts = { cwd: cwd, env: env, maxBuffer: 10 * 1024 * 1024 }; + var opts = { + cwd: cwd, + env: env, + maxBuffer: 10 * 1024 * 1024 + }; - return new Promise(function (resolve) { - require('child_process').execFile( - npmPath, args, opts, function (err, stdout, stderr) { - if (meteorNpm._printNpmCalls) { - process.stdout.write(err ? 'failed\n' : 'done\n'); + return new Promise(function (resolve) { + require('child_process').execFile( + npmPath, args, opts, function (err, stdout, stderr) { + if (meteorNpm._printNpmCalls) { + process.stdout.write(err ? 'failed\n' : 'done\n'); + } + + resolve({ + success: ! err, + error: (err ? `${err.message}${stderr}` : stderr), + stdout: stdout, + stderr: stderr + }); } - - resolve({ - success: ! err, - error: (err ? `${err.message}${stderr}` : stderr), - stdout: stdout, - stderr: stderr - }); - } - ); + ); + }); }).await(); }); From 287ec0e10bbf47eb8ac4bd3ac628d1a672c72652 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 1 Jul 2016 20:40:39 -0400 Subject: [PATCH 081/144] Upgrade npm to 3.10.3. --- scripts/build-dev-bundle-common.sh | 2 +- scripts/dev-bundle-tool-package.js | 2 +- scripts/generate-dev-bundle.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 9ead53ed2a..49c4013d99 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -6,7 +6,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) NODE_VERSION=4.4.7 -NPM_VERSION=3.10.2 +NPM_VERSION=3.10.3 if [ "$UNAME" == "Linux" ] ; then if [ "$ARCH" != "i686" -a "$ARCH" != "x86_64" ] ; then diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index 69f31f0cba..1146123285 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -11,7 +11,7 @@ var packageJson = { dependencies: { // Explicit dependency because we are replacing it with a bundled version // and we want to make sure there are no dependencies on a higher version - npm: "3.10.2", + npm: "3.10.3", "node-gyp": "3.3.1", "node-pre-gyp": "0.6.26", "meteor-babel": "0.11.7", diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index 11c1718edd..a7ede1c15b 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -3,7 +3,7 @@ $PLATFORM = "windows_x86" $MONGO_VERSION = "3.2.6" $NODE_VERSION = "4.4.7" -$NPM_VERSION = "3.10.2" +$NPM_VERSION = "3.10.3" $PYTHON_VERSION = "2.7.10" # For node-gyp # take it form the environment if exists From fa518b496c30b9ba6d955cd4e0e3991a3f631a81 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 1 Jul 2016 20:41:10 -0400 Subject: [PATCH 082/144] Bump $BUNDLE_VERSION to 4.0.16 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 64bfda82f7..2232430e95 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.0.15 +BUNDLE_VERSION=4.0.16 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From b364796619148408c6dd88f5304ea87e74f1f83e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 1 Jul 2016 20:43:34 -0400 Subject: [PATCH 083/144] Bump package versions for 1.4-beta.7 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 8a8d875b29..8d5c0f961c 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.6" + version: "1.2.9-beta.7" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 7c0d514de8..0387643f4c 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.1.12-beta.6" + version: "1.1.12-beta.7" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 84e393fdbb..aa33800e56 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.6" + version: "1.1.11-beta.7" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index 828c21ed5a..4142d74cdd 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.2.11-beta.6' + version: '1.2.11-beta.7' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 2dda3642d9..880160b2f9 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.6' + version: '6.9.0-beta.7' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 5f4af14436..f34b3a4e8b 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.6', + version: '0.1.10-beta.7', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index cbd21718f0..660fda821b 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.0.6-beta.6', + version: '1.0.6-beta.7', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index af63b4bfac..51b357f86b 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.1.3-beta.6" + version: "1.1.3-beta.7" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 5decdb166f..d835f53653 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: '1.3.0-beta.6', + version: '1.3.0-beta.7', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 9f2a0ddd14..7f3eca06cc 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.2.9-beta.6', + version: '1.2.9-beta.7', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 82b7b098fc..28fc7bd68a 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.2.12-beta.6", + version: "0.2.12-beta.7", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 4741a11459..391b0dd274 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.4.7-beta.6', + version: '0.4.7-beta.7', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 31f78bb3f8..01cbe0c163 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.15-beta.6" + version: "1.0.15-beta.7" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index ebc90a7cd5..6ac88f46b8 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.5.13-beta.6", + version: "4.5.13-beta.7", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 8e60a8530b..c4cbeda105 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.1.8-beta.6' + version: '1.1.8-beta.7' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 821eb830c5..e0cae0a32e 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.0.5-beta.6', + version: '1.0.5-beta.7', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 1cddd3bba4..6de0f061f5 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.6.4-beta.6', + version: '2.6.4-beta.7', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index a1a43d4b36..c0b6425ff1 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.14-beta.6' + version: '1.0.14-beta.7' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index b783023d18..0bd69000f5 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.6' + version: '1.4.0-beta.7' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index ba0f47ea51..902f943d6e 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.16-beta.6' + version: '1.1.16-beta.7' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 6dd42198e1..068d829403 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.1.13-beta.6" + version: "1.1.13-beta.7" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index ac335c0062..947a747064 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.1.13-beta.6" + version: "1.1.13-beta.7" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 534227331b..b2128357de 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.6.5-beta.6", + version: "0.6.5-beta.7", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 321b9e8401..e90e3e9215 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.6.5-beta.6", + version: "0.6.5-beta.7", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 490a04330e..30dc9e7de5 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.1.10-beta.6' + version: '1.1.10-beta.7' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index b172bd9b9c..198b7901f5 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.4.45-beta.6', + version: '1.4.45-beta.7', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index b9959757fc..0a63e14129 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.13-beta.6' + version: '1.0.13-beta.7' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 9a584ade7a..80144d9388 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.7.3-beta.6", + version: "0.7.3-beta.7", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 0b85e86a39..cc74ba13aa 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.0.8-beta.6', + version: '1.0.8-beta.7', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 965e9fa3c4..5673fd1486 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.0.8-beta.6', + version: '1.0.8-beta.7', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index d98474bf3a..fe5b651ef4 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.0.11-beta.6', + version: '1.0.11-beta.7', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 20b610504e..3d5d91d706 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.512.4-beta.6" + version: "2.512.4-beta.7" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index d079db234b..075fa1fbc3 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.1.13-beta.6' + version: '1.1.13-beta.7' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 81cc371200..26f156ed34 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.6' + version: '1.1.12-beta.7' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 3a407a1c59..3bc4ca4f1e 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.2.10-beta.6' + version: '1.2.10-beta.7' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 25d5705a8a..1c164ea43a 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.4.13-beta.6' + version: '2.4.13-beta.7' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 601400f307..d268e18d1e 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.6", + "version": "1.4-beta.7", "recommended": false, "official": false, "description": "Meteor" From 4228b30e6fb066c6a9870dfc157cea2a35026a2e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 9 Jul 2016 15:09:54 -0400 Subject: [PATCH 084/144] Bump $BUNDLE_VERSION to 4.1.0 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 2232430e95..dfd41d2759 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.0.16 +BUNDLE_VERSION=4.1.0 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From fa786d714a4c0177e3ce76e1f32bbed1b79597b4 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 9 Jul 2016 15:30:07 -0400 Subject: [PATCH 085/144] Bump package versions for 1.4-beta.8 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 8d5c0f961c..34959a968a 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.7" + version: "1.2.9-beta.8" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index b032f9e524..ffe521d63d 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.7" + version: "1.2.12-beta.8" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index aa33800e56..c5a7fbbaf0 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.7" + version: "1.1.11-beta.8" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index 7d17386e48..ad96c70dc2 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.7' + version: '1.3.11-beta.8' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 880160b2f9..0caf328df4 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.7' + version: '6.9.0-beta.8' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index f34b3a4e8b..6ae7805e60 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.7', + version: '0.1.10-beta.8', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index b636c88a7c..cc6e216a5a 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.7', + version: '1.1.6-beta.8', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 1b1369d32c..0a0bce3a04 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.7" + version: "1.2.3-beta.8" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index d835f53653..acf49f3ac8 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: '1.3.0-beta.7', + version: '1.3.0-beta.8', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 70593bd71b..9320b796cd 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.7', + version: '1.3.9-beta.8', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 54560a11f2..d309d7862f 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.7", + version: "0.3.12-beta.8", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index a3ab124545..d59f21fcd2 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.7', + version: '0.5.7-beta.8', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 550d2e2b87..baddf4a0bd 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.15-beta.7" + version: "1.1.15-beta.8" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 6ef3d9bc15..82956d6589 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.7", + version: "4.6.13-beta.8", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 644056f4ea..eefb5ac0ad 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.7' + version: '1.2.8-beta.8' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 0bfa4ff131..3aef1e2394 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.7', + version: '1.1.5-beta.8', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 39c819502d..50523523a4 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.7', + version: '2.7.4-beta.8', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 2294e30428..572cb77301 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.7' + version: '1.1.14-beta.8' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 0bd69000f5..791da8f63c 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.7' + version: '1.4.0-beta.8' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 612afe4044..17afdb2b13 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.7' + version: '1.2.16-beta.8' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 7d24a4d127..6165e9835a 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.7" + version: "1.2.13-beta.8" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 3fdbdc077c..9b0b9c6d9f 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.7" + version: "1.2.13-beta.8" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 1db1a552e7..b6f95292da 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.7", + version: "0.7.5-beta.8", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index c201da700a..f3877fdd97 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.7", + version: "0.7.5-beta.8", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 30dc9e7de5..79a123a049 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.1.10-beta.7' + version: '1.1.10-beta.8' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index fb2be3b47c..7916d81344 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.7', + version: '1.5.45-beta.8', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 4495e8d1d1..0737600455 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.7' + version: '1.1.13-beta.8' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index f81c962adb..4b7db9fc32 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.7", + version: "0.8.3-beta.8", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 4bf0fa668b..2b69597a66 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.7', + version: '1.1.8-beta.8', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index f2938d4eaa..d5ece6b303 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.7', + version: '1.1.8-beta.8', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index a68fe167c4..94bd74b179 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.7', + version: '1.1.11-beta.8', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 63df78fa04..e9c4f7fa39 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.7" + version: "2.513.4-beta.8" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index f6cd851ab7..0378fd2f41 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.7' + version: '1.2.13-beta.8' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 26f156ed34..35c75741e4 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.7' + version: '1.1.12-beta.8' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 6b63d48fc6..0b7ac30bb5 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.7' + version: '1.3.10-beta.8' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 56b03c629c..8eea213f89 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.7' + version: '2.5.13-beta.8' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index d268e18d1e..1eed7b7e01 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.7", + "version": "1.4-beta.8", "recommended": false, "official": false, "description": "Meteor" From ac28ac16d9847dfe7790d461c0ba414a16398782 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sat, 9 Jul 2016 16:31:46 -0400 Subject: [PATCH 086/144] Fix bug: solutionReleaseName no longer defined. --- tools/cli/commands-packages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/commands-packages.js b/tools/cli/commands-packages.js index 74db747099..701ebbd4d7 100644 --- a/tools/cli/commands-packages.js +++ b/tools/cli/commands-packages.js @@ -1503,7 +1503,7 @@ var maybeUpdateRelease = function (options) { projectContext.prepareProjectForBuild(); }); - projectContext.writeReleaseFileAndDevBundleLink(solutionReleaseName); + projectContext.writeReleaseFileAndDevBundleLink(releaseName); projectContext.packageMapDelta.displayOnConsole({ title: ("Changes to your project's package version selections from " + From 211f6a6fd368c3d701766dec5b7fe60218b5af38 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Sun, 10 Jul 2016 15:53:36 -0400 Subject: [PATCH 087/144] Bump package versions for 1.4-beta.9 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 34959a968a..3b66c3f0fc 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.8" + version: "1.2.9-beta.9" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index ffe521d63d..f13a9dd6c7 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.8" + version: "1.2.12-beta.9" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index c5a7fbbaf0..4718a44d8c 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.8" + version: "1.1.11-beta.9" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index ad96c70dc2..b0d2866d45 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.8' + version: '1.3.11-beta.9' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 0caf328df4..8c1bb1e66b 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.8' + version: '6.9.0-beta.9' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 6ae7805e60..cb8dc74ee6 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.8', + version: '0.1.10-beta.9', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index cc6e216a5a..8b7de9c0e2 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.8', + version: '1.1.6-beta.9', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 0a0bce3a04..6ea1ba0757 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.8" + version: "1.2.3-beta.9" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index acf49f3ac8..d2434f3e15 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: '1.3.0-beta.8', + version: '1.3.0-beta.9', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 9320b796cd..ece77ecf3e 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.8', + version: '1.3.9-beta.9', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index d309d7862f..962741f968 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.8", + version: "0.3.12-beta.9", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index d59f21fcd2..7c7b1a69e8 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.8', + version: '0.5.7-beta.9', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index baddf4a0bd..436c15faf3 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.15-beta.8" + version: "1.1.15-beta.9" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 82956d6589..d782f69171 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.8", + version: "4.6.13-beta.9", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index eefb5ac0ad..92392284cd 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.8' + version: '1.2.8-beta.9' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 3aef1e2394..921cc08bb2 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.8', + version: '1.1.5-beta.9', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 50523523a4..1ec960edad 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.8', + version: '2.7.4-beta.9', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 572cb77301..9a2ab6f806 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.8' + version: '1.1.14-beta.9' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 791da8f63c..b5fe9536b4 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.8' + version: '1.4.0-beta.9' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 17afdb2b13..5c80f88413 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.8' + version: '1.2.16-beta.9' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 6165e9835a..252e7aef10 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.8" + version: "1.2.13-beta.9" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 9b0b9c6d9f..e382ec4bc3 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.8" + version: "1.2.13-beta.9" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index b6f95292da..19c293b1be 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.8", + version: "0.7.5-beta.9", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index f3877fdd97..6084f8345f 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.8", + version: "0.7.5-beta.9", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 79a123a049..9c03dbddd9 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.1.10-beta.8' + version: '1.1.10-beta.9' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 7916d81344..5ec80957f6 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.8', + version: '1.5.45-beta.9', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 0737600455..670d609201 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.8' + version: '1.1.13-beta.9' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 4b7db9fc32..732f76b630 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.8", + version: "0.8.3-beta.9", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 2b69597a66..1e76f61aa5 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.8', + version: '1.1.8-beta.9', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index d5ece6b303..4879561475 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.8', + version: '1.1.8-beta.9', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 94bd74b179..1483d612e1 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.8', + version: '1.1.11-beta.9', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index e9c4f7fa39..d9abeb9ce6 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.8" + version: "2.513.4-beta.9" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 0378fd2f41..472e133fd9 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.8' + version: '1.2.13-beta.9' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 35c75741e4..bf688a204b 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.8' + version: '1.1.12-beta.9' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 0b7ac30bb5..5031188b75 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.8' + version: '1.3.10-beta.9' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 8eea213f89..17110a1547 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.8' + version: '2.5.13-beta.9' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 1eed7b7e01..d683f26ab6 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.8", + "version": "1.4-beta.9", "recommended": false, "official": false, "description": "Meteor" From d732c2e649794f350238d515153f7fb71969c526 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 11 Jul 2016 18:39:52 -0400 Subject: [PATCH 088/144] Always link .meteor/dev_bundle to release specified in .meteor/release. I was mistaken to think that files.getDevBundle() would be called after springboarding to the appropriate release. --- tools/project-context.js | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/project-context.js b/tools/project-context.js index 2e2f057aa4..896b93751c 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -299,7 +299,8 @@ _.extend(ProjectContext.prototype, { // Read .meteor/release. self.releaseFile = new exports.ReleaseFile({ - projectDir: self.projectDir + projectDir: self.projectDir, + catalog: self._officialCatalog, }); if (buildmessage.jobHasMessages()) return; @@ -1264,6 +1265,8 @@ exports.ReleaseFile = function (options) { var self = this; self.filename = files.pathJoin(options.projectDir, '.meteor', 'release'); + self.catalog = options.catalog || catalog.official; + self.watchSet = null; // The release name actually written in the file. Null if no fill. Empty if // the file is empty. @@ -1329,6 +1332,29 @@ _.extend(exports.ReleaseFile.prototype, { self.ensureDevBundleLink(); }, + // Returns an absolute path to the dev_bundle appropriate for the + // release specified in the .meteor/release file. + getDevBundle() { + let devBundle = files.getDevBundle(); + const devBundleParts = devBundle.split(files.pathSep); + const meteorToolIndex = devBundleParts.lastIndexOf("meteor-tool"); + + if (meteorToolIndex >= 0) { + const releaseVersion = this.catalog.getReleaseVersion( + this.releaseTrack, + this.releaseVersion + ); + + if (releaseVersion) { + const meteorToolVersion = releaseVersion.tool.split("@").pop(); + devBundleParts[meteorToolIndex + 1] = meteorToolVersion; + devBundle = devBundleParts.join(files.pathSep); + } + } + + return files.realpath(devBundle); + }, + ensureDevBundleLink() { import { makeLink, readLink } from "./cli/dev-bundle-links.js"; @@ -1350,7 +1376,7 @@ _.extend(exports.ReleaseFile.prototype, { return; } - const newTarget = files.realpath(files.getDevBundle()); + const newTarget = this.getDevBundle(); try { if (newTarget === readLink(devBundleLink)) { From f001d223fa0728c824ebf1edd7becefb403cab95 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 11 Jul 2016 20:40:50 -0400 Subject: [PATCH 089/144] Rebuild binary npm packages used by compiler plugins, too. Fixes #7297. --- tools/isobuild/bundler.js | 6 +++++- tools/isobuild/isopack.js | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index c13ad758a1..9d9ccd818a 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -1953,6 +1953,9 @@ class JsImage { ret.arch = json.arch; + // Rebuild binary npm packages if unibuild arch matches host arch. + const rebuildBinaries = archinfo.matches(archinfo.host(), ret.arch); + _.each(json.load, function (item) { rejectBadPath(item.path); @@ -1962,7 +1965,8 @@ class JsImage { ret.nodeModulesDirectories, nodeModulesDirectories = NodeModulesDirectory.readDirsFromJSON(item.node_modules, { - sourceRoot: dir + sourceRoot: dir, + rebuildBinaries, }) ); } diff --git a/tools/isobuild/isopack.js b/tools/isobuild/isopack.js index 1f8da417a7..ce98fba763 100644 --- a/tools/isobuild/isopack.js +++ b/tools/isobuild/isopack.js @@ -1085,13 +1085,17 @@ _.extend(Isopack.prototype, { } }); + // Rebuild binary npm packages if unibuild arch matches host arch. + const rebuildBinaries = archinfo.matches( + archinfo.host(), + unibuildMeta.arch + ); + const nodeModulesDirectories = bundler.NodeModulesDirectory .readDirsFromJSON(unibuildJson.node_modules, { packageName: self.name, sourceRoot: unibuildBasePath, - // Rebuild binaries if unibuild arch matches host arch. - rebuildBinaries: archinfo.matches( - archinfo.host(), unibuildMeta.arch) + rebuildBinaries, }); self.unibuilds.push(new Unibuild(self, { From c1dc3207e354381f449af673ed9357cc8ecac65e Mon Sep 17 00:00:00 2001 From: Tom Freudenberg Date: Tue, 12 Jul 2016 02:46:21 +0200 Subject: [PATCH 090/144] Move define for MONGO_VERSION into COMMON build-dev-bundle-common.sh to have a unique source where all defines are. This is ordered like in generate-dev-bundle.ps1 (#7370) --- scripts/build-dev-bundle-common.sh | 1 + scripts/generate-dev-bundle.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 77d5d77bb6..325f6f4994 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -5,6 +5,7 @@ set -u UNAME=$(uname) ARCH=$(uname -m) +MONGO_VERSION=3.2.6 NODE_VERSION=4.4.7 NPM_VERSION=3.10.5 diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh index 64a44c1aa2..099a4a971d 100755 --- a/scripts/generate-dev-bundle.sh +++ b/scripts/generate-dev-bundle.sh @@ -25,7 +25,6 @@ echo "Downloading Node from ${NODE_URL}" curl "${NODE_URL}" | tar zx --strip-components 1 # Download Mongo from mongodb.com -MONGO_VERSION=3.2.6 MONGO_NAME="mongodb-${OS}-${ARCH}-${MONGO_VERSION}" MONGO_TGZ="${MONGO_NAME}.tgz" MONGO_URL="http://fastdl.mongodb.org/${OS}/${MONGO_TGZ}" From 7b2193188fc9e297eefc841ce6035825164f0684 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 11 Jul 2016 21:24:29 -0400 Subject: [PATCH 091/144] Return all packages from getProdPackageNames if package.json missing. --- tools/isobuild/meteor-npm.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js index 19c1cc27a5..64ba95b759 100644 --- a/tools/isobuild/meteor-npm.js +++ b/tools/isobuild/meteor-npm.js @@ -119,9 +119,22 @@ meteorNpm.updateDependencies = function (packageName, // Returns a flattened list of npm package names used in production. meteorNpm.getProdPackageNames = function (nodeModulesDir) { var names = Object.create(null); - var lsResult = runNpmCommand([ - "ls", "--json", "--production" - ], nodeModulesDir); + var lsCmdArgs = ["ls", "--json"]; + + const packageJsonPath = files.pathJoin( + files.pathDirname(nodeModulesDir), + "package.json" + ); + + const packageJsonStat = files.statOrNull(packageJsonPath); + if (packageJsonStat && + packageJsonStat.isFile()) { + // If there is no package.json file, adding --production will cause + // the names object to be empty, which is not what we want. + lsCmdArgs.push("--production"); + } + + var lsResult = runNpmCommand(lsCmdArgs, nodeModulesDir); function walk(deps) { if (! deps) { From 6313a66049a472f8ce0337731047149a8c7d9fdb Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 11 Jul 2016 21:56:51 -0400 Subject: [PATCH 092/144] Prevent archinfo.host() from yielding by forcing its result to be cached. --- tools/isobuild/bundler.js | 2 +- tools/tool-env/isopackets.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index 9d9ccd818a..68eaaa70f9 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -1953,7 +1953,7 @@ class JsImage { ret.arch = json.arch; - // Rebuild binary npm packages if unibuild arch matches host arch. + // Rebuild binary npm packages if host arch matches image arch. const rebuildBinaries = archinfo.matches(archinfo.host(), ret.arch); _.each(json.load, function (item) { diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js index 95b7b9bd35..6bdb129ff4 100644 --- a/tools/tool-env/isopackets.js +++ b/tools/tool-env/isopackets.js @@ -1,3 +1,4 @@ +var assert = require('assert'); var _ = require('underscore'); var bundler = require('../isobuild/bundler.js'); @@ -12,6 +13,7 @@ var watch = require('../fs/watch.js'); var Console = require('../console/console.js').Console; var fiberHelpers = require('../utils/fiber-helpers.js'); var packageMapModule = require('../packaging/package-map.js'); +var archinfo = require('../utils/archinfo.js'); var Profile = require('./profile.js').Profile; // TL;DR: Isopacket is a set of isopacks. Isopackets are used only inside @@ -77,6 +79,12 @@ var loadedIsopackets = {}; // disk. Does not do a build step: ensureIsopacketsLoadable must be called // first! export function load(isopacketName) { + // Small but necessary hack: because archinfo.host() calls execFileSync, + // it yields the first time we call it, which is a problem for the + // fiberHelpers.noYieldsAllowed block below. Calling it here ensures the + // result is cached, so no yielding occurs later. + assert.strictEqual(archinfo.host().split(".", 1)[0], "os"); + return fiberHelpers.noYieldsAllowed(function () { if (_.has(loadedIsopackets, isopacketName)) { if (loadedIsopackets[isopacketName]) { From c0c6f75bf1fb79dd993fe2638867acdd79d126b5 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 10:16:08 -0400 Subject: [PATCH 093/144] Flatten webapp npm-shrinkwrap.json. This may also help fix errors installing the mime-db dependency, since it has been upgraded from 1.21.0 to 1.23.0. --- .../webapp/.npm/package/npm-shrinkwrap.json | 998 ++++++++---------- 1 file changed, 421 insertions(+), 577 deletions(-) diff --git a/packages/webapp/.npm/package/npm-shrinkwrap.json b/packages/webapp/.npm/package/npm-shrinkwrap.json index 3068f849c5..f953690d52 100644 --- a/packages/webapp/.npm/package/npm-shrinkwrap.json +++ b/packages/webapp/.npm/package/npm-shrinkwrap.json @@ -1,611 +1,455 @@ { "dependencies": { + "accepts": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", + "from": "accepts@>=1.2.12 <1.3.0" + }, + "base64-url": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz", + "from": "base64-url@1.2.2" + }, + "basic-auth": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz", + "from": "basic-auth@>=1.0.3 <1.1.0" + }, + "basic-auth-connect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", + "from": "basic-auth-connect@1.0.0" + }, + "batch": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz", + "from": "batch@0.5.3" + }, + "body-parser": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", + "from": "body-parser@>=1.13.3 <1.14.0" + }, + "bytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz", + "from": "bytes@2.1.0" + }, + "compressible": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz", + "from": "compressible@>=2.0.5 <2.1.0" + }, + "compression": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz", + "from": "compression@>=1.5.2 <1.6.0" + }, "connect": { "version": "2.30.2", "resolved": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz", - "from": "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz", + "from": "connect@2.30.2" + }, + "connect-timeout": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", + "from": "connect-timeout@>=1.6.2 <1.7.0" + }, + "content-type": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "from": "content-type@>=1.0.1 <1.1.0" + }, + "cookie": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", + "from": "cookie@0.1.3" + }, + "cookie-parser": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", + "from": "cookie-parser@>=1.3.5 <1.4.0" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "from": "cookie-signature@1.0.6" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0" + }, + "crc": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz", + "from": "crc@3.3.0" + }, + "csrf": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz", + "from": "csrf@>=3.0.0 <3.1.0" + }, + "csurf": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", + "from": "csurf@>=1.8.3 <1.9.0" + }, + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "from": "debug@>=2.2.0 <2.3.0" + }, + "depd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", + "from": "depd@>=1.0.1 <1.1.0" + }, + "destroy": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz", + "from": "destroy@1.0.3" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "from": "ee-first@1.1.1" + }, + "errorhandler": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz", + "from": "errorhandler@>=1.4.2 <1.5.0", "dependencies": { - "basic-auth-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz", - "from": "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz" + "accepts": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "from": "accepts@>=1.3.0 <1.4.0" }, - "body-parser": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", - "from": "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz", - "dependencies": { - "iconv-lite": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz" - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "dependencies": { - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - } - } - }, - "raw-body": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.5.tgz", - "from": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.5.tgz", - "dependencies": { - "bytes": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz", - "from": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz" - }, - "iconv-lite": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "from": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz" - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" - } - } - } - } - }, - "bytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz", - "from": "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz" - }, - "compression": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz", - "from": "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz", - "dependencies": { - "accepts": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "from": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "dependencies": { - "mime-types": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "dependencies": { - "mime-db": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" - } - } - }, - "negotiator": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", - "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz" - } - } - }, - "compressible": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.6.tgz", - "from": "https://registry.npmjs.org/compressible/-/compressible-2.0.6.tgz", - "dependencies": { - "mime-db": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" - } - } - }, - "vary": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz", - "from": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz" - } - } - }, - "connect-timeout": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", - "from": "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz", - "dependencies": { - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" - } - } - }, - "content-type": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz", - "from": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz" - }, - "cookie": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz", - "from": "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz" - }, - "cookie-parser": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz", - "from": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz" - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "from": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" - }, - "csurf": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", - "from": "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz", - "dependencies": { - "csrf": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/csrf/-/csrf-3.0.0.tgz", - "from": "https://registry.npmjs.org/csrf/-/csrf-3.0.0.tgz", - "dependencies": { - "base64-url": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", - "from": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz" - }, - "rndm": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.1.1.tgz", - "from": "https://registry.npmjs.org/rndm/-/rndm-1.1.1.tgz" - }, - "scmp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz", - "from": "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz" - }, - "uid-safe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", - "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz" - } - } - } - } - }, - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "dependencies": { - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" - } - } - }, - "depd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", - "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz" - }, - "errorhandler": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.2.tgz", - "from": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.2.tgz", - "dependencies": { - "accepts": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "from": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "dependencies": { - "mime-types": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "dependencies": { - "mime-db": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" - } - } - }, - "negotiator": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", - "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz" - } - } - }, - "escape-html": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" - } - } - }, - "express-session": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", - "from": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", - "dependencies": { - "crc": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz", - "from": "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz" - }, - "uid-safe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", - "from": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", - "dependencies": { - "base64-url": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", - "from": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz" - } - } - } - } - }, - "finalhandler": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", - "from": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", - "dependencies": { - "escape-html": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "dependencies": { - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - } - } - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "from": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" - } - } - }, - "fresh": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "from": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz" - }, - "http-errors": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "statuses": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" - } - } - }, - "method-override": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.5.tgz", - "from": "https://registry.npmjs.org/method-override/-/method-override-2.3.5.tgz", - "dependencies": { - "methods": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.1.tgz", - "from": "https://registry.npmjs.org/methods/-/methods-1.1.1.tgz" - }, - "vary": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz", - "from": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz" - } - } - }, - "morgan": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", - "from": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", - "dependencies": { - "basic-auth": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.3.tgz", - "from": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.3.tgz" - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "dependencies": { - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - } - } - } - } - }, - "multiparty": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", - "from": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", - "dependencies": { - "readable-stream": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - } - } - }, - "stream-counter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz", - "from": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz" - } - } - }, - "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "from": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz" - }, - "pause": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz", - "from": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz" - }, - "qs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz", - "from": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz" - }, - "response-time": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz", - "from": "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz" - }, - "serve-favicon": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz", - "from": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz", - "dependencies": { - "etag": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", - "from": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz" - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" - } - } - }, - "serve-index": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.2.tgz", - "from": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.2.tgz", - "dependencies": { - "accepts": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "from": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "dependencies": { - "negotiator": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", - "from": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz" - } - } - }, - "batch": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.2.tgz", - "from": "https://registry.npmjs.org/batch/-/batch-0.5.2.tgz" - }, - "escape-html": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" - }, - "mime-types": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "dependencies": { - "mime-db": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" - } - } - } - } - }, - "serve-static": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.0.tgz", - "from": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.0.tgz", - "dependencies": { - "escape-html": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" - } - } - }, - "type-is": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.10.tgz", - "from": "https://registry.npmjs.org/type-is/-/type-is-1.6.10.tgz", - "dependencies": { - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "from": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz" - }, - "mime-types": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "from": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", - "dependencies": { - "mime-db": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz", - "from": "https://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz" - } - } - } - } - }, - "utils-merge": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "from": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz" - }, - "vhost": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz", - "from": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz" + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "from": "negotiator@0.6.1" } } }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "from": "escape-html@>=1.0.3 <1.1.0" + }, + "etag": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", + "from": "etag@>=1.7.0 <1.8.0" + }, + "express-session": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz", + "from": "express-session@>=1.11.3 <1.12.0", + "dependencies": { + "base64-url": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz", + "from": "base64-url@1.2.1" + }, + "uid-safe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz", + "from": "uid-safe@>=2.0.0 <2.1.0" + } + } + }, + "finalhandler": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz", + "from": "finalhandler@0.4.0", + "dependencies": { + "escape-html": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", + "from": "escape-html@1.0.2" + } + } + }, + "fresh": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "from": "fresh@0.3.0" + }, + "http-errors": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", + "from": "http-errors@>=1.3.1 <1.4.0" + }, + "iconv-lite": { + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz", + "from": "iconv-lite@0.4.11" + }, + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1" + }, + "lru-cache": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", + "from": "lru-cache@>=2.2.0 <2.3.0" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "from": "media-typer@0.3.0" + }, + "method-override": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz", + "from": "method-override@>=2.3.5 <2.4.0", + "dependencies": { + "parseurl": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "from": "parseurl@>=1.3.1 <1.4.0" + }, + "vary": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz", + "from": "vary@>=1.1.0 <1.2.0" + } + } + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "from": "methods@>=1.1.2 <1.2.0" + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "from": "mime@1.3.4" + }, + "mime-db": { + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz", + "from": "mime-db@>=1.23.0 <1.24.0" + }, + "mime-types": { + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz", + "from": "mime-types@>=2.1.11 <2.2.0" + }, + "morgan": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz", + "from": "morgan@>=1.6.1 <1.7.0" + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "from": "ms@0.7.1" + }, + "multiparty": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz", + "from": "multiparty@3.3.2" + }, + "negotiator": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", + "from": "negotiator@0.5.3" + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "from": "on-finished@>=2.3.0 <2.4.0" + }, + "on-headers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", + "from": "on-headers@>=1.0.0 <1.1.0" + }, "parseurl": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz", - "from": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz" + "from": "parseurl@1.3.0" + }, + "pause": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz", + "from": "pause@0.1.0" + }, + "qs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz", + "from": "qs@4.0.0" + }, + "random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "from": "random-bytes@>=1.0.0 <1.1.0" + }, + "range-parser": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz", + "from": "range-parser@>=1.0.3 <1.1.0" + }, + "raw-body": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz", + "from": "raw-body@>=2.1.2 <2.2.0", + "dependencies": { + "bytes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "from": "bytes@2.4.0" + }, + "iconv-lite": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", + "from": "iconv-lite@0.4.13" + } + } + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "from": "readable-stream@>=1.1.9 <1.2.0" + }, + "response-time": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz", + "from": "response-time@>=2.3.1 <2.4.0" + }, + "rndm": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz", + "from": "rndm@1.2.0" }, "send": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/send/-/send-0.13.0.tgz", - "from": "https://registry.npmjs.org/send/-/send-0.13.0.tgz", + "from": "send@0.13.0", "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "from": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz" - }, - "depd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz", - "from": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz" - }, - "destroy": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz", - "from": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz" - }, "escape-html": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz", - "from": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz" - }, - "etag": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", - "from": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz" - }, - "fresh": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", - "from": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz" - }, - "http-errors": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "from": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz", - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - } - } - }, - "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "from": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz" - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "from": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "from": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "dependencies": { - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "from": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz" - } - } - }, - "range-parser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz", - "from": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz" + "from": "escape-html@1.0.2" }, "statuses": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", - "from": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz" + "from": "statuses@>=1.2.1 <1.3.0" } } }, + "serve-favicon": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz", + "from": "serve-favicon@>=2.3.0 <2.4.0" + }, + "serve-index": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz", + "from": "serve-index@>=1.7.2 <1.8.0", + "dependencies": { + "parseurl": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "from": "parseurl@>=1.3.1 <1.4.0" + } + } + }, + "serve-static": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz", + "from": "serve-static@>=1.10.0 <1.11.0", + "dependencies": { + "depd": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz", + "from": "depd@>=1.1.0 <1.2.0" + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "from": "destroy@>=1.0.4 <1.1.0" + }, + "parseurl": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "from": "parseurl@>=1.3.1 <1.4.0" + }, + "send": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz", + "from": "send@0.13.2" + }, + "statuses": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz", + "from": "statuses@~1.2.1" + } + } + }, + "statuses": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz", + "from": "statuses@>=1.0.0 <2.0.0" + }, + "stream-counter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz", + "from": "stream-counter@>=0.2.0 <0.3.0" + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0" + }, + "tsscmp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz", + "from": "tsscmp@1.0.5" + }, + "type-is": { + "version": "1.6.13", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz", + "from": "type-is@>=1.6.6 <1.7.0" + }, + "uid-safe": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz", + "from": "uid-safe@2.1.1" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "from": "unpipe@1.0.0" + }, "useragent": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz", - "from": "https://registry.npmjs.org/useragent/-/useragent-2.0.7.tgz", - "dependencies": { - "lru-cache": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", - "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz" - } - } + "from": "useragent@2.0.7" + }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "from": "utils-merge@1.0.0" + }, + "vary": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz", + "from": "vary@>=1.0.1 <1.1.0" + }, + "vhost": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz", + "from": "vhost@>=3.0.1 <3.1.0" } } } From bee3112a63d0f0c9d034e1ec0b368460a396d1e8 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 11:40:42 -0400 Subject: [PATCH 094/144] Try harder to create .meteor/dev_bundle symlink. May help with #7391. --- tools/cli/dev-bundle-links.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/cli/dev-bundle-links.js b/tools/cli/dev-bundle-links.js index d6d4af9349..bb157dce56 100644 --- a/tools/cli/dev-bundle-links.js +++ b/tools/cli/dev-bundle-links.js @@ -13,7 +13,13 @@ exports.makeLink = function (target, linkPath) { fs.writeFileSync(tempPath, target, "utf8"); } - fs.renameSync(tempPath, linkPath); + try { + fs.renameSync(tempPath, linkPath); + } catch (e) { + // If renaming fails, try unlinking first. + fs.unlinkSync(linkPath); + fs.renameSync(tempPath, linkPath); + } }; exports.readLink = function (linkPath) { From ab3d8b2165bd223f32acb375e5decaea382277df Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 10:18:57 -0400 Subject: [PATCH 095/144] Bump package versions for 1.4-beta.10 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 3b66c3f0fc..1c9949dc05 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.9" + version: "1.2.9-beta.10" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index f13a9dd6c7..afdee2b220 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.9" + version: "1.2.12-beta.10" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 4718a44d8c..6a2a073ea5 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.9" + version: "1.1.11-beta.10" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index b0d2866d45..e66473fdb9 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.9' + version: '1.3.11-beta.10' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 8c1bb1e66b..f013de694b 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.9' + version: '6.9.0-beta.10' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index cb8dc74ee6..1834808073 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.9', + version: '0.1.10-beta.10', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 8b7de9c0e2..47a3d38e46 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.9', + version: '1.1.6-beta.10', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 6ea1ba0757..f1be5d1333 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.9" + version: "1.2.3-beta.10" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index d2434f3e15..bd38211902 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: '1.3.0-beta.9', + version: '1.3.0-beta.10', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index ece77ecf3e..fcb34db749 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.9', + version: '1.3.9-beta.10', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 962741f968..62c4456266 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.9", + version: "0.3.12-beta.10", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 7c7b1a69e8..e7cbbc4d55 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.9', + version: '0.5.7-beta.10', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 436c15faf3..f2d0331e83 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.15-beta.9" + version: "1.1.15-beta.10" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index d782f69171..1e039bff09 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.9", + version: "4.6.13-beta.10", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 92392284cd..e40ad92ad8 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.9' + version: '1.2.8-beta.10' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 921cc08bb2..61e57b5be4 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.9', + version: '1.1.5-beta.10', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 1ec960edad..3c1ff79172 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.9', + version: '2.7.4-beta.10', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 9a2ab6f806..0897b58210 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.9' + version: '1.1.14-beta.10' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index b5fe9536b4..7305392707 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.9' + version: '1.4.0-beta.10' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 5c80f88413..02cd4261a7 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.9' + version: '1.2.16-beta.10' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 252e7aef10..b9617f1a58 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.9" + version: "1.2.13-beta.10" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index e382ec4bc3..caa918c969 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.9" + version: "1.2.13-beta.10" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 19c293b1be..5a1f5a6869 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.9", + version: "0.7.5-beta.10", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 6084f8345f..ebe93fd03d 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.9", + version: "0.7.5-beta.10", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 9c03dbddd9..26be1b5167 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.1.10-beta.9' + version: '1.1.10-beta.10' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 5ec80957f6..076029f942 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.9', + version: '1.5.45-beta.10', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 670d609201..de9d623e23 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.9' + version: '1.1.13-beta.10' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 732f76b630..0dbbeeb457 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.9", + version: "0.8.3-beta.10", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 1e76f61aa5..7eeddec36c 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.9', + version: '1.1.8-beta.10', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 4879561475..95bf4cb3d6 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.9', + version: '1.1.8-beta.10', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 1483d612e1..793e8cdcca 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.9', + version: '1.1.11-beta.10', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index d9abeb9ce6..36d81fe280 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.9" + version: "2.513.4-beta.10" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 472e133fd9..32a1b1f0c4 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.9' + version: '1.2.13-beta.10' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index bf688a204b..707b80147c 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.9' + version: '1.1.12-beta.10' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 5031188b75..930171cc6c 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.9' + version: '1.3.10-beta.10' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 17110a1547..6e6ea89302 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.9' + version: '2.5.13-beta.10' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index d683f26ab6..b88a9c1171 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.9", + "version": "1.4-beta.10", "recommended": false, "official": false, "description": "Meteor" From e9fa8391a23aac4bfbf21cea458adbbb5d882c15 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 12:07:14 -0400 Subject: [PATCH 096/144] Update History.md with changes in 1.4-beta.10. --- History.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/History.md b/History.md index cac266e878..b01f5288bb 100644 --- a/History.md +++ b/History.md @@ -33,6 +33,19 @@ `Mongo.setConnectionOptions(options)` API. [#7277](https://github.com/meteor/meteor/pull/7277) +* If an app has no `package.json` file, all packages in `node_modules` + will be built into the production bundle. In other words, make sure you + have a `package.json` file if you want to benefit from `devDependencies` + pruning. 7b2193188fc9e297eefc841ce6035825164f0684 + +* Binary npm dependencies of compiler plugins are now automatically + rebuilt when Node/V8 versions change. + [#7297](https://github.com/meteor/meteor/issues/7297) + +* The `.meteor/dev_bundle` link now corresponds exactly to + `.meteor/release` even when an app is using an older version of + Meteor. d732c2e649794f350238d515153f7fb71969c526 + ## v1.3.4.4 * Fixed [#7374](https://github.com/meteor/meteor/issues/7374). From bfb35ed65c805cd0b0c2a0639105116c127f62a3 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 13:31:06 -0400 Subject: [PATCH 097/144] Make constraint solver result cache JSON-serializable. --- .../constraint-solver/constraint-solver-input.js | 13 ++++++++----- packages/constraint-solver/constraint-solver.js | 8 +++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/constraint-solver/constraint-solver-input.js b/packages/constraint-solver/constraint-solver-input.js index 68d6cc30dd..9835e44030 100644 --- a/packages/constraint-solver/constraint-solver-input.js +++ b/packages/constraint-solver/constraint-solver-input.js @@ -171,21 +171,24 @@ CS.Input.prototype.isEqual = function (otherInput) { // to reload the entire relevant part of the catalog from SQLite on // every rebuild! return _.isEqual( - _.omit(a.toJSONable(), "catalogCache"), - _.omit(b.toJSONable(), "catalogCache") + a.toJSONable(true), + b.toJSONable(true) ); }; -CS.Input.prototype.toJSONable = function () { +CS.Input.prototype.toJSONable = function (omitCatalogCache) { var self = this; var obj = { dependencies: self.dependencies, constraints: _.map(self.constraints, function (c) { return c.toString(); - }), - catalogCache: self.catalogCache.toJSONable() + }) }; + if (! omitCatalogCache) { + obj.catalogCache = self.catalogCache.toJSONable(); + } + // For readability of the resulting JSON, only include optional // properties that aren't the default. if (self.upgrade.length) { diff --git a/packages/constraint-solver/constraint-solver.js b/packages/constraint-solver/constraint-solver.js index f35562399f..8e4b78be21 100644 --- a/packages/constraint-solver/constraint-solver.js +++ b/packages/constraint-solver/constraint-solver.js @@ -60,8 +60,10 @@ CS.PackagesResolver.prototype.resolve = function (dependencies, constraints, }); var resultCache = self._options.resultCache; - if (resultCache && resultCache.lastInput && - input.isEqual(resultCache.lastInput)) { + if (resultCache && + resultCache.lastInput && + _.isEqual(resultCache.lastInput, + input.toJSONable(true))) { return resultCache.lastOutput; } @@ -127,7 +129,7 @@ CS.PackagesResolver.prototype.resolve = function (dependencies, constraints, } if (resultCache) { - resultCache.lastInput = input; + resultCache.lastInput = input.toJSONable(true); resultCache.lastOutput = output; } From f620f2f047aa4f3775a87c0f6235437343499234 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 13:32:09 -0400 Subject: [PATCH 098/144] Save .meteor/local/resolver-result-cache.json to improve startup performance. --- tools/project-context.js | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tools/project-context.js b/tools/project-context.js index 896b93751c..7daf27666f 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -210,7 +210,7 @@ _.extend(ProjectContext.prototype, { // calls to the constraint solver, the constraint solver can be // more efficient by caching or memoizing its work. We choose not // to reset this when reset() is called more than once. - self._resolverResultCache = (self._resolverResultCache || {}); + self._readResolverResultCache(); }, readProjectMetadata: function () { @@ -559,11 +559,40 @@ _.extend(ProjectContext.prototype, { anticipatedPrereleases: anticipatedPrereleases }); + self._saveResolverResultCache(); + self._completedStage = STAGE.RESOLVE_CONSTRAINTS; }); }); }), + _readResolverResultCache() { + if (! this._resolverResultCache) { + try { + this._resolverResultCache = + JSON.parse(files.readFile(files.pathJoin( + this.projectLocalDir, + "resolver-result-cache.json" + ))); + } catch (e) { + if (e.code !== "ENOENT") throw e; + this._resolverResultCache = {}; + } + } + + return this._resolverResultCache; + }, + + _saveResolverResultCache() { + files.writeFileAtomically( + files.pathJoin( + this.projectLocalDir, + "resolver-result-cache.json" + ), + JSON.stringify(this._resolverResultCache) + "\n" + ); + }, + // When running test-packages for an app with local packages, this // method will return the original app dir, as opposed to the temporary // testRunnerAppDir created for the tests. From 2c8d36aed2cada3e813c00f0c9332779c2fad98f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 14:12:03 -0400 Subject: [PATCH 099/144] Ensure parent directory exists in files.writeFileAtomically. --- tools/fs/files.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/fs/files.js b/tools/fs/files.js index 8f7e47adad..d2bbfd49d2 100644 --- a/tools/fs/files.js +++ b/tools/fs/files.js @@ -836,9 +836,14 @@ files.renameDirAlmostAtomically = Profile("files.renameDirAlmostAtomically", files.renameDirAlmostAtomically); files.writeFileAtomically = function (filename, contents) { - var tmpFile = files.pathJoin( - files.pathDirname(filename), - '.' + files.pathBasename(filename) + '.' + utils.randomToken()); + const parentDir = files.pathDirname(filename); + files.mkdir_p(parentDir); + + const tmpFile = files.pathJoin( + parentDir, + '.' + files.pathBasename(filename) + '.' + utils.randomToken() + ); + files.writeFile(tmpFile, contents); files.rename(tmpFile, filename); }; From 66061ba40523c355fdef91f84cf43300adb724b4 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 15:25:53 -0400 Subject: [PATCH 100/144] Bump package versions for 1.4-beta.11 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 1c9949dc05..d4f7b15290 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.10" + version: "1.2.9-beta.11" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index afdee2b220..c5a7989a7a 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.10" + version: "1.2.12-beta.11" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 6a2a073ea5..5795fe7d45 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.10" + version: "1.1.11-beta.11" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index e66473fdb9..a3b65432b1 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.10' + version: '1.3.11-beta.11' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index f013de694b..1b95ce1e60 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.10' + version: '6.9.0-beta.11' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 1834808073..d83d56c1a6 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.10', + version: '0.1.10-beta.11', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 47a3d38e46..90b8cbcb25 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.10', + version: '1.1.6-beta.11', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index f1be5d1333..5704d6bcb1 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.10" + version: "1.2.3-beta.11" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index 40aaf5801f..c6ce1abe0b 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.0.26" + version: "1.1.0-beta.11" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index bd38211902..20d9e78cfd 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: '1.3.0-beta.10', + version: '1.3.0-beta.11', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index fcb34db749..df9ff5d9a1 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.10', + version: '1.3.9-beta.11', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 62c4456266..81ce7ee88f 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.10", + version: "0.3.12-beta.11", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index e7cbbc4d55..f2d881bab9 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.10', + version: '0.5.7-beta.11', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index f2d0331e83..648dadf1a0 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.15-beta.10" + version: "1.1.16-beta.11" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 1e039bff09..e5e24d82a5 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.10", + version: "4.6.13-beta.11", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index e40ad92ad8..ffc96f177f 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.10' + version: '1.2.8-beta.11' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 61e57b5be4..23e5e4952b 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.10', + version: '1.1.5-beta.11', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 3c1ff79172..a95ce85468 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.10', + version: '2.7.4-beta.11', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 0897b58210..1a6f5f9479 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.10' + version: '1.1.14-beta.11' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 7305392707..7daa8751e3 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.10' + version: '1.4.0-beta.11' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 02cd4261a7..81d4120ca9 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.10' + version: '1.2.16-beta.11' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index b9617f1a58..a91c2a9f5d 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.10" + version: "1.2.13-beta.11" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index caa918c969..821680355c 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.10" + version: "1.2.13-beta.11" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 5a1f5a6869..89dc416a6e 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.10", + version: "0.7.5-beta.11", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index ebe93fd03d..ad2d91309b 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.10", + version: "0.7.5-beta.11", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 26be1b5167..e0463a04e5 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.1.10-beta.10' + version: '1.1.10-beta.11' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 076029f942..b7f5422e51 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.10', + version: '1.5.45-beta.11', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index de9d623e23..74c0fb952f 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.10' + version: '1.1.13-beta.11' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 0dbbeeb457..227a5fdd63 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.10", + version: "0.8.3-beta.11", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 7eeddec36c..adcb65cc2e 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.10', + version: '1.1.8-beta.11', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 95bf4cb3d6..a2b5d5dd7f 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.10', + version: '1.1.8-beta.11', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 793e8cdcca..d38073eaa7 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.10', + version: '1.1.11-beta.11', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 36d81fe280..9be3f4f6c0 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.10" + version: "2.513.4-beta.11" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 32a1b1f0c4..daa707feef 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.10' + version: '1.2.13-beta.11' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 707b80147c..7cffb1e925 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.10' + version: '1.1.12-beta.11' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 930171cc6c..796b9097d7 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.10' + version: '1.3.10-beta.11' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 6e6ea89302..781102d520 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.10' + version: '2.5.13-beta.11' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index b88a9c1171..2ab147cdb0 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.10", + "version": "1.4-beta.11", "recommended": false, "official": false, "description": "Meteor" From 084f0cb279384b8d09690f93878873d7a5b88634 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 16:58:26 -0400 Subject: [PATCH 101/144] Call `npm rebuild --update-binary` in npm-rebuild.json. --- tools/static-assets/server/npm-rebuild.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/static-assets/server/npm-rebuild.js b/tools/static-assets/server/npm-rebuild.js index 34acf2f3ab..ade9b26199 100644 --- a/tools/static-assets/server/npm-rebuild.js +++ b/tools/static-assets/server/npm-rebuild.js @@ -40,7 +40,10 @@ function rebuild(i) { return; } - spawn("npm", ["rebuild"], { + // The --update-binary flag tells node-pre-gyp to replace previously + // installed local binaries with remote binaries: + // https://github.com/mapbox/node-pre-gyp#options + spawn("npm", ["rebuild", "--update-binary"], { cwd: path.join(__dirname, dir), stdio: "inherit", env: env From 455b62ca285d01ecb7aec50922d186ea58d930d7 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 12 Jul 2016 19:07:21 -0400 Subject: [PATCH 102/144] Bump package versions for 1.4-beta.12 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index d4f7b15290..1172852afa 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.11" + version: "1.2.9-beta.12" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index c5a7989a7a..2ee28693eb 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.11" + version: "1.2.12-beta.12" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 5795fe7d45..d68f58d526 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.11" + version: "1.1.11-beta.12" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index a3b65432b1..fd825c4fd8 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.11' + version: '1.3.11-beta.12' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 1b95ce1e60..f1735e87ca 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.11' + version: '6.9.0-beta.12' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index d83d56c1a6..2b382e064b 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.11', + version: '0.1.10-beta.12', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 90b8cbcb25..07ad9e34a9 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.11', + version: '1.1.6-beta.12', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 5704d6bcb1..797207e3b3 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.11" + version: "1.2.3-beta.12" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index c6ce1abe0b..6b2b646136 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-beta.11" + version: "1.1.0-beta.12" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 20d9e78cfd..36114a2f3b 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: '1.3.0-beta.11', + version: '1.3.0-beta.12', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index df9ff5d9a1..029bcf2baa 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.11', + version: '1.3.9-beta.12', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 81ce7ee88f..8532892afc 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.11", + version: "0.3.12-beta.12", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index f2d881bab9..2b56943b4f 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.11', + version: '0.5.7-beta.12', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 81a21cf451..179b639075 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-beta.11" + version: "1.1.16-beta.12" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index e5e24d82a5..7f1d07a5c4 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.11", + version: "4.6.13-beta.12", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index ffc96f177f..01898ba7fa 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.11' + version: '1.2.8-beta.12' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 23e5e4952b..9d58a7ea3a 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.11', + version: '1.1.5-beta.12', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index a95ce85468..04d3c69f7f 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.11', + version: '2.7.4-beta.12', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 1a6f5f9479..ae9baf5aa7 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.11' + version: '1.1.14-beta.12' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 7daa8751e3..8fc5c80308 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.11' + version: '1.4.0-beta.12' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 81d4120ca9..b8b9ebe8a5 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.11' + version: '1.2.16-beta.12' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index a91c2a9f5d..5d6ee2ceaa 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.11" + version: "1.2.13-beta.12" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 821680355c..c4373a5985 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.11" + version: "1.2.13-beta.12" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 89dc416a6e..e95608b101 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.11", + version: "0.7.5-beta.12", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index ad2d91309b..f1dfcc1f0b 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.11", + version: "0.7.5-beta.12", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index e0463a04e5..f85d913136 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.1.10-beta.11' + version: '1.1.10-beta.12' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index b7f5422e51..43ede3aaff 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.11', + version: '1.5.45-beta.12', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 74c0fb952f..59d3b02b5e 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.11' + version: '1.1.13-beta.12' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 227a5fdd63..2bdc12c1cf 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.11", + version: "0.8.3-beta.12", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index adcb65cc2e..84f6c6f7ae 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.11', + version: '1.1.8-beta.12', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index a2b5d5dd7f..c4659683f0 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.11', + version: '1.1.8-beta.12', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index d38073eaa7..3ef8798ff7 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.11', + version: '1.1.11-beta.12', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 9be3f4f6c0..986ef278f5 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.11" + version: "2.513.4-beta.12" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index daa707feef..57ecfccd83 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.11' + version: '1.2.13-beta.12' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index 5f79e06a30..dd8befaa63 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.0.14' + version: '1.1.0-beta.12' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 7cffb1e925..686fe92a23 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.11' + version: '1.1.12-beta.12' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 796b9097d7..b8e5b374aa 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.11' + version: '1.3.10-beta.12' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 781102d520..4dbb1b5c1d 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.11' + version: '2.5.13-beta.12' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 2ab147cdb0..fab0d43e86 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.11", + "version": "1.4-beta.12", "recommended": false, "official": false, "description": "Meteor" From 756fb597c63fde784af1288357fa721575376e36 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 13 Jul 2016 17:50:41 +1000 Subject: [PATCH 103/144] First pass at request resuming via buffering the `range` header This is still a WIP, but I wanted to get feedback at this point. Will update the PR with outstanding TODOs. --- tools/packaging/tropohouse.js | 2 +- tools/tests/utils-tests.js | 27 ++++++++++++++++++ tools/utils/http-helpers.js | 54 ++++++++++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 2 deletions(-) diff --git a/tools/packaging/tropohouse.js b/tools/packaging/tropohouse.js index a30719a232..2dcb096c6d 100644 --- a/tools/packaging/tropohouse.js +++ b/tools/packaging/tropohouse.js @@ -304,7 +304,7 @@ _.extend(exports.Tropohouse.prototype, { // it relies on extractTarGz being fast and not reporting any progress. // Really, we should create two subtasks // (and, we should stream the download to the tar extractor) - var packageTarball = httpHelpers.getUrl({ + var packageTarball = httpHelpers.getUrlWithResuming({ url: url, encoding: null, progress: buildmessage.getCurrentProgressTracker(), diff --git a/tools/tests/utils-tests.js b/tools/tests/utils-tests.js index 729bca6116..d7272b0d97 100644 --- a/tools/tests/utils-tests.js +++ b/tools/tests/utils-tests.js @@ -152,3 +152,30 @@ selftest.define("parse url", function () { protocol: "https" }); }); + +// XXX: WIP -- I'm not sure how to properly test a failed connection. +// At the moment, I'm thinking I'll just mark this test as "don't run" +// and use it by hand for testing (which basically means run it, kill my +// internet, start my internet again, watch what happens) +selftest.define("resume downloads", function () { + const url = 'http://warehouse.meteor.com/builds/Pr7L8f6PqXyqNJJn4/1443478653127/aRiirNrp4v/meteor-tool-1.1.9-os.osx.x86_64+web.browser+web.cordova.tgz'; + + const result = require('../utils/http-helpers').getUrlWithResuming({ + timeout: 1000, + url: url, + encoding: null, + wait: false, + progress: { + reportProgress({ current, end }) { + const percent = current / end * 100; + if (Math.random() < 0.1) { + console.log(`${percent} %`); + } + }, + reportProgressDone() { + console.log('done'); + } + } + }); + console.log(result, result.toString().length) +}); diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index cf1e196932..6793fc0851 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -14,6 +14,7 @@ var release = require('../packaging/release.js'); var Console = require('../console/console.js').Console; var timeoutScaleFactor = require('./utils.js').timeoutScaleFactor; +import { WritableStreamBuffer } from 'stream-buffers'; // Helper that tracks bytes written to a writable var WritableWithProgress = function (writable, listener) { @@ -128,6 +129,12 @@ _.extend(exports, { options = _.clone(urlOrOptions); } + var outputStream; + if (_.has(options, 'outputStream')) { + outputStream = options.outputStream; + delete options.outputStream; + } + var bodyStream; if (_.has(options, 'bodyStream')) { bodyStream = options.bodyStream; @@ -278,6 +285,10 @@ _.extend(exports, { bodyStream.pipe(dest); } + if (outputStream) { + req.pipe(outputStream); + } + if (progress) { httpHelpers._addProgressEvents(req); req.on('progress', function (state) { @@ -358,6 +369,47 @@ _.extend(exports, { } else { return body; } - } + }, + getUrlWithResuming(urlOrOptions) { + const options = _.isObject(urlOrOptions) ? urlOrOptions : { + url: urlOrOptions, + }; + + const outputStream = new WritableStreamBuffer(); + + const MAX_ATTEMPTS = 5; + function attempt(triesRemaining) { + const headers = _.extend({}, urlOrOptions.headers, { + range: `bytes=${outputStream.size()}-`, + }); + try { + return httpHelpers.request({ + outputStream, + headers, + ...urlOrOptions, + }); + } catch (e) { + console.log(e); + if (triesRemaining > 0) { + console.log(`Request failed, retrying`); + return attempt(triesRemaining - 1); + } else { + console.log(`Request failed ${MAX_ATTEMPTS} times, failing`) + throw new files.OfflineError(e); + } + } + } + const response = attempt(MAX_ATTEMPTS).response; + const body = outputStream.getContents(); + + if (response.statusCode >= 400 && response.statusCode < 600) { + const href = response.request.href; + throw Error( + body || + `Could not get ${href}; server returned [${response.statusCode}]`); + } else { + return body; + } + } }); From e9b6b86a71031e46e037e7324627463a6eec93e9 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 10:10:10 -0400 Subject: [PATCH 104/144] New URL for 7-zip .msi in publish-meteor-tool.bat. --- scripts/admin/publish-meteor-tool.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/admin/publish-meteor-tool.bat b/scripts/admin/publish-meteor-tool.bat index 48da72c7ad..4f0c233441 100644 --- a/scripts/admin/publish-meteor-tool.bat +++ b/scripts/admin/publish-meteor-tool.bat @@ -22,7 +22,7 @@ REM GITSHA is replaced by the script transferring this file C:\git\bin\git.exe checkout $GITSHA REM install 7-zip, required for running meteor from checkout -C:\git\bin\curl -L http://downloads.sourceforge.net/sevenzip/7z920.msi ^> C:\7z.msi +C:\git\bin\curl -L http://www.7-zip.org/a/7z1602.msi ^> C:\7z.msi msiexec /i C:\7z.msi /quiet /qn /norestart set PATH=^%PATH^%;"C:\Program Files\7-Zip" REM wait 3 seconds to avoid races with the 7-zip installation From 99886f990e57dfa72267b7eb5a64e263d024a0e6 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 12:46:08 -0400 Subject: [PATCH 105/144] Fix a bug in tools/utils/http-helpers.js. --- tools/utils/http-helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index cf1e196932..9505888b9f 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -136,7 +136,7 @@ _.extend(exports, { // Body stream length for progress var bodyStreamLength = 0; - if (_.has(options, 'bodyStream')) { + if (_.has(options, 'bodyStreamLength')) { bodyStreamLength = options.bodyStreamLength; delete options.bodyStreamLength; } else { From e6acb9f39f7071b031d41f30bd6a1635f70a7c3e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 12:53:14 -0400 Subject: [PATCH 106/144] Decompose npm-rebuild-args.js. Helps with #7401. --- tools/isobuild/bundler.js | 1 + tools/isobuild/meteor-npm.js | 5 ++++- tools/static-assets/server/npm-rebuild-args.js | 14 ++++++++++++++ tools/static-assets/server/npm-rebuild.js | 6 ++---- 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 tools/static-assets/server/npm-rebuild-args.js diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index 68eaaa70f9..5790d0a5b2 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -2149,6 +2149,7 @@ class ServerTarget extends JsImageTarget { "mini-files.js", "npm-require.js", "npm-rebuild.js", + "npm-rebuild-args.js", ], function (filename) { builder.write(filename, { file: files.pathJoin( diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js index 64ba95b759..8e49438c19 100644 --- a/tools/isobuild/meteor-npm.js +++ b/tools/isobuild/meteor-npm.js @@ -15,6 +15,9 @@ var utils = require('../utils/utils.js'); var runLog = require('../runners/run-log.js'); var Profile = require('../tool-env/profile.js').Profile; import { execFileAsync } from "../utils/processes.js"; +import { + get as getRebuildArgs +} from "../static-assets/server/npm-rebuild-args.js"; var meteorNpm = exports; @@ -235,7 +238,7 @@ Profile("meteorNpm.rebuildIfNonPortable", function (nodeModulesDir) { // The `npm rebuild` command must be run in the parent directory of the // relevant node_modules directory, which in this case is tempDir. - const rebuildResult = runNpmCommand(["rebuild"], tempDir); + const rebuildResult = runNpmCommand(getRebuildArgs(), tempDir); if (! rebuildResult.success) { buildmessage.error(rebuildResult.error); files.rm_recursive(tempDir); diff --git a/tools/static-assets/server/npm-rebuild-args.js b/tools/static-assets/server/npm-rebuild-args.js new file mode 100644 index 0000000000..d4451f8dd4 --- /dev/null +++ b/tools/static-assets/server/npm-rebuild-args.js @@ -0,0 +1,14 @@ +// Command-line arguments passed to npm when rebuilding binary packages. +var args = [ + "rebuild", + + // The --update-binary flag tells node-pre-gyp to replace previously + // installed local binaries with remote binaries: + // https://github.com/mapbox/node-pre-gyp#options + "--update-binary" +]; + +exports.get = function () { + // Make a defensive copy. + return args.slice(0); +}; diff --git a/tools/static-assets/server/npm-rebuild.js b/tools/static-assets/server/npm-rebuild.js index ade9b26199..50a4ec89bd 100644 --- a/tools/static-assets/server/npm-rebuild.js +++ b/tools/static-assets/server/npm-rebuild.js @@ -7,6 +7,7 @@ if (process.env.METEOR_SKIP_NPM_REBUILD) { var path = require("path"); var spawn = require("child_process").spawn; +var rebuildArgs = require("./npm-rebuild-args.js").get(); try { // This JSON file gets written in meteor/tools/isobuild/bundler.js. @@ -40,10 +41,7 @@ function rebuild(i) { return; } - // The --update-binary flag tells node-pre-gyp to replace previously - // installed local binaries with remote binaries: - // https://github.com/mapbox/node-pre-gyp#options - spawn("npm", ["rebuild", "--update-binary"], { + spawn("npm", rebuildArgs, { cwd: path.join(__dirname, dir), stdio: "inherit", env: env From d2ddd0f98db3a8bdf1f002ea4485d485752a3b74 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 13:05:17 -0400 Subject: [PATCH 107/144] Pass --no-bin-links to `npm rebuild` to fix #7401. --- tools/static-assets/server/npm-rebuild-args.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/static-assets/server/npm-rebuild-args.js b/tools/static-assets/server/npm-rebuild-args.js index d4451f8dd4..238f903103 100644 --- a/tools/static-assets/server/npm-rebuild-args.js +++ b/tools/static-assets/server/npm-rebuild-args.js @@ -2,6 +2,11 @@ var args = [ "rebuild", + // The --no-bin-links flag tells npm not to create symlinks in the + // node_modules/.bin/ directory when rebuilding packages, which helps + // avoid problems like https://github.com/meteor/meteor/issues/7401. + "--no-bin-links", + // The --update-binary flag tells node-pre-gyp to replace previously // installed local binaries with remote binaries: // https://github.com/mapbox/node-pre-gyp#options From b5005711f41dbd24c4a0f3309048c817477e411f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 13:05:30 -0400 Subject: [PATCH 108/144] Support additional `meteor rebuild` flags via environment variable. --- tools/static-assets/server/npm-rebuild-args.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/static-assets/server/npm-rebuild-args.js b/tools/static-assets/server/npm-rebuild-args.js index 238f903103..8d1d4cae09 100644 --- a/tools/static-assets/server/npm-rebuild-args.js +++ b/tools/static-assets/server/npm-rebuild-args.js @@ -13,6 +13,13 @@ var args = [ "--update-binary" ]; +// Allow additional flags to be passed via the $METEOR_NPM_REBUILD_FLAGS +// environment variable. +var flags = process.env.METEOR_NPM_REBUILD_FLAGS; +if (flags) { + args.push.apply(args, flags.split(/\s+/g)); +} + exports.get = function () { // Make a defensive copy. return args.slice(0); From e76cb6f719623336f880ed65a48a6c4bb68d6374 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 13:13:07 -0400 Subject: [PATCH 109/144] Update History.md to reflect changes to `npm rebuild` flags. --- History.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/History.md b/History.md index b01f5288bb..62f888517d 100644 --- a/History.md +++ b/History.md @@ -46,6 +46,11 @@ `.meteor/release` even when an app is using an older version of Meteor. d732c2e649794f350238d515153f7fb71969c526 +* When recompiling binary npm packages, the `npm rebuild` command now + receives the flags `--update-binary` and `--no-bin-links`, in addition + to respecting the `$METEOR_NPM_REBUILD_FLAGS` environment variable. + [#7401](https://github.com/meteor/meteor/issues/7401) + ## v1.3.4.4 * Fixed [#7374](https://github.com/meteor/meteor/issues/7374). From 6146b43ca5600c0bcedf5da8f98e059f4915a1e3 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 13:18:52 -0400 Subject: [PATCH 110/144] Bump package versions for 1.4-beta.13 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 1172852afa..c69350daa3 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.12" + version: "1.2.9-beta.13" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 2ee28693eb..f8253d4f21 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.12" + version: "1.2.12-beta.13" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index d68f58d526..53223eba4b 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.12" + version: "1.1.11-beta.13" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index fd825c4fd8..61e53e31d0 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.12' + version: '1.3.11-beta.13' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index f1735e87ca..935ee21f1c 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.12' + version: '6.9.0-beta.13' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 2b382e064b..e1de4c0baf 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.12', + version: '0.1.10-beta.13', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 07ad9e34a9..7643d36520 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.12', + version: '1.1.6-beta.13', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 797207e3b3..07a5b8cfc4 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.12" + version: "1.2.3-beta.13" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index 6b2b646136..3a4714d1a4 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-beta.12" + version: "1.1.0-beta.13" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 36114a2f3b..b755f7f93c 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: '1.3.0-beta.12', + version: '1.3.0-beta.13', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 029bcf2baa..2da4c22f49 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.12', + version: '1.3.9-beta.13', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 8532892afc..523975dd4c 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.12", + version: "0.3.12-beta.13", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 2b56943b4f..e1d9f6a567 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.12', + version: '0.5.7-beta.13', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 179b639075..8eee4b9a8e 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-beta.12" + version: "1.1.16-beta.13" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 7f1d07a5c4..33ad2cbfc7 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.12", + version: "4.6.13-beta.13", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 01898ba7fa..9034411bd4 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.12' + version: '1.2.8-beta.13' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 9d58a7ea3a..7e4794166f 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.12', + version: '1.1.5-beta.13', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index 04d3c69f7f..d380911aed 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.12', + version: '2.7.4-beta.13', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index ae9baf5aa7..e55cf6f7fe 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.12' + version: '1.1.14-beta.13' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 8fc5c80308..69225e2a21 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.12' + version: '1.4.0-beta.13' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index b8b9ebe8a5..f5d2f0a40c 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.12' + version: '1.2.16-beta.13' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 5d6ee2ceaa..7898d615e9 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.12" + version: "1.2.13-beta.13" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index c4373a5985..dafaf6d587 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.12" + version: "1.2.13-beta.13" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index e95608b101..19001649ec 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.12", + version: "0.7.5-beta.13", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index f1dfcc1f0b..2174a62998 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.12", + version: "0.7.5-beta.13", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index f85d913136..723b249d7c 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.1.10-beta.12' + version: '1.1.10-beta.13' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 43ede3aaff..f2a0c844cb 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.12', + version: '1.5.45-beta.13', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 59d3b02b5e..a6ff41c071 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.12' + version: '1.1.13-beta.13' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 2bdc12c1cf..034d645027 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.12", + version: "0.8.3-beta.13", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 84f6c6f7ae..83ecfabda9 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.12', + version: '1.1.8-beta.13', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index c4659683f0..b27f71791b 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.12', + version: '1.1.8-beta.13', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 3ef8798ff7..54e6e57ba0 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.12', + version: '1.1.11-beta.13', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 986ef278f5..abc7a63312 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.12" + version: "2.513.4-beta.13" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 57ecfccd83..45a3555348 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.12' + version: '1.2.13-beta.13' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index dd8befaa63..cef4ad28c1 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.1.0-beta.12' + version: '1.1.0-beta.13' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 686fe92a23..1afd176ab2 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.12' + version: '1.1.12-beta.13' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index b8e5b374aa..096c16f791 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.12' + version: '1.3.10-beta.13' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 4dbb1b5c1d..8dd79ad0d8 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.12' + version: '2.5.13-beta.13' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index fab0d43e86..d57407666e 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.12", + "version": "1.4-beta.13", "recommended": false, "official": false, "description": "Meteor" From c94960e7b23a1175aa6eaa519402ca36dce5521a Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 13 Jul 2016 18:12:41 -0400 Subject: [PATCH 111/144] Make $METEOR_NPM_REBUILD_FLAGS override default flags. --- tools/static-assets/server/npm-rebuild-args.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/static-assets/server/npm-rebuild-args.js b/tools/static-assets/server/npm-rebuild-args.js index 8d1d4cae09..dab0ad56f8 100644 --- a/tools/static-assets/server/npm-rebuild-args.js +++ b/tools/static-assets/server/npm-rebuild-args.js @@ -17,7 +17,12 @@ var args = [ // environment variable. var flags = process.env.METEOR_NPM_REBUILD_FLAGS; if (flags) { - args.push.apply(args, flags.split(/\s+/g)); + args = ["rebuild"]; + flags.split(/\s+/g).forEach(function (flag) { + if (flag) { + args.push(flag); + } + }); } exports.get = function () { From eeba73eba03e16e25084221b6cff912b79eadd23 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 14 Jul 2016 14:01:53 +1000 Subject: [PATCH 112/144] Made the test work in a sensible way --- tools/tests/utils-tests.js | 33 ++++++++++++++++--------- tools/utils/http-helpers.js | 49 +++++++++++++++++++++++++------------ 2 files changed, 54 insertions(+), 28 deletions(-) diff --git a/tools/tests/utils-tests.js b/tools/tests/utils-tests.js index d7272b0d97..2fb65f99aa 100644 --- a/tools/tests/utils-tests.js +++ b/tools/tests/utils-tests.js @@ -153,14 +153,23 @@ selftest.define("parse url", function () { }); }); -// XXX: WIP -- I'm not sure how to properly test a failed connection. -// At the moment, I'm thinking I'll just mark this test as "don't run" -// and use it by hand for testing (which basically means run it, kill my -// internet, start my internet again, watch what happens) -selftest.define("resume downloads", function () { +selftest.define("resume downloads", ['net', 'slow'], function () { + // A reasonably big file that (I think) should take more than 1s to download + // and that we know the size of const url = 'http://warehouse.meteor.com/builds/Pr7L8f6PqXyqNJJn4/1443478653127/aRiirNrp4v/meteor-tool-1.1.9-os.osx.x86_64+web.browser+web.cordova.tgz'; - const result = require('../utils/http-helpers').getUrlWithResuming({ + let firstPass = true; + const httpHelpers = require('../utils/http-helpers'); + + setTimeout(() => { + httpHelpers._currentRequest.emit('error', 'pretend-http-error'); + httpHelpers._currentRequest.emit('end'); + }, 1000); + + const result = httpHelpers.getUrlWithResuming({ + // This doesn't affect the test, but if you remove the timeout above, + // you can kill the connection manually by shutting down your network. + // This makes it a bit faster timeout: 1000, url: url, encoding: null, @@ -168,14 +177,14 @@ selftest.define("resume downloads", function () { progress: { reportProgress({ current, end }) { const percent = current / end * 100; - if (Math.random() < 0.1) { - console.log(`${percent} %`); + if (Math.random() < 0.01) { + // Uncomment this when manually testing I guess + // console.log(`${percent} %`); } }, - reportProgressDone() { - console.log('done'); - } + reportProgressDone() {} } }); - console.log(result, result.toString().length) + + selftest.expectEqual(result.toString().length, 65041076); }); diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index 6793fc0851..66d483312a 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -15,6 +15,7 @@ var Console = require('../console/console.js').Console; var timeoutScaleFactor = require('./utils.js').timeoutScaleFactor; import { WritableStreamBuffer } from 'stream-buffers'; +import fiberHelpers from '../utils/fiber-helpers.js'; // Helper that tracks bytes written to a writable var WritableWithProgress = function (writable, listener) { @@ -83,6 +84,10 @@ var getUserAgent = function () { var httpHelpers = exports; _.extend(exports, { + // For testing purposes, do not use (obviously it doesn't really make + // sense to have only one current request) + _currentRequest: null, + getUserAgent: getUserAgent, // A wrapper around request with the following improvements: @@ -269,6 +274,8 @@ _.extend(exports, { var request = require('request'); var req = request(options, callback); + // A handle for testing + httpHelpers._currentRequest = req; var totalProgress = { current: 0, end: bodyStreamLength + responseLength, done: false }; @@ -372,44 +379,54 @@ _.extend(exports, { }, getUrlWithResuming(urlOrOptions) { - const options = _.isObject(urlOrOptions) ? urlOrOptions : { + const options = _.isObject(urlOrOptions) ? _.clone(urlOrOptions) : { url: urlOrOptions, }; const outputStream = new WritableStreamBuffer(); - const MAX_ATTEMPTS = 5; + const MAX_ATTEMPTS = 10; + const RETRY_DELAY_SECS = 5; + + let lastSize = 0; function attempt(triesRemaining) { - const headers = _.extend({}, urlOrOptions.headers, { - range: `bytes=${outputStream.size()}-`, - }); + if (lastSize > 0) { + options.headers = { + ...options.headers, + Range: `bytes=${outputStream.size()}-` + }; + } + try { return httpHelpers.request({ outputStream, - headers, - ...urlOrOptions, + ...options, }); } catch (e) { - console.log(e); - if (triesRemaining > 0) { + const size = outputStream.size(); + const useTry = size === lastSize; + lastSize = outputStream.size(); + + if (!useTry || triesRemaining > 0) { console.log(`Request failed, retrying`); - return attempt(triesRemaining - 1); + return new Promise(resolve => { + setTimeout(fiberHelpers.bindEnvironment(() => { + resolve(attempt(useTry ? triesRemaining - 1 : triesRemaining)); + }, RETRY_DELAY_SECS * 1000)); + }).await(); } else { console.log(`Request failed ${MAX_ATTEMPTS} times, failing`) throw new files.OfflineError(e); } } } - const response = attempt(MAX_ATTEMPTS).response; - const body = outputStream.getContents(); + const response = attempt(MAX_ATTEMPTS).response; if (response.statusCode >= 400 && response.statusCode < 600) { const href = response.request.href; - throw Error( - body || - `Could not get ${href}; server returned [${response.statusCode}]`); + throw Error(`Could not get ${href}; server returned [${response.statusCode}]`); } else { - return body; + return outputStream.getContents(); } } }); From 1ef12c7f43261e82fd15c7548aa46b23982c084f Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 14 Jul 2016 16:09:19 +1000 Subject: [PATCH 113/144] Better logging and progress Using Console.debug to register messages about retries. --- tools/utils/http-helpers.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index 66d483312a..5659752121 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -387,6 +387,7 @@ _.extend(exports, { const MAX_ATTEMPTS = 10; const RETRY_DELAY_SECS = 5; + const masterProgress = options.progress; let lastSize = 0; function attempt(triesRemaining) { @@ -397,6 +398,12 @@ _.extend(exports, { }; } + if (masterProgress) { + options.progress = masterProgress.addChildTask({ + title: masterProgress._title + }); + } + try { return httpHelpers.request({ outputStream, @@ -405,17 +412,23 @@ _.extend(exports, { } catch (e) { const size = outputStream.size(); const useTry = size === lastSize; + const change = size - lastSize; lastSize = outputStream.size(); if (!useTry || triesRemaining > 0) { - console.log(`Request failed, retrying`); + if (useTry) { + Console.debug(`Request failed, ${triesRemaining - 1} attempts left`); + } else { + Console.debug(`Request failed after ${change} bytes, retrying`); + } + return new Promise(resolve => { setTimeout(fiberHelpers.bindEnvironment(() => { resolve(attempt(useTry ? triesRemaining - 1 : triesRemaining)); }, RETRY_DELAY_SECS * 1000)); }).await(); } else { - console.log(`Request failed ${MAX_ATTEMPTS} times, failing`) + Console.debug(`Request failed ${MAX_ATTEMPTS} times: failing`); throw new files.OfflineError(e); } } From c5cc1c7ddd3cc6c185f9a3259df1943317fff751 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 14 Jul 2016 16:12:02 +1000 Subject: [PATCH 114/144] Added stream buffers to the dev bundle --- scripts/dev-bundle-tool-package.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/dev-bundle-tool-package.js b/scripts/dev-bundle-tool-package.js index fd75a4d7a5..0649543971 100644 --- a/scripts/dev-bundle-tool-package.js +++ b/scripts/dev-bundle-tool-package.js @@ -54,7 +54,8 @@ var packageJson = { runas: "3.1.1", 'lru-cache': '2.6.4', 'cordova-lib': "6.0.0", - longjohn: '0.2.11' + longjohn: '0.2.11', + 'stream-buffers': '3.0.0' } }; From 14210b29ecc7e586b4e32ec2e0d0537b6d2cbb89 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 14 Jul 2016 16:13:31 +1000 Subject: [PATCH 115/144] Bumped dev bundle version --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index dfd41d2759..9b24e5f97c 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.1.0 +BUNDLE_VERSION=4.1.1 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 6fe6875dd2e7af1b0d92d6547582af950b56e0ac Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Thu, 14 Jul 2016 16:30:18 +1000 Subject: [PATCH 116/144] Minor fixes + added a comment --- tools/tests/utils-tests.js | 5 ++--- tools/utils/http-helpers.js | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/tests/utils-tests.js b/tools/tests/utils-tests.js index 2fb65f99aa..b700cd19fe 100644 --- a/tools/tests/utils-tests.js +++ b/tools/tests/utils-tests.js @@ -1,6 +1,8 @@ var selftest = require('../tool-testing/selftest.js'); var utils = require('../utils/utils.js'); +import httpHelpers from '../utils/http-helpers'; + selftest.define('subset generator', function () { var out = []; utils.generateSubsetsOfIncreasingSize(['a', 'b', 'c'], function (x) { @@ -158,9 +160,6 @@ selftest.define("resume downloads", ['net', 'slow'], function () { // and that we know the size of const url = 'http://warehouse.meteor.com/builds/Pr7L8f6PqXyqNJJn4/1443478653127/aRiirNrp4v/meteor-tool-1.1.9-os.osx.x86_64+web.browser+web.cordova.tgz'; - let firstPass = true; - const httpHelpers = require('../utils/http-helpers'); - setTimeout(() => { httpHelpers._currentRequest.emit('error', 'pretend-http-error'); httpHelpers._currentRequest.emit('end'); diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index 5659752121..7d5825e52f 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -378,6 +378,12 @@ _.extend(exports, { } }, + // More or less as above, except with support for multiple attempts per + // request and resuming on retries. This means if the connection is bad, + // we can sometimes complete a request, even if each individual attempt fails. + // We only use this for package downloads. In theory we could use it for + // all requests but that seems like overkill and it isn't well tested in + // other scenarioes. getUrlWithResuming(urlOrOptions) { const options = _.isObject(urlOrOptions) ? _.clone(urlOrOptions) : { url: urlOrOptions, From c946e77d646fa80cf85229bc8303715a75ae2c1f Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 14 Jul 2016 10:07:36 -0400 Subject: [PATCH 117/144] Use .meteor/local/dev_bundle instead of .meteor/dev_bundle. I'm deliberately leaving in the code to ensure .meteor/.gitignore contains dev_bundle for now, so that the old file won't get accidentally checked into anyone's app repository. --- History.md | 6 +++++- tools/cli/dev-bundle.js | 9 +++++---- tools/project-context.js | 21 +++++++++++---------- tools/upgraders.js | 6 ++++++ 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/History.md b/History.md index 62f888517d..74c347d04c 100644 --- a/History.md +++ b/History.md @@ -42,7 +42,11 @@ rebuilt when Node/V8 versions change. [#7297](https://github.com/meteor/meteor/issues/7297) -* The `.meteor/dev_bundle` link now corresponds exactly to +* Because `.meteor/local` is where purely local information should be + stored, the `.meteor/dev_bundle` link has been renamed to + `.meteor/local/dev_bundle`. + +* The `.meteor/local/dev_bundle` link now corresponds exactly to `.meteor/release` even when an app is using an older version of Meteor. d732c2e649794f350238d515153f7fb71969c526 diff --git a/tools/cli/dev-bundle.js b/tools/cli/dev-bundle.js index 286eb5d0a2..0a8ebac721 100644 --- a/tools/cli/dev-bundle.js +++ b/tools/cli/dev-bundle.js @@ -27,11 +27,12 @@ function getDevBundleDir() { return defaultDevBundlePromise; } - var devBundleLink = path.join( - path.dirname(releaseFile), - "dev_bundle" - ); + var localDir = path.join(path.dirname(releaseFile), "local"); + if (! statOrNull(localDir, "isDirectory")) { + return defaultDevBundlePromise; + } + var devBundleLink = path.join(localDir, "dev_bundle"); var devBundleStat = statOrNull(devBundleLink); if (devBundleStat) { return new Promise(function (resolve) { diff --git a/tools/project-context.js b/tools/project-context.js index 7daf27666f..d8e5209072 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -1384,33 +1384,34 @@ _.extend(exports.ReleaseFile.prototype, { return files.realpath(devBundle); }, + // Make a symlink from .meteor/local/dev_bundle to the actual dev_bundle. ensureDevBundleLink() { import { makeLink, readLink } from "./cli/dev-bundle-links.js"; - // Make a symlink from .meteor/dev_bundle to the actual dev_bundle. - const devBundleLink = files.pathJoin( - files.pathDirname(this.filename), - "dev_bundle" - ); + const dotMeteorDir = files.pathDirname(this.filename); + const localDir = files.pathJoin(dotMeteorDir, "local"); + const devBundleLink = files.pathJoin(localDir, "dev_bundle"); if (this.isCheckout()) { - // Only create the .meteor/dev_bundle symlink if .meteor/release - // refers to an actual release, and remove it otherwise. + // Only create .meteor/local/dev_bundle if .meteor/release refers to + // an actual release, and remove it otherwise. files.rm_recursive(devBundleLink); return; } if (files.inCheckout()) { - // Never update .meteor/dev_bundle to point to a checkout. + // Never update .meteor/local/dev_bundle to point to a checkout. return; } + files.mkdir_p(localDir); + const newTarget = this.getDevBundle(); try { if (newTarget === readLink(devBundleLink)) { - // Don't touch .meteor/dev_bundle if it already points to the - // right target path. + // Don't touch .meteor/local/dev_bundle if it already points to + // the right target path. return; } diff --git a/tools/upgraders.js b/tools/upgraders.js index ff88bcbf64..8691afc261 100644 --- a/tools/upgraders.js +++ b/tools/upgraders.js @@ -227,6 +227,12 @@ the guide about breaking changes here:`, packagesFile.writeIfModified(); }, + "1.4.0-remove-old-dev-bundle-link": function (projectContext) { + const oldDevBundleLink = + files.pathJoin(projectContext.projectDir, ".meteor", "dev_bundle"); + files.rm_recursive(oldDevBundleLink); + }, + //////////// // PLEASE. When adding new upgraders that print mesasges, follow the // examples for 0.9.0 and 0.9.1 above. Specifically, formatting From 82dae55ef0d4646d61e2abfe501844c513b165d9 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 14 Jul 2016 10:22:26 -0400 Subject: [PATCH 118/144] Avoid exposing httpHelpers._currentRequest. Follow-up to #7399. --- tools/tests/utils-tests.js | 11 ++++++----- tools/utils/http-helpers.js | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/tests/utils-tests.js b/tools/tests/utils-tests.js index b700cd19fe..85938f8e28 100644 --- a/tools/tests/utils-tests.js +++ b/tools/tests/utils-tests.js @@ -160,11 +160,6 @@ selftest.define("resume downloads", ['net', 'slow'], function () { // and that we know the size of const url = 'http://warehouse.meteor.com/builds/Pr7L8f6PqXyqNJJn4/1443478653127/aRiirNrp4v/meteor-tool-1.1.9-os.osx.x86_64+web.browser+web.cordova.tgz'; - setTimeout(() => { - httpHelpers._currentRequest.emit('error', 'pretend-http-error'); - httpHelpers._currentRequest.emit('end'); - }, 1000); - const result = httpHelpers.getUrlWithResuming({ // This doesn't affect the test, but if you remove the timeout above, // you can kill the connection manually by shutting down your network. @@ -182,6 +177,12 @@ selftest.define("resume downloads", ['net', 'slow'], function () { } }, reportProgressDone() {} + }, + onRequest(request) { + setTimeout(() => { + request.emit('error', 'pretend-http-error'); + request.emit('end'); + }, 1000); } }); diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index a9a2f34e50..f48b896836 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -84,10 +84,6 @@ var getUserAgent = function () { var httpHelpers = exports; _.extend(exports, { - // For testing purposes, do not use (obviously it doesn't really make - // sense to have only one current request) - _currentRequest: null, - getUserAgent: getUserAgent, // A wrapper around request with the following improvements: @@ -122,6 +118,9 @@ _.extend(exports, { // set to false since it doesn't understand origins (see comment // in implementation). // + // - An optional options.onRequest callback may be provided if the + // caller desires access to the request object. + // // NB: With useSessionHeader and useAuthHeader, this function will // read *and possibly write to* the session file, so if you are // writing auth code (in auth.js) and you call it, be sure to reread @@ -268,14 +267,21 @@ _.extend(exports, { delete options.timeout; } + let onRequest; + if (_.has(options, "onRequest")) { + onRequest = options.onRequest; + delete options.onRequest; + } + // request is the most heavy-weight of the tool's npm dependencies; don't // require it until we definitely need it. Console.debug("Doing HTTP request: ", options.method || 'GET', options.url); var request = require('request'); var req = request(options, callback); - // A handle for testing - httpHelpers._currentRequest = req; + if (_.isFunction(onRequest)) { + onRequest(req); + } var totalProgress = { current: 0, end: bodyStreamLength + responseLength, done: false }; From aeca6807ab0b36370acfd630844a8e39b2dba8ed Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 14 Jul 2016 10:35:31 -0400 Subject: [PATCH 119/144] Avoid fiberHelpers.bindEnvironment by returning Promise from attempt. Follow-up to #7399. --- tools/utils/http-helpers.js | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tools/utils/http-helpers.js b/tools/utils/http-helpers.js index f48b896836..84c7ad4bce 100644 --- a/tools/utils/http-helpers.js +++ b/tools/utils/http-helpers.js @@ -15,7 +15,6 @@ var Console = require('../console/console.js').Console; var timeoutScaleFactor = require('./utils.js').timeoutScaleFactor; import { WritableStreamBuffer } from 'stream-buffers'; -import fiberHelpers from '../utils/fiber-helpers.js'; // Helper that tracks bytes written to a writable var WritableWithProgress = function (writable, listener) { @@ -417,10 +416,11 @@ _.extend(exports, { } try { - return httpHelpers.request({ + return Promise.resolve(httpHelpers.request({ outputStream, ...options, - }); + }).response); + } catch (e) { const size = outputStream.size(); const useTry = size === lastSize; @@ -434,24 +434,22 @@ _.extend(exports, { Console.debug(`Request failed after ${change} bytes, retrying`); } - return new Promise(resolve => { - setTimeout(fiberHelpers.bindEnvironment(() => { - resolve(attempt(useTry ? triesRemaining - 1 : triesRemaining)); - }, RETRY_DELAY_SECS * 1000)); - }).await(); - } else { - Console.debug(`Request failed ${MAX_ATTEMPTS} times: failing`); - throw new files.OfflineError(e); + return new Promise( + resolve => setTimeout(resolve, RETRY_DELAY_SECS * 1000) + ).then(() => attempt(triesRemaining - (useTry ? 1 : 0))); } + + Console.debug(`Request failed ${MAX_ATTEMPTS} times: failing`); + return Promise.reject(new files.OfflineError(e)); } } - const response = attempt(MAX_ATTEMPTS).response; + const response = attempt(MAX_ATTEMPTS).await(); if (response.statusCode >= 400 && response.statusCode < 600) { const href = response.request.href; throw Error(`Could not get ${href}; server returned [${response.statusCode}]`); - } else { - return outputStream.getContents(); } + + return outputStream.getContents(); } }); From c5e593fc63b285806e7f997b6e188171293a3ed5 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 14 Jul 2016 10:41:15 -0400 Subject: [PATCH 120/144] Bump $BUNDLE_VERSION to 4.1.2 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 9b24e5f97c..fab7b82bf3 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.1.1 +BUNDLE_VERSION=4.1.2 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From eb8480910d4dc0613a03fb2635df2239c00f4d32 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Thu, 14 Jul 2016 11:08:06 -0400 Subject: [PATCH 121/144] Bump package versions for 1.4-beta.14 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index c69350daa3..e0fa90e23f 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.13" + version: "1.2.9-beta.14" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index f8253d4f21..c00a719beb 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.13" + version: "1.2.12-beta.14" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 53223eba4b..0705d515f9 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.13" + version: "1.1.11-beta.14" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index 61e53e31d0..eb6de70d99 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.13' + version: '1.3.11-beta.14' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 935ee21f1c..bd7143f6e0 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.13' + version: '6.9.0-beta.14' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index e1de4c0baf..15a06c26db 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.13', + version: '0.1.10-beta.14', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 7643d36520..78509b86b1 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.13', + version: '1.1.6-beta.14', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 07a5b8cfc4..c2a51da7a6 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.13" + version: "1.2.3-beta.14" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index 3a4714d1a4..f306ba17f8 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-beta.13" + version: "1.1.0-beta.14" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index b755f7f93c..a1afd0b3fe 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: '1.3.0-beta.13', + version: '1.3.0-beta.14', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 2da4c22f49..58a6543f7b 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.13', + version: '1.3.9-beta.14', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 523975dd4c..7987329386 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.13", + version: "0.3.12-beta.14", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index e1d9f6a567..0934daa23b 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.13', + version: '0.5.7-beta.14', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 8eee4b9a8e..7169d22ee4 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-beta.13" + version: "1.1.16-beta.14" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 33ad2cbfc7..1c475dbb1b 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.13", + version: "4.6.13-beta.14", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 9034411bd4..25dc758891 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.13' + version: '1.2.8-beta.14' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 7e4794166f..54b9eb9ad5 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.13', + version: '1.1.5-beta.14', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index d380911aed..a99fd4ca1c 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.13', + version: '2.7.4-beta.14', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index e55cf6f7fe..ef3cb0f0d1 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.13' + version: '1.1.14-beta.14' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 69225e2a21..98cf4b1994 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.13' + version: '1.4.0-beta.14' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index f5d2f0a40c..372f8504b8 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.13' + version: '1.2.16-beta.14' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 7898d615e9..c816145e1e 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.13" + version: "1.2.13-beta.14" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index dafaf6d587..15c35aafa1 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.13" + version: "1.2.13-beta.14" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 19001649ec..50a888ca3b 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.13", + version: "0.7.5-beta.14", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 2174a62998..a03f6b749c 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.13", + version: "0.7.5-beta.14", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 723b249d7c..8fafa80946 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.1.10-beta.13' + version: '1.1.10-beta.14' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index f2a0c844cb..684a0ff144 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.13', + version: '1.5.45-beta.14', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index a6ff41c071..596682bea4 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.13' + version: '1.1.13-beta.14' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 034d645027..604ff9a222 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.13", + version: "0.8.3-beta.14", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 83ecfabda9..d53b6f6e12 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.13', + version: '1.1.8-beta.14', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index b27f71791b..c8cb3e7ac7 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.13', + version: '1.1.8-beta.14', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 54e6e57ba0..cd97560bbd 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.13', + version: '1.1.11-beta.14', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index abc7a63312..17caa53811 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.13" + version: "2.513.4-beta.14" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 45a3555348..ae227dc070 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.13' + version: '1.2.13-beta.14' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index cef4ad28c1..37d88151f4 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.1.0-beta.13' + version: '1.1.0-beta.14' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 1afd176ab2..36ca40f413 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.13' + version: '1.1.12-beta.14' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 096c16f791..54af5f9028 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.13' + version: '1.3.10-beta.14' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 8dd79ad0d8..e40fc6075b 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.13' + version: '2.5.13-beta.14' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index d57407666e..dcc63910e7 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.13", + "version": "1.4-beta.14", "recommended": false, "official": false, "description": "Meteor" From ccd7dc40c8af1a3aad22f32b0c6cf45a80b2c477 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 16 Jul 2016 13:13:39 +0300 Subject: [PATCH 122/144] Add test for CSS URL re-writing of network-path references Catches bug found in meteor/meteor#7416 caused by regression in 1b34866de2dd8415bfa2ddbda1d8fcba00e33499 --- packages/minifier-css/urlrewriting-tests.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/minifier-css/urlrewriting-tests.js b/packages/minifier-css/urlrewriting-tests.js index 804e81786e..8626267909 100644 --- a/packages/minifier-css/urlrewriting-tests.js +++ b/packages/minifier-css/urlrewriting-tests.js @@ -78,6 +78,7 @@ Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursio t("'/image.png'", "'image.png'", 'single quoted url'); t('"./../image.png"', '"packages/image.png"', 'quoted parent directory'); t('http://i.imgur.com/fBcdJIh.gif', 'http://i.imgur.com/fBcdJIh.gif', 'complete URL'); + t('//i.imgur.com/fBcdJIh.gif', '//i.imgur.com/fBcdJIh.gif', 'network-path reference'); t('"http://i.imgur.com/fBcdJIh.gif"', '"http://i.imgur.com/fBcdJIh.gif"', 'complete quoted URL'); t('data:image/png;base64,iVBORw0K=', 'data:image/png;base64,iVBORw0K=', 'data URI'); t('http://', 'http://', 'malformed URL'); @@ -90,6 +91,7 @@ Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursio t('"/image.png"', '"image.png"', 'double quoted url'); t("'/image.png'", "'image.png'", 'single quoted url'); t('http://i.imgur.com/fBcdJIh.gif', 'http://i.imgur.com/fBcdJIh.gif', 'complete URL'); + t('//i.imgur.com/fBcdJIh.gif', '//i.imgur.com/fBcdJIh.gif', 'network-path reference'); t('"http://i.imgur.com/fBcdJIh.gif"', '"http://i.imgur.com/fBcdJIh.gif"', 'complete quoted URL'); t('data:image/png;base64,iVBORw0K=', 'data:image/png;base64,iVBORw0K=', 'data URI'); t('http://', 'http://', 'malformed URL'); From fddaedeb083afe528cde91798960d8e2d4cfdc5e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 16 Jul 2016 13:46:29 +0300 Subject: [PATCH 123/144] Don't rewrite network path references in CSS URLs. Fixes regression caused in 1.3.4.1 which caused network path reference URLs (i.e. //img.domain.com/path/font.eot) used in CSS `url()`'s' to be stripped of their leading slashes causing them to become relative URL paths. Closes meteor/meteor#7416 --- packages/minifier-css/minifier.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/minifier-css/minifier.js b/packages/minifier-css/minifier.js index bd88ede21d..0994ee6fc8 100644 --- a/packages/minifier-css/minifier.js +++ b/packages/minifier-css/minifier.js @@ -136,8 +136,9 @@ var rewriteRules = function (rules, mergedCssPath) { // We don't rewrite URLs starting with a protocol definition such as - // http, https, or data. - if (resource.protocol !== null) { + // http, https, or data, or those with network-path references + // i.e. //img.domain.com/cat.gif + if (resource.protocol !== null || resource.href.startsWith('//')) { continue; } From e02893fa43018f8a01403ef3d87fb60b6d5472a2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 16 Jul 2016 16:54:48 +0300 Subject: [PATCH 124/144] Add missing History entry for 1.3.4.2 release regarding #5837 This change should be mentioned as it those who were manually prefixing their relative CSS paths with the same path as their ROOT_URL will need to remove the path. Relates to meteor/meteor#7416 --- History.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/History.md b/History.md index cb34f72080..b074169bee 100644 --- a/History.md +++ b/History.md @@ -53,6 +53,9 @@ * `App.appendToConfig` allows adding custom tags to config.xml. [#7307](https://github.com/meteor/meteor/pull/7307) +* When using `ROOT_URL` with a path, relative CSS URLs are rewriten + accordingly. [#5837](https://github.com/meteor/meteor/issues/5837) + * Fixed bugs: [#7149](https://github.com/meteor/meteor/issues/7149) [#7296](https://github.com/meteor/meteor/issues/7296) From 34969a1eb774a1806454cc47131fa545c358f757 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Sat, 16 Jul 2016 16:57:48 +0300 Subject: [PATCH 125/144] History entry for #7416 --- History.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.md b/History.md index b074169bee..1056f21d3a 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,9 @@ ## v.NEXT +* Fix for regression caused by #5837 which incorrectly rewrote + network-path references (i.e. //domain.com/image.gif) in CSS URLs + [#7416](https://github.com/meteor/meteor/issues/7416) + ## v1.3.4.4 * Fixed [#7374](https://github.com/meteor/meteor/issues/7374). From 9511c9f0b52754a8adf46d8d9b27e61f7d946a64 Mon Sep 17 00:00:00 2001 From: Loren Sands-Ramshaw Date: Sun, 17 Jul 2016 16:30:31 -0400 Subject: [PATCH 126/144] Note in docs that findOne can return undefined --- packages/mongo/collection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mongo/collection.js b/packages/mongo/collection.js index 253a71d754..2522ca9d36 100644 --- a/packages/mongo/collection.js +++ b/packages/mongo/collection.js @@ -317,7 +317,7 @@ _.extend(Mongo.Collection.prototype, { }, /** - * @summary Finds the first document that matches the selector, as ordered by sort and skip options. + * @summary Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found. * @locus Anywhere * @method findOne * @memberOf Mongo.Collection From 79d5a7139fdc5fdda3089e8fccfaf2d0b8ae51aa Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 18 Jul 2016 14:55:52 -0400 Subject: [PATCH 127/144] Bump package versions for 1.4-rc.0 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index e0fa90e23f..1c8ad74428 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-beta.14" + version: "1.2.9-rc.0" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 9ea4debff8..ed98d95518 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-beta.14" + version: "1.2.12-rc.0" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 0705d515f9..41a4fe6508 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-beta.14" + version: "1.1.11-rc.0" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index eb6de70d99..d077faac59 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-beta.14' + version: '1.3.11-rc.0' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index bd7143f6e0..a64edd02b9 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-beta.14' + version: '6.9.0-rc.0' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 15a06c26db..0aa14f0bc5 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-beta.14', + version: '0.1.10-rc.0', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 78509b86b1..55bdac66f7 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-beta.14', + version: '1.1.6-rc.0', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index c2a51da7a6..561b231368 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-beta.14" + version: "1.2.3-rc.0" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index f306ba17f8..75b61ab627 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-beta.14" + version: "1.1.0-rc.0" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index a1afd0b3fe..214b9bb7cb 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: '1.3.0-beta.14', + version: '1.3.0-rc.0', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 58a6543f7b..400d10e51f 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-beta.14', + version: '1.3.9-rc.0', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 7987329386..d0eed56b83 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-beta.14", + version: "0.3.12-rc.0", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 0934daa23b..d234e68e1e 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-beta.14', + version: '0.5.7-rc.0', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 7169d22ee4..6facff7b12 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-beta.14" + version: "1.1.16-rc.0" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 1c475dbb1b..f7211d3d74 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-beta.14", + version: "4.6.13-rc.0", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 25dc758891..fb1959c1b5 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-beta.14' + version: '1.2.8-rc.0' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 54b9eb9ad5..1c41e28d9b 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-beta.14', + version: '1.1.5-rc.0', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index a99fd4ca1c..bf49281f3b 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-beta.14', + version: '2.7.4-rc.0', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index ef3cb0f0d1..b9781d8ff4 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-beta.14' + version: '1.1.14-rc.0' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 98cf4b1994..0feb01e4cf 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-beta.14' + version: '1.4.0-rc.0' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 372f8504b8..5f33271702 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-beta.14' + version: '1.2.16-rc.0' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index c816145e1e..855836d6c8 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-beta.14" + version: "1.2.13-rc.0" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 15c35aafa1..2c71f13861 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-beta.14" + version: "1.2.13-rc.0" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 50a888ca3b..baee601da2 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-beta.14", + version: "0.7.5-rc.0", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index a03f6b749c..7b01d2ff0f 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-beta.14", + version: "0.7.5-rc.0", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 8fafa80946..71944f6d49 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.1.10-beta.14' + version: '1.1.10-rc.0' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 684a0ff144..7a4d9ad506 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-beta.14', + version: '1.5.45-rc.0', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 596682bea4..7a963c230d 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-beta.14' + version: '1.1.13-rc.0' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 604ff9a222..e629df7121 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-beta.14", + version: "0.8.3-rc.0", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index d53b6f6e12..ed408710d6 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-beta.14', + version: '1.1.8-rc.0', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index c8cb3e7ac7..72dcb79c12 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-beta.14', + version: '1.1.8-rc.0', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index cd97560bbd..6974177987 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-beta.14', + version: '1.1.11-rc.0', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 17caa53811..81b05a4d58 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-beta.14" + version: "2.513.4-rc.0" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index ae227dc070..cf5dc56118 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-beta.14' + version: '1.2.13-rc.0' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index 37d88151f4..78e87ccf15 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.1.0-beta.14' + version: '1.1.0-rc.0' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 36ca40f413..f2c46e4e3e 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-beta.14' + version: '1.1.12-rc.0' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 54af5f9028..55ba4f816b 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-beta.14' + version: '1.3.10-rc.0' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index e40fc6075b..5e70f80e91 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-beta.14' + version: '2.5.13-rc.0' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index dcc63910e7..0cb2901019 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-beta.14", + "version": "1.4-rc.0", "recommended": false, "official": false, "description": "Meteor" From dc28c29985b09fe920bf7dfc8d81224f801d42f8 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 18 Jul 2016 20:11:52 -0400 Subject: [PATCH 128/144] Update modules test app to Meteor 1.3.5.1. --- .../tests/apps/modules/.meteor/.finished-upgraders | 1 + tools/tests/apps/modules/.meteor/release | 2 +- tools/tests/apps/modules/.meteor/versions | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/tests/apps/modules/.meteor/.finished-upgraders b/tools/tests/apps/modules/.meteor/.finished-upgraders index dacc2c0d7a..7bd7197893 100644 --- a/tools/tests/apps/modules/.meteor/.finished-upgraders +++ b/tools/tests/apps/modules/.meteor/.finished-upgraders @@ -11,3 +11,4 @@ notices-for-facebook-graph-api-2 1.2.0-cordova-changes 1.2.0-breaking-changes 1.3.0-split-minifiers-package +1.3.5-remove-old-dev-bundle-link diff --git a/tools/tests/apps/modules/.meteor/release b/tools/tests/apps/modules/.meteor/release index e5b4dc1807..fcf9d2d773 100644 --- a/tools/tests/apps/modules/.meteor/release +++ b/tools/tests/apps/modules/.meteor/release @@ -1 +1 @@ -METEOR@1.3.4.4 +METEOR@1.3.5.1 diff --git a/tools/tests/apps/modules/.meteor/versions b/tools/tests/apps/modules/.meteor/versions index 642f7e7cec..c7993884d1 100644 --- a/tools/tests/apps/modules/.meteor/versions +++ b/tools/tests/apps/modules/.meteor/versions @@ -1,7 +1,7 @@ allow-deny@1.0.5 autoupdate@1.2.11 avital:mocha@2.1.0_10 -babel-compiler@6.8.4 +babel-compiler@6.8.5 babel-runtime@0.1.9_1 base64@1.0.9 binary-heap@1.0.9 @@ -14,14 +14,14 @@ caching-html-compiler@1.0.6 callback-hook@1.0.9 check@1.2.3 client-only-ecmascript@0.0.1 -coffeescript@1.1.3 +coffeescript@1.1.4 ddp@1.2.5 ddp-client@1.2.9 ddp-common@1.2.6 -ddp-server@1.2.9 +ddp-server@1.2.10 deps@1.0.12 diff-sequence@1.0.6 -ecmascript@0.4.7 +ecmascript@0.4.8 ecmascript-runtime@0.2.12 ejson@1.0.12 es5-shim@4.5.13 @@ -68,12 +68,12 @@ spacebars@1.0.12 spacebars-compiler@1.0.12 standard-minifier-css@1.0.8 standard-minifier-js@1.0.8 -templating@1.1.13 +templating@1.1.14 templating-tools@1.0.4 tmeasday:test-reporter-helpers@0.2.1 -tracker@1.0.14 +tracker@1.0.15 ui@1.0.11 underscore@1.0.9 url@1.0.10 -webapp@1.2.10 +webapp@1.2.11 webapp-hashing@1.0.9 From 7600571717f1630540a7002e402e00b9d66eefa1 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 19 Jul 2016 11:52:31 -0400 Subject: [PATCH 129/144] Revert "Make sure .meteor/.gitignore ignores .meteor/dev_bundle." This reverts commit 9e6ebde83640bb2f5ad49007230970174098fd6a. Now that the `dev_bundle` link is called `.meteor/local/dev_bundle`, and `.meteor/local` is already ignored, we don't need to ignore `.meteor/dev_bundle` anymore. --- tools/project-context.js | 15 ++------------- tools/static-assets/skel/.meteor/.gitignore | 1 - 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/project-context.js b/tools/project-context.js index 0e45b45b2b..9dfde085d6 100644 --- a/tools/project-context.js +++ b/tools/project-context.js @@ -370,19 +370,8 @@ _.extend(ProjectContext.prototype, { // Let's also make sure we have a minimal gitignore. var gitignorePath = files.pathJoin(self.projectDir, '.meteor', '.gitignore'); - try { - var lines = files.readFile(gitignorePath, "utf8").split("\n"); - } catch (e) { - if (e.code !== "ENOENT") throw e; - lines = [""]; - } - - var needLocal = lines.indexOf("local") < 0; - var needDevBundle = lines.indexOf("dev_bundle") < 0; - if (needDevBundle || needLocal) { - if (needDevBundle) lines.unshift("dev_bundle"); - if (needLocal) lines.unshift("local"); - files.writeFileAtomically(gitignorePath, lines.join("\n")); + if (! files.exists(gitignorePath)) { + files.writeFileAtomically(gitignorePath, 'local\n'); } }, diff --git a/tools/static-assets/skel/.meteor/.gitignore b/tools/static-assets/skel/.meteor/.gitignore index 2b8ab361bb..4083037423 100644 --- a/tools/static-assets/skel/.meteor/.gitignore +++ b/tools/static-assets/skel/.meteor/.gitignore @@ -1,2 +1 @@ local -dev_bundle From 83e87aaaef17c6445b2d82152395d03f742ad751 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 19 Jul 2016 12:26:35 -0400 Subject: [PATCH 130/144] Revise PERFORMANCE.md now that constraint solutions are cached. --- tools/PERFORMANCE.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/PERFORMANCE.md b/tools/PERFORMANCE.md index 36e6c2af74..7a8864bd84 100644 --- a/tools/PERFORMANCE.md +++ b/tools/PERFORMANCE.md @@ -213,9 +213,11 @@ the top level (probably because they are fired off asynchronously). Some initial work has been done to make constraint solving fast in the typical case where a previous solution exists in `APP/.meteor/versions`, but there is -possible room for improvement. For example, the previous solution could be -checked without invoking the logic solver at all, though the manual logic would -have to match closely. +possible room for improvement. + +For example, the previous solution could be checked without +invoking the logic solver at all, though the manual logic would have to +match closely. [Implemented](https://github.com/meteor/meteor/compare/ea236fc9da99a1679b6205dce3a7008617e660e5...69b100d21a33fd7ca58fc2fe2d8997ade4a36af6)! Time spent reading from the packages database (a SQLite file) could be understood better and improved by batching queries, reading less data, or using SQLite From 258b14af0c68216506d3ffc6124331fc20a6f676 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Wed, 20 Jul 2016 11:24:32 +1000 Subject: [PATCH 131/144] Allow passing `applySkipLimit` to count and default it to false. Not currently supported in minimongo, so I'm not sure we want to document it yet. Supporting it (and making it consistent) in MM will take a little bit of work: https://github.com/meteor/meteor/issues/1201 --- History.md | 4 + packages/mongo/mongo_driver.js | 4 +- packages/mongo/mongo_livedata_tests.js | 10 ++ .../.npm/package/npm-shrinkwrap.json | 124 ++++++++---------- packages/npm-mongo/package.js | 2 +- 5 files changed, 75 insertions(+), 69 deletions(-) diff --git a/History.md b/History.md index 39059f3c62..df084900ae 100644 --- a/History.md +++ b/History.md @@ -33,6 +33,10 @@ `Mongo.setConnectionOptions(options)` API. [#7277](https://github.com/meteor/meteor/pull/7277) +* On the server, cursor.count() now takes a single argument `applySkipLimit` + (see the corresponding [Mongo documentation] + (http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count)) + ## v1.3.5.1 * This release fixed a small bug in 1.3.5 that prevented updating apps diff --git a/packages/mongo/mongo_driver.js b/packages/mongo/mongo_driver.js index 8435dc523a..567c349e4c 100644 --- a/packages/mongo/mongo_driver.js +++ b/packages/mongo/mongo_driver.js @@ -1089,9 +1089,9 @@ _.extend(SynchronousCursor.prototype, { return self.map(_.identity); }, - count: function () { + count: function (applySkipLimit: false) { var self = this; - return self._synchronousCount().wait(); + return self._synchronousCount(applySkipLimit).wait(); }, // This method is NOT wrapped in Cursor. diff --git a/packages/mongo/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js index 83a82e674b..cf06c5033d 100644 --- a/packages/mongo/mongo_livedata_tests.js +++ b/packages/mongo/mongo_livedata_tests.js @@ -310,6 +310,16 @@ Tinytest.addAsync("mongo-livedata - basics, " + idGeneration, function (test, on test.equal(coll.findOne({run: run}, {sort: {x: -1}, skip: 1}).x, 1); + // Regression test for https://github.com/meteor/meteor/issues/7436 + // - ensure applySkipLimit defaults to false for count() + // Note that the current behavior is inconsistent on the client. + // (https://github.com/meteor/meteor/issues/1201) + if (Meteor.isServer) { + test.equal(coll.find({run: run}, {limit: 1}).count(), 2); + test.equal(coll.find({run: run}, {limit: 1}).count(true), 1); + test.equal(coll.find({run: run}, {limit: 1}).count(false), 2); + } + var cur = coll.find({run: run}, {sort: ["x"]}); var total = 0; var index = 0; diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index 776e3af114..716c57af97 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -1,72 +1,64 @@ { "dependencies": { + "bson": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.2.tgz", + "from": "bson@>=0.5.1 <0.6.0" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "from": "core-util-is@>=1.0.0 <1.1.0" + }, + "es6-promise": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", + "from": "es6-promise@3.0.2" + }, + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "from": "inherits@>=2.0.1 <2.1.0" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "isarray@0.0.1" + }, "mongodb": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz", - "from": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz", - "dependencies": { - "es6-promise": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", - "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz" - }, - "mongodb-core": { - "version": "1.3.18", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz", - "from": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz", - "dependencies": { - "bson": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz", - "from": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz" - }, - "require_optional": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", - "from": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", - "dependencies": { - "resolve-from": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", - "from": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz" - }, - "semver": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz", - "from": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz" - } - } - } - } - }, - "readable-stream": { - "version": "1.0.31", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", - "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", - "dependencies": { - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz" - }, - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - } - } - } - } + "version": "2.2.4", + "resolved": "https://registry.npmjs.com/mongodb/-/mongodb-2.2.4.tgz", + "from": "mongodb@2.2.4" + }, + "mongodb-core": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.com/mongodb-core/-/mongodb-core-2.0.6.tgz", + "from": "mongodb-core@2.0.6" + }, + "readable-stream": { + "version": "1.0.31", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz", + "from": "readable-stream@1.0.31" + }, + "require_optional": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz", + "from": "require_optional@>=1.0.0 <1.1.0" + }, + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "from": "resolve-from@>=2.0.0 <3.0.0" + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "from": "semver@>=5.1.0 <6.0.0" + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "from": "string_decoder@>=0.10.0 <0.11.0" } } } diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 7a4d9ad506..296959d473 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -8,7 +8,7 @@ Package.describe({ }); Npm.depends({ - mongodb: "2.1.18" + mongodb: "2.2.4" }); Package.onUse(function (api) { From 11833c4e667f54f94d44bb415dbc5ec8ff35bd90 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Wed, 20 Jul 2016 14:05:27 -0400 Subject: [PATCH 132/144] Bump package versions for 1.4-rc.1 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 1c8ad74428..4ae6e9a70d 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-rc.0" + version: "1.2.9-rc.1" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index ed98d95518..f2d2bf3e22 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-rc.0" + version: "1.2.12-rc.1" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index 41a4fe6508..ef3e7571c4 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-rc.0" + version: "1.1.11-rc.1" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index d077faac59..72f47fed51 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-rc.0' + version: '1.3.11-rc.1' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index a64edd02b9..fe84365821 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-rc.0' + version: '6.9.0-rc.1' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 0aa14f0bc5..9c315eb35b 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-rc.0', + version: '0.1.10-rc.1', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 55bdac66f7..d1e313f453 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-rc.0', + version: '1.1.6-rc.1', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 561b231368..86e030a837 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-rc.0" + version: "1.2.3-rc.1" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index 75b61ab627..f0ad914c79 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-rc.0" + version: "1.1.0-rc.1" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 214b9bb7cb..a3b4c31a76 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: '1.3.0-rc.0', + version: '1.3.0-rc.1', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 400d10e51f..36e4f17a53 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-rc.0', + version: '1.3.9-rc.1', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index d0eed56b83..e0efdc82fd 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-rc.0", + version: "0.3.12-rc.1", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index d234e68e1e..217f1070ed 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-rc.0', + version: '0.5.7-rc.1', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 6facff7b12..5d1575cb17 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-rc.0" + version: "1.1.16-rc.1" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index f7211d3d74..197e0d077f 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-rc.0", + version: "4.6.13-rc.1", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index fb1959c1b5..275b20ec8b 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-rc.0' + version: '1.2.8-rc.1' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 1c41e28d9b..3cf07f7738 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-rc.0', + version: '1.1.5-rc.1', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index bf49281f3b..f6b42c98ce 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-rc.0', + version: '2.7.4-rc.1', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index b9781d8ff4..f549ce6091 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-rc.0' + version: '1.1.14-rc.1' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 0feb01e4cf..abf119a141 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-rc.0' + version: '1.4.0-rc.1' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 5f33271702..7da23d2e9d 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-rc.0' + version: '1.2.16-rc.1' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 855836d6c8..0aeafc37ac 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-rc.0" + version: "1.2.13-rc.1" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 2c71f13861..4fd0e5d789 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-rc.0" + version: "1.2.13-rc.1" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index baee601da2..2c42914d6d 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-rc.0", + version: "0.7.5-rc.1", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 7b01d2ff0f..44500d6f08 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-rc.0", + version: "0.7.5-rc.1", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 71944f6d49..df941a78e3 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.1.10-rc.0' + version: '1.1.10-rc.1' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 296959d473..ffdb9b9586 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-rc.0', + version: '1.5.45-rc.1', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 7a963c230d..f6ad7591c7 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-rc.0' + version: '1.1.13-rc.1' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index e629df7121..389c52a16c 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-rc.0", + version: "0.8.3-rc.1", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index ed408710d6..86fd9f794a 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-rc.0', + version: '1.1.8-rc.1', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index 72dcb79c12..cc65214a32 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-rc.0', + version: '1.1.8-rc.1', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index 6974177987..a8ecb1685e 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-rc.0', + version: '1.1.11-rc.1', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 81b05a4d58..23a6e37ec9 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-rc.0" + version: "2.513.4-rc.1" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index cf5dc56118..81babb7231 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-rc.0' + version: '1.2.13-rc.1' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index 78e87ccf15..849e330a6b 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.1.0-rc.0' + version: '1.1.0-rc.1' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index f2c46e4e3e..9c22ada26e 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-rc.0' + version: '1.1.12-rc.1' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 55ba4f816b..20dbc7e381 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-rc.0' + version: '1.3.10-rc.1' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 5e70f80e91..3909ae33b9 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-rc.0' + version: '2.5.13-rc.1' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 0cb2901019..b69b94c2d9 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-rc.0", + "version": "1.4-rc.1", "recommended": false, "official": false, "description": "Meteor" From 1c64d3a6da683c6d1fe401bd6c62733b105ca8a6 Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Thu, 7 Jul 2016 14:16:07 +0300 Subject: [PATCH 133/144] Added Angular2 to the example repositories --- tools/cli/example-repositories.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/cli/example-repositories.js b/tools/cli/example-repositories.js index b4354be208..bfedaf58da 100644 --- a/tools/cli/example-repositories.js +++ b/tools/cli/example-repositories.js @@ -14,4 +14,7 @@ export const EXAMPLE_REPOSITORIES = { 'repo': 'https://github.com/meteor/todos', 'branch': 'react', }, + angular2: { + repo: 'https://github.com/bsliran/angular2-meteor-base' + } }; From 9003eb47b13a125ec65b25fb23630aa966595c05 Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Wed, 20 Jul 2016 15:00:50 +0300 Subject: [PATCH 134/144] Updated the name of the example for angular 2 --- tools/cli/example-repositories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cli/example-repositories.js b/tools/cli/example-repositories.js index bfedaf58da..42b9b4a16a 100644 --- a/tools/cli/example-repositories.js +++ b/tools/cli/example-repositories.js @@ -14,7 +14,7 @@ export const EXAMPLE_REPOSITORIES = { 'repo': 'https://github.com/meteor/todos', 'branch': 'react', }, - angular2: { + 'angular2-boilerplate': { repo: 'https://github.com/bsliran/angular2-meteor-base' } }; From 1f5baf5cd8b31017d2f1adc275a2a5de88f263e1 Mon Sep 17 00:00:00 2001 From: Zoltan Olah Date: Wed, 20 Jul 2016 11:49:52 -0700 Subject: [PATCH 135/144] Adds ng2 boilerplate example to History --- History.md | 1 + 1 file changed, 1 insertion(+) diff --git a/History.md b/History.md index aa3d202d6b..aa0f8d134c 100644 --- a/History.md +++ b/History.md @@ -40,6 +40,7 @@ * Fix for regression caused by #5837 which incorrectly rewrote network-path references (e.g. `//domain.com/image.gif`) in CSS URLs. [#7416](https://github.com/meteor/meteor/issues/7416) +* Added Angular2 boilerplate example [#7364](https://github.com/meteor/meteor/pull/7363) ## v1.3.5.1 From 317edd88ab51942fa0d792c6454c8600e49544eb Mon Sep 17 00:00:00 2001 From: Wexpo Lyu Date: Sun, 17 Jul 2016 19:18:54 +0800 Subject: [PATCH 136/144] Add a warning when use --production. --- tools/cli/commands.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index e3faf30bf0..ed4f97ee21 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -325,6 +325,15 @@ function doRunCommand(options) { appPort = appPortMatch[2] ? parseInt(appPortMatch[2]) : null; } + if (options.production) { + Console.warn( + "You're using --production to run the app. Please attention that ", + "this option is not intended for production deployments and may ", + "have performance or security issues. See", + "https://guide.meteor.com/deployment.html to deploy a Meteor app." + ); + } + if (options['raw-logs']) { runLog.setRawLogs(true); } From 9581a6920c0fab127446c06504772673f957855a Mon Sep 17 00:00:00 2001 From: Wexpo Lyu Date: Wed, 20 Jul 2016 21:27:35 +0800 Subject: [PATCH 137/144] Update commands.js --- tools/cli/commands.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index ed4f97ee21..87473a5777 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -327,10 +327,9 @@ function doRunCommand(options) { if (options.production) { Console.warn( - "You're using --production to run the app. Please attention that ", - "this option is not intended for production deployments and may ", - "have performance or security issues. See", - "https://guide.meteor.com/deployment.html to deploy a Meteor app." + "Warning: The --production flag should only be used to simulate production " + + "bundling for testing purposes. Use meteor build to create a bundle for " + + "production deployment. See: https://guide.meteor.com/deployment.html" ); } From 89d50890cc4258887f80c4f269bd2e15057e2869 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 22 Jul 2016 16:10:01 -0400 Subject: [PATCH 138/144] Make 7z work even if not in $env:PATH. --- scripts/generate-dev-bundle.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index a8951da314..704e35c2f5 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -149,8 +149,8 @@ cd "$DIR\.." # rename the folder with the devbundle cmd /c rename "$DIR" "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}" -cmd /c 7z.exe a -ttar dev_bundle.tar "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}" -cmd /c 7z.exe a -tgzip "${CHECKOUT_DIR}\dev_bundle_${PLATFORM}_${BUNDLE_VERSION}.tar.gz" dev_bundle.tar +& "C:\Program Files*\7-zip\7z.exe" a -ttar dev_bundle.tar "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}" +& "C:\Program Files*\7-zip\7z.exe" a -tgzip "${CHECKOUT_DIR}\dev_bundle_${PLATFORM}_${BUNDLE_VERSION}.tar.gz" dev_bundle.tar del dev_bundle.tar cmd /c rmdir "dev_bundle_${PLATFORM}_${BUNDLE_VERSION}" /s /q From 16b17d98358fdb4800a93d3132e7523774444b6e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 22 Jul 2016 15:38:44 -0400 Subject: [PATCH 139/144] Bump $BUNDLE_VERSION to 4.1.4 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index fab7b82bf3..0ab07e0073 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.1.2 +BUNDLE_VERSION=4.1.4 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From f9688fe855d19ee8852d01916d25deb6c19151e1 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Fri, 22 Jul 2016 16:31:02 -0400 Subject: [PATCH 140/144] Bump package versions for 1.4-rc.2 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 4ae6e9a70d..a222bcc3c3 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-rc.1" + version: "1.2.9-rc.2" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index f2d2bf3e22..7f13467b55 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-rc.1" + version: "1.2.12-rc.2" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index ef3e7571c4..c226040d50 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-rc.1" + version: "1.1.11-rc.2" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index 72f47fed51..747028a054 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-rc.1' + version: '1.3.11-rc.2' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index fe84365821..56c6872084 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-rc.1' + version: '6.9.0-rc.2' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 9c315eb35b..c6c422b993 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-rc.1', + version: '0.1.10-rc.2', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index d1e313f453..4814b848c6 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-rc.1', + version: '1.1.6-rc.2', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 86e030a837..572278a9d8 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-rc.1" + version: "1.2.3-rc.2" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index f0ad914c79..1ddbf8a49f 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-rc.1" + version: "1.1.0-rc.2" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index a3b4c31a76..2f0003cf4b 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: '1.3.0-rc.1', + version: '1.3.0-rc.2', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 36e4f17a53..c7ccdc6411 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-rc.1', + version: '1.3.9-rc.2', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index e0efdc82fd..2ef487b702 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-rc.1", + version: "0.3.12-rc.2", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 217f1070ed..1d9711ac76 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-rc.1', + version: '0.5.7-rc.2', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 5d1575cb17..98c46360ba 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-rc.1" + version: "1.1.16-rc.2" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 197e0d077f..6d2f3ec17c 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-rc.1", + version: "4.6.13-rc.2", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 275b20ec8b..665020abb8 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-rc.1' + version: '1.2.8-rc.2' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 3cf07f7738..3b8fa87cbb 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-rc.1', + version: '1.1.5-rc.2', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index f6b42c98ce..dad066da90 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-rc.1', + version: '2.7.4-rc.2', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index f549ce6091..3b5f6ebdb4 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-rc.1' + version: '1.1.14-rc.2' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index abf119a141..49d7b40117 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-rc.1' + version: '1.4.0-rc.2' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 7da23d2e9d..dd2a0623a3 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-rc.1' + version: '1.2.16-rc.2' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 0aeafc37ac..53518cd598 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-rc.1" + version: "1.2.13-rc.2" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 4fd0e5d789..b58e8f8cd3 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-rc.1" + version: "1.2.13-rc.2" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 2c42914d6d..276489920d 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-rc.1", + version: "0.7.5-rc.2", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 44500d6f08..191029b85d 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-rc.1", + version: "0.7.5-rc.2", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index df941a78e3..22e1b75347 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.1.10-rc.1' + version: '1.1.10-rc.2' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index ffdb9b9586..629b4779b7 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-rc.1', + version: '1.5.45-rc.2', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index f6ad7591c7..1f6137cb5d 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-rc.1' + version: '1.1.13-rc.2' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index 389c52a16c..dbc4dcfeab 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-rc.1", + version: "0.8.3-rc.2", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 86fd9f794a..4d4cb37275 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-rc.1', + version: '1.1.8-rc.2', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index cc65214a32..a673235fa7 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-rc.1', + version: '1.1.8-rc.2', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index a8ecb1685e..d6940f0486 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-rc.1', + version: '1.1.11-rc.2', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 23a6e37ec9..fb830ee2ea 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-rc.1" + version: "2.513.4-rc.2" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 81babb7231..0e5ce08c8f 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-rc.1' + version: '1.2.13-rc.2' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index 849e330a6b..ec60da2bbe 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.1.0-rc.1' + version: '1.1.0-rc.2' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 9c22ada26e..14d30093ec 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-rc.1' + version: '1.1.12-rc.2' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 20dbc7e381..9263dee23d 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-rc.1' + version: '1.3.10-rc.2' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 3909ae33b9..8899d2e1c1 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-rc.1' + version: '2.5.13-rc.2' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index b69b94c2d9..56fb5520a2 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4-rc.1", + "version": "1.4-rc.2", "recommended": false, "official": false, "description": "Meteor" From 5b6175ed72072246f036ca9e5df80d30ad24a2ef Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Mon, 25 Jul 2016 12:50:21 +1000 Subject: [PATCH 141/144] List the correct mongo driver version --- History.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.md b/History.md index aa0f8d134c..84f0b7520f 100644 --- a/History.md +++ b/History.md @@ -14,7 +14,7 @@ application code. 699cf1f38e9b2a074169515d23983f74148c7223 * Meteor has been upgraded to support Mongo 3.2 by default (the bundled version - used by `meteor run` has been upgraded). Internally it now uses the 2.1.18 + used by `meteor run` has been upgraded). Internally it now uses the 2.2.4 version of the `mongodb` npm driver, and has been tested against at Mongo 3.2 server. [Issue #6957](https://github.com/meteor/meteor/issues/6957) From d946b0940e9e5b0794da10d2f68d0e86d8fa8d58 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 25 Jul 2016 11:51:14 -0400 Subject: [PATCH 142/144] Update npm-mongo shrinkwrap file (trivial). --- packages/npm-mongo/.npm/package/npm-shrinkwrap.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json index 716c57af97..e327314325 100644 --- a/packages/npm-mongo/.npm/package/npm-shrinkwrap.json +++ b/packages/npm-mongo/.npm/package/npm-shrinkwrap.json @@ -27,12 +27,12 @@ }, "mongodb": { "version": "2.2.4", - "resolved": "https://registry.npmjs.com/mongodb/-/mongodb-2.2.4.tgz", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.4.tgz", "from": "mongodb@2.2.4" }, "mongodb-core": { "version": "2.0.6", - "resolved": "https://registry.npmjs.com/mongodb-core/-/mongodb-core-2.0.6.tgz", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.6.tgz", "from": "mongodb-core@2.0.6" }, "readable-stream": { From 0c183c42b1e23b26e45436f4f58f359ca127f26e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 25 Jul 2016 11:49:04 -0400 Subject: [PATCH 143/144] Bump compiler.BUILT_BY and LINKER_CACHE_SALT for good measure. --- tools/isobuild/compiler-plugin.js | 2 +- tools/isobuild/compiler.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js index e17912a591..8e22ba6375 100644 --- a/tools/isobuild/compiler-plugin.js +++ b/tools/isobuild/compiler-plugin.js @@ -59,7 +59,7 @@ import { isTestFilePath } from './test-files.js'; // Cache the (slightly post-processed) results of linker.fullLink. const CACHE_SIZE = process.env.METEOR_LINKER_CACHE_SIZE || 1024*1024*100; const CACHE_DEBUG = !! process.env.METEOR_TEST_PRINT_LINKER_CACHE_DEBUG; -const LINKER_CACHE_SALT = 8; // Increment this number to force relinking. +const LINKER_CACHE_SALT = 9; // Increment this number to force relinking. const LINKER_CACHE = new LRU({ max: CACHE_SIZE, // Cache is measured in bytes. We don't care about servePath. diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js index 58bb8ebf34..9d9e9b632c 100644 --- a/tools/isobuild/compiler.js +++ b/tools/isobuild/compiler.js @@ -29,7 +29,7 @@ var compiler = exports; // dependencies. (At least for now, packages only used in target creation (eg // minifiers) don't require you to update BUILT_BY, though you will need to quit // and rerun "meteor run".) -compiler.BUILT_BY = 'meteor/21'; +compiler.BUILT_BY = 'meteor/22'; // This is a list of all possible architectures that a build can target. (Client // is expanded into 'web.browser' and 'web.cordova') From 1ec0a46982608ba85d1d5c41c3257e8c777f04ed Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 25 Jul 2016 11:51:33 -0400 Subject: [PATCH 144/144] Bump package versions for the official 1.4 release. --- packages/accounts-base/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/babel-compiler/package.js | 2 +- packages/babel-runtime/package.js | 2 +- packages/caching-compiler/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ddp-client/package.js | 2 +- packages/ddp-server/package.js | 2 +- packages/ecmascript-runtime/package.js | 2 +- packages/ecmascript/package.js | 2 +- packages/email/package.js | 2 +- packages/es5-shim/package.js | 2 +- packages/http/package.js | 2 +- packages/jshint/package.js | 2 +- packages/less/package.js | 2 +- packages/logging/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/minifier-css/package.js | 2 +- packages/minifier-js/package.js | 2 +- packages/modules-runtime/package.js | 2 +- packages/modules/package.js | 2 +- packages/mongo/package.js | 2 +- packages/npm-mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/promise/package.js | 2 +- packages/standard-minifier-css/package.js | 2 +- packages/standard-minifier-js/package.js | 2 +- packages/static-html/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-official.json | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index a222bcc3c3..a64b9a6611 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.2.9-rc.2" + version: "1.2.9" }); Package.onUse(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index 7f13467b55..01ea4278df 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.2.12-rc.2" + version: "1.2.12" }); Package.onUse(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index c226040d50..63bb4aa397 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.1.11-rc.2" + version: "1.1.11" }); Package.onUse(function(api) { diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index 747028a054..c4b13bde2d 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.3.11-rc.2' + version: '1.3.11' }); Package.onUse(function (api) { diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 56c6872084..1a6c4306d2 100644 --- a/packages/babel-compiler/package.js +++ b/packages/babel-compiler/package.js @@ -6,7 +6,7 @@ Package.describe({ // isn't possible because you can't publish a non-recommended // release with package versions that don't have a pre-release // identifier at the end (eg, -dev) - version: '6.9.0-rc.2' + version: '6.9.0' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index c6c422b993..8f68486e18 100644 --- a/packages/babel-runtime/package.js +++ b/packages/babel-runtime/package.js @@ -1,7 +1,7 @@ Package.describe({ name: "babel-runtime", summary: "Runtime support for output of Babel transpiler", - version: '0.1.10-rc.2', + version: '0.1.10', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 4814b848c6..06b1d6d4cd 100644 --- a/packages/caching-compiler/package.js +++ b/packages/caching-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'caching-compiler', - version: '1.1.6-rc.2', + version: '1.1.6', summary: 'An easy way to make compiler plugins cache', documentation: 'README.md' }); diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index 572278a9d8..7f339ed356 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.2.3-rc.2" + version: "1.2.3" }); Package.registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index 1ddbf8a49f..f4655d7309 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.1.0-rc.2" + version: "1.1.0" }); Package.onUse(function (api) { diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 2f0003cf4b..cc0cb2a6d3 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: '1.3.0-rc.2', + version: '1.3.0', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index c7ccdc6411..c2a7731e23 100644 --- a/packages/ddp-server/package.js +++ b/packages/ddp-server/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data server", - version: '1.3.9-rc.2', + version: '1.3.9', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 2ef487b702..b014f46c7d 100644 --- a/packages/ecmascript-runtime/package.js +++ b/packages/ecmascript-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "ecmascript-runtime", - version: "0.3.12-rc.2", + version: "0.3.12", summary: "Polyfills for new ECMAScript 2015 APIs like Map and Set", git: "https://github.com/meteor/ecmascript-runtime", documentation: "README.md" diff --git a/packages/ecmascript/package.js b/packages/ecmascript/package.js index 1d9711ac76..252280c8be 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.7-rc.2', + version: '0.5.7', summary: 'Compiler plugin that supports ES2015+ in all .js files', documentation: 'README.md' }); diff --git a/packages/email/package.js b/packages/email/package.js index 98c46360ba..ad1dc37e5d 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.16-rc.2" + version: "1.1.16" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 6d2f3ec17c..30e5b6451a 100644 --- a/packages/es5-shim/package.js +++ b/packages/es5-shim/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "es5-shim", - version: "4.6.13-rc.2", + version: "4.6.13", summary: "Shims and polyfills to improve ECMAScript 5 support", documentation: "README.md" }); diff --git a/packages/http/package.js b/packages/http/package.js index 665020abb8..745d6bc218 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.2.8-rc.2' + version: '1.2.8' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 3b8fa87cbb..50c54dc46f 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.5-rc.2', + version: '1.1.5', summary: 'Lint all your JavaScript files with JSHint.', documentation: 'README.md' }); diff --git a/packages/less/package.js b/packages/less/package.js index dad066da90..589d8bf262 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.4-rc.2', + version: '2.7.4', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 3b5f6ebdb4..c3a9806e24 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.14-rc.2' + version: '1.1.14' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 49d7b40117..dca5e85d20 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.4.0-rc.2' + version: '1.4.0' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index dd2a0623a3..f4067cf16e 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.16-rc.2' + version: '1.2.16' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 53518cd598..3de369f110 100644 --- a/packages/minifier-css/package.js +++ b/packages/minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "CSS minifier", - version: "1.2.13-rc.2" + version: "1.2.13" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index b58e8f8cd3..afb5f8b6c9 100644 --- a/packages/minifier-js/package.js +++ b/packages/minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript minifier", - version: "1.2.13-rc.2" + version: "1.2.13" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 276489920d..9ef594d341 100644 --- a/packages/modules-runtime/package.js +++ b/packages/modules-runtime/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules-runtime", - version: "0.7.5-rc.2", + version: "0.7.5", summary: "CommonJS module system", git: "https://github.com/benjamn/install", documentation: "README.md" diff --git a/packages/modules/package.js b/packages/modules/package.js index 191029b85d..2315ab1943 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.5-rc.2", + version: "0.7.5", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 22e1b75347..34065c55ea 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.1.10-rc.2' + version: '1.1.10' }); Npm.depends({ diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 629b4779b7..92c312d7fe 100644 --- a/packages/npm-mongo/package.js +++ b/packages/npm-mongo/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Wrapper around the mongo npm package", - version: '1.5.45-rc.2', + version: '1.5.45', documentation: null }); diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 1f6137cb5d..14609f0702 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.1.13-rc.2' + version: '1.1.13' }); Package.onUse(function (api) { diff --git a/packages/promise/package.js b/packages/promise/package.js index dbc4dcfeab..a808ffae15 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.3-rc.2", + version: "0.8.3", summary: "ECMAScript 2015 Promise polyfill with Fiber support", git: "https://github.com/meteor/promise", documentation: "README.md" diff --git a/packages/standard-minifier-css/package.js b/packages/standard-minifier-css/package.js index 4d4cb37275..fc4129ed43 100644 --- a/packages/standard-minifier-css/package.js +++ b/packages/standard-minifier-css/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-css', - version: '1.1.8-rc.2', + version: '1.1.8', summary: 'Standard css minifier used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js index a673235fa7..dcab86536c 100644 --- a/packages/standard-minifier-js/package.js +++ b/packages/standard-minifier-js/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'standard-minifier-js', - version: '1.1.8-rc.2', + version: '1.1.8', summary: 'Standard javascript minifiers used with Meteor apps by default.', documentation: 'README.md' }); diff --git a/packages/static-html/package.js b/packages/static-html/package.js index d6940f0486..e8df227b46 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.11-rc.2', + version: '1.1.11', // Brief, one-line summary of the package. summary: 'Define static page content in .html files', git: 'https://github.com/meteor/meteor', diff --git a/packages/stylus/package.js b/packages/stylus/package.js index fb830ee2ea..27946df7ac 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "2.513.4-rc.2" + version: "2.513.4" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 0e5ce08c8f..31a8133d11 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.2.13-rc.2' + version: '1.2.13' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/tracker/package.js b/packages/tracker/package.js index ec60da2bbe..56a3709ffe 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.1.0-rc.2' + version: '1.1.0' }); Package.onUse(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index 14d30093ec..4acf8c0b2e 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.12-rc.2' + version: '1.1.12' }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 9263dee23d..5675570b12 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.3.10-rc.2' + version: '1.3.10' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 8899d2e1c1..619eabb6ba 100644 --- a/packages/xmlbuilder/package.js +++ b/packages/xmlbuilder/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "An XML builder for node.js similar to java-xmlbuilder.", - version: '2.5.13-rc.2' + version: '2.5.13' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index f34a1073bc..996cb5ecf3 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.3.5.1", + "version": "1.4", "recommended": false, "official": true, "description": "The Official Meteor Distribution"