Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc41

1 files changed, 39 insertions, 12 deletions

diff --git a/.eslintrc.yml b/.eslintrc.yml
index a764f749785..99c390e5060 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -43,20 +43,47 @@ 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/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
+  import/order:
+  - error
+  - groups:
+    - builtin
+    - external
+    - internal
+    - parent
+    - sibling
+    - index
+    pathGroups:
+    - pattern: ~/**
+      group: internal
+    - pattern: emojis/**
+      group: internal
+    - pattern: "{ee_,}empty_states/**"
+      group: internal
+    - pattern: "{ee_,}icons/**"
+      group: internal
+    - pattern: "{ee_,}images/**"
+      group: internal
+    - pattern: vendor/**
+      group: internal
+    - pattern: shared_queries/**
+      group: internal
+    - pattern: "{ee_,}spec/**"
+      group: internal
+    - pattern: "{ee_,}jest/**"
+      group: internal
+    - pattern: ee_else_ce/**
+      group: internal
+    - pattern: ee/**
+      group: internal
+    - pattern: ee_component/**
+      group: internal
+    - pattern: "{test_,}helpers/**"
+      group: internal
+    - pattern: test_fixtures/**
+      group: internal
 overrides:
   - files:
       - '**/spec/**/*'
     rules:
       "@gitlab/require-i18n-strings": off
+      "@gitlab/no-runtime-template-compiler": off