diff --git a/package-lock.json b/package-lock.json index 91ca14346d2..7ec9512ce8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2667,17 +2667,17 @@ "backbone": "1.2.3", "backbone-poller": "^1.1.3", "camshaft-reference": "0.34.0", - "carto": "github:cartodb/carto#master", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", - "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#master", + "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", - "torque.js": "github:CartoDB/torque#master", + "torque.js": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", "underscore": "1.8.3", "whatwg-fetch": "^2.0.3" }, @@ -2704,7 +2704,7 @@ "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", "from": "github:CartoDB/torque#master", "requires": { - "carto": "github:cartodb/carto#master", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" @@ -9857,7 +9857,7 @@ } }, "vue-loader-v16": { - "version": "npm:vue-loader-v16@16.8.3", + "version": "16.8.3", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", "dev": true, @@ -17427,8 +17427,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true, - "optional": true + "dev": true }, "detect-newline": { "version": "3.1.0", @@ -22831,17 +22830,17 @@ "backbone": "1.2.3", "backbone-poller": "^1.1.3", "camshaft-reference": "0.34.0", - "carto": "github:cartodb/carto#master", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "clip-path-polygon": "0.1.12", "d3-array": "1.2.1", "d3-format": "1.2.0", "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", - "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#master", + "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", - "torque.js": "github:CartoDB/torque#master", + "torque.js": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", "underscore": "1.8.3", "whatwg-fetch": "^2.0.3" }, @@ -42735,7 +42734,6 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, - "optional": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -42746,15 +42744,13 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "optional": true + "dev": true }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "~5.2.0" } @@ -43568,7 +43564,7 @@ "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", "from": "github:CartoDB/torque#master", "requires": { - "carto": "github:cartodb/carto#master", + "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c", "d3": "3.5.17", "turbo-carto": "^0.21.1", "turf-jenks": "~1.0.1" diff --git a/package.json b/package.json index 8dc822de3f4..e9af057f4b8 100644 --- a/package.json +++ b/package.json @@ -239,8 +239,8 @@ "lint:fix": "eslint . --ext .js,.vue --fix", "lint:css": "stylelint './app/assets/stylesheets/**/*.scss'", "bump": "npm --no-git-tag-version version prerelease --preid=assets", - "preinstall": "git config --global url.'https://'.insteadOf 'git://'", - "postinstall": "git config --global --unset url.'https://'.insteadOf", + "preinstall": "npm config set git https:// --local", + "postinstall": "npm config delete git --local", "postversion": "git add package.json package-lock.json && git commit -m 'Bump assets version' && git push", "update-internal-deps": "rm -rf node_modules && npm install", "branch-files": "node lib/build/branchFiles/branchFiles.js",