From 9ecf3f2b509cce2fbc5ad1137fed52422a0b1225 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 4 Oct 2016 11:50:03 -0400 Subject: [PATCH 1/4] Upgrade Node to 4.6.0 and npm to 3.10.8. --- History.md | 7 +++++++ scripts/build-dev-bundle-common.sh | 4 ++-- scripts/dev-bundle-tool-package.js | 2 +- scripts/generate-dev-bundle.ps1 | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/History.md b/History.md index ce5a62aa2a..ed93c7f288 100644 --- a/History.md +++ b/History.md @@ -1,5 +1,12 @@ ## v.NEXT +## v1.4.1.2 + +* Node has been upgraded to version 4.6.0, a recommended security release: + https://nodejs.org/en/blog/release/v4.6.0/ + +* `npm` has been upgraded to version 3.10.8. + ## v1.4.1.1 * Update the version of our Node MongoDB driver to 2.2.7 to fix a bug in diff --git a/scripts/build-dev-bundle-common.sh b/scripts/build-dev-bundle-common.sh index 5e2e858e55..b0807c45fb 100644 --- a/scripts/build-dev-bundle-common.sh +++ b/scripts/build-dev-bundle-common.sh @@ -6,8 +6,8 @@ set -u UNAME=$(uname) ARCH=$(uname -m) MONGO_VERSION=3.2.6 -NODE_VERSION=4.5.0 -NPM_VERSION=3.10.6 +NODE_VERSION=4.6.0 +NPM_VERSION=3.10.8 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 7daff12cda..2156c75fa0 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.6", + npm: "3.10.8", "node-gyp": "3.4.0", "node-pre-gyp": "0.6.29", "meteor-babel": "0.12.0", diff --git a/scripts/generate-dev-bundle.ps1 b/scripts/generate-dev-bundle.ps1 index 61953f70d4..7b9823ef84 100644 --- a/scripts/generate-dev-bundle.ps1 +++ b/scripts/generate-dev-bundle.ps1 @@ -2,8 +2,8 @@ # use 32bit by default $PLATFORM = "windows_x86" $MONGO_VERSION = "3.2.6" -$NODE_VERSION = "4.5.0" -$NPM_VERSION = "3.10.6" +$NODE_VERSION = "4.6.0" +$NPM_VERSION = "3.10.8" $PYTHON_VERSION = "2.7.12" # For node-gyp # take it form the environment if exists From 595f67fda86ab127d3314755ef0ef132813cca95 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 4 Oct 2016 11:50:23 -0400 Subject: [PATCH 2/4] Bump $BUNDLE_VERSION to 4.3.0 before rebuilding dev bundle. --- meteor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meteor b/meteor index 03d4169b23..f7e92d6cd0 100755 --- a/meteor +++ b/meteor @@ -1,6 +1,6 @@ #!/usr/bin/env bash -BUNDLE_VERSION=4.2.9 +BUNDLE_VERSION=4.3.0 # OS Check. Put here because here is where we download the precompiled # bundles that are arch specific. From 2937403be0166837e2d97d0bb7b27105e084cd4e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 4 Oct 2016 12:07:55 -0400 Subject: [PATCH 3/4] Bump package versions for 1.4.1.2-rc.0 release. --- 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 | 4 ++-- packages/npm-bcrypt/package.js | 2 +- packages/npm-mongo/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/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 94daa41410..33a6dd7018 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.1' + version: '6.9.1-1-rc.0' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index a3a2050c94..0306f4533d 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.11', + version: '0.1.11-1-rc.0', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index f9c2ac587b..15e2759521 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.7', + version: '1.1.7-1-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 3feb3ff339..a6135f5567 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.4_1" + version: "1.2.4-2-rc.0" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index d49ca97779..68dddb985a 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.1', + version: '1.3.1-1-rc.0', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index e3c599d45d..727a154505 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.10', + version: '1.3.10-1-rc.0', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 0174dcc23a..5278481e54 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.14", + version: "0.3.14-1-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 7643da24c9..e873c1baaf 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.8', + version: '0.5.8-1-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 bb30e9853e..9c37723794 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.17" + version: "1.1.17-1-rc.0" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index c7dcc696ab..40a7374a1e 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.14", + version: "4.6.14-1-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 dd130ccb72..0844c6c948 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.9' + version: '1.2.9-1-rc.0' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index 6527945fd5..a800dfd0a9 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.6', + version: '1.1.6-1-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 ac0a88c577..1b281bb0d5 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.5', + version: '2.7.5-1-rc.0', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index 567aa4d3a6..c10ce9ef3a 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.15' + version: '1.1.15-1-rc.0' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 0ac0d2148c..a3186a7564 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.1_1' + version: '1.4.1-2-rc.0' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 2941f35c7c..a1ee553bf0 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.17' + version: '1.2.17-1-rc.0' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index 93d75bd005..e8a5fbe261 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.14" + version: "1.2.14-1-rc.0" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index b53c6ceb37..059d04fb72 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.14" + version: "1.2.14-1-rc.0" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index c18ad3de4d..4be251c9ca 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.6", + version: "0.7.6-1-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 69ac7073bc..620c0a928b 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.6", + version: "0.7.6-1-rc.0", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 3e420265e4..310b2d3dc4 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.12' + version: '1.1.12-1-rc.0' }); Npm.depends({ @@ -21,7 +21,7 @@ Npm.strip({ }); Package.onUse(function (api) { - api.use('npm-mongo@1.5.48', 'server'); + api.use('npm-mongo@1.5.48-1-rc.0', 'server'); api.use('allow-deny'); api.use([ diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js index c6025af0c6..1d1585f956 100644 --- a/packages/npm-bcrypt/package.js +++ b/packages/npm-bcrypt/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Wrapper around the bcrypt npm package", - version: "0.9.1", + version: "0.9.1-1-rc.0", documentation: null }); diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 86dab645cb..87586c8ebe 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.48', + version: '1.5.48-1-rc.0', documentation: null }); diff --git a/packages/promise/package.js b/packages/promise/package.js index 9e4589b23f..7edb963fda 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.4", + version: "0.8.4-1-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 cf53e0e1c0..b1dacc94f3 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.2.0', + version: '1.2.0-1-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 72c501e663..d973f1660a 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.2.0', + version: '1.2.0-1-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 4efeb39971..13bb8df73e 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.12', + version: '1.1.12-1-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 8285d3017f..7f3ff4bae7 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.5" + version: "2.513.5-1-rc.0" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 2e23bd1c2a..05cd67dc45 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.14' + version: '1.2.14-1-rc.0' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/webapp/package.js b/packages/webapp/package.js index 6fcf9a54b8..e5178646e1 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.11' + version: '1.3.11-1-rc.0' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 1caee9b139..66e7469d14 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.14' + version: '2.5.14-1-rc.0' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index 2a7ca869b9..934f0fb5e1 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "1.4.1-rc.7", + "version": "1.4.1.2-rc.0", "recommended": false, "official": false, "description": "Meteor" From 1d74c0ce5e2134fbc58ba0aa77353fe1534f76bb Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 4 Oct 2016 12:44:28 -0400 Subject: [PATCH 4/4] Bump package versions for the official 1.4.1.2 release. --- 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-bcrypt/package.js | 2 +- packages/npm-mongo/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/webapp/package.js | 2 +- packages/xmlbuilder/package.js | 2 +- scripts/admin/meteor-release-official.json | 4 ++-- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/packages/babel-compiler/package.js b/packages/babel-compiler/package.js index 33a6dd7018..55aa60f64b 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.1-1-rc.0' + version: '6.9.1_1' }); Npm.depends({ diff --git a/packages/babel-runtime/package.js b/packages/babel-runtime/package.js index 0306f4533d..297d5a5183 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.11-1-rc.0', + version: '0.1.11_1', documentation: 'README.md' }); diff --git a/packages/caching-compiler/package.js b/packages/caching-compiler/package.js index 15e2759521..d7d0166791 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.7-1-rc.0', + version: '1.1.7_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 a6135f5567..dcfcec2264 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.4-2-rc.0" + version: "1.2.4_2" }); Package.registerBuildPlugin({ diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js index 68dddb985a..ea71593dc9 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.1-1-rc.0', + version: '1.3.1_1', documentation: null }); diff --git a/packages/ddp-server/package.js b/packages/ddp-server/package.js index 727a154505..8164390a88 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.10-1-rc.0', + version: '1.3.10_1', documentation: null }); diff --git a/packages/ecmascript-runtime/package.js b/packages/ecmascript-runtime/package.js index 5278481e54..9518fcc111 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.14-1-rc.0", + version: "0.3.14_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 e873c1baaf..61059cbd1d 100644 --- a/packages/ecmascript/package.js +++ b/packages/ecmascript/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'ecmascript', - version: '0.5.8-1-rc.0', + version: '0.5.8_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 9c37723794..731edd87b0 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.1.17-1-rc.0" + version: "1.1.17_1" }); Npm.depends({ diff --git a/packages/es5-shim/package.js b/packages/es5-shim/package.js index 40a7374a1e..f3f318fe1a 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.14-1-rc.0", + version: "4.6.14_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 0844c6c948..9d676a16ae 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.9-1-rc.0' + version: '1.2.9_1' }); Npm.depends({ diff --git a/packages/jshint/package.js b/packages/jshint/package.js index a800dfd0a9..d27523098c 100644 --- a/packages/jshint/package.js +++ b/packages/jshint/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'jshint', - version: '1.1.6-1-rc.0', + version: '1.1.6_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 1b281bb0d5..11cb834139 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'less', - version: '2.7.5-1-rc.0', + version: '2.7.5_1', summary: 'Leaner CSS language', documentation: 'README.md' }); diff --git a/packages/logging/package.js b/packages/logging/package.js index c10ce9ef3a..3e23cb9ef4 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.1.15-1-rc.0' + version: '1.1.15_1' }); Npm.depends({ diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index a3186a7564..764cc54fe4 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.1-2-rc.0' + version: '1.4.1_2' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index a1ee553bf0..67cf28d435 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.2.17-1-rc.0' + version: '1.2.17_1' }); Package.registerBuildPlugin({ diff --git a/packages/minifier-css/package.js b/packages/minifier-css/package.js index e8a5fbe261..6127e0c540 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.14-1-rc.0" + version: "1.2.14_1" }); Npm.depends({ diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js index 059d04fb72..c4feaa0cce 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.14-1-rc.0" + version: "1.2.14_1" }); Npm.depends({ diff --git a/packages/modules-runtime/package.js b/packages/modules-runtime/package.js index 4be251c9ca..39fb3e6139 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.6-1-rc.0", + version: "0.7.6_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 620c0a928b..d99217c7b1 100644 --- a/packages/modules/package.js +++ b/packages/modules/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "modules", - version: "0.7.6-1-rc.0", + version: "0.7.6_1", summary: "CommonJS module system", documentation: "README.md" }); diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 310b2d3dc4..5af9494d1f 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.12-1-rc.0' + version: '1.1.12_1' }); Npm.depends({ diff --git a/packages/npm-bcrypt/package.js b/packages/npm-bcrypt/package.js index 1d1585f956..79e184bf3b 100644 --- a/packages/npm-bcrypt/package.js +++ b/packages/npm-bcrypt/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Wrapper around the bcrypt npm package", - version: "0.9.1-1-rc.0", + version: "0.9.1_1", documentation: null }); diff --git a/packages/npm-mongo/package.js b/packages/npm-mongo/package.js index 87586c8ebe..33c34710c2 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.48-1-rc.0', + version: '1.5.48_1', documentation: null }); diff --git a/packages/promise/package.js b/packages/promise/package.js index 7edb963fda..e7b9b2a4ca 100644 --- a/packages/promise/package.js +++ b/packages/promise/package.js @@ -1,6 +1,6 @@ Package.describe({ name: "promise", - version: "0.8.4-1-rc.0", + version: "0.8.4_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 b1dacc94f3..40e9dddfa7 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.2.0-1-rc.0', + version: '1.2.0_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 d973f1660a..96eda1b389 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.2.0-1-rc.0', + version: '1.2.0_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 13bb8df73e..04e9441c30 100644 --- a/packages/static-html/package.js +++ b/packages/static-html/package.js @@ -1,5 +1,5 @@ Package.describe({ - version: '1.1.12-1-rc.0', + version: '1.1.12_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 7f3ff4bae7..6f63dadec7 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.5-1-rc.0" + version: "2.513.5_1" }); Package.registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 05cd67dc45..f32ab9f5fc 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.14-1-rc.0' + version: '1.2.14_1' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/webapp/package.js b/packages/webapp/package.js index e5178646e1..39f3567481 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.11-1-rc.0' + version: '1.3.11_1' }); Npm.depends({connect: "2.30.2", diff --git a/packages/xmlbuilder/package.js b/packages/xmlbuilder/package.js index 66e7469d14..bd621c5e19 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.14-1-rc.0' + version: '2.5.14_1' }); Npm.depends({ diff --git a/scripts/admin/meteor-release-official.json b/scripts/admin/meteor-release-official.json index 3f211afbdd..34188e3837 100644 --- a/scripts/admin/meteor-release-official.json +++ b/scripts/admin/meteor-release-official.json @@ -1,8 +1,8 @@ { "track": "METEOR", - "version": "1.4.1.1", + "version": "1.4.1.2", "recommended": false, "official": true, "description": "The Official Meteor Distribution", - "patchFrom": ["1.4.1"] + "patchFrom": ["1.4.1.1"] }