diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 4ffe11af..d98d93b5 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "2.88.2", + "version": "2.88.4", "dependencies": { "body-parser": { "version": "1.14.2", @@ -105,9 +105,9 @@ } }, "camshaft": { - "version": "0.49.0", - "from": "camshaft@0.49.0", - "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.49.0.tgz", + "version": "0.50.2", + "from": "camshaft@0.50.2", + "resolved": "https://registry.npmjs.org/camshaft/-/camshaft-0.50.2.tgz", "dependencies": { "async": { "version": "1.5.2", @@ -228,9 +228,9 @@ } }, "safe-json-stringify": { - "version": "1.0.3", + "version": "1.0.4", "from": "safe-json-stringify@>=1.0.0 <2.0.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz" + "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz" }, "moment": { "version": "2.17.1", @@ -869,9 +869,9 @@ } }, "is-my-json-valid": { - "version": "2.15.0", + "version": "2.16.0", "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -976,9 +976,9 @@ } }, "sshpk": { - "version": "1.10.2", + "version": "1.11.0", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz", "dependencies": { "asn1": { "version": "0.2.3", @@ -1169,7 +1169,7 @@ "windshaft": { "version": "2.7.1", "from": "cartodb/windshaft#mapnik-migration", - "resolved": "git://github.com/cartodb/windshaft.git#4ff259e66e192ad0ce7a4a7cb7a6a2463f381990", + "resolved": "git://github.com/cartodb/windshaft.git#7086416a60a238aadb1c3fdfd92b26b86e646ab6", "dependencies": { "abaculus": { "version": "2.0.3-cdb1", @@ -1946,9 +1946,9 @@ } }, "is-my-json-valid": { - "version": "2.15.0", + "version": "2.16.0", "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -2053,9 +2053,9 @@ } }, "sshpk": { - "version": "1.10.2", + "version": "1.11.0", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz", "dependencies": { "asn1": { "version": "0.2.3", @@ -4477,9 +4477,9 @@ } }, "is-my-json-valid": { - "version": "2.15.0", + "version": "2.16.0", "from": "is-my-json-valid@>=2.12.4 <3.0.0", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", "dependencies": { "generate-function": { "version": "2.0.0", @@ -4584,9 +4584,9 @@ } }, "sshpk": { - "version": "1.10.2", + "version": "1.11.0", "from": "sshpk@>=1.7.0 <2.0.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz", "dependencies": { "asn1": { "version": "0.2.3", @@ -5064,9 +5064,9 @@ } }, "tilelive-mapnik": { - "version": "0.6.18-cdb", - "from": "cartodb/tilelive-mapnik#cdb-0.6.18", - "resolved": "git://github.com/cartodb/tilelive-mapnik.git#7c947e5598f8e0a476230f5ec2ad92f0487b7bea", + "version": "0.6.18-cdb1", + "from": "cartodb/tilelive-mapnik#0.6.18-cdb1", + "resolved": "git://github.com/cartodb/tilelive-mapnik.git#cf7e5b4633db653a889a6c6e6a5ddcbcf4ddc3b5", "dependencies": { "generic-pool": { "version": "2.4.6", diff --git a/yarn.lock b/yarn.lock index 8cbfe65b..4ca83862 100644 --- a/yarn.lock +++ b/yarn.lock @@ -187,9 +187,9 @@ camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" -camshaft@0.49.0: - version "0.49.0" - resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.49.0.tgz#03b462dae9df6eb3d5d58ba215307a7aff38c798" +camshaft@0.50.2: + version "0.50.2" + resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.50.2.tgz#0128bcb15801172c22efd9bd1a132b8b438306b7" dependencies: async "^1.5.2" bunyan "1.8.1" @@ -701,7 +701,7 @@ generate-object-property@^1.1.0: dependencies: is-property "^1.0.0" -generic-pool@2.4.2: +generic-pool@2.4.2, generic-pool@~2.4.0, generic-pool@~2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683" @@ -713,10 +713,6 @@ generic-pool@~2.2.0, generic-pool@~2.2.1: version "2.2.2" resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.2.2.tgz#7a89f491d575b42f9f069a0e8e2c6dbaa3c241be" -generic-pool@~2.4.0, generic-pool@~2.4.1: - version "2.4.6" - resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.6.tgz#f1b55e572167dba2fe75d5aa91ebb1e9f72642d7" - get-caller-file@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" @@ -727,7 +723,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob@3.2.3: +glob@3.2.3, "glob@~ 3.2.1": version "3.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.3.tgz#e313eeb249c7affaa5c475286b0e115b59839467" dependencies: @@ -766,13 +762,6 @@ glob@^7.0.5: once "^1.3.0" path-is-absolute "^1.0.0" -"glob@~ 3.2.1": - version "3.2.11" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d" - dependencies: - inherits "2" - minimatch "0.3" - graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -937,8 +926,8 @@ is-fullwidth-code-point@^1.0.0: number-is-nan "^1.0.0" is-my-json-valid@^2.12.4: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b" + version "2.16.0" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693" dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" @@ -1194,13 +1183,6 @@ mime@~1.2.11: version "1.2.11" resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" -minimatch@0.3: - version "0.3.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - minimatch@1.0.x: version "1.0.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-1.0.0.tgz#e0dd2120b49e1b724ce8d714c520822a9438576d" @@ -1739,8 +1721,8 @@ rimraf@~2.4.0: glob "^6.0.1" safe-json-stringify@~1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz#3cb6717660a086d07cb5bd9b7a6875bcf67bd05e" + version "1.0.4" + resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz#81a098f447e4bbc3ff3312a243521bc060ef5911" "semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@~5.3.0: version "5.3.0" @@ -1892,8 +1874,8 @@ srs@1.x: gdal "~0.9.2" sshpk@^1.7.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.10.2.tgz#d5a804ce22695515638e798dbe23273de070a5fa" + version "1.11.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -2014,9 +1996,9 @@ tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb1: mapnik-pool "~0.1.3" sphericalmercator "1.0.x" -tilelive-mapnik@cartodb/tilelive-mapnik#cdb-0.6.18: - version "0.6.18-cdb" - resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/7c947e5598f8e0a476230f5ec2ad92f0487b7bea" +tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb1: + version "0.6.18-cdb1" + resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cf7e5b4633db653a889a6c6e6a5ddcbcf4ddc3b5" dependencies: generic-pool "~2.4.0" mapnik "3.5.14" @@ -2086,8 +2068,8 @@ type-is@~1.6.10, type-is@~1.6.6: mime-types "~2.1.13" uglify-js@^2.6: - version "2.7.5" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8" + version "2.8.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.4.tgz#5aeb6fd6f1f0a672dea63795016590502c290513" dependencies: async "~0.2.6" source-map "~0.5.1" @@ -2169,7 +2151,7 @@ window-size@^0.2.0: windshaft@cartodb/windshaft#mapnik-migration: version "2.7.1" - resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/4ff259e66e192ad0ce7a4a7cb7a6a2463f381990" + resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/7086416a60a238aadb1c3fdfd92b26b86e646ab6" dependencies: abaculus cartodb/abaculus#2.0.3-cdb1 canvas cartodb/node-canvas#1.6.2-cdb2 @@ -2187,7 +2169,7 @@ windshaft@cartodb/windshaft#mapnik-migration: step "~0.0.6" tilelive "5.12.2" tilelive-bridge cartodb/tilelive-bridge#2.3.1-cdb1 - tilelive-mapnik cartodb/tilelive-mapnik#cdb-0.6.18 + tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb1 torque.js "~2.11.0" underscore "~1.6.0"