stuff that doesn't have conflicts

tOlorun · May 13, 2013 · 6b48e8b · 6b48e8b
1 parent 6f05a29
commit 6b48e8b
Show file tree

Hide file tree

Showing 69 changed files with 1,006 additions and 90 deletions.
diff --git a/packages/accounts-base/accounts_common.js b/packages/accounts-base/accounts_common.js
@@ -1,3 +1,4 @@
+// @export Accounts
 if (typeof Accounts === 'undefined')
   Accounts = {};
 

diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js
@@ -3,9 +3,11 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use('underscore', 'server');
+  api.use('underscore', ['client', 'server']);
   api.use('localstorage', 'client');
-  api.use('accounts-urls', 'client');
+  api.use('accounts-urls', ['client', 'server']);
+  api.use('deps', 'client');
+  api.use('random', ['client', 'server']);
 
   // need this because of the Meteor.users collection but in the future
   // we'd probably want to abstract this away
@@ -24,5 +26,6 @@ Package.on_use(function (api) {
 Package.on_test(function (api) {
   api.use('accounts-base');
   api.use('tinytest');
+  api.use('random');
   api.add_files('accounts_tests.js', 'server');
 });
diff --git a/packages/accounts-oauth1-helper/oauth1_binding.js b/packages/accounts-oauth1-helper/oauth1_binding.js
@@ -1,6 +1,7 @@
 var crypto = Npm.require("crypto");
 var querystring = Npm.require("querystring");
 
+// @export OAuth1Binding
 // An OAuth1 wrapper around http calls which helps get tokens and
 // takes care of HTTP headers
 //

diff --git a/packages/accounts-oauth1-helper/package.js b/packages/accounts-oauth1-helper/package.js
@@ -4,7 +4,7 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use('accounts-oauth-helper', 'client');
+  api.use('accounts-oauth-helper', ['client', 'server']);
   api.use('accounts-base', ['client', 'server']);
 
   api.add_files('oauth1_binding.js', 'server');
@@ -13,6 +13,9 @@ Package.on_use(function (api) {
 });
 
 Package.on_test(function (api) {
+  api.use('tinytest');
+  api.use('random');
+  api.use('accounts-base');
   api.use('accounts-oauth1-helper', 'server');
   api.add_files("oauth1_tests.js", 'server');
 });
diff --git a/packages/accounts-oauth2-helper/package.js b/packages/accounts-oauth2-helper/package.js
@@ -4,14 +4,17 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use('accounts-oauth-helper', 'client');
+  api.use('accounts-oauth-helper', ['client', 'server']);
   api.use('accounts-base', ['client', 'server']);
 
   api.add_files('oauth2_common.js', ['client', 'server']);
   api.add_files('oauth2_server.js', 'server');
 });
 
 Package.on_test(function (api) {
+  api.use('tinytest');
+  api.use('random');
+  api.use('accounts-base');
   api.use('accounts-oauth2-helper', 'server');
   api.add_files("oauth2_tests.js", 'server');
 });
diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
@@ -6,6 +6,8 @@ Package.on_use(function(api) {
   api.use('accounts-base', ['client', 'server']);
   api.use('srp', ['client', 'server']);
   api.use('email', ['server']);
+  api.use('random', ['server']);
+  api.use('underscore');
 
   api.add_files('email_templates.js', 'server');
   api.add_files('password_server.js', 'server');
@@ -14,7 +16,8 @@ Package.on_use(function(api) {
 });
 
 Package.on_test(function(api) {
-  api.use(['accounts-password', 'tinytest', 'test-helpers', 'deps']);
+  api.use(['accounts-password', 'tinytest', 'test-helpers', 'deps',
+           'accounts-base', 'random', 'email', 'underscore']);
   api.add_files('password_tests_setup.js', 'server');
   api.add_files('password_tests.js', ['client', 'server']);
   api.add_files('email_tests_setup.js', 'server');

diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
@@ -3,7 +3,8 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use(['accounts-urls', 'accounts-base', 'underscore', 'templating'], 'client');
+  api.use(['accounts-urls', 'accounts-base', 'underscore', 'templating',
+           'handlebars', 'spark', 'session'], 'client');
 
   api.add_files([
     'accounts_ui.js',

diff --git a/packages/accounts-urls/url_client.js b/packages/accounts-urls/url_client.js
@@ -1,3 +1,4 @@
+// @export Accounts
 if (typeof Accounts === 'undefined')
   Accounts = {};
 

diff --git a/packages/accounts-urls/url_server.js b/packages/accounts-urls/url_server.js
@@ -1,3 +1,4 @@
+// @export Accounts
 if (typeof Accounts === 'undefined')
   Accounts = {};
 

diff --git a/packages/appcache/appcache-client.js b/packages/appcache/appcache-client.js
@@ -1,5 +1,4 @@
-if (! window.applicationCache)
-  return;
+if (window.applicationCache) {
 
 var appCacheStatuses = [
   'uncached',
@@ -65,3 +64,5 @@ window.applicationCache.addEventListener('obsolete', (function() {
     Meteor._reload.reload();
   }
 }), false);
+
+} // if window.applicationCache
diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js
@@ -31,6 +31,7 @@ Package.register_extension("coffee", coffeescript_handler);
 Package.register_extension("litcoffee", coffeescript_handler);
 
 Package.on_test(function (api) {
+  api.use(['coffeescript', 'tinytest']);
   api.add_files([
     'coffeescript_tests.coffee',
     'coffeescript_strict_tests.coffee',

diff --git a/packages/deps/deps.js b/packages/deps/deps.js
@@ -1,3 +1,4 @@
+// @export Deps
 Deps = {};
 Deps.active = false;
 Deps.currentComputation = null;

diff --git a/packages/domutils/domutils.js b/packages/domutils/domutils.js
@@ -1,4 +1,6 @@
+// @export DomUtils
 DomUtils = {};
+
 var qsaFindAllBySelector = function (selector, contextNode) {
   // If IE7 users report the following error message, you
   // can fix it with "meteor add jquery".

diff --git a/packages/domutils/package.js b/packages/domutils/package.js
@@ -12,12 +12,14 @@ Package.on_use(function (api) {
   // cut this dependency.
   api.use('jquery', 'client');
 
+  api.use('underscore', 'client');
+
   api.add_files('domutils.js', 'client');
 });
 
 Package.on_test(function (api) {
   api.use(['tinytest']);
-  api.use(['domutils', 'test-helpers'], 'client');
+  api.use(['domutils', 'test-helpers', 'underscore'], 'client');
 
   api.add_files([
     'domutils_tests.js'

diff --git a/packages/ejson/ejson.js b/packages/ejson/ejson.js
@@ -1,4 +1,6 @@
-EJSON = {}; // Global!
+// @export EJSON
+EJSON = {};
+
 var customTypes = {};
 // Add a custom type, using a method of your choice to get to and
 // from a basic JSON-able representation.  The factory argument

diff --git a/packages/ejson/package.js b/packages/ejson/package.js
@@ -4,13 +4,14 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
-  api.use('json');
+  api.use(['json', 'underscore']);
   api.add_files('ejson.js', ['client', 'server']);
   api.add_files('base64.js', ['client', 'server']);
 });
 
 Package.on_test(function (api) {
   api.use('ejson', ['client', 'server']);
+  api.use(['tinytest', 'underscore']);
 
   api.add_files('base64_test.js', ['client', 'server']);
   api.add_files('ejson_test.js', ['client', 'server']);

diff --git a/packages/email/email.js b/packages/email/email.js
@@ -1,3 +1,4 @@
+// @export Email
 Email = {};
 
 var Future = Npm.require('fibers/future');

diff --git a/packages/handlebars/package.js b/packages/handlebars/package.js
@@ -1,23 +1,16 @@
-// XXX this is hella confusing. this package really only has the
-// handlebars *runtime*, for precompiled templates. so really it is an
-// internal package that should get shipped down to the client iff you
-// have a precompiled handlebars template in your project.
-
 Package.describe({
-  summary: "Simple semantic templating language"
+  summary: "Simple semantic templating language",
+  internal: true
 });
 
-Package._require('parse.js'); // needed at bundle time
-
 Package.on_use(function (api) {
-  // XXX should only be sent if we have handlebars templates in the app..
-  api.add_files('evaluate.js', 'client');
-  api.add_files('parse.js', 'server'); // needed on server for tests
-
-  api.use('underscore', 'client');
+  // XXX This package has been folded into the 'templating' package
+  // for now. Historically, you could see it in your package list
+  // (because it didn't have internal: true, which it probably should
+  // have), but adding it didn't do anything (because it just
+  // contained the handlebars precompiler and runtime, not any
+  // functions you could call yourself.) So leave it around as an
+  // empty package for the moment so as to not break the projects of
+  // anyone that happened to type 'meteor add handlebars' because they
+  // thought they had to.
 });
-
-// XXX lots more to do here .. registering this a templating engine,
-// making it the default default, providing the compiler code,
-// depending on the node package (or packaging the compiler
-// ourselves..)
diff --git a/packages/htmljs/html.js b/packages/htmljs/html.js
@@ -69,6 +69,13 @@ var tag_names =
    'P PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG SUB SUP ' +
    'TABLE TBODY TD TEXTAREA TFOOT TH THEAD TR TT U UL VAR').split(' ');
 
+// @export A, ABBR, ACRONYM, B, BDO, BIG, BLOCKQUOTE, BR, BUTTON, CAPTION
+// @export CITE, CODE, COL, COLGROUP, DD, DEL, DFN, DIV, DL, DT, EM, FIELDSET
+// @export FORM, H1, H2, H3, H4, H5, H6, HR, I, IFRAME, IMG, INPUT, INS, KBD
+// @export LABEL, LEGEND, LI, OBJECT, OL, OPTGROUP, OPTION, P, PARAM, PRE, Q
+// @export S, SAMP, SCRIPT, SELECT, SMALL, SPAN, STRIKE, STRONG, SUB, SUP
+// @export TABLE, TBODY, TD, TEXTAREA, TFOOT, TH, THEAD, TR, TT, U, UL, VAR
+
 for (var i = 0; i < tag_names.length; i++) {
   var tag = tag_names[i];
 

diff --git a/packages/http/package.js b/packages/http/package.js
@@ -3,12 +3,15 @@ Package.describe({
 });
 
 Package.on_use(function (api) {
+  api.use('underscore');
   api.add_files('httpcall_common.js', ['client', 'server']);
   api.add_files('httpcall_client.js', 'client');
   api.add_files('httpcall_server.js', 'server');
 });
 
 Package.on_test(function (api) {
+  api.use('underscore');
+  api.use('random');
   api.use('jquery', 'client');
   api.use('http', ['client', 'server']);
   api.use('test-helpers', ['client', 'server']);

diff --git a/packages/jsparse/lexer.js b/packages/jsparse/lexer.js
@@ -255,6 +255,7 @@ Lexeme.prototype.toString = function () {
 //           Thie flag can be read and set manually to affect the
 //           parsing of the next token.
 
+// @export JSLexer
 JSLexer = function (code) {
   this.code = code;
   this.pos = 0;

diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js
@@ -9,7 +9,7 @@ Package.on_use(function (api) {
 });
 
 Package.on_test(function (api) {
-  api.use('tinytest');
+  api.use(['tinytest', 'underscore']);
   api.use('jsparse', 'client');
 
   api.add_files('parser_tests.js',

diff --git a/packages/jsparse/parser.js b/packages/jsparse/parser.js
@@ -26,6 +26,7 @@ var makeSet = function (array) {
 };
 
 
+// @export JSParser
 JSParser = function (code, options) {
   this.lexer = new JSLexer(code);
   this.oldToken = null;

diff --git a/packages/jsparse/parserlib.js b/packages/jsparse/parserlib.js
@@ -6,6 +6,7 @@ var isArray = function (obj) {
   return obj && (typeof obj === 'object') && (typeof obj.length === 'number');
 };
 
+// @export ParseNode
 ParseNode = function (name, children) {
   this.name = name;
   this.children = children;

diff --git a/packages/less/package.js b/packages/less/package.js
@@ -49,6 +49,6 @@ Package.register_extension(
 Package.register_extension("lessimport", function () {});
 
 Package.on_test(function (api) {
-  api.use('test-helpers');
+  api.use(['test-helpers', 'tinytest', 'less']);
   api.add_files(['less_tests.less', 'less_tests.js'], 'client');
 });
diff --git a/packages/livedata/package.js b/packages/livedata/package.js
@@ -41,7 +41,7 @@ Package.on_test(function (api) {
   api.use('livedata', ['client', 'server']);
   api.use('mongo-livedata', ['client', 'server']);
   api.use('test-helpers', ['client', 'server']);
-  api.use('tinytest');
+  api.use(['underscore', 'tinytest', 'random', 'deps']);
 
   api.add_files('livedata_connection_tests.js', ['client', 'server']);
   api.add_files('livedata_tests.js', ['client', 'server']);

diff --git a/packages/liverange/liverange.js b/packages/liverange/liverange.js
@@ -89,6 +89,8 @@ var wrapEndpoints = function (start, end) {
 //
 // XXX Should eventually support LiveRanges where start === end
 // and start.parentNode is null.
+//
+// @export LiveRange
 LiveRange = function (tag, start, end, inner) {
   if (start.nodeType === 11 /* DocumentFragment */) {
     end = start.lastChild;

diff --git a/packages/liverange/package.js b/packages/liverange/package.js
@@ -9,7 +9,7 @@ Package.on_use(function (api) {
 
 Package.on_test(function (api) {
   api.use(['tinytest']);
-  api.use(['liverange', 'test-helpers', 'domutils'], 'client');
+  api.use(['liverange', 'test-helpers', 'domutils', 'underscore'], 'client');
 
   api.add_files([
     'liverange_test_helpers.js',

diff --git a/packages/logging/package.js b/packages/logging/package.js
@@ -9,6 +9,7 @@ Package.on_use(function (api, where) {
 });
 
 Package.on_test(function (api) {
+  api.use('tinytest');
   api.use('logging', 'client');
   api.add_files('logging_test.js', 'client');
 });
diff --git a/packages/meteor/client_environment.js b/packages/meteor/client_environment.js
@@ -1,3 +1,4 @@
+// @export Meteor
 Meteor = {
   isClient: true,
   isServer: false

diff --git a/packages/meteor/package.js b/packages/meteor/package.js
@@ -51,7 +51,7 @@ Package.on_use(function (api, where) {
 });
 
 Package.on_test(function (api) {
-  api.use('tinytest');
+  api.use(['underscore', 'tinytest']);
 
   api.add_files('client_environment_test.js', 'client');
   api.add_files('server_environment_test.js', 'server');

diff --git a/packages/meteor/server_environment.js b/packages/meteor/server_environment.js
@@ -1,3 +1,4 @@
+// @export Meteor
 Meteor = {
   isClient: false,
   isServer: true

diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
@@ -7,6 +7,7 @@
 
 // LiveResultsSet: the return value of a live query.
 
+// @export LocalCollection
 LocalCollection = function () {
   this.docs = {}; // _id -> document (also containing id)
 

diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js
@@ -8,7 +8,8 @@ Package.on_use(function (api, where) {
 
   // It would be sort of nice if minimongo didn't depend on
   // underscore, so we could ship it separately.
-  api.use(['underscore', 'json', 'ejson', 'ordered-dict', 'random'], where);
+  api.use(['underscore', 'json', 'ejson', 'ordered-dict', 'deps',
+           'random', 'ordered-dict'], where);
   api.add_files([
     'minimongo.js',
     'selector.js',
@@ -21,6 +22,7 @@ Package.on_use(function (api, where) {
 Package.on_test(function (api) {
   api.use('minimongo', 'client');
   api.use('test-helpers', 'client');
-  api.use('tinytest');
+  api.use(['tinytest', 'underscore', 'ejson', 'ordered-dict',
+           'random', 'deps']);
   api.add_files('minimongo_tests.js', 'client');
 });
diff --git a/packages/mongo-livedata/package.js b/packages/mongo-livedata/package.js
@@ -15,7 +15,8 @@ Package.describe({
 Npm.depends({mongodb: "1.2.13"});
 
 Package.on_use(function (api) {
-  api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging', 'livedata'],
+  api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging',
+           'livedata', 'deps'],
           ['client', 'server']);
 
   api.add_files('mongo_driver.js', 'server');
@@ -26,8 +27,7 @@ Package.on_use(function (api) {
 
 Package.on_test(function (api) {
   api.use('mongo-livedata');
-  api.use('tinytest');
-  api.use('test-helpers');
+  api.use(['tinytest', 'underscore', 'test-helpers', 'ejson', 'random']);
   // XXX test order dependency: the allow_tests "partial allow" test
   // fails if it is run before mongo_livedata_tests.
   api.add_files('mongo_livedata_tests.js', ['client', 'server']);