diff --git a/docs/client/api.html b/docs/client/api.html index a6029b3685..b0279ca4dc 100644 --- a/docs/client/api.html +++ b/docs/client/api.html @@ -28,6 +28,7 @@ put on the screen. }); } +{{> api_box absoluteUrl}}

Publish and subscribe

diff --git a/docs/client/api.js b/docs/client/api.js index 1d14bdaa9c..c6ef8d2940 100644 --- a/docs/client/api.js +++ b/docs/client/api.js @@ -24,6 +24,33 @@ Template.api.startup = { ] }; +Template.api.absoluteUrl = { + id: "meteor_absoluteUrl", + name: "Meteor.absoluteUrl([path], [options])", + locus: "Anywhere", + descr: ["Generate an absolute URL pointing to the application. The server " + + "reads from the `ROOT_URL` environment variable to determine " + + "where it is running. This is taken care of automatically for " + + "apps deployed with `meteor deploy`, but must be provided when " + + "using `meteor bundle`."], + args: [ + {name: "path", + type: "String", + descr: 'A path to append to the root URL. Do not include a leading "`/`".' + } + ], + options: [ + {name: "secure", + type: "Boolean", + descr: "Create an HTTPS URL." + }, + {name: "rootUrl", + type: "String", + descr: "Override the default ROOT_URL from the server environment. For example: \"`http://foo.example.com`\"" + } + ] +}; + Template.api.publish = { id: "meteor_publish", name: "Meteor.publish(name, func)", diff --git a/docs/client/docs.js b/docs/client/docs.js index 41f2337097..871b46b975 100644 --- a/docs/client/docs.js +++ b/docs/client/docs.js @@ -82,7 +82,8 @@ var toc = [ "Core", [ "Meteor.isClient", "Meteor.isServer", - "Meteor.startup" + "Meteor.startup", + "Meteor.absoluteUrl" ], "Publish and subscribe", [ @@ -205,7 +206,6 @@ var toc = [ ], "Packages", [ [ - "absolute-url", "amplify", "backbone", "bootstrap", diff --git a/docs/client/packages/absolute-url.html b/docs/client/packages/absolute-url.html deleted file mode 100644 index 19a0401e63..0000000000 --- a/docs/client/packages/absolute-url.html +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/docs/client/packages/absolute-url.js b/docs/client/packages/absolute-url.js deleted file mode 100644 index 7a4ba1d036..0000000000 --- a/docs/client/packages/absolute-url.js +++ /dev/null @@ -1,24 +0,0 @@ -Template.pkg_absolute_url.absoluteUrl = { - id: "meteor_absoluteUrl", - name: "Meteor.absoluteUrl([path], [options])", - locus: "Anywhere", - descr: ["Generate an absolute URL pointing to the application."], - args: [ - {name: "path", - type: "String", - descr: 'A path to append to the root URL. Do not include a leading "`/`".' - } - ], - options: [ - {name: "secure", - type: "Boolean", - descr: "Create an HTTPS URL." - }, - {name: "rootUrl", - type: "String", - descr: "Override the default ROOT_URL from the server environment. For example: \"`http://foo.example.com`\"" - } - ] - -}; - diff --git a/packages/absolute-url/package.js b/packages/absolute-url/package.js index 796cba69b8..6c93f33226 100644 --- a/packages/absolute-url/package.js +++ b/packages/absolute-url/package.js @@ -1,17 +1,8 @@ Package.describe({ - summary: "Generate absolute URLs pointing to the application" + summary: "DEPRECATED: Generate absolute URLs pointing to the application" }); Package.on_use(function (api) { - // note server before common. usually it is the other way around, but - // in this case server must load first. - api.add_files('url_server.js', 'server'); - api.add_files('url_common.js', ['client', 'server']); -}); - -Package.on_test(function (api) { - api.use('absolute-url', ['client', 'server']); - api.use('tinytest'); - - api.add_files('url_tests.js', ['client', 'server']); + console.log('DEPRECATED. The `absolute-url` package has been folded into ' + + 'the `meteor` package and should not be used directly.'); }); diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js index 90b5037578..bc413ad820 100644 --- a/packages/force-ssl/package.js +++ b/packages/force-ssl/package.js @@ -8,11 +8,6 @@ Package.on_use(function (api) { // server has been instantiated. api.use('livedata', 'server'); - // we don't really depend on absolute-url, but we do modify its - // behavior. If there were a way to say "if the other package is - // loaded, make sure we come after it", we should do that here. - api.use('absolute-url', ['client', 'server']); - api.add_files('force_ssl_common.js', ['client', 'server']); api.add_files('force_ssl_server.js', 'server'); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 9b93219566..a194a549d0 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -40,6 +40,11 @@ Package.on_use(function (api, where) { api.use('underscore', ['client', 'server']); api.add_files('dynamics_browser.js', 'client'); api.add_files('dynamics_nodejs.js', 'server'); + + // note server before common. usually it is the other way around, but + // in this case server must load first. + api.add_files('url_server.js', 'server'); + api.add_files('url_common.js', ['client', 'server']); }); Package.on_test(function (api) { @@ -50,4 +55,6 @@ Package.on_test(function (api) { api.add_files('helpers_test.js', ['client', 'server']); api.add_files('dynamics_test.js', ['client', 'server']); + + api.add_files('url_tests.js', ['client', 'server']); }); diff --git a/packages/absolute-url/url_common.js b/packages/meteor/url_common.js similarity index 100% rename from packages/absolute-url/url_common.js rename to packages/meteor/url_common.js diff --git a/packages/absolute-url/url_server.js b/packages/meteor/url_server.js similarity index 100% rename from packages/absolute-url/url_server.js rename to packages/meteor/url_server.js diff --git a/packages/absolute-url/url_tests.js b/packages/meteor/url_tests.js similarity index 100% rename from packages/absolute-url/url_tests.js rename to packages/meteor/url_tests.js