From 2e920f14cd3d46a92ace3b5116f13832b8666a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Yeguas?= <neokore@gmail.com>
Date: Wed, 20 May 2020 13:58:04 +0200
Subject: [PATCH] Bump common-ui and fix jpg handling

---
 package-lock.json                 | 13 ++++++-------
 package.json                      |  4 ++--
 webpack/v4/webpack.base.config.js |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f83651e01..b264287068 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.178-docatalog-6",
+  "version": "1.0.0-assets.178-docatalog-7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6322,10 +6322,9 @@
       "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
     },
     "common-ui": {
-      "version": "git://github.com/CartoDB/common-ui.git#0a4560a802bebaa92c126d276096903aef941e8b",
-      "from": "git://github.com/CartoDB/common-ui.git#feature/ch69082/environment",
+      "version": "git://github.com/CartoDB/common-ui.git#72dab532b193c8591a77cf7556a96e7d0977bfb3",
+      "from": "git://github.com/CartoDB/common-ui.git",
       "requires": {
-        "core-js": "^3.6.4",
         "vue": "^2.6.11",
         "vue-router": "^3.1.6",
         "vuex": "^3.1.3"
@@ -6337,9 +6336,9 @@
           "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
         },
         "vue-router": {
-          "version": "3.1.6",
-          "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
-          "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.2.0.tgz",
+          "integrity": "sha512-khkrcUIzMcI1rDcNtqkvLwfRFzB97GmJEsPAQdj7t/VvpGhmXLOkUfhc+Ah8CvpSXGXwuWuQO+x8Sy/xDhXZIA=="
         },
         "vuex": {
           "version": "3.4.0",
diff --git a/package.json b/package.json
index 483913234f..a730bb8784 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.178-docatalog-6",
+  "version": "1.0.0-assets.178-docatalog-7",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
     "cartodb-pecan": "0.2.x",
     "clipboard": "1.6.1",
     "codemirror": "5.14.2",
-    "common-ui": "git://github.com/CartoDB/common-ui.git#feature/ch69082/environment",
+    "common-ui": "git://github.com/CartoDB/common-ui.git",
     "confetti-js": "0.0.14",
     "core-js": "^3.6.4",
     "d3-interpolate": "^1.1.6",
diff --git a/webpack/v4/webpack.base.config.js b/webpack/v4/webpack.base.config.js
index 6fecb3b01d..dab0b6dc6a 100644
--- a/webpack/v4/webpack.base.config.js
+++ b/webpack/v4/webpack.base.config.js
@@ -246,7 +246,7 @@ module.exports = {
         }
       },
       {
-        test: /\.(png|gif|svg)$/,
+        test: /\.(png|gif|svg|jpg)$/,
         use: {
           loader: 'file-loader',
           options: {