Skip to content

ESLint: Enable sort-imports rule #3075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ module.exports = {
// it's fine to use `return` without a value and rely on the implicit `undefined` return value
'getter-return': 'off',

// declaration sort is taken care of by `import-helpers/order-imports`
'sort-imports': ['error', { ignoreDeclarationSort: true, ignoreCase: true }],

'prettier/prettier': 'error',

// disabled because we still use `this.set()` in a few places and it works just fine
Expand Down
2 changes: 1 addition & 1 deletion app/adapters/category-slug.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { underscore, decamelize } from '@ember/string';
import { decamelize, underscore } from '@ember/string';

import { pluralize } from 'ember-inflector';

Expand Down
2 changes: 1 addition & 1 deletion app/components/follow-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { inject as service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import { task, didCancel } from 'ember-concurrency';
import { didCancel, task } from 'ember-concurrency';

import ajax from '../utils/ajax';

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/crate/version.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import { gt, readOnly, alias } from '@ember/object/computed';
import { alias, gt, readOnly } from '@ember/object/computed';
import { inject as service } from '@ember/service';

import { task } from 'ember-concurrency';
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/search.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Controller from '@ember/controller';
import { action, computed } from '@ember/object';
import { readOnly, bool } from '@ember/object/computed';
import { bool, readOnly } from '@ember/object/computed';

import { task } from 'ember-concurrency';

Expand Down
2 changes: 1 addition & 1 deletion app/models/dependency.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Model, { belongsTo, attr } from '@ember-data/model';
import Model, { attr, belongsTo } from '@ember-data/model';

import Inflector from 'ember-inflector';

Expand Down
2 changes: 1 addition & 1 deletion app/models/version-download.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Model, { belongsTo, attr } from '@ember-data/model';
import Model, { attr, belongsTo } from '@ember-data/model';

export default class VersionDownload extends Model {
/** @type number */
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/api-token.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, belongsTo } from 'ember-cli-mirage';
import { belongsTo, Model } from 'ember-cli-mirage';

export default Model.extend({
user: belongsTo(),
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/crate-ownership.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, belongsTo } from 'ember-cli-mirage';
import { belongsTo, Model } from 'ember-cli-mirage';

export default Model.extend({
crate: belongsTo(),
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/crate.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, hasMany } from 'ember-cli-mirage';
import { hasMany, Model } from 'ember-cli-mirage';

export default Model.extend({
categories: hasMany(),
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/dependency.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, belongsTo } from 'ember-cli-mirage';
import { belongsTo, Model } from 'ember-cli-mirage';

export default Model.extend({
crate: belongsTo(),
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/mirage-session.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, belongsTo } from 'ember-cli-mirage';
import { belongsTo, Model } from 'ember-cli-mirage';

/**
* This is a mirage-only model, that is used to keep track of the current
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/user.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, hasMany } from 'ember-cli-mirage';
import { hasMany, Model } from 'ember-cli-mirage';

export default Model.extend({
followedCrates: hasMany('crate'),
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/version-download.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, belongsTo } from 'ember-cli-mirage';
import { belongsTo, Model } from 'ember-cli-mirage';

export default Model.extend({
version: belongsTo(),
Expand Down
2 changes: 1 addition & 1 deletion mirage/models/version.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Model, belongsTo } from 'ember-cli-mirage';
import { belongsTo, Model } from 'ember-cli-mirage';

export default Model.extend({
crate: belongsTo(),
Expand Down
2 changes: 1 addition & 1 deletion mirage/route-handlers/categories.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pageParams, compareStrings, withMeta, notFound } from './-utils';
import { compareStrings, notFound, pageParams, withMeta } from './-utils';

export function register(server) {
server.get('/api/v1/categories', function (schema, request) {
Expand Down
2 changes: 1 addition & 1 deletion mirage/route-handlers/keywords.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { pageParams, withMeta, notFound } from './-utils';
import { notFound, pageParams, withMeta } from './-utils';

export function register(server) {
server.get('/api/v1/keywords', function (schema, request) {
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/404-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { fillIn, currentURL, triggerEvent, visit } from '@ember/test-helpers';
import { currentURL, fillIn, triggerEvent, visit } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/api-token-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { currentURL, findAll, click, fillIn } from '@ember/test-helpers';
import { click, currentURL, fillIn, findAll } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/crate-following-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { visit, waitFor, settled, click } from '@ember/test-helpers';
import { click, settled, visit, waitFor } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/crate-test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { click, currentURL, currentRouteName, visit, waitFor } from '@ember/test-helpers';
import { click, currentRouteName, currentURL, visit, waitFor } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test, skip } from 'qunit';
import { module, skip, test } from 'qunit';

import percySnapshot from '@percy/ember';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/front-page-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { currentURL, visit, click, waitFor, settled } from '@ember/test-helpers';
import { click, currentURL, settled, visit, waitFor } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/invites-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { currentURL, click } from '@ember/test-helpers';
import { click, currentURL } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/login-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { visit, currentURL, click, waitFor } from '@ember/test-helpers';
import { click, currentURL, visit, waitFor } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/logout-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { visit, currentURL, click } from '@ember/test-helpers';
import { click, currentURL, visit } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/search-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { click, fillIn, currentURL, triggerEvent, visit, blur, waitFor, settled } from '@ember/test-helpers';
import { blur, click, currentURL, fillIn, settled, triggerEvent, visit, waitFor } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/bugs/2329-test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { currentURL, click, waitFor } from '@ember/test-helpers';
import { click, currentURL, waitFor } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';

Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/visit-ignoring-abort.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { settled, visit as _visit } from '@ember/test-helpers';
import { visit as _visit, settled } from '@ember/test-helpers';

// see https://github.com/emberjs/ember-test-helpers/issues/332
export async function visit(url) {
Expand Down