Skip to content

Commit

Permalink
Revert "feat(eslint): sort import rule (#6939)"
Browse files Browse the repository at this point in the history
This reverts commit c27ad46.
  • Loading branch information
ozyx authored Aug 31, 2023
1 parent c27ad46 commit 54a6c41
Show file tree
Hide file tree
Showing 303 changed files with 524 additions and 739 deletions.
4 changes: 1 addition & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
globals: {
_: 'readonly'
},
plugins: ['prettier', 'simple-import-sort'],
plugins: ['prettier'],
extends: [
'eslint:recommended',
'plugin:compat/recommended',
Expand All @@ -28,8 +28,6 @@ module.exports = {
}
},
rules: {
'simple-import-sort/imports': 'warn',
'simple-import-sort/exports': 'warn',
'vue/no-deprecated-dollar-listeners-api': 'warn',
'vue/no-deprecated-events-api': 'warn',
'vue/no-v-for-template-key': 'off',
Expand Down
2 changes: 1 addition & 1 deletion example/eventGenerator/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
import EventMetadataProvider from './EventMetadataProvider';
import EventTelemetryProvider from './EventTelemetryProvider';
import EventMetadataProvider from './EventMetadataProvider';

export default function EventGeneratorPlugin(options) {
return function install(openmct) {
Expand Down
2 changes: 1 addition & 1 deletion example/eventGenerator/pluginSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
import { createOpenMct, resetApplicationState } from '../../src/utils/testing';
import EventMessageGeneratorPlugin from './plugin.js';
import { createOpenMct, resetApplicationState } from '../../src/utils/testing';

describe('the plugin', () => {
let openmct;
Expand Down
1 change: 0 additions & 1 deletion example/exampleUser/ExampleUserProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import EventEmitter from 'EventEmitter';
import { v4 as uuid } from 'uuid';

import createExampleUser from './exampleUserCreator';

const STATUSES = [
Expand Down
2 changes: 1 addition & 1 deletion example/generator/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import GeneratorMetadataProvider from './GeneratorMetadataProvider';
import GeneratorProvider from './GeneratorProvider';
import SinewaveLimitProvider from './SinewaveLimitProvider';
import SinewaveStalenessProvider from './SinewaveStalenessProvider';
import StateGeneratorProvider from './StateGeneratorProvider';
import GeneratorMetadataProvider from './GeneratorMetadataProvider';

export default function (openmct) {
openmct.types.addType('example.state-generator', {
Expand Down
1 change: 0 additions & 1 deletion example/simpleVuePlugin/plugin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Vue from 'vue';

import HelloWorld from './HelloWorld.vue';

function SimpleVuePlugin() {
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"eslint-plugin-compat": "4.1.4",
"eslint-plugin-playwright": "0.12.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-simple-import-sort": "10.0.0",
"eslint-plugin-vue": "9.15.0",
"eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
"eventemitter3": "1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/api/actions/ActionCollectionSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import { createOpenMct, resetApplicationState } from '../../utils/testing';
import ActionCollection from './ActionCollection';
import { createOpenMct, resetApplicationState } from '../../utils/testing';

describe('The ActionCollection', () => {
let openmct;
Expand Down
3 changes: 1 addition & 2 deletions src/api/actions/ActionsAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
import EventEmitter from 'EventEmitter';
import _ from 'lodash';

import ActionCollection from './ActionCollection';
import _ from 'lodash';

class ActionsAPI extends EventEmitter {
constructor(openmct) {
Expand Down
2 changes: 1 addition & 1 deletion src/api/actions/ActionsAPISpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import ActionsAPI from './ActionsAPI';
import { createOpenMct, resetApplicationState } from '../../utils/testing';
import ActionCollection from './ActionCollection';
import ActionsAPI from './ActionsAPI';

describe('The Actions API', () => {
let openmct;
Expand Down
2 changes: 1 addition & 1 deletion src/api/annotation/AnnotationAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import { v4 as uuid } from 'uuid';
import EventEmitter from 'EventEmitter';
import _ from 'lodash';
import { v4 as uuid } from 'uuid';

/**
* @readonly
Expand Down
2 changes: 1 addition & 1 deletion src/api/annotation/AnnotationAPISpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import ExampleTagsPlugin from '../../../example/exampleTags/plugin';
import { createOpenMct, resetApplicationState } from '../../utils/testing';
import ExampleTagsPlugin from '../../../example/exampleTags/plugin';

describe('The Annotation API', () => {
let openmct;
Expand Down
2 changes: 1 addition & 1 deletion src/api/composition/CompositionAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import CompositionCollection from './CompositionCollection';
import DefaultCompositionProvider from './DefaultCompositionProvider';
import CompositionCollection from './CompositionCollection';

/**
* @typedef {import('./CompositionProvider').default} CompositionProvider
Expand Down
1 change: 0 additions & 1 deletion src/api/composition/CompositionProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
import _ from 'lodash';

import objectUtils from '../objects/object-utils';

/**
Expand Down
3 changes: 1 addition & 2 deletions src/api/composition/DefaultCompositionProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
import { toRaw } from 'vue';

import objectUtils from '../objects/object-utils';
import CompositionProvider from './CompositionProvider';
import { toRaw } from 'vue';

/**
* @typedef {import('../objects/ObjectAPI').DomainObject} DomainObject
Expand Down
6 changes: 3 additions & 3 deletions src/api/forms/FormController.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import mount from 'utils/mount';

import AutoCompleteField from './components/controls/AutoCompleteField.vue';
import CheckBoxField from './components/controls/CheckBoxField.vue';
import ClockDisplayFormatField from './components/controls/ClockDisplayFormatField.vue';
import CheckBoxField from './components/controls/CheckBoxField.vue';
import Datetime from './components/controls/Datetime.vue';
import FileInput from './components/controls/FileInput.vue';
import Locator from './components/controls/Locator.vue';
Expand All @@ -11,6 +9,8 @@ import SelectField from './components/controls/SelectField.vue';
import TextAreaField from './components/controls/TextAreaField.vue';
import TextField from './components/controls/TextField.vue';
import ToggleSwitchField from './components/controls/ToggleSwitchField.vue';

import mount from 'utils/mount';
export const DEFAULT_CONTROLS_MAP = {
autocomplete: AutoCompleteField,
checkbox: CheckBoxField,
Expand Down
6 changes: 3 additions & 3 deletions src/api/forms/FormsAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import FormController from './FormController';
import FormProperties from './components/FormProperties.vue';

import _ from 'lodash';
import mount from 'utils/mount';

import FormProperties from './components/FormProperties.vue';
import FormController from './FormController';

export default class FormsAPI {
constructor(openmct) {
this.openmct = openmct;
Expand Down
3 changes: 1 addition & 2 deletions src/api/forms/components/FormProperties.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@
</template>

<script>
import { v4 as uuid } from 'uuid';

import FormRow from '@/api/forms/components/FormRow.vue';
import { v4 as uuid } from 'uuid';

export default {
components: {
Expand Down
5 changes: 2 additions & 3 deletions src/api/forms/components/controls/ToggleSwitchField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@
</template>

<script>
import { v4 as uuid } from 'uuid';

import toggleMixin from '../../toggle-check-box-mixin';
import ToggleSwitch from '@/ui/components/ToggleSwitch.vue';

import toggleMixin from '../../toggle-check-box-mixin';
import { v4 as uuid } from 'uuid';

export default {
components: {
Expand Down
1 change: 0 additions & 1 deletion src/api/indicators/IndicatorAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
*****************************************************************************/

import EventEmitter from 'EventEmitter';

import SimpleIndicator from './SimpleIndicator';

class IndicatorAPI extends EventEmitter {
Expand Down
4 changes: 1 addition & 3 deletions src/api/indicators/SimpleIndicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
*****************************************************************************/

import EventEmitter from 'EventEmitter';

import { convertTemplateToHTML } from '@/utils/template/templateHelpers';

import indicatorTemplate from './res/indicator-template.html';
import { convertTemplateToHTML } from '@/utils/template/templateHelpers';

const DEFAULT_ICON_CLASS = 'icon-info';

Expand Down
7 changes: 3 additions & 4 deletions src/api/menu/MenuAPISpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import Vue from 'vue';

import { createMouseEvent, createOpenMct, resetApplicationState } from '../../utils/testing';
import Menu from './menu';
import MenuAPI from './MenuAPI';
import Menu from './menu';
import { createOpenMct, createMouseEvent, resetApplicationState } from '../../utils/testing';
import Vue from 'vue';

describe('The Menu API', () => {
let openmct;
Expand Down
5 changes: 2 additions & 3 deletions src/api/menu/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/
import EventEmitter from 'EventEmitter';
import mount from 'utils/mount';
import { h } from 'vue';

import MenuComponent from './components/Menu.vue';
import SuperMenuComponent from './components/SuperMenu.vue';
import { h } from 'vue';
import mount from 'utils/mount';

export const MENU_PLACEMENT = {
TOP: 'top',
Expand Down
2 changes: 1 addition & 1 deletion src/api/notifications/NotificationAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
*
* @namespace platform/api/notifications
*/
import EventEmitter from 'eventemitter3';
import moment from 'moment';
import EventEmitter from 'eventemitter3';

/**
* @typedef {object} NotificationProperties
Expand Down
3 changes: 1 addition & 2 deletions src/api/objects/MutableDomainObject.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
import EventEmitter from 'EventEmitter';
import _ from 'lodash';

import utils from './object-utils.js';
import EventEmitter from 'EventEmitter';

const ANY_OBJECT_EVENT = 'mutation';

Expand Down
11 changes: 5 additions & 6 deletions src/api/objects/ObjectAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import EventEmitter from 'EventEmitter';
import utils from 'objectUtils';

import ConflictError from './ConflictError';
import InMemorySearchProvider from './InMemorySearchProvider';
import InterceptorRegistry from './InterceptorRegistry';
import MutableDomainObject from './MutableDomainObject';
import RootObjectProvider from './RootObjectProvider';
import RootRegistry from './RootRegistry';
import RootObjectProvider from './RootObjectProvider';
import EventEmitter from 'EventEmitter';
import InterceptorRegistry from './InterceptorRegistry';
import Transaction from './Transaction';
import ConflictError from './ConflictError';
import InMemorySearchProvider from './InMemorySearchProvider';

/**
* Uniquely identifies a domain object.
Expand Down
2 changes: 1 addition & 1 deletion src/api/objects/ObjectAPISpec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createOpenMct, resetApplicationState } from '../../utils/testing';
import ObjectAPI from './ObjectAPI.js';
import { createOpenMct, resetApplicationState } from '../../utils/testing';

describe('The Object API', () => {
let objectAPI;
Expand Down
3 changes: 1 addition & 2 deletions src/api/objects/TransactionSpec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import utils from 'objectUtils';

import Transaction from './Transaction';
import utils from 'objectUtils';

let openmct = {};
let objectAPI;
Expand Down
3 changes: 1 addition & 2 deletions src/api/overlays/Dialog.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import mount from 'utils/mount';

import DialogComponent from './components/DialogComponent.vue';
import Overlay from './Overlay';
import mount from 'utils/mount';

class Dialog extends Overlay {
constructor({ iconClass, message, title, hint, timestamp, ...options }) {
Expand Down
3 changes: 1 addition & 2 deletions src/api/overlays/Overlay.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import OverlayComponent from './components/OverlayComponent.vue';
import EventEmitter from 'EventEmitter';
import mount from 'utils/mount';

import OverlayComponent from './components/OverlayComponent.vue';

const cssClasses = {
large: 'l-overlay-large',
small: 'l-overlay-small',
Expand Down
2 changes: 1 addition & 1 deletion src/api/overlays/OverlayAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import Dialog from './Dialog';
import Overlay from './Overlay';
import Dialog from './Dialog';
import ProgressDialog from './ProgressDialog';
import Selection from './Selection';

Expand Down
3 changes: 1 addition & 2 deletions src/api/overlays/ProgressDialog.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import mount from 'utils/mount';

import ProgressDialogComponent from './components/ProgressDialogComponent.vue';
import Overlay from './Overlay';
import mount from 'utils/mount';

let component;
class ProgressDialog extends Overlay {
Expand Down
3 changes: 1 addition & 2 deletions src/api/overlays/Selection.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import mount from 'utils/mount';

import SelectionComponent from './components/SelectionComponent.vue';
import Overlay from './Overlay';
import mount from 'utils/mount';

class Selection extends Overlay {
constructor({
Expand Down
2 changes: 1 addition & 1 deletion src/api/status/StatusAPISpec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createOpenMct, resetApplicationState } from '../../utils/testing';
import StatusAPI from './StatusAPI.js';
import { createOpenMct, resetApplicationState } from '../../utils/testing';

describe('The Status API', () => {
let statusAPI;
Expand Down
9 changes: 4 additions & 5 deletions src/api/telemetry/TelemetryAPI.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@
* at runtime from the About dialog for additional information.
*****************************************************************************/

import objectUtils from 'objectUtils';

import CustomStringFormatter from '../../plugins/displayLayout/CustomStringFormatter';
import DefaultMetadataProvider from './DefaultMetadataProvider';
import TelemetryCollection from './TelemetryCollection';
import TelemetryMetadataManager from './TelemetryMetadataManager';
import TelemetryRequestInterceptorRegistry from './TelemetryRequestInterceptor';
import CustomStringFormatter from '../../plugins/displayLayout/CustomStringFormatter';
import TelemetryMetadataManager from './TelemetryMetadataManager';
import TelemetryValueFormatter from './TelemetryValueFormatter';
import DefaultMetadataProvider from './DefaultMetadataProvider';
import objectUtils from 'objectUtils';

/**
* @typedef {import('../time/TimeContext').TimeContext} TimeContext
Expand Down
Loading

0 comments on commit 54a6c41

Please sign in to comment.