Merge branch 'leipert-gitlab-eslint-plugin' into 'master'

Migrate to @gitlab/eslint-plugin

See merge request gitlab-org/gitlab!27415

.eslintrc.yml

 extends:
-  - '@gitlab'
-  - plugin:promise/recommended
+  - plugin:@gitlab/default
+  - plugin:@gitlab/i18n
   - plugin:no-jquery/slim
   - plugin:no-jquery/deprecated-3.4
 globals:
@@ -16,9 +16,6 @@ settings:
     webpack:
       config: './config/webpack.config.js'
 rules:
-  "@gitlab/i18n/no-non-i18n-strings": error
-  "@gitlab/vue-i18n/no-bare-strings": error
-  "@gitlab/vue-i18n/no-bare-attribute-strings": error
   import/no-commonjs: error
   no-underscore-dangle:
     - error
@@ -54,4 +51,4 @@ overrides:
   - files:
       - '**/spec/**/*'
     rules:
-      "@gitlab/i18n/no-non-i18n-strings": off
+      "@gitlab/require-i18n-strings": off

app/assets/javascripts/awards_handler.js

-/* eslint-disable class-methods-use-this, @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable class-methods-use-this, @gitlab/require-i18n-strings */
 
 import $ from 'jquery';
 import _ from 'underscore';

app/assets/javascripts/badges/components/badge.vue

@@ -4,7 +4,7 @@ import Icon from '~/vue_shared/components/icon.vue';
 
 export default {
   // name: 'Badge' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Badge',
   components: {
     Icon,

app/assets/javascripts/behaviors/markdown/nodes/playable.js

 /* eslint-disable class-methods-use-this */
-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 
 import { Node } from 'tiptap';
 import { defaultMarkdownSerializer } from 'prosemirror-markdown';

app/assets/javascripts/boards/components/board.js

@@ -36,6 +36,7 @@ export default Vue.extend({
     list: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
     disabled: {
       type: Boolean,
@@ -94,7 +95,7 @@ export default Vue.extend({
       return this.list.type !== ListType.blank && this.list.type !== ListType.promotion;
     },
     uniqueKey() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `boards.${this.boardId}.${this.list.type}.${this.list.id}`;
     },
     helpLink() {

app/assets/javascripts/boards/components/board_card.vue

@@ -13,29 +13,36 @@ export default {
     list: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
     issue: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
     issueLinkBase: {
       type: String,
       default: '',
+      required: false,
     },
     disabled: {
       type: Boolean,
       default: false,
+      required: false,
     },
     index: {
       type: Number,
       default: 0,
+      required: false,
     },
     rootPath: {
       type: String,
       default: '',
+      required: false,
     },
     groupId: {
       type: Number,
+      required: false,
     },
   },
   data() {

app/assets/javascripts/boards/components/board_delete.js

@@ -7,6 +7,7 @@ export default Vue.extend({
     list: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   methods: {

app/assets/javascripts/boards/components/board_sidebar.js

@@ -34,6 +34,7 @@ export default Vue.extend({
     currentUser: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   data() {

app/assets/javascripts/boards/components/boards_selector.vue

@@ -43,6 +43,7 @@ export default {
     throttleDuration: {
       type: Number,
       default: 200,
+      required: false,
     },
     boardBaseUrl: {
       type: String,

app/assets/javascripts/boards/components/modal/header.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { __ } from '~/locale';
 import ModalFilters from './filters';
 import ModalTabs from './tabs.vue';

app/assets/javascripts/boards/components/modal/tabs.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import ModalStore from '../../stores/modal_store';
 import modalMixin from '../../mixins/modal_mixins';
 

app/assets/javascripts/boards/stores/actions.js

 const notImplemented = () => {
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   throw new Error('Not implemented!');
 };
 

app/assets/javascripts/boards/stores/mutations.js

 import * as mutationTypes from './mutation_types';
 
 const notImplemented = () => {
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   throw new Error('Not implemented!');
 };
 

app/assets/javascripts/clusters/components/application_row.vue

 <script>
 /* eslint-disable vue/require-default-prop */
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLink, GlModalDirective } from '@gitlab/ui';
 import { s__, __, sprintf } from '~/locale';
 import eventHub from '../event_hub';
@@ -95,6 +95,7 @@ export default {
     updateable: {
       type: Boolean,
       default: true,
+      required: false,
     },
     updateSuccessful: {
       type: Boolean,

app/assets/javascripts/clusters/components/knative_domain_editor.vue

@@ -22,6 +22,7 @@ export default {
     ingressDnsHelpPath: {
       type: String,
       default: '',
+      required: false,
     },
   },
   computed: {

app/assets/javascripts/cycle_analytics/components/stage_code_component.vue

@@ -13,10 +13,12 @@ export default {
     items: {
       type: Array,
       default: () => [],
+      required: false,
     },
     stage: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
 };

app/assets/javascripts/cycle_analytics/components/stage_component.vue

@@ -13,10 +13,12 @@ export default {
     items: {
       type: Array,
       default: () => [],
+      required: false,
     },
     stage: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
 };

app/assets/javascripts/cycle_analytics/components/stage_review_component.vue

@@ -15,10 +15,12 @@ export default {
     items: {
       type: Array,
       default: () => [],
+      required: false,
     },
     stage: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
 };

app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue

@@ -16,10 +16,12 @@ export default {
     items: {
       type: Array,
       default: () => [],
+      required: false,
     },
     stage: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   computed: {

app/assets/javascripts/cycle_analytics/components/stage_test_component.vue

@@ -15,10 +15,12 @@ export default {
     items: {
       type: Array,
       default: () => [],
+      required: false,
     },
     stage: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   computed: {

app/assets/javascripts/diffs/components/commit_item.vue

@@ -48,7 +48,7 @@ export default {
     },
     authorUrl() {
       // name: 'mailto:' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return this.author.web_url || `mailto:${this.commit.author_email}`;
     },
     authorAvatar() {

app/assets/javascripts/diffs/components/hidden_files_warning.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 export default {
   props: {
     total: {

app/assets/javascripts/environments/components/environment_item.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import _ from 'underscore';
 import { GlTooltipDirective } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
@@ -342,7 +342,7 @@ export default {
     isLastDeployment() {
       // name: 'last?' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
       // Vue i18n ESLint rules issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/63560
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return this.model && this.model.last_deployment && this.model.last_deployment['last?'];
     },
 

app/assets/javascripts/environments/components/environment_rollback.vue

@@ -24,6 +24,7 @@ export default {
     isLastDeployment: {
       type: Boolean,
       default: true,
+      required: false,
     },
 
     environment: {

app/assets/javascripts/environments/components/stop_environment_modal.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlTooltipDirective } from '@gitlab/ui';
 import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
 import { s__, sprintf } from '~/locale';

app/assets/javascripts/error_tracking/utils.js

-/* eslint-disable @gitlab/i18n/no-non-i18n-strings, import/prefer-default-export */
+/* eslint-disable @gitlab/require-i18n-strings, import/prefer-default-export */
 
 /**
  * Tracks snowplow event when User clicks on error link to Sentry

app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue

@@ -24,7 +24,7 @@ export default {
       <label class="label-bold" for="error-tracking-api-host">{{ __('Sentry API URL') }}</label>
       <div class="row">
         <div class="col-8 col-md-9 gl-pr-0">
-          <!-- eslint-disable @gitlab/vue-i18n/no-bare-attribute-strings -->
+          <!-- eslint-disable @gitlab/vue-require-i18n-attribute-strings -->
           <gl-form-input
             id="error-tracking-api-host"
             :value="apiHost"
@@ -39,7 +39,7 @@ export default {
               )
             }}
           </p>
-          <!-- eslint-enable @gitlab/vue-i18n/no-bare-attribute-strings -->
+          <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings -->
         </div>
       </div>
     </div>

app/assets/javascripts/ide/components/branches/item.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import Icon from '~/vue_shared/components/icon.vue';
 import Timeago from '~/vue_shared/components/time_ago_tooltip.vue';
 import router from '../../ide_router';

app/assets/javascripts/ide/components/commit_sidebar/list_item.vue

@@ -38,7 +38,7 @@ export default {
   computed: {
     iconName() {
       // name: '-solid' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       const suffix = this.stagedList ? '-solid' : '';
 
       return `${getCommitIconMap(this.file).icon}${suffix}`;

app/assets/javascripts/ide/components/ide_status_bar.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { mapActions, mapState, mapGetters } from 'vuex';
 import IdeStatusList from 'ee_else_ce/ide/components/ide_status_list.vue';
 import IdeStatusMr from './ide_status_mr.vue';

app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue

@@ -48,7 +48,7 @@ export default {
       },
     }),
     namespace() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `${this.side}Pane`;
     },
     tabs() {

app/assets/javascripts/issuable_suggestions/components/item.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { uniqueId } from 'lodash';
 import { GlLink, GlTooltip, GlTooltipDirective } from '@gitlab/ui';
 import { __ } from '~/locale';

app/assets/javascripts/issue_show/components/edit_actions.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { __, sprintf } from '~/locale';
 import updateMixin from '../mixins/update';
 import eventHub from '../event_hub';

app/assets/javascripts/issue_show/components/edited.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
 
 export default {

app/assets/javascripts/issue_show/components/fields/description_template.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import $ from 'jquery';
 import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors';
 

app/assets/javascripts/jobs/components/commit_block.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLink } from '@gitlab/ui';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 

app/assets/javascripts/lib/utils/autosave.js

@@ -29,5 +29,5 @@ export const updateDraft = (autosaveKey, text) => {
 };
 
 export const getDiscussionReplyKey = (noteableType, discussionId) =>
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   ['Note', capitalizeFirstCharacter(noteableType), discussionId, 'Reply'].join('/');

app/assets/javascripts/lib/utils/datetime_range.js

@@ -10,7 +10,7 @@ const durationToMillis = duration => {
   if (Object.entries(duration).length === 1 && Number.isFinite(duration.seconds)) {
     return secondsToMilliseconds(duration.seconds);
   }
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   throw new Error('Invalid duration: only `seconds` is supported');
 };
 
@@ -131,7 +131,7 @@ const convertOpenToFixed = ({ anchor, direction }) => {
  * Handles invalid date ranges
  */
 const handleInvalidRange = () => {
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   throw new Error('The input range does not have the right format.');
 };
 

app/assets/javascripts/lib/utils/notify.js

@@ -13,7 +13,7 @@ function notificationGranted(message, opts, onclick) {
 }
 
 function notifyPermissions() {
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   if ('Notification' in window) {
     return Notification.requestPermission();
   }
@@ -25,7 +25,7 @@ function notifyMe(message, body, icon, onclick) {
     icon,
   };
   // Let's check if the browser supports notifications
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   if (!('Notification' in window)) {
     // do nothing
   } else if (Notification.permission === 'granted') {

app/assets/javascripts/lib/utils/unit_format/formatter_factory.js

@@ -111,7 +111,7 @@ export const scaledSIFormatter = (unit = '', prefixOffset = 0) => {
   });
 
   if (!units.length) {
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     throw new RangeError('The unit cannot be converted, please try a different scale');
   }
 
@@ -122,7 +122,7 @@ export const scaledSIFormatter = (unit = '', prefixOffset = 0) => {
  * Returns a function that formats a number scaled using SI units notation.
  */
 export const scaledBinaryFormatter = (unit = '', prefixOffset = 0) => {
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   const multiplicative = ['Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'];
   const symbols = ['', ...multiplicative];
 
@@ -131,7 +131,7 @@ export const scaledBinaryFormatter = (unit = '', prefixOffset = 0) => {
   });
 
   if (!units.length) {
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     throw new RangeError('The unit cannot be converted, please try a different scale');
   }
 

app/assets/javascripts/main.js

@@ -49,7 +49,7 @@ window.$ = jQuery;
 // Add nonce to jQuery script handler
 jQuery.ajaxSetup({
   converters: {
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings, func-names
+    // eslint-disable-next-line @gitlab/require-i18n-strings, func-names
     'text script': function(text) {
       jQuery.globalEval(text, { nonce: getCspNonceValue() });
       return text;

app/assets/javascripts/monitoring/components/charts/stacked_column.vue

@@ -68,7 +68,7 @@ export default {
           }
         })
         .catch(e => {
-          // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line no-console, @gitlab/require-i18n-strings
           console.error('SVG could not be rendered correctly: ', e);
         });
     },

app/assets/javascripts/monitoring/components/charts/time_series.vue

@@ -327,7 +327,7 @@ export default {
           }
         })
         .catch(e => {
-          // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line no-console, @gitlab/require-i18n-strings
           console.error('SVG could not be rendered correctly: ', e);
         });
     },

app/assets/javascripts/monitoring/components/panel_type.vue

@@ -95,7 +95,7 @@ export default {
     csvText() {
       const chartData = this.graphData.metrics[0].result[0].values;
       const yLabel = this.graphData.y_label;
-      const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/require-i18n-strings
       return chartData.reduce((csv, data) => {
         const row = data.join(',');
         return `${csv}${row}\r\n`;

app/assets/javascripts/monitoring/utils.js

@@ -28,7 +28,7 @@ export const graphDataValidatorForValues = (isValues, graphData) => {
   );
 };
 
-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 /**
  * Checks that element that triggered event is located on cluster health check dashboard
  * @param {HTMLElement}  element to check against

app/assets/javascripts/mr_popover/components/mr_popover.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlPopover, GlSkeletonLoading } from '@gitlab/ui';
 import CiIcon from '../../vue_shared/components/ci_icon.vue';
 import timeagoMixin from '../../vue_shared/mixins/timeago';
@@ -8,7 +8,7 @@ import { mrStates, humanMRStates } from '../constants';
 
 export default {
   // name: 'MRPopover' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
-  name: 'MRPopover', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+  name: 'MRPopover', // eslint-disable-line @gitlab/require-i18n-strings
   components: {
     GlPopover,
     GlSkeletonLoading,
@@ -102,11 +102,11 @@ export default {
         <ci-icon v-if="detailedStatus" :status="detailedStatus" />
       </div>
       <h5 class="my-2">{{ mergeRequestTitle }}</h5>
-      <!-- eslint-disable @gitlab/vue-i18n/no-bare-strings -->
+      <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
       <div class="text-secondary">
         {{ `${projectPath}!${mergeRequestIID}` }}
       </div>
-      <!-- eslint-enable @gitlab/vue-i18n/no-bare-strings -->
+      <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
     </div>
   </gl-popover>
 </template>

app/assets/javascripts/new_branch_form.js

-/* eslint-disable func-names, consistent-return, no-return-assign, no-else-return, @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable func-names, consistent-return, no-return-assign, no-else-return, @gitlab/require-i18n-strings */
 
 import $ from 'jquery';
 import RefSelectDropdown from './ref_select_dropdown';

app/assets/javascripts/notebook/cells/code/index.vue

@@ -29,6 +29,7 @@ export default {
     metadata: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   computed: {

app/assets/javascripts/notebook/cells/markdown.vue

@@ -43,7 +43,7 @@ renderer.paragraph = t => {
   if (typeof katex !== 'undefined') {
     const katexString = text
       .replace(/&/g, '&')
-      .replace(/&=&/g, '\\space=\\space') // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      .replace(/&=&/g, '\\space=\\space') // eslint-disable-line @gitlab/require-i18n-strings
       .replace(/<(\/?)em>/g, '_');
     const regex = new RegExp(katexRegexString, 'gi');
     const matchLocation = katexString.search(regex);

app/assets/javascripts/notebook/cells/output/image.vue

@@ -25,7 +25,7 @@ export default {
   },
   computed: {
     imgSrc() {
-      return `data:${this.outputType};base64,${this.rawCode}`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      return `data:${this.outputType};base64,${this.rawCode}`; // eslint-disable-line @gitlab/require-i18n-strings
     },
     showOutput() {
       return this.index === 0;

app/assets/javascripts/notebook/cells/output/index.vue

@@ -22,6 +22,7 @@ export default {
     metadata: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   methods: {

app/assets/javascripts/notebook/index.vue

@@ -39,7 +39,7 @@ export default {
   },
   methods: {
     cellType(type) {
-      return `${type}-cell`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      return `${type}-cell`; // eslint-disable-line @gitlab/require-i18n-strings
     },
   },
 };

app/assets/javascripts/notes/components/diff_with_note.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { mapState, mapActions } from 'vuex';
 import { GlSkeletonLoading } from '@gitlab/ui';
 import DiffFileHeader from '~/diffs/components/diff_file_header.vue';

app/assets/javascripts/notes/components/note_edited_text.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
 
 export default {

app/assets/javascripts/operation_settings/components/external_dashboard.vue

@@ -54,14 +54,14 @@ export default {
           :description="s__('ExternalMetrics|Enter the URL of the dashboard you want to link to')"
         >
           <!-- placeholder with a url is a false positive  -->
-          <!-- eslint-disable @gitlab/vue-i18n/no-bare-attribute-strings -->
+          <!-- eslint-disable @gitlab/vue-require-i18n-attribute-strings -->
           <gl-form-input
             id="full-dashboard-url"
             v-model="userDashboardUrl"
             placeholder="https://my-org.gitlab.io/my-dashboards"
             @keydown.enter.native.prevent="updateExternalDashboardUrl"
           />
-          <!-- eslint-enable @gitlab/vue-i18n/no-bare-attribute-strings -->
+          <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings -->
         </gl-form-group>
         <gl-button variant="success" @click="updateExternalDashboardUrl">
           {{ __('Save Changes') }}

app/assets/javascripts/pages/admin/users/index.js

@@ -19,7 +19,7 @@ function loadModalsConfigurationFromHtml(modalsElement) {
   const modalsConfiguration = {};
 
   if (!modalsElement) {
-    /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+    /* eslint-disable-next-line @gitlab/require-i18n-strings */
     throw new Error('Modals content element not found!');
   }
 

app/assets/javascripts/performance_bar/index.js

-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 import Vue from 'vue';
 import axios from '~/lib/utils/axios_utils';
 

app/assets/javascripts/pipelines/components/pipelines_artifacts.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLink, GlTooltipDirective } from '@gitlab/ui';
 import Icon from '~/vue_shared/components/icon.vue';
 

app/assets/javascripts/registry/explorer/components/project_empty_state.vue

@@ -14,15 +14,15 @@ export default {
   computed: {
     ...mapState(['config']),
     dockerBuildCommand() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `docker build -t ${this.config.repositoryUrl} .`;
     },
     dockerPushCommand() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `docker push ${this.config.repositoryUrl}`;
     },
     dockerLoginCommand() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `docker login ${this.config.registryHostUrlWithPort}`;
     },
   },

app/assets/javascripts/registry/list/components/project_empty_state.vue

@@ -37,15 +37,15 @@ export default {
   },
   computed: {
     dockerBuildCommand() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `docker build -t ${this.repositoryUrl} .`;
     },
     dockerPushCommand() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `docker push ${this.repositoryUrl}`;
     },
     dockerLoginCommand() {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `docker login ${this.registryHostUrlWithPort}`;
     },
     noContainerImagesText() {

app/assets/javascripts/reports/components/report_link.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 export default {
   name: 'ReportIssueLink',
   props: {

app/assets/javascripts/repository/components/table/row.vue

@@ -151,7 +151,7 @@ export default {
       >
         {{ fullPath }}
       </component>
-      <!-- eslint-disable-next-line @gitlab/vue-i18n/no-bare-strings -->
+      <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
       <gl-badge v-if="lfsOid" variant="default" class="label-lfs ml-1">LFS</gl-badge>
       <template v-if="isSubmodule">
         @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link>

app/assets/javascripts/repository/graphql.js

@@ -39,7 +39,7 @@ const defaultClient = createDefaultClient(
     cacheConfig: {
       fragmentMatcher,
       dataIdFromObject: obj => {
-        /* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-disable @gitlab/require-i18n-strings */
         // eslint-disable-next-line no-underscore-dangle
         switch (obj.__typename) {
           // We need to create a dynamic ID for each entry
@@ -55,7 +55,7 @@ const defaultClient = createDefaultClient(
             // eslint-disable-next-line no-underscore-dangle
             return obj.id || obj._id;
         }
-        /* eslint-enable @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-enable @gitlab/require-i18n-strings */
       },
     },
   },

app/assets/javascripts/repository/utils/title.js

@@ -9,7 +9,7 @@ export const setTitle = (pathMatch, ref, project) => {
   const path = pathMatch.replace(/^\//, '');
   const isEmpty = path === '';
 
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   document.title = `${isEmpty ? 'Files' : path} · ${ref} · ${project} ${DEFAULT_TITLE}`;
 };
 

app/assets/javascripts/search_autocomplete.js

@@ -420,11 +420,11 @@ export class SearchAutocomplete {
   onClick(item, $el, e) {
     if (window.location.pathname.indexOf(item.url) !== -1) {
       if (!e.metaKey) e.preventDefault();
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable-next-line @gitlab/require-i18n-strings */
       if (item.category === 'Projects') {
         this.projectInputEl.val(item.id);
       }
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       if (item.category === 'Groups') {
         this.groupInputEl.val(item.id);
       }

app/assets/javascripts/sidebar/components/assignees/assignees.vue

@@ -4,7 +4,7 @@ import UncollapsedAssigneeList from '../assignees/uncollapsed_assignee_list.vue'
 
 export default {
   // name: 'Assignees' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Assignees',
   components: {
     CollapsedAssigneeList,

app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue

@@ -40,6 +40,7 @@ export default {
     limitToHours: {
       type: Boolean,
       default: false,
+      required: false,
     },
     rootPath: {
       type: String,

app/assets/javascripts/tracking.js

@@ -54,7 +54,7 @@ export default class Tracking {
 
   static event(category = document.body.dataset.page, action = 'generic', data = {}) {
     if (!this.enabled()) return false;
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     if (!category) throw new Error('Tracking: no category provided for tracking.');
 
     const { label, property, value, context } = data;

app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue

@@ -5,7 +5,7 @@ import { MANUAL_DEPLOY, WILL_DEPLOY, CREATED } from './constants';
 
 export default {
   // name: 'Deployment' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Deployment',
   components: {
     DeploymentActions,

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLoadingIcon } from '@gitlab/ui';
 import Flash from '~/flash';
 import tooltip from '~/vue_shared/directives/tooltip';
@@ -86,7 +86,7 @@ export default {
         .then(res => res.data)
         .then(data => {
           // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-          // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line @gitlab/require-i18n-strings
           if (data.message === 'Branch was deleted') {
             eventHub.$emit('MRWidgetUpdateRequested', () => {
               this.isMakingRequest = false;

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue

@@ -42,7 +42,7 @@ import { setFaviconOverlay } from '../lib/utils/common_utils';
 export default {
   el: '#js-vue-mr-widget',
   // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'MRWidget',
   components: {
     Loading,

app/assets/javascripts/vue_shared/components/changed_file_icon.vue

@@ -40,7 +40,7 @@ export default {
   computed: {
     changedIcon() {
       // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       const suffix = this.file.staged && this.showStagedIcon ? '-solid' : '';
 
       return `${getCommitIconMap(this.file).icon}${suffix}`;

app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue

@@ -8,6 +8,7 @@ export default {
     content: {
       type: String,
       default: '',
+      required: false,
     },
     path: {
       type: String,

app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue

@@ -16,6 +16,7 @@ export default {
     renderInfo: {
       type: Boolean,
       default: true,
+      required: false,
     },
     innerCssClasses: {
       type: [Array, Object, String],

app/assets/javascripts/vue_shared/components/markdown/header.vue

@@ -39,10 +39,10 @@ export default {
     mdTable() {
       return [
         // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-        '| header | header |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+        '| header | header |', // eslint-disable-line @gitlab/require-i18n-strings
         '| ------ | ------ |',
-        '| cell | cell |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
-        '| cell | cell |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+        '| cell | cell |', // eslint-disable-line @gitlab/require-i18n-strings
+        '| cell | cell |', // eslint-disable-line @gitlab/require-i18n-strings
       ].join('\n');
     },
     mdSuggestion() {

app/assets/javascripts/vue_shared/components/markdown/toolbar.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLink, GlLoadingIcon } from '@gitlab/ui';
 
 export default {

app/assets/javascripts/vue_shared/components/project_avatar/default.vue

@@ -15,6 +15,7 @@ export default {
     size: {
       type: Number,
       default: 40,
+      required: false,
     },
   },
   computed: {

app/assets/javascripts/vue_shared/components/select2_select.vue

@@ -4,7 +4,7 @@ import 'select2';
 
 export default {
   // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Select2Select',
   props: {
     options: {

app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue

@@ -77,12 +77,12 @@ export default {
     },
     enableScopedLabels: {
       type: Boolean,
-      require: false,
+      required: false,
       default: false,
     },
     scopedLabelsDocumentationLink: {
       type: String,
-      require: false,
+      required: false,
       default: '#',
     },
   },

app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue

@@ -33,12 +33,12 @@ export default {
     },
     enableScopedLabels: {
       type: Boolean,
-      require: false,
+      required: false,
       default: false,
     },
     scopedLabelsDocumentationLink: {
       type: String,
-      require: false,
+      required: false,
       default: '#',
     },
   },

app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js

@@ -45,7 +45,7 @@ export const createLabel = ({ state, dispatch }, label) => {
         dispatch('receiveCreateLabelSuccess');
         dispatch('toggleDropdownContentsCreateView');
       } else {
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         throw new Error('Error Creating Label');
       }
     })

app/assets/javascripts/vue_shared/components/smart_virtual_list.vue

@@ -8,9 +8,9 @@ export default {
     size: { type: Number, required: true },
     length: { type: Number, required: true },
     remain: { type: Number, required: true },
-    rtag: { type: String, default: 'div' },
-    wtag: { type: String, default: 'div' },
-    wclass: { type: String, default: null },
+    rtag: { type: String, default: 'div', required: false },
+    wtag: { type: String, default: 'div', required: false },
+    wclass: { type: String, default: null, required: false },
   },
 };
 </script>

app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue

@@ -83,7 +83,7 @@ export default {
     },
     barStyle(percent) {
       // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `width: ${percent}%;`;
     },
     getTooltip(label, count) {

ee/app/assets/javascripts/add_gitlab_slack_application/components/add_gitlab_slack_application.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { __ } from '~/locale';
 import Flash from '~/flash';
 import { redirectTo } from '~/lib/utils/url_utility';

ee/app/assets/javascripts/analytics/contribution_analytics/components/column_chart.vue

@@ -55,7 +55,7 @@ export default {
           }
         })
         .catch(e => {
-          // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line no-console, @gitlab/require-i18n-strings
           console.error('SVG could not be rendered correctly: ', e);
         });
     },

ee/app/assets/javascripts/analytics/productivity_analytics/components/filter_dropdowns.vue

@@ -24,6 +24,7 @@ export default {
     hideGroupDropDown: {
       type: Boolean,
       default: false,
+      required: false,
     },
   },
   data() {

ee/app/assets/javascripts/analytics/shared/components/daterange.vue

@@ -31,7 +31,7 @@ export default {
     },
     minDate: {
       type: Date,
-      rerquired: false,
+      required: false,
       default: null,
     },
     maxDate: {

ee/app/assets/javascripts/approvals/components/app.vue

@@ -15,6 +15,7 @@ export default {
     isMrEdit: {
       type: Boolean,
       default: true,
+      required: false,
     },
   },
   computed: {

ee/app/assets/javascripts/approvals/components/modal_rule_create.vue

@@ -17,6 +17,7 @@ export default {
     isMrEdit: {
       type: Boolean,
       default: true,
+      required: false,
     },
   },
   computed: {

ee/app/assets/javascripts/approvals/components/mr_edit/empty_rule.vue

@@ -31,6 +31,7 @@ export default {
     isMrEdit: {
       type: Boolean,
       default: true,
+      required: false,
     },
     canEdit: {
       type: Boolean,

ee/app/assets/javascripts/approvals/components/rule_form.vue

@@ -28,6 +28,7 @@ export default {
     isMrEdit: {
       type: Boolean,
       default: true,
+      required: false,
     },
   },
   data() {

ee/app/assets/javascripts/batch_comments/components/preview_item.vue

@@ -45,7 +45,7 @@ export default {
     },
     linePosition() {
       if (this.draft.position && this.draft.position.position_type === IMAGE_DIFF_POSITION_TYPE) {
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         return `${this.draft.position.x}x ${this.draft.position.y}y`;
       }
 

ee/app/assets/javascripts/boards/components/milestone_select.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLoadingIcon } from '@gitlab/ui';
 import MilestoneSelect from '~/milestone_select';
 

ee/app/assets/javascripts/boards/mixins/issue_card_inner.js

@@ -15,7 +15,7 @@ export default {
       if (!this.updateFilters) return;
 
       const issueWeight = encodeURIComponent(weight);
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable-next-line @gitlab/require-i18n-strings */
       const filter = `weight=${issueWeight}`;
 
       this.applyFilter(filter);

ee/app/assets/javascripts/boards/stores/actions.js

@@ -4,7 +4,7 @@ import boardsStoreEE from './boards_store_ee';
 import * as types from './mutation_types';
 
 const notImplemented = () => {
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   throw new Error('Not implemented!');
 };
 

ee/app/assets/javascripts/boards/stores/boards_store_ee.js

@@ -96,7 +96,7 @@ class BoardsStoreEE {
 
     let { milestoneTitle } = this.store.boardConfig;
     if (this.store.boardConfig.milestoneId === 0) {
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable-next-line @gitlab/require-i18n-strings */
       milestoneTitle = 'No+Milestone';
     } else {
       milestoneTitle = encodeURIComponent(milestoneTitle);
@@ -109,7 +109,7 @@ class BoardsStoreEE {
     let { weight } = this.store.boardConfig;
     if (weight !== -1) {
       if (weight === 0) {
-        /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-disable-next-line @gitlab/require-i18n-strings */
         weight = 'No+Weight';
       }
       updateFilterPath('weight', weight);

ee/app/assets/javascripts/boards/stores/mutations.js

 import * as mutationTypes from './mutation_types';
 
 const notImplemented = () => {
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   throw new Error('Not implemented!');
 };
 

ee/app/assets/javascripts/design_management/graphql.js

@@ -13,7 +13,7 @@ const defaultClient = createDefaultClient(
   {
     cacheConfig: {
       dataIdFromObject: object => {
-        // eslint-disable-next-line no-underscore-dangle, @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line no-underscore-dangle, @gitlab/require-i18n-strings
         if (object.__typename === 'Design') {
           return object.id && object.image ? `${object.id}-${object.image}` : _.uniqueId();
         }

ee/app/assets/javascripts/design_management/utils/cache_update.js

@@ -73,7 +73,7 @@ const addDiscussionCommentToStore = (store, createNote, query, queryVariables, d
       {
         __typename: 'UserEdge',
         node: {
-          // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line @gitlab/require-i18n-strings
           __typename: 'User',
           ...createNote.note.author,
         },
@@ -101,7 +101,7 @@ const addImageDiffNoteToStore = (store, createImageDiffNote, query, variables) =
     __typename: 'DiscussionEdge',
     node: {
       // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       __typename: 'Discussion',
       id: createImageDiffNote.note.discussion.id,
       replyId: createImageDiffNote.note.discussion.replyId,
@@ -129,7 +129,7 @@ const addImageDiffNoteToStore = (store, createImageDiffNote, query, variables) =
       {
         __typename: 'UserEdge',
         node: {
-          // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line @gitlab/require-i18n-strings
           __typename: 'User',
           ...createImageDiffNote.note.author,
         },

ee/app/assets/javascripts/design_management/utils/design_management_utils.js

@@ -49,7 +49,7 @@ export const extractDesign = data => data.project.issue.designCollection.designs
 export const designUploadOptimisticResponse = files => {
   const designs = files.map(file => ({
     // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     __typename: 'Design',
     id: -uniqueId(),
     image: '',
@@ -82,7 +82,7 @@ export const designUploadOptimisticResponse = files => {
 
   return {
     // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     __typename: 'Mutation',
     designManagementUpload: {
       __typename: 'DesignManagementUploadPayload',
@@ -99,7 +99,7 @@ export const designUploadOptimisticResponse = files => {
  */
 export const updateImageDiffNoteOptimisticResponse = (note, { position }) => ({
   // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   __typename: 'Mutation',
   updateImageDiffNote: {
     __typename: 'UpdateImageDiffNotePayload',

ee/app/assets/javascripts/environments/components/deploy_board_component.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 /**
  * Renders a deploy board.
  *

ee/app/assets/javascripts/epic/components/epic_header.vue

@@ -43,7 +43,7 @@ export default {
     actionButtonClass() {
       // False positive css classes
       // https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/24
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `btn btn-grouped js-btn-epic-action qa-close-reopen-epic-button ${
         this.isEpicOpen ? 'btn-close' : 'btn-open'
       }`;

ee/app/assets/javascripts/epic/store/actions.js

@@ -182,7 +182,7 @@ export const saveDate = ({ state, dispatch }, { dateType, dateTypeIsFixed, newDa
           newDate,
         });
       } else {
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         throw new Error('An error occurred while saving the date');
       }
     })
@@ -226,7 +226,7 @@ export const updateEpicLabels = ({ dispatch, state }, labels) => {
       if (!data?.updateEpic?.errors.length) {
         dispatch('receiveEpicLabelsSelectSuccess', labels);
       } else {
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         throw new Error('An error occurred while updating labels');
       }
     })
@@ -269,7 +269,7 @@ export const toggleEpicSubscription = ({ state, dispatch }) => {
           subscribed: !state.subscribed,
         });
       } else {
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         throw new Error('An error occurred while toggling to notifications.');
       }
     })

ee/app/assets/javascripts/feature_flags/components/environments_dropdown.vue

@@ -56,6 +56,7 @@ export default {
     disabled: {
       type: Boolean,
       default: false,
+      required: false,
     },
   },
   data() {

ee/app/assets/javascripts/ide/components/ide.vue

@@ -4,7 +4,7 @@ import EERightPane from './panes/right.vue';
 
 export default {
   // name: 'EEIde' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'EEIde',
   components: {
     Ide,

ee/app/assets/javascripts/ide/lib/create_file_diff.js

-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 import { createTwoFilesPatch } from 'diff';
 import { commitActionTypes } from '~/ide/constants';
 

ee/app/assets/javascripts/insights/components/insights_chart.vue

@@ -101,7 +101,7 @@ export default {
           }
         })
         .catch(e => {
-          // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line no-console, @gitlab/require-i18n-strings
           console.error('SVG could not be rendered correctly: ', e);
         });
     },

ee/app/assets/javascripts/licenses/components/cells/cell.vue

@@ -3,7 +3,7 @@ import _ from 'underscore';
 
 export default {
   // name: 'Cell' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Cell',
   props: {
     title: {

ee/app/assets/javascripts/onboarding/tour_parts.js

@@ -191,7 +191,7 @@ const GUIDED_GITLAB_TOUR = [
           {
             text: s__('UserOnboardingTour|Ok, show me'),
             btnClass: 'btn-primary',
-            // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+            // eslint-disable-next-line @gitlab/require-i18n-strings
             redirectPath: `issues?${LABEL_SEARCH_QUERY}`,
           },
         ],

ee/app/assets/javascripts/packages/details/store/getters.js

@@ -25,12 +25,12 @@ export const packageTypeDisplay = ({ packageEntity }) => {
 export const conanInstallationCommand = ({ packageEntity }) => {
   const recipe = generateConanRecipe(packageEntity);
 
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   return `conan install ${recipe} --remote=gitlab`;
 };
 
 export const conanSetupCommand = ({ conanPath }) =>
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   `conan remote add gitlab ${conanPath}`;
 
 export const mavenInstallationXml = ({ packageEntity = {} }) => {
@@ -77,7 +77,7 @@ export const mavenSetupXml = ({ mavenPath }) => `<repositories>
 </distributionManagement>`;
 
 export const npmInstallationCommand = ({ packageEntity }) => (type = NpmManager.NPM) => {
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   const instruction = type === NpmManager.NPM ? 'npm i' : 'yarn add';
 
   return `${instruction} ${packageEntity.name}`;

ee/app/assets/javascripts/packages/shared/utils.js

 import { TrackingCategories } from './constants';
 
 export const packageTypeToTrackCategory = type =>
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   `UI::${TrackingCategories[type]}`;
 
 export const beautifyPath = path => (path ? path.split('/').join(' / ') : '');

ee/app/assets/javascripts/pages/trial_registrations/new/username_suggester.js

@@ -19,13 +19,13 @@ export default class UsernameSuggester {
     this.usernameElement = document.getElementById(targetElement);
 
     if (!this.usernameElement) {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       throw new Error('The target element is missing.');
     }
 
     this.apiPath = this.usernameElement.dataset.apiPath;
     if (!this.apiPath) {
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       throw new Error('The API path was not specified.');
     }
 

ee/app/assets/javascripts/related_items_tree/constants.js

 import { s__ } from '~/locale';
 
 export const ChildType = {
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   Epic: 'Epic',
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   Issue: 'Issue',
 };
 

ee/app/assets/javascripts/related_items_tree/store/actions.js

@@ -334,7 +334,7 @@ export const addItem = ({ state, dispatch, getters }) => {
         dispatch('receiveAddItemFailure', { itemAddFailureType: itemAddFailureTypesMap.NOT_FOUND });
       }
       // Ignore 409 conflict when the issue or epic is already attached to epic
-      /* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable @gitlab/require-i18n-strings */
       else if (
         response.status === httpStatusCodes.CONFLICT &&
         response.data.message === 'Epic hierarchy level too deep'

ee/app/assets/javascripts/roadmap/mixins/common_mixin.js

@@ -105,17 +105,17 @@ export default {
       if (this.hasStartDate) {
         if (this.presetTypeQuarters) {
           // CSS properties are a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/24
-          // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line @gitlab/require-i18n-strings
           barStyles = `width: ${this.getTimelineBarWidthForQuarters(
             roadmapItem,
           )}px; ${this.getTimelineBarStartOffsetForQuarters(roadmapItem)}`;
         } else if (this.presetTypeMonths) {
-          // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line @gitlab/require-i18n-strings
           barStyles = `width: ${this.getTimelineBarWidthForMonths()}px; ${this.getTimelineBarStartOffsetForMonths(
             roadmapItem,
           )}`;
         } else if (this.presetTypeWeeks) {
-          // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line @gitlab/require-i18n-strings
           barStyles = `width: ${this.getTimelineBarWidthForWeeks()}px; ${this.getTimelineBarStartOffsetForWeeks(
             roadmapItem,
           )}`;

ee/app/assets/javascripts/roadmap/mixins/months_preset_mixin.js

@@ -56,13 +56,13 @@ export default {
       } else if (startDate === 1) {
         // If Epic startDate is first day of the month
         // Set offset to 0.
-        /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-disable-next-line @gitlab/require-i18n-strings */
         return 'left: 0;';
       }
 
       // Calculate proportional offset based on startDate and total days in
       // current month.
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable-next-line @gitlab/require-i18n-strings */
       return `left: ${(startDate / daysInMonth) * 100}%;`;
     },
     /**

ee/app/assets/javascripts/roadmap/mixins/quarters_preset_mixin.js

@@ -55,11 +55,11 @@ export default {
       ) {
         return '';
       } else if (startDay === 1) {
-        /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-disable-next-line @gitlab/require-i18n-strings */
         return 'left: 0;';
       }
 
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable-next-line @gitlab/require-i18n-strings */
       return `left: ${(startDay / daysInQuarter) * 100}%;`;
     },
     /**

ee/app/assets/javascripts/roadmap/mixins/weeks_preset_mixin.js

@@ -65,11 +65,11 @@ export default {
       ) {
         return '';
       } else if (startDate === firstDayOfWeek) {
-        /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-disable-next-line @gitlab/require-i18n-strings */
         return 'left: 0;';
       }
 
-      /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+      /* eslint-disable-next-line @gitlab/require-i18n-strings */
       return `left: ${startDate * dayWidth - dayWidth / 2}px;`;
     },
     /**

ee/app/assets/javascripts/status_page_settings/components/settings_form.vue

@@ -74,7 +74,7 @@ export default {
     </div>
 
     <div class="settings-content">
-      <!-- eslint-disable @gitlab/vue-i18n/no-bare-attribute-strings -->
+      <!-- eslint-disable @gitlab/vue-require-i18n-attribute-strings -->
       <p>
         <gl-sprintf :message="$options.i18n.introText">
           <template #docsLink>

ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue

@@ -66,7 +66,7 @@ export default {
       return {
         variant: 'info',
         // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         rel: 'noopener noreferrer',
         class: 'discover-button justify-content-center',
         'data-track-event': 'click_button',

ee/app/assets/javascripts/vue_shared/license_management/constants.js

-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 
 /*
  * Endpoint still returns 'approved' & 'blacklisted'

package.json

@@ -146,7 +146,7 @@
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-    "@gitlab/eslint-config": "^3.0.0",
+    "@gitlab/eslint-plugin": "^2.0.0",
     "@vue/test-utils": "^1.0.0-beta.30",
     "axios-mock-adapter": "^1.15.0",
     "babel-jest": "^24.1.0",
@@ -215,4 +215,4 @@
     "node": ">=10.13.0",
     "yarn": "^1.10.0"
   }
-}
\ No newline at end of file
+}

yarn.lock

@@ -766,13 +766,11 @@
   resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz#5f6bfe6baaef360daa9b038fa78798d7a6a916b4"
   integrity sha512-282Dn3SPVsUHVDhMsXgfnv+Rzog0uxecjttxGRQvxh25es1+xvkGQFsvJfkSKJ3X1kHVkSjKf+Tt5Rra+Jhp9g==
 
-"@gitlab/eslint-config@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-3.0.0.tgz#9a93662ffefb7792d5d0d96d876c316f2c393315"
-  integrity sha512-wlMpcl4q4hTnvmdPB9yuD+ZIi39P2ZCSfp3LQYSvbSXCF3POfyjRRe4tK7cerKrawjmJmII8YvNnIg2Ip9eKnQ==
+"@gitlab/eslint-plugin@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-2.0.0.tgz#4eedd16cf95cf82dc359c1b220d4f5a08361df9c"
+  integrity sha512-ctmsGnCuokhfh/5goLdz3NdBIUpwTMkx/17QxxutxkWW7yOGMPIY8Na+WhjnUSdst8Wjwzexc+snbh5NMs8H/A==
   dependencies:
-    "@gitlab/eslint-plugin-i18n" "^1.1.0"
-    "@gitlab/eslint-plugin-vue-i18n" "^2.0.0"
     babel-eslint "^10.0.3"
     eslint-config-airbnb-base "^14.0.0"
     eslint-config-prettier "^6.10.0"
@@ -780,20 +778,7 @@
     eslint-plugin-filenames "^1.3.2"
     eslint-plugin-import "^2.20.1"
     eslint-plugin-promise "^4.2.1"
-    eslint-plugin-vue "^6.0.1"
-
-"@gitlab/eslint-plugin-i18n@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin-i18n/-/eslint-plugin-i18n-1.1.0.tgz#e494d599e644ce3a094ea85f87dbbda41a924c5e"
-  integrity sha512-Cwm7sLtQnUDqvxE9Ez8UMslyosPCpMVLxBnFb+2n6QcBZmXRao4aNSVRkmlsDZYgYegWhOGn3Qq3MLy4BSqauQ==
-  dependencies:
-    requireindex "~1.1.0"
-
-"@gitlab/eslint-plugin-vue-i18n@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-2.0.0.tgz#5a01912d9d5a7524539d678f09cac6fa57d6d838"
-  integrity sha512-z72ysu5AgjL/oWPckvNrMWUnkcFJhtZT0oqeSgN97NyktrvYMMpAOjSSeu2Nv+HLTD5vk9w/fG3zskp/qgT+lw==
-  dependencies:
+    eslint-plugin-vue "^6.2.1"
     vue-eslint-parser "^7.0.0"
 
 "@gitlab/svgs@^1.113.0":
@@ -4408,11 +4393,12 @@ 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.0.1:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz#4b05c28c83c0ec912669b64dbd998bb8bf692ef6"
-  integrity sha512-M75oAB+2a/LNkLKRbeEaS07EjzjIUaV7/hYoHAfRFeeF8ZMmCbahUn8nQLsLP85mkar24+zDU3QW2iT1JRsACw==
+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==
   dependencies:
+    natural-compare "^1.4.0"
     semver "^5.6.0"
     vue-eslint-parser "^7.0.0"
 
@@ -9872,11 +9858,6 @@ require-package-name@^2.0.1:
   resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
   integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=
 
-requireindex@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
-  integrity sha1-5UBLgVV+91225JxacgBIk/4D4WI=
-
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"