From b9e3f365f3df3779be91ec7e0dc7bf35cff8d658 Mon Sep 17 00:00:00 2001 From: Mark Florian Date: Wed, 13 Jan 2021 17:33:18 +0000 Subject: [PATCH] Update dependency @gitlab/eslint-plugin to v6.0.0 Addresses https://gitlab.com/gitlab-org/status-page/-/issues/33, part of https://gitlab.com/groups/gitlab-org/-/epics/5142. --- package.json | 2 +- src/behaviors/emoji/support/index.js | 6 +-- .../support/is_emoji_unicode_supported.js | 2 +- .../emoji/support/unicode_support_map.js | 2 +- src/behaviors/gl_emoji.js | 10 +++-- src/main.js | 6 +-- src/router/index.js | 6 +-- yarn.lock | 43 ++++++++++--------- 8 files changed, 39 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 18b6b6da..607ccd4d 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "vue-sanitize": "^0.2.0" }, "devDependencies": { - "@gitlab/eslint-plugin": "3.2.0", + "@gitlab/eslint-plugin": "^6.0.0", "@gitlab/stylelint-config": "2.0.0", "@vue/cli-plugin-babel": "~4.2.0", "@vue/cli-plugin-e2e-cypress": "~4.3.0", diff --git a/src/behaviors/emoji/support/index.js b/src/behaviors/emoji/support/index.js index 1f7852dd..8bb3bf00 100644 --- a/src/behaviors/emoji/support/index.js +++ b/src/behaviors/emoji/support/index.js @@ -1,10 +1,10 @@ -import isEmojiUnicodeSupported from './is_emoji_unicode_supported'; -import getUnicodeSupportMap from './unicode_support_map'; +import { isEmojiUnicodeSupported } from './is_emoji_unicode_supported'; +import { getUnicodeSupportMap } from './unicode_support_map'; // cache browser support map between calls let browserUnicodeSupportMap; -export default function isEmojiUnicodeSupportedByBrowser(emojiUnicode, unicodeVersion) { +export function isEmojiUnicodeSupportedByBrowser(emojiUnicode, unicodeVersion) { browserUnicodeSupportMap = browserUnicodeSupportMap || getUnicodeSupportMap(); return isEmojiUnicodeSupported(browserUnicodeSupportMap, emojiUnicode, unicodeVersion); } diff --git a/src/behaviors/emoji/support/is_emoji_unicode_supported.js b/src/behaviors/emoji/support/is_emoji_unicode_supported.js index c5f9fcf6..908aab96 100644 --- a/src/behaviors/emoji/support/is_emoji_unicode_supported.js +++ b/src/behaviors/emoji/support/is_emoji_unicode_supported.js @@ -129,7 +129,7 @@ function isEmojiUnicodeSupported(unicodeSupportMap = {}, emojiUnicode, unicodeVe } export { - isEmojiUnicodeSupported as default, + isEmojiUnicodeSupported, isFlagEmoji, isRainbowFlagEmoji, isKeycapEmoji, diff --git a/src/behaviors/emoji/support/unicode_support_map.js b/src/behaviors/emoji/support/unicode_support_map.js index a8561e9f..1ef799db 100644 --- a/src/behaviors/emoji/support/unicode_support_map.js +++ b/src/behaviors/emoji/support/unicode_support_map.js @@ -134,7 +134,7 @@ function generateUnicodeSupportMap(testMap) { return resultMap; } -export default function getUnicodeSupportMap() { +export function getUnicodeSupportMap() { let unicodeSupportMap; try { diff --git a/src/behaviors/gl_emoji.js b/src/behaviors/gl_emoji.js index 8d870a44..289b4bc7 100644 --- a/src/behaviors/gl_emoji.js +++ b/src/behaviors/gl_emoji.js @@ -1,5 +1,5 @@ import 'document-register-element'; -import isEmojiUnicodeSupported from './emoji/support'; +import { isEmojiUnicodeSupportedByBrowser } from './emoji/support'; import { emojiImageTag, emojiFallbackImageSrc } from './emoji'; class GlEmoji extends HTMLElement { @@ -13,7 +13,11 @@ class GlEmoji extends HTMLElement { Array.prototype.every.call(this.childNodes, childNode => childNode.nodeType === 3); const hasImageFallback = fallbackSrc && fallbackSrc.length > 0; - if (emojiUnicode && isEmojiUnicode && !isEmojiUnicodeSupported(emojiUnicode, unicodeVersion)) { + if ( + emojiUnicode && + isEmojiUnicode && + !isEmojiUnicodeSupportedByBrowser(emojiUnicode, unicodeVersion) + ) { if (hasImageFallback) { this.innerHTML = emojiImageTag(name, fallbackSrc); } else { @@ -24,7 +28,7 @@ class GlEmoji extends HTMLElement { } } -export default function installGlEmojiElement() { +export function installGlEmojiElement() { if (!customElements.get('gl-emoji')) { customElements.define('gl-emoji', GlEmoji); } diff --git a/src/main.js b/src/main.js index 82967975..2cd2fb84 100644 --- a/src/main.js +++ b/src/main.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import VueSanitize from 'vue-sanitize'; import App from '~/app.vue'; -import router from '~/router'; -import installGlEmojiElement from './behaviors/gl_emoji'; +import { createRouter } from '~/router'; +import { installGlEmojiElement } from './behaviors/gl_emoji'; import '~/assets/styles/global.scss'; @@ -27,6 +27,6 @@ Vue.config.productionTip = false; installGlEmojiElement(); new Vue({ - router, + router: createRouter(), render: h => h(App), }).$mount('#app'); diff --git a/src/router/index.js b/src/router/index.js index 1788e285..030f8c3e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -20,8 +20,4 @@ const routes = [ { path: '*', component: PageNotFound }, ]; -const router = new VueRouter({ - routes, -}); - -export default router; +export const createRouter = () => new VueRouter({ routes }); diff --git a/yarn.lock b/yarn.lock index bac77772..53e954e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -801,10 +801,10 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@gitlab/eslint-plugin@3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-3.2.0.tgz#e1780c2cab4c206e4900f2a1a4cf636f788182ea" - integrity sha512-3s28sQoGMgmwKtmVij7TjBDdW6fHiP4k6k6FWZdU6XZBJFwwA0JlU8PzYZRRTyY+pYed2u1jF06LHzv5YWNS2g== +"@gitlab/eslint-plugin@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz#deb18f63808af1cb1cc117a92558f07edb1e2256" + integrity sha512-3TihEG0EzbGtc6wxZLANZN1ge2tnAv0qU8w6smUACmPhqFj0/DrCq9V6QKPqAHk/Yn3hrfGk5nznAzzuMEgwDQ== dependencies: babel-eslint "^10.0.3" eslint-config-airbnb-base "^14.0.0" @@ -814,7 +814,7 @@ eslint-plugin-import "^2.20.1" eslint-plugin-jest "^23.8.2" eslint-plugin-promise "^4.2.1" - eslint-plugin-vue "^6.2.1" + eslint-plugin-vue "^7.4.1" vue-eslint-parser "^7.0.0" "@gitlab/stylelint-config@2.0.0": @@ -4318,14 +4318,15 @@ eslint-plugin-promise@^4.2.1: resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-vue@^6.2.1: - version "6.2.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe" - integrity sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ== +eslint-plugin-vue@^7.4.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz#2526ef0c010c218824a89423dbe6ddbe76f04fd6" + integrity sha512-W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw== dependencies: + eslint-utils "^2.1.0" natural-compare "^1.4.0" - semver "^5.6.0" - vue-eslint-parser "^7.0.0" + semver "^7.3.2" + vue-eslint-parser "^7.3.0" eslint-rule-composer@^0.3.0: version "0.3.0" @@ -4355,10 +4356,10 @@ eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" -eslint-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" - integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA== +eslint-utils@^2.0.0, eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" @@ -4410,7 +4411,7 @@ eslint@^6.8.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.1.2: +espree@^6.1.2, espree@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== @@ -11234,15 +11235,15 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vue-eslint-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz#a4ed2669f87179dedd06afdd8736acbb3a3864d6" - integrity sha512-yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g== +vue-eslint-parser@^7.0.0, vue-eslint-parser@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559" + integrity sha512-n5PJKZbyspD0+8LnaZgpEvNCrjQx1DyDHw8JdWwoxhhC+yRip4TAvSDpXGf9SWX6b0umeB5aR61gwUo6NVvFxw== dependencies: debug "^4.1.1" eslint-scope "^5.0.0" eslint-visitor-keys "^1.1.0" - espree "^6.1.2" + espree "^6.2.1" esquery "^1.0.1" lodash "^4.17.15" -- GitLab