From 5b1a20ee16b3c50d74d4d2fc39fd7a618f6d0622 Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Wed, 4 Aug 2021 11:21:21 +0200
Subject: [PATCH] Manually upgrade GitLab UI _and_ GitLab SVGs
Unfortunately Renovate is currently mal-functioning, as we are hitting
this error: https://gitlab.com/gitlab-org/gitlab/-/issues/336657
Therefore we manually bump the GitLab UI version to the latest major.
This should have no impact on the GitLab project (apart from smaller
bundle size, due to new, aligned browser support), as all of the things
we need to migrate have been taken care of, _before_ we started merged
the new major release.
---
package.json | 4 ++--
yarn.lock | 22 ++++++++--------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/package.json b/package.json
index 518beee7ad0a6..0f00ac90862a5 100644
--- a/package.json
+++ b/package.json
@@ -57,9 +57,9 @@
"@babel/preset-env": "^7.10.1",
"@gitlab/at.js": "1.5.7",
"@gitlab/favicon-overlay": "2.0.0",
- "@gitlab/svgs": "1.207.0",
+ "@gitlab/svgs": "1.208.0",
"@gitlab/tributejs": "1.0.0",
- "@gitlab/ui": "31.6.1",
+ "@gitlab/ui": "32.0.0",
"@gitlab/visual-review-tools": "1.6.1",
"@rails/actioncable": "6.1.3-2",
"@rails/ujs": "6.1.3-2",
diff --git a/yarn.lock b/yarn.lock
index 3ad7f4a53814b..cd8511bbd2f0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -898,20 +898,20 @@
stylelint-declaration-strict-value "1.7.7"
stylelint-scss "3.18.0"
-"@gitlab/svgs@1.207.0":
- version "1.207.0"
- resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.207.0.tgz#39a1ff30b79a7c1134bcdc086a96e01988b89034"
- integrity sha512-1JTuocHt1xk3fAP/C7xV79EJNtHmnoIAs+39eY3aidrgTo3hK8XkyANNBAmVooY0RdfUhK3juHfmj7i/C1ps0g==
+"@gitlab/svgs@1.208.0":
+ version "1.208.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.208.0.tgz#e298b4d38ac38b7186000cc21bafebebe0766a83"
+ integrity sha512-dK2fXLCPOg0bchIqiNpVPY8RmEIpmR9wo/BHeLpf8NTcEjtAok87hJ+cwySbDvKeu10bSePsgl8NcST61GlNaA==
"@gitlab/tributejs@1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
-"@gitlab/ui@31.6.1":
- version "31.6.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.6.1.tgz#32acb2c9b6ded53077d703c071774c262db4c48b"
- integrity sha512-x3851iL9N4qIIKqjVquFPuFk4IcrJwMVGCe2iVrCDfOckbHSnvKrR1QYO+wgx/OpLt818hD7BcMXd4R+p1Cz4Q==
+"@gitlab/ui@32.0.0":
+ version "32.0.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.0.0.tgz#2bf8995e405f35c5fa9dcc2ad0de24d79dc9c006"
+ integrity sha512-GVQVx8Db9fb/BfYf7Vzdf6MxqLsF5RZta0VanwTm/asGdQxWG7I9fJIPUHqhCK3S9efZ83zXfZBF0M3uHuxveg==
dependencies:
"@babel/standalone" "^7.0.0"
bootstrap-vue "2.18.1"
@@ -922,7 +922,6 @@
js-beautify "^1.8.8"
lodash "^4.17.20"
portal-vue "^2.1.6"
- resize-observer-polyfill "^1.5.1"
url-search-params-polyfill "^5.0.0"
vue-runtime-helpers "^1.1.2"
@@ -10310,11 +10309,6 @@ requizzle@~0.2.1:
dependencies:
underscore "~1.6.0"
-resize-observer-polyfill@^1.5.1:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
- integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
--
GitLab