zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '12667-migrate-rails-js' into 12673-static

Browse Source
pull/12680/head
Carlos Matallín 7 years ago
parent 6a9fad4de3 12a5a47b10
commit 4f97505785
6 changed files with 49 additions and 492 deletions
Show Stats Download Patch File Download Diff File

1
NEWS.md
Unescape View File

@ -4,6 +4,7 @@ Development
### Features
* Add /api/v3/me endpoint (#12599)
* Add assets version column in user model (#12676)
* Vector rendering improvements #12722.
* Enable georeferencer for database connectors (#12566)
* Enable other hosts apart from account host to include CORS headers via the cors_enabled_hosts param in app_config.yml (#12685)
* Add tooltips to show bucket data in time-series (#11650)

2
config/app_config.yml.sample
Unescape View File

@ -5,7 +5,7 @@ defaults: &defaults
# https: "https.cdn.host"
http_client_logs: true
ogr2ogr:
binary: 'which ogr2ogr2.1'
binary: 'which ogr2ogr'
csv_guessing: true
debug_assets: true
mandatory_keys: [layer_opts, sql_api, varnish_management, redis, session_domain]

1
lib/build/tasks/webpack/webpack.config.js
Unescape View File

@ -37,6 +37,7 @@ module.exports = {
include: [
path.resolve(path.resolve('.'), 'lib/assets/javascripts/cartodb3/carto-node'),
path.resolve(path.resolve('.'), 'lib/assets/test/spec/cartodb3/carto-node'),
path.resolve(path.resolve('.'), 'node_modules/tangram-cartocss'),
path.resolve(path.resolve('.'), 'node_modules/tangram.cartodb')
],
options: {

528
npm-shrinkwrap.json generated
Unescape View File

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.9.64-12673.1",
"version": "4.9.73",
"dependencies": {
"accessory": {
"version": "1.0.1",
@ -125,347 +125,6 @@
"from": "async-each@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"
},
"babel-code-frame": {
"version": "6.26.0",
"from": "babel-code-frame@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
"dependencies": {
"esutils": {
"version": "2.0.2",
"from": "esutils@>=2.0.2 <3.0.0",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
}
}
},
"babel-helper-builder-binary-assignment-operator-visitor": {
"version": "6.24.1",
"from": "babel-helper-builder-binary-assignment-operator-visitor@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz"
},
"babel-helper-call-delegate": {
"version": "6.24.1",
"from": "babel-helper-call-delegate@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz"
},
"babel-helper-define-map": {
"version": "6.26.0",
"from": "babel-helper-define-map@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babel-helper-explode-assignable-expression": {
"version": "6.24.1",
"from": "babel-helper-explode-assignable-expression@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz"
},
"babel-helper-function-name": {
"version": "6.24.1",
"from": "babel-helper-function-name@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz"
},
"babel-helper-get-function-arity": {
"version": "6.24.1",
"from": "babel-helper-get-function-arity@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz"
},
"babel-helper-hoist-variables": {
"version": "6.24.1",
"from": "babel-helper-hoist-variables@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz"
},
"babel-helper-optimise-call-expression": {
"version": "6.24.1",
"from": "babel-helper-optimise-call-expression@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz"
},
"babel-helper-regex": {
"version": "6.26.0",
"from": "babel-helper-regex@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babel-helper-remap-async-to-generator": {
"version": "6.24.1",
"from": "babel-helper-remap-async-to-generator@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz"
},
"babel-helper-replace-supers": {
"version": "6.24.1",
"from": "babel-helper-replace-supers@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz"
},
"babel-messages": {
"version": "6.23.0",
"from": "babel-messages@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"
},
"babel-plugin-check-es2015-constants": {
"version": "6.22.0",
"from": "babel-plugin-check-es2015-constants@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz"
},
"babel-plugin-syntax-async-functions": {
"version": "6.13.0",
"from": "babel-plugin-syntax-async-functions@>=6.8.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz"
},
"babel-plugin-syntax-exponentiation-operator": {
"version": "6.13.0",
"from": "babel-plugin-syntax-exponentiation-operator@>=6.8.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz"
},
"babel-plugin-syntax-trailing-function-commas": {
"version": "6.22.0",
"from": "babel-plugin-syntax-trailing-function-commas@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz"
},
"babel-plugin-transform-async-to-generator": {
"version": "6.24.1",
"from": "babel-plugin-transform-async-to-generator@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz"
},
"babel-plugin-transform-es2015-arrow-functions": {
"version": "6.22.0",
"from": "babel-plugin-transform-es2015-arrow-functions@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz"
},
"babel-plugin-transform-es2015-block-scoped-functions": {
"version": "6.22.0",
"from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz"
},
"babel-plugin-transform-es2015-block-scoping": {
"version": "6.26.0",
"from": "babel-plugin-transform-es2015-block-scoping@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babel-plugin-transform-es2015-classes": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-classes@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz"
},
"babel-plugin-transform-es2015-computed-properties": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-computed-properties@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz"
},
"babel-plugin-transform-es2015-destructuring": {
"version": "6.23.0",
"from": "babel-plugin-transform-es2015-destructuring@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz"
},
"babel-plugin-transform-es2015-duplicate-keys": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-duplicate-keys@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz"
},
"babel-plugin-transform-es2015-for-of": {
"version": "6.23.0",
"from": "babel-plugin-transform-es2015-for-of@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz"
},
"babel-plugin-transform-es2015-function-name": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-function-name@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz"
},
"babel-plugin-transform-es2015-literals": {
"version": "6.22.0",
"from": "babel-plugin-transform-es2015-literals@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz"
},
"babel-plugin-transform-es2015-modules-amd": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-modules-amd@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz"
},
"babel-plugin-transform-es2015-modules-commonjs": {
"version": "6.26.0",
"from": "babel-plugin-transform-es2015-modules-commonjs@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babel-plugin-transform-es2015-modules-systemjs": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-modules-systemjs@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz"
},
"babel-plugin-transform-es2015-modules-umd": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-modules-umd@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz"
},
"babel-plugin-transform-es2015-object-super": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-object-super@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz"
},
"babel-plugin-transform-es2015-parameters": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-parameters@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz"
},
"babel-plugin-transform-es2015-shorthand-properties": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-shorthand-properties@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz"
},
"babel-plugin-transform-es2015-spread": {
"version": "6.22.0",
"from": "babel-plugin-transform-es2015-spread@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz"
},
"babel-plugin-transform-es2015-sticky-regex": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-sticky-regex@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz"
},
"babel-plugin-transform-es2015-template-literals": {
"version": "6.22.0",
"from": "babel-plugin-transform-es2015-template-literals@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz"
},
"babel-plugin-transform-es2015-typeof-symbol": {
"version": "6.23.0",
"from": "babel-plugin-transform-es2015-typeof-symbol@>=6.23.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz"
},
"babel-plugin-transform-es2015-unicode-regex": {
"version": "6.24.1",
"from": "babel-plugin-transform-es2015-unicode-regex@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz"
},
"babel-plugin-transform-exponentiation-operator": {
"version": "6.24.1",
"from": "babel-plugin-transform-exponentiation-operator@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz"
},
"babel-plugin-transform-regenerator": {
"version": "6.26.0",
"from": "babel-plugin-transform-regenerator@>=6.22.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz"
},
"babel-plugin-transform-strict-mode": {
"version": "6.24.1",
"from": "babel-plugin-transform-strict-mode@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz"
},
"babel-preset-env": {
"version": "1.6.0",
"from": "babel-preset-env@>=1.4.0 <2.0.0",
"resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.0.tgz"
},
"babel-runtime": {
"version": "6.23.0",
"from": "babel-runtime@6.23.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
},
"babel-template": {
"version": "6.26.0",
"from": "babel-template@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babel-traverse": {
"version": "6.26.0",
"from": "babel-traverse@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babel-types": {
"version": "6.26.0",
"from": "babel-types@>=6.24.1 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
"dependencies": {
"babel-runtime": {
"version": "6.26.0",
"from": "babel-runtime@>=6.26.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
},
"esutils": {
"version": "2.0.2",
"from": "esutils@>=2.0.2 <3.0.0",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
},
"regenerator-runtime": {
"version": "0.11.0",
"from": "regenerator-runtime@>=0.11.0 <0.12.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz"
}
}
},
"babylon": {
"version": "6.18.0",
"from": "babylon@>=6.18.0 <7.0.0",
"resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz"
},
"backbone": {
"version": "1.2.3",
"from": "backbone@1.2.3",
@ -615,11 +274,6 @@
"from": "browserify-zlib@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"
},
"browserslist": {
"version": "2.4.0",
"from": "browserslist@>=2.1.2 <3.0.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz"
},
"buffer": {
"version": "4.9.1",
"from": "buffer@>=4.1.0 <5.0.0",
@ -672,11 +326,6 @@
"from": "camshaft-reference@0.33.0",
"resolved": "https://registry.npmjs.org/camshaft-reference/-/camshaft-reference-0.33.0.tgz"
},
"caniuse-lite": {
"version": "1.0.30000726",
"from": "caniuse-lite@>=1.0.30000718 <2.0.0",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000726.tgz"
},
"carto": {
"version": "0.15.1-cdb4",
"from": "cartodb/carto#master",
@ -690,7 +339,7 @@
"cartodb-deep-insights.js": {
"version": "0.0.3",
"from": "cartodb/deep-insights.js#master",
"resolved": "git://github.com/cartodb/deep-insights.js.git#8a4e11069af668dc38d16d262c98489279b46f5b",
"resolved": "git://github.com/cartodb/deep-insights.js.git#c8de0e104747fcd7a013493d6180d9350c52e273",
"dependencies": {
"node-polyglot": {
"version": "2.2.2",
@ -705,9 +354,9 @@
"resolved": "https://registry.npmjs.org/cartodb-pecan/-/cartodb-pecan-0.2.0.tgz"
},
"cartodb.js": {
"version": "4.0.0-alpha.1",
"version": "4.0.0-alpha.1.1.0",
"from": "cartodb/cartodb.js#v4",
"resolved": "git://github.com/cartodb/cartodb.js.git#cae49fcee928d5ef2ba2b5fb219928e6ab35ae88"
"resolved": "git://github.com/cartodb/cartodb.js.git#c62b4fcbfbf9360217b858f93213d937d50e6e72"
},
"center-align": {
"version": "0.1.3",
@ -726,11 +375,6 @@
}
}
},
"charenc": {
"version": "0.0.2",
"from": "charenc@>=0.0.1 <0.1.0",
"resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
},
"chokidar": {
"version": "1.7.0",
"from": "chokidar@>=1.7.0 <2.0.0",
@ -835,11 +479,6 @@
"from": "convert-source-map@>=1.1.0 <1.2.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"
},
"core-js": {
"version": "2.5.1",
"from": "core-js@>=2.4.0 <3.0.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz"
},
"core-util-is": {
"version": "1.0.2",
"from": "core-util-is@>=1.0.0 <1.1.0",
@ -860,11 +499,6 @@
"from": "create-hmac@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz"
},
"crypt": {
"version": "0.0.2",
"from": "crypt@>=0.0.1 <0.1.0",
"resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
},
"crypto-browserify": {
"version": "3.11.1",
"from": "crypto-browserify@>=3.0.0 <4.0.0",
@ -906,9 +540,9 @@
"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
},
"debug": {
"version": "2.6.8",
"from": "debug@>=2.6.8 <3.0.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"
"version": "2.2.0",
"from": "debug@2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
},
"decamelize": {
"version": "1.2.0",
@ -1016,11 +650,6 @@
"from": "earcut@2.1.1",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.1.tgz"
},
"electron-to-chromium": {
"version": "1.3.21",
"from": "electron-to-chromium@>=1.3.18 <2.0.0",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz"
},
"elliptic": {
"version": "6.4.0",
"from": "elliptic@>=6.0.0 <7.0.0",
@ -1263,11 +892,6 @@
"from": "glob-parent@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
},
"globals": {
"version": "9.18.0",
"from": "globals@>=9.18.0 <10.0.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"
},
"globo": {
"version": "1.0.2",
"from": "globo@>=1.0.0 <1.1.0",
@ -1329,9 +953,9 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"
},
"html-minifier": {
"version": "3.5.3",
"version": "3.5.4",
"from": "html-minifier@>=3.2.3 <4.0.0",
"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz"
"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.4.tgz"
},
"html-webpack-plugin": {
"version": "2.30.1",
@ -1400,11 +1024,6 @@
"from": "interpret@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz"
},
"invariant": {
"version": "2.2.2",
"from": "invariant@>=2.2.2 <3.0.0",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"
},
"invert-kv": {
"version": "1.0.0",
"from": "invert-kv@>=1.0.0 <2.0.0",
@ -1533,13 +1152,13 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.1.4.tgz"
},
"js-base64": {
"version": "2.1.9",
"version": "2.3.1",
"from": "js-base64@>=2.1.9 <3.0.0",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.1.tgz"
},
"js-tokens": {
"version": "3.0.2",
"from": "js-tokens@>=3.0.2 <4.0.0",
"from": "js-tokens@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"
},
"js-yaml": {
@ -1554,11 +1173,6 @@
}
}
},
"jsesc": {
"version": "0.5.0",
"from": "jsesc@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
},
"json-loader": {
"version": "0.5.7",
"from": "json-loader@>=0.5.4 <0.6.0",
@ -1663,7 +1277,7 @@
},
"lodash": {
"version": "4.17.4",
"from": "lodash@>=4.17.4 <5.0.0",
"from": "lodash@>=4.17.3 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
},
"lodash.memoize": {
@ -1696,11 +1310,6 @@
"from": "mapnik-reference@>=6.0.2 <6.1.0",
"resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz"
},
"md5": {
"version": "2.2.1",
"from": "md5@>=2.2.1 <3.0.0",
"resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz"
},
"md5.js": {
"version": "1.3.4",
"from": "md5.js@>=1.3.4 <2.0.0",
@ -1781,9 +1390,9 @@
"resolved": "https://registry.npmjs.org/mothership/-/mothership-0.2.0.tgz"
},
"ms": {
"version": "2.0.0",
"from": "ms@2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
"version": "0.7.1",
"from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
},
"mustache": {
"version": "1.1.0",
@ -1796,9 +1405,9 @@
"resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz"
},
"no-case": {
"version": "2.3.1",
"version": "2.3.2",
"from": "no-case@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz"
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"
},
"node-libs-browser": {
"version": "2.0.0",
@ -1960,9 +1569,9 @@
"resolved": "https://registry.npmjs.org/pbf/-/pbf-1.3.7.tgz"
},
"pbkdf2": {
"version": "3.0.13",
"version": "3.0.14",
"from": "pbkdf2@>=3.0.3 <4.0.0",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.13.tgz"
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz"
},
"perfect-scrollbar": {
"version": "0.6.16",
@ -2026,11 +1635,6 @@
"from": "pretty-error@>=2.0.2 <3.0.0",
"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz"
},
"private": {
"version": "0.1.7",
"from": "private@>=0.1.6 <0.2.0",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz"
},
"process": {
"version": "0.11.10",
"from": "process@>=0.11.0 <0.12.0",
@ -2081,11 +1685,6 @@
"from": "quote-stream@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz"
},
"ramda": {
"version": "0.23.0",
"from": "ramda@>=0.23.0 <0.24.0",
"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.23.0.tgz"
},
"randomatic": {
"version": "1.1.7",
"from": "randomatic@>=1.1.3 <2.0.0",
@ -2157,41 +1756,11 @@
"from": "readdirp@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"
},
"regenerate": {
"version": "1.3.2",
"from": "regenerate@>=1.2.1 <2.0.0",
"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz"
},
"regenerator-runtime": {
"version": "0.10.5",
"from": "regenerator-runtime@>=0.10.0 <0.11.0",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"
},
"regenerator-transform": {
"version": "0.10.1",
"from": "regenerator-transform@>=0.10.0 <0.11.0",
"resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz"
},
"regex-cache": {
"version": "0.4.4",
"from": "regex-cache@>=0.4.2 <0.5.0",
"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"
},
"regexpu-core": {
"version": "2.0.0",
"from": "regexpu-core@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"
},
"regjsgen": {
"version": "0.2.0",
"from": "regjsgen@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz"
},
"regjsparser": {
"version": "0.1.5",
"from": "regjsparser@>=0.1.4 <0.2.0",
"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"
},
"relateurl": {
"version": "0.2.7",
"from": "relateurl@>=0.2.0 <0.3.0",
@ -2290,7 +1859,7 @@
},
"semver": {
"version": "5.4.1",
"from": "semver@>=5.3.0 <6.0.0",
"from": "semver@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0||>=4.0.0 <5.0.0||>=5.0.0 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"
},
"set-blocking": {
@ -2555,24 +2124,24 @@
"resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"
},
"tangram": {
"version": "0.12.1",
"from": "cartodb/tangram-1#master",
"resolved": "git://github.com/cartodb/tangram-1.git#05fbe2b438bb8be7cd411587d8d4e4415fe4227c"
"version": "0.13.2",
"from": "cartodb/tangram-1#pmaster",
"resolved": "git://github.com/cartodb/tangram-1.git#bbce7fa0fd24eb5a2b34cebdb694b313c2d4d6b4"
},
"tangram-cartocss": {
"version": "0.6.0",
"from": "tangram-cartocss@0.6.0",
"resolved": "https://registry.npmjs.org/tangram-cartocss/-/tangram-cartocss-0.6.0.tgz"
"version": "0.9.1",
"from": "tangram-cartocss@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/tangram-cartocss/-/tangram-cartocss-0.9.1.tgz"
},
"tangram-reference": {
"version": "1.0.20",
"from": "tangram-reference@>=1.0.18 <2.0.0",
"resolved": "https://registry.npmjs.org/tangram-reference/-/tangram-reference-1.0.20.tgz"
"version": "2.1.0",
"from": "tangram-reference@>=2.1.0 <2.2.0",
"resolved": "https://registry.npmjs.org/tangram-reference/-/tangram-reference-2.1.0.tgz"
},
"tangram.cartodb": {
"version": "0.4.6",
"from": "cartodb/tangram.cartodb#b189621d2278bded7a299025c1583bd872b2d1aa",
"resolved": "git://github.com/cartodb/tangram.cartodb.git#b189621d2278bded7a299025c1583bd872b2d1aa"
"version": "0.5.6",
"from": "tangram.cartodb@>=0.5.6 <0.6.0",
"resolved": "https://registry.npmjs.org/tangram.cartodb/-/tangram.cartodb-0.5.6.tgz"
},
"tapable": {
"version": "0.2.8",
@ -2614,11 +2183,6 @@
"from": "to-arraybuffer@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"
},
"to-fast-properties": {
"version": "1.0.3",
"from": "to-fast-properties@>=1.0.3 <2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"
},
"topojson-client": {
"version": "2.1.0",
"from": "tangrams/topojson-client#read-only",
@ -2654,19 +2218,7 @@
"turbo-carto": {
"version": "0.19.0",
"from": "turbo-carto@0.19.0",
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz",
"dependencies": {
"debug": {
"version": "2.2.0",
"from": "debug@2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
},
"ms": {
"version": "0.7.1",
"from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
}
}
"resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.19.0.tgz"
},
"turf-jenks": {
"version": "1.0.1",
@ -2679,9 +2231,9 @@
"resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
},
"uglify-js": {
"version": "3.0.28",
"from": "uglify-js@>=3.0.0 <3.1.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.28.tgz"
"version": "3.1.0",
"from": "uglify-js@>=3.1.0 <3.2.0",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.0.tgz"
},
"uglify-to-browserify": {
"version": "1.0.2",
@ -2833,9 +2385,9 @@
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"
},
"yamljs": {
"version": "0.2.10",
"from": "yamljs@>=0.2.8 <0.3.0",
"resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.2.10.tgz",
"version": "0.3.0",
"from": "yamljs@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz",
"dependencies": {
"glob": {
"version": "7.1.2",

4
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "cartodb-ui",
"version": "4.9.73",
"version": "4.9.73-12673.1",
"description": "CARTO UI frontend",
"repository": {
"type": "git",
@ -37,7 +37,7 @@
"perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master",
"queue-async": "1.2.1",
"rangeslider.js": "2.3.0",
"tangram": "cartodb/tangram-1#master",
"tangram": "cartodb/tangram-1#pmaster",
"torque.js": "CartoDB/torque#master",
"underscore": "1.8.3",
"webpack": "2.3.2"

5
webpack.prod.config.js
Unescape View File

@ -97,7 +97,10 @@ module.exports = env => {
{
test: /\.js$/,
loader: 'babel-loader',
include: [resolve(__dirname, 'node_modules/tangram.cartodb')],
include: [
resolve(__dirname, 'node_modules/tangram-cartocss'),
resolve(__dirname, 'node_modules/tangram.cartodb')
],
options: {
presets: ['es2015']
}

Write Preview
Loading…
Cancel
Save