Merge branch 'renovate/major-gitlab-packages' into 'master'

Update dependency @gitlab/eslint-plugin to v6 See merge request gitlab-org/gitlab!51143

Merge branch 'renovate/major-gitlab-packages' into 'master'
Update dependency @gitlab/eslint-plugin to v6 See merge request gitlab-org/gitlab!51143
0859b783 · Denys Mishunov · a797c314 · f7c724e8 · 0859b783 · 0859b783
Commit 0859b783 authored Jan 11, 2021 by Denys Mishunov
6 changed files
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -43,6 +43,62 @@ rules:
  promise/always-return: off
  promise/no-callback-in-promise: off
  "@gitlab/no-global-event-off": error
+
+  # BEGIN eslint-plugin-vue@7 overrides
+  # TODO: Remove these rules as part of
+  # https://gitlab.com/groups/gitlab-org/-/epics/5142. These are setting
+  # various vue lint rules as they were in eslint-plugin-vue@6, or disabling
+  # new ones, to ease migration to v7, so violations of each can be fixed
+  # separately.
+  vue/order-in-components:
+    - error
+    # This is the order from eslint-plugin-vue@6.2.2
+    - order:
+      - el
+      - name
+      - parent
+      - functional
+      -
+        - delimiters
+        - comments
+      -
+        - components
+        - directives
+        - filters
+      - extends
+      - mixins
+      - inheritAttrs
+      - model
+      -
+        - props
+        - propsData
+      - fetch
+      - asyncData
+      - data
+      - computed
+      - watch
+      -
+        - beforeCreate
+        - created
+        - beforeMount
+        - mounted
+        - beforeUpdate
+        - updated
+        - activated
+        - deactivated
+        - beforeDestroy
+        - destroyed
+      - methods
+      - head
+      -
+        - template
+        - render
+      - renderError
+  vue/no-mutating-props: off
+  vue/one-component-per-file: off
+  vue/no-lone-template: off
+  vue/component-definition-name-casing: off
+  # END eslint-plugin-vue@7 overrides
 overrides:
  - files:
      - '**/spec/**/*'

--- a/ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue
+++ b/ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue
@@ -108,7 +108,7 @@ export default {
    },
  },
  watch: {
-    currentPage: () => {
+    currentPage() {
      window.scrollTo(0, 0);
    },
  },

--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
  },
  "devDependencies": {
    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
-    "@gitlab/eslint-plugin": "5.0.0",
+    "@gitlab/eslint-plugin": "^6.0.0",
    "@testing-library/dom": "^7.16.2",
    "@vue/test-utils": "1.1.2",
    "acorn": "^6.3.0",

--- a/spec/frontend/clusters/components/applications_spec.js
+++ b/spec/frontend/clusters/components/applications_spec.js
@@ -16,7 +16,7 @@ describe('Applications', () => {
    gon.features = gon.features || {};
  });

-  const createApp = ({ applications, type, props } = {}, isShallow) => {
+  const createApp = ({ applications, type, propsData } = {}, isShallow) => {
    const mountMethod = isShallow ? shallowMount : mount;

    wrapper = mountMethod(Applications, {
@@ -24,7 +24,7 @@ describe('Applications', () => {
      propsData: {
        type,
        applications: { ...APPLICATIONS_MOCK_STATE, ...applications },
-        ...props,
+        ...propsData,
      },
    });
  };
@@ -544,7 +544,7 @@ describe('Applications', () => {

  describe('Cilium application', () => {
    it('shows the correct description', () => {
-      createApp({ props: { ciliumHelpPath: 'cilium-help-path' } });
+      createApp({ propsData: { ciliumHelpPath: 'cilium-help-path' } });
      expect(findByTestId('ciliumDescription').element).toMatchSnapshot();
    });
  });

--- a/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js
+++ b/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js
@@ -47,7 +47,7 @@ describe('ide/components/panes/collapsible_sidebar.vue', () => {

    beforeEach(() => {
      const FakeComponent = localVue.component(fakeComponentName, {
-        render: () => {},
+        render: () => null,
      });

      fakeView = {

--- a/yarn.lock
+++ b/yarn.lock
@@ -845,10 +845,10 @@
  resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz#5f6bfe6baaef360daa9b038fa78798d7a6a916b4"
  integrity sha512-282Dn3SPVsUHVDhMsXgfnv+Rzog0uxecjttxGRQvxh25es1+xvkGQFsvJfkSKJ3X1kHVkSjKf+Tt5Rra+Jhp9g==

-"@gitlab/eslint-plugin@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz#502eb2bccb55d65d6310ce9ef2da76035b6fc319"
-  integrity sha512-zd4pa6D2OUuhPUD2QmyhfpZh7vuXKsNHaCHJdbTb2ld+mHel5IDqdidAzAshCI9On3e6o9XieD6l7rBTpN6H/g==
+"@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"
@@ -858,7 +858,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/favicon-overlay@2.0.0":
@@ -1639,10 +1639,10 @@ acorn-globals@^6.0.0:
    acorn "^7.1.1"
    acorn-walk "^7.1.1"

-acorn-jsx@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
-  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
+acorn-jsx@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==

 acorn-walk@^6.1.1:
  version "6.2.0"
@@ -1659,7 +1659,7 @@ acorn@^6.0.7, acorn@^6.2.1, acorn@^6.3.0:
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
  integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==

-acorn@^7.1.0, acorn@^7.1.1:
+acorn@^7.1.1:
  version "7.4.1"
  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -4631,14 +4631,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"
@@ -4668,10 +4669,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"

@@ -4723,13 +4724,13 @@ eslint@^6.8.0:
    text-table "^0.2.0"
    v8-compile-cache "^2.0.3"

-espree@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
-  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+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==
  dependencies:
-    acorn "^7.1.0"
-    acorn-jsx "^5.1.0"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
    eslint-visitor-keys "^1.1.0"

 esprima@^4.0.0, esprima@^4.0.1:
@@ -12402,15 +12403,15 @@ vue-apollo@^3.0.3:
    serialize-javascript "^2.1.0"
    throttle-debounce "^2.1.0"

-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"