Commit c0290a26 authored by Scott Hampton's avatar Scott Hampton

Merge branch '357001-use-deprecated-skeleton-import-name-only' into 'master'

Disallow import of non-deprecated name

See merge request gitlab-org/gitlab!83982
parents b4120f95 ba7de88d
......@@ -93,6 +93,10 @@ rules:
group: internal
alphabetize:
order: ignore
'no-restricted-syntax':
- error
- selector: ImportSpecifier[imported.name='GlSkeletonLoading']
message: 'Migrate to GlSkeletonLoader, or import GlDeprecatedSkeletonLoading.'
overrides:
- files:
- '{,ee/,jh/}spec/frontend*/**/*'
......@@ -107,6 +111,8 @@ overrides:
message: 'Using $nextTick from a component instance is discouraged. Import nextTick directly from the Vue package.'
- selector: Identifier[name='setImmediate']
message: 'Prefer explicit waitForPromises (or equivalent), or jest.runAllTimers (or equivalent) to vague setImmediate calls.'
- selector: ImportSpecifier[imported.name='GlSkeletonLoading']
message: 'Migrate to GlSkeletonLoader, or import GlDeprecatedSkeletonLoading.'
- files:
- 'config/**/*'
- 'scripts/**/*'
......
<script>
import { GlSkeletonLoading } from '@gitlab/ui';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import { createAlert } from '~/flash';
import runnerJobsQuery from '../graphql/details/runner_jobs.query.graphql';
import { I18N_FETCH_ERROR, I18N_NO_JOBS_FOUND, RUNNER_DETAILS_JOBS_PAGE_SIZE } from '../constants';
......
<script>
import { GlSkeletonLoading } from '@gitlab/ui';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import { sprintf, formatNumber } from '~/locale';
import { createAlert } from '~/flash';
import runnerProjectsQuery from '../graphql/details/runner_projects.query.graphql';
......
<script>
import { GlAlert, GlKeysetPagination, GlSkeletonLoading, GlPagination } from '@gitlab/ui';
import {
GlAlert,
GlKeysetPagination,
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlPagination,
} from '@gitlab/ui';
import { uniqueId } from 'lodash';
import { getIdFromGraphQLId } from '~/graphql_shared/utils';
import { updateHistory, setUrlParams } from '~/lib/utils/url_utility';
......
<script>
import { GlCard, GlSkeletonLoading } from '@gitlab/ui';
import { GlCard, GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
import createFlash from '~/flash';
......
......@@ -4,7 +4,7 @@ import {
GlLink,
GlSprintf,
GlTruncate,
GlSkeletonLoading,
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlTooltipDirective,
GlTable,
} from '@gitlab/ui';
......
......@@ -8,7 +8,7 @@ import {
GlLoadingIcon,
GlTable,
GlLink,
GlSkeletonLoading,
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlSprintf,
GlTooltipDirective,
} from '@gitlab/ui';
......
import { GlCard, GlSkeletonLoading } from '@gitlab/ui';
import { GlCard, GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import Vue, { nextTick } from 'vue';
import VueApollo from 'vue-apollo';
......
import { GlSkeletonLoading, GlTable, GlTruncate, GlFormCheckbox } from '@gitlab/ui';
import {
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlTable,
GlTruncate,
GlFormCheckbox,
} from '@gitlab/ui';
import { capitalize } from 'lodash';
import { Portal } from 'portal-vue';
import { nextTick } from 'vue';
......
import { GlIntersectionObserver, GlSkeletonLoading } from '@gitlab/ui';
import {
GlIntersectionObserver,
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
} from '@gitlab/ui';
import { createLocalVue } from '@vue/test-utils';
import VueApollo from 'vue-apollo';
import { nextTick } from 'vue';
......
import { GlSkeletonLoading } from '@gitlab/ui';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import { mount } from '@vue/test-utils';
import Vue, { nextTick } from 'vue';
import Vuex from 'vuex';
......
import { GlSkeletonLoading } from '@gitlab/ui';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import Vue from 'vue';
import VueApollo from 'vue-apollo';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
......
import { GlSkeletonLoading } from '@gitlab/ui';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import Vue from 'vue';
import VueApollo from 'vue-apollo';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
......
import { GlAlert, GlKeysetPagination, GlSkeletonLoading, GlPagination } from '@gitlab/ui';
import {
GlAlert,
GlKeysetPagination,
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlPagination,
} from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils';
import VueDraggable from 'vuedraggable';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment