diff --git a/commands/core.bones b/commands/core.bones index 6a09aae3f..437b906c4 100644 --- a/commands/core.bones +++ b/commands/core.bones @@ -189,7 +189,7 @@ command.prototype.bootstrap = function(plugin, callback) { } // Load plugin // NOTE: even broken plugins (ones that throw upon require) will likely get partially loaded here - require('bones').load(path.join(p, dir)); + require('bones-clima').load(path.join(p, dir)); console.warn('Plugin [%s] loaded.', Bones.utils.colorize(data.name, 'green')); return data; } catch (err) { diff --git a/index.js b/index.js index e52faab4e..9dc63563a 100755 --- a/index.js +++ b/index.js @@ -34,8 +34,8 @@ if (existsSync(config)) { argv.config = argv.config || config; } -require('tilelive-mapnik').registerProtocols(require('tilelive')); -require('mbtiles').registerProtocols(require('tilelive')); +require('tilelive-mapnik').registerProtocols(require('tilelive-clima')); +require('mbtiles').registerProtocols(require('tilelive-clima')); -require('bones').load(__dirname); -!module.parent && require('bones').start(); +require('bones-clima').load(__dirname); +!module.parent && require('bones-clima').start(); diff --git a/models/Datasource.server.bones b/models/Datasource.server.bones index 6e10bec4f..217e91e26 100644 --- a/models/Datasource.server.bones +++ b/models/Datasource.server.bones @@ -3,7 +3,7 @@ var url = require('url'); var fs = require('fs'); var mapnik = require('mapnik'); var Step = require('step'); -var millstone = require('millstone'); +var millstone = require('millstone-clima'); models.Datasource.prototype.sync = function(method, model, success, error) { if (method !== 'read') return error('Method not supported.'); diff --git a/models/Library.server.bones b/models/Library.server.bones index c35a81059..e6723a399 100644 --- a/models/Library.server.bones +++ b/models/Library.server.bones @@ -11,7 +11,7 @@ var config = Bones.plugin.config; var url = require('url'); // node v6 -> v8 compatibility var existsAsync = require('fs').exists || require('path').exists; -var millstone = require('millstone'); +var millstone = require('millstone-clima'); // File based extensions supported by TileMill. diff --git a/models/Preview.server.bones b/models/Preview.server.bones index e05f9fc3b..401157012 100644 --- a/models/Preview.server.bones +++ b/models/Preview.server.bones @@ -1,5 +1,5 @@ var path = require('path'); -var tilelive = require('tilelive'); +var tilelive = require('tilelive-clima'); var settings = Bones.plugin.config; models.Preview.prototype.sync = function(method, model, success, error) { diff --git a/models/Project.server.bones b/models/Project.server.bones index 33d6b7c92..5a62c3cd6 100644 --- a/models/Project.server.bones +++ b/models/Project.server.bones @@ -12,7 +12,7 @@ if (mapnik.register_system_fonts) mapnik.register_system_fonts(); if (mapnik.register_default_input_plugins) mapnik.register_default_input_plugins(); var EventEmitter = require('events').EventEmitter; -var millstone = require('millstone'); +var millstone = require('millstone-clima'); var settings = Bones.plugin.config; var tileURL = _('http://<%=url%>/tile/<%=id%>/{z}/{x}/{y}.<%=format%>?updated=<%=updated%>&metatile=<%=metatile%>&scale=<%=scale%>').template(); var request = require('request'); diff --git a/package.json b/package.json index 7b073b988..52db66f77 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "tileoven", + "name": "tilemill", "version": "0.10.2", "main": "./index.js", "description": "A modern map design studio.", @@ -26,28 +26,28 @@ "glob":"~4.0.0", "generic-pool": "~2.1.1", "backbone-dirty": "~1.1.3", - "jsdom":"https://github.com/springmeyer/jsdom-nogyp/tarball/c501ee8b71d8", + "jsdom":"7.0.0", "xmlhttprequest": "1.5.0", "backbone":"0.3.3", - "jquery":"1.6.3", + "jquery":"2.1.0", "express":"2.5.11", "connect":"1.9.2", - "bones": "1.3.29", + "bones-clima": "git://github.com/paulovieira/bones-clima.git", "chrono": "~1.0.1", "JSV": "4.0.x", "sax": "0.6.x", "request": "2.x", "step": "~0.0.5", - "mbtiles": "~0.7.4", + "mbtiles": "~0.8.1", "mapnik": "3.4.9", "tilelive-mapnik": "~0.6.16 ", - "tilelive": "~4.5.3", + "tilelive-clima": "git://github.com/paulovieira/tilelive-clima.git", "carto": "0.15.x", - "millstone": "~0.6.16", + "millstone-clima": "git://github.com/paulovieira/millstone-clima.git", "sphericalmercator": "~1.0.2", "underscore": "~1.6.0", "wax": "6.4.2", - "sqlite3": "~3.0.4", + "sqlite3": "^3.1.x", "modestmaps": "3.3.5", "npm": "2.1.x", "semver": "~4.1.0", @@ -69,5 +69,5 @@ "tileoven": "./index.js" }, "engineStrict": true, - "engines": { "node": "0.8.x || 0.10.x" } + "engines": { "node": "0.8.x || 0.10.x || 4.x"} } diff --git a/servers/Tile.bones b/servers/Tile.bones index 4e78c84ac..8eabae59e 100644 --- a/servers/Tile.bones +++ b/servers/Tile.bones @@ -1,6 +1,6 @@ var fs = require('fs'); var path = require('path'); -var tilelive = require('tilelive'); +var tilelive = require('tilelive-clima'); var settings = Bones.plugin.config; var Step = require('step'); var readdir = require('../lib/fsutil.js').readdir;