From 39cb463fbd8c3479f04f9f4842eff61f7dc59375 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Fri, 12 Feb 2016 16:12:02 +0100 Subject: [PATCH 1/6] Fix jsdoc --- lib/cartodb/controllers/map.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index ee49e0eb..a5555a2f 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -27,6 +27,7 @@ var MapConfigOverviewsAdapter = require('../models/mapconfig_overviews_adapter') * @param {MapBackend} mapBackend * @param metadataBackend * @param {QueryTablesApi} queryTablesApi + * @param {OverviewsMetadataApi} overviewsMetadataApi * @param {SurrogateKeysCache} surrogateKeysCache * @param {UserLimitsApi} userLimitsApi * @param {LayergroupAffectedTables} layergroupAffectedTables From fe5c6faff1571906fd453f0d9046d432122a8f6a Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 12:16:56 +0100 Subject: [PATCH 2/6] Upgrade windshaft to 1.10.0 --- NEWS.md | 5 ++++- npm-shrinkwrap.json | 19 ++++++++++--------- package.json | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NEWS.md b/NEWS.md index 1d8676b3..49cef27c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,12 @@ # Changelog -## 2.23.1 +## 2.24.0 Released 2016-mm-dd +Announcements: + - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.0) + ## 2.23.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 70e7c50e..9c0f6b32 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.23.1", + "version": "2.24.0", "dependencies": { "body-parser": { "version": "1.14.2", @@ -193,7 +193,7 @@ "dependencies": { "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.6 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -382,7 +382,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.6 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -520,9 +520,9 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.62.0.tgz", "dependencies": { "bl": { - "version": "1.0.2", + "version": "1.0.3", "from": "bl@>=1.0.0 <1.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz", "dependencies": { "readable-stream": { "version": "2.0.5", @@ -585,7 +585,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.4.0 <2.0.0", + "from": "async@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -597,7 +597,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.2 <2.2.0", + "from": "mime-types@>=2.1.9 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -830,8 +830,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.9.0", - "from": "windshaft@1.9.0", + "version": "1.10.0", + "from": "windshaft@1.10.0", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.0.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index e31e26ff..021640ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.23.1", + "version": "2.24.0", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.9.0", + "windshaft": "1.10.0", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From d0f84b2440e59186b85c56f45044e548296e1542 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 13:22:35 +0100 Subject: [PATCH 3/6] windshaft@1.10.1 --- NEWS.md | 2 +- npm-shrinkwrap.json | 16 ++++++++-------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NEWS.md b/NEWS.md index 49cef27c..df3fcb77 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,7 +5,7 @@ Released 2016-mm-dd Announcements: - - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.0) + - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) ## 2.23.0 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9c0f6b32..47137877 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -193,7 +193,7 @@ "dependencies": { "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -382,7 +382,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.6 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -443,7 +443,7 @@ }, "inherits": { "version": "2.0.1", - "from": "inherits@>=2.0.1 <2.1.0", + "from": "inherits@>=2.0.0 <3.0.0", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz" } } @@ -585,7 +585,7 @@ "dependencies": { "async": { "version": "1.5.2", - "from": "async@>=1.0.0 <2.0.0", + "from": "async@>=1.4.0 <2.0.0", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz" } } @@ -597,7 +597,7 @@ }, "mime-types": { "version": "2.1.9", - "from": "mime-types@>=2.1.9 <2.2.0", + "from": "mime-types@>=2.1.2 <2.2.0", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz", "dependencies": { "mime-db": { @@ -830,9 +830,9 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" }, "windshaft": { - "version": "1.10.0", - "from": "windshaft@1.10.0", - "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.0.tgz", + "version": "1.10.1", + "from": "windshaft@1.10.1", + "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-1.10.1.tgz", "dependencies": { "mapnik": { "version": "1.4.15-cdb6", diff --git a/package.json b/package.json index 021640ba..09d0cc9f 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "node-statsd": "~0.0.7", "underscore" : "~1.6.0", "dot": "~1.0.2", - "windshaft": "1.10.0", + "windshaft": "1.10.1", "step": "~0.0.6", "queue-async": "~1.0.7", "request": "~2.62.0", From 3ab94c7c91d3bdbea620b6e6f5d0d171a896c84e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 14:46:43 +0100 Subject: [PATCH 4/6] Release 2.24.0 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index df3fcb77..dc955572 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ ## 2.24.0 -Released 2016-mm-dd +Released 2016-02-15 Announcements: - Upgrades windshaft to [1.10.0](https://github.com/CartoDB/Windshaft/releases/tag/1.10.1) From 121c146ef9695fe68b2c94fa6942b98f6c88a2a6 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 14:47:36 +0100 Subject: [PATCH 5/6] Stubs next version --- NEWS.md | 5 +++++ npm-shrinkwrap.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index dc955572..784d26af 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,10 @@ # Changelog +## 2.24.1 + +Released 2016-mm-dd + + ## 2.24.0 Released 2016-02-15 diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 47137877..36867205 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.24.0", + "version": "2.24.1", "dependencies": { "body-parser": { "version": "1.14.2", diff --git a/package.json b/package.json index 09d0cc9f..4e2e3145 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "2.24.0", + "version": "2.24.1", "description": "A map tile server for CartoDB", "keywords": [ "cartodb" From cd81a594187e0f2873f78870d1e12558ea310bce Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 15 Feb 2016 16:53:31 +0100 Subject: [PATCH 6/6] Adds some notes about how to npm link windshaft for development --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 88d4b897..6045cda7 100644 --- a/README.md +++ b/README.md @@ -67,3 +67,16 @@ Contributing --- See [CONTRIBUTING.md](CONTRIBUTING.md). + +### Developing with a custom windshaft version + +If you plan or want to use a custom / not released yet version of windshaft (or any other dependency) the best option is +to use `npm link`. You can read more about it at [npm-link: Symlink a package folder](https://docs.npmjs.com/cli/link). + +**Quick start**: + +```shell +~/windshaft-directory $ npm install +~/windshaft-directory $ npm link +~/windshaft-cartodb-directory $ npm link windshaft +```