Skip to content

Commit

Permalink
Merge branch 'release-0.9.1' into ddp
Browse files Browse the repository at this point in the history
Conflicts:
	packages/livedata/package.js
  • Loading branch information
Sashko Stubailo committed Aug 29, 2014
2 parents d0a0c17 + a924aa7 commit aafd8a0
Show file tree
Hide file tree
Showing 49 changed files with 57 additions and 55 deletions.
2 changes: 1 addition & 1 deletion packages/accounts-base/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "A user account system",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/accounts-password/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Password support for accounts",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/accounts-ui-unstyled/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Unstyled version of login widgets",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/autoupdate/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Update the client when new client code is available",
version: '1.0.5'
version: '1.0.6-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/blaze/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor Reactive Templating library",
version: '1.0.3'
version: '2.0.0-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Front-end framework from Twitter",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/constraint-solver/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Given the set of the constraints, picks a satisfying configuration",
version: "1.0.10"
version: "1.0.11-rc0"
});

Npm.depends({
Expand Down
1 change: 0 additions & 1 deletion packages/deps/deps.js

This file was deleted.

5 changes: 2 additions & 3 deletions packages/deps/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

Package.describe({
summary: "Deprecated package, please use tracker instead.",
version: '1.0.1'
version: '1.0.2-rc1'
});

Package.on_use(function (api) {
api.use('tracker');
api.export('Deps');
api.add_files('tracker.js');
api.imply('tracker');
});
2 changes: 1 addition & 1 deletion packages/ejson/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Extended and Extensible JSON library",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/facebook/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Facebook OAuth flow",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/facts/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Publish internal app statistics",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/github/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Github OAuth flow",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/google/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Google OAuth flow",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/http/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Make HTTP calls to remote servers",
version: '1.0.3'
version: '1.0.4-rc0'
});

Npm.depends({request: "2.33.0"});
Expand Down
2 changes: 1 addition & 1 deletion packages/jquery-layout/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Package.describe({
summary: "Easily create arbitrary multicolumn layouts",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/less/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "The dynamic stylesheet language",
version: "1.0.6"
version: "1.0.7-rc0"
});

Package._transitional_registerBuildPlugin({
Expand Down
4 changes: 2 additions & 2 deletions packages/livedata/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Moved to the ddp package",
version: '1.0.7'
summary: "Moved to the 'ddp' package",
version: '1.0.8-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/meetup/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meetup OAuth flow",
version: "1.0.1"
version: "1.0.2-rc0"
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/meteor-developer/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor developer accounts OAuth flow",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/meteor-platform/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Include a standard set of Meteor packages in your app",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/meteor-tool/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "The Meteor command-line tool",
version: '1.0.26'
version: '1.0.27-rc2'
});

Package.includeTool();
2 changes: 1 addition & 1 deletion packages/meteor/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Package.describe({
summary: "Core Meteor environment",
version: '1.0.2'
version: '1.0.3-rc0'
});

Package._transitional_registerBuildPlugin({
Expand Down
2 changes: 1 addition & 1 deletion packages/minimongo/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Meteor's client-side datastore: a port of MongoDB to Javascript",
version: '1.0.1'
version: '1.0.2-rc0'
});

Package.on_use(function (api) {
Expand Down
4 changes: 2 additions & 2 deletions packages/mongo-livedata/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Moved to the mongo package",
version: '1.0.3'
summary: "Adaptor for using MongoDB and Minimongo over DDP",
version: '1.0.4-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/oauth1/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Common code for OAuth1-based login services",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/observe-sequence/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Observe changes to various sequence types such as arrays, cursors and objects",
version: "1.0.1"
version: "1.0.2-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/reactive-dict/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Reactive dictionary",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/reactive-dict/reactive-dict.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ _.extend(ReactiveDict.prototype, {
var self = this;

// Meteor.Collection.ObjectID is in the 'mongo' package
var ObjectID = Meteor && Meteor.Collection && Meteor.Collection.ObjectID;
var ObjectID = Meteor.Collection && Meteor.Collection.ObjectID;

// We don't allow objects (or arrays that might include objects) for
// .equals, because JSON.stringify doesn't canonicalize object key
Expand Down
2 changes: 1 addition & 1 deletion packages/reactive-var/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Reactive variable",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/session/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Session variable",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/showdown/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Package.describe({
summary: "Markdown-to-HTML processor",
version: "1.0.0"
version: "1.0.1-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/spacebars-compiler/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Compiler for Spacebars template language",
version: '1.0.1'
version: '1.0.2-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/spacebars/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Handlebars-like template language for Meteor",
version: '1.0.0'
version: '1.0.1-rc0'
});

// For more, see package `spacebars-compiler`, which is used by
Expand Down
2 changes: 1 addition & 1 deletion packages/spiderable/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Makes the application crawlable to web spiders",
version: "1.0.2"
version: "1.0.3-rc0"
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/standard-app-packages/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Moved to meteor-platform",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/templating/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Allows templates to be defined in .html files",
version: '1.0.4'
version: '1.0.5-rc0'
});

// Today, this package is closely intertwined with Handlebars, meaning
Expand Down
2 changes: 1 addition & 1 deletion packages/test-helpers/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Utility functions for tests",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/test-in-browser/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Run tests interactively in the browser",
version: '1.0.3'
version: '1.0.4-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/test-in-console/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Run tests noninteractively, with results going to the console.",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 2 additions & 0 deletions packages/tracker/deprecated.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ Meteor.autosubscribe = Tracker.autorun;
Tracker.depend = function (d) {
return d.depend();
};

Deps = Tracker;
3 changes: 2 additions & 1 deletion packages/tracker/package.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Package.describe({
summary: "Dependency tracker to allow reactive callbacks",
version: '1.0.1'
version: '1.0.2-rc1'
});

Package.on_use(function (api) {
api.export('Tracker');
api.export('Deps');
api.add_files('tracker.js');
api.add_files('deprecated.js');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/twitter/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Twitter OAuth flow",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Deprecated: Use the Blaze package",
version: '1.0.0'
version: '1.0.1-rc0'
});

Package.on_use(function (api) {
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Serves a Meteor app over HTTP",
version: '1.0.2'
version: '1.0.3-rc0'
});

Npm.depends({connect: "2.9.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/weibo/package.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package.describe({
summary: "Weibo OAuth flow",
version: '1.0.0',
version: '1.0.1-rc0',
});

Package.on_use(function(api) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/admin/meteor-release-experimental.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"track": "METEOR",
"version": "0.9.0.1-rc1",
"version": "0.9.1-rc2",
"recommended": false,
"official": false,
"description": "The official Meteor distribution."
Expand Down
3 changes: 2 additions & 1 deletion tools/commands-packages.js
Original file line number Diff line number Diff line change
Expand Up @@ -1203,7 +1203,8 @@ main.registerCommand({
var versionAddendum = "" ;
var latest = catalog.complete.getLatestMainlineVersion(name, version);
var semver = require('semver');
if (version !== latest.version &&
if (latest &&
version !== latest.version &&
// If we're currently running a prerelease, "latest" may be older than
// what we're at, so don't tell us we're outdated!
semver.lt(version, latest.version) &&
Expand Down
Loading

0 comments on commit aafd8a0

Please sign in to comment.