Skip to content

Commit 82cb342

Browse files
committed
Auto merge of #3075 - Turbo87:sort-order, r=locks
ESLint: Enable `sort-imports` rule With https://github.com/Tibfib/eslint-plugin-import-helpers and prettier, this rule makes it even easier to import things and have the tooling take care of formatting things in a readable way. r? `@locks`
2 parents c69faed + ee5eac3 commit 82cb342

28 files changed

+31
-28
lines changed

.eslintrc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ module.exports = {
2222
// it's fine to use `return` without a value and rely on the implicit `undefined` return value
2323
'getter-return': 'off',
2424

25+
// declaration sort is taken care of by `import-helpers/order-imports`
26+
'sort-imports': ['error', { ignoreDeclarationSort: true, ignoreCase: true }],
27+
2528
'prettier/prettier': 'error',
2629

2730
// disabled because we still use `this.set()` in a few places and it works just fine

app/adapters/category-slug.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { underscore, decamelize } from '@ember/string';
1+
import { decamelize, underscore } from '@ember/string';
22

33
import { pluralize } from 'ember-inflector';
44

app/components/follow-button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { inject as service } from '@ember/service';
22
import Component from '@glimmer/component';
33
import { tracked } from '@glimmer/tracking';
44

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

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

app/controllers/crate/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Controller from '@ember/controller';
22
import { computed } from '@ember/object';
3-
import { gt, readOnly, alias } from '@ember/object/computed';
3+
import { alias, gt, readOnly } from '@ember/object/computed';
44
import { inject as service } from '@ember/service';
55

66
import { task } from 'ember-concurrency';

app/controllers/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Controller from '@ember/controller';
22
import { action, computed } from '@ember/object';
3-
import { readOnly, bool } from '@ember/object/computed';
3+
import { bool, readOnly } from '@ember/object/computed';
44

55
import { task } from 'ember-concurrency';
66

app/models/dependency.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Model, { belongsTo, attr } from '@ember-data/model';
1+
import Model, { attr, belongsTo } from '@ember-data/model';
22

33
import Inflector from 'ember-inflector';
44

app/models/version-download.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Model, { belongsTo, attr } from '@ember-data/model';
1+
import Model, { attr, belongsTo } from '@ember-data/model';
22

33
export default class VersionDownload extends Model {
44
/** @type number */

mirage/models/api-token.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, belongsTo } from 'ember-cli-mirage';
1+
import { belongsTo, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
user: belongsTo(),

mirage/models/crate-ownership.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, belongsTo } from 'ember-cli-mirage';
1+
import { belongsTo, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
crate: belongsTo(),

mirage/models/crate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, hasMany } from 'ember-cli-mirage';
1+
import { hasMany, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
categories: hasMany(),

mirage/models/dependency.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, belongsTo } from 'ember-cli-mirage';
1+
import { belongsTo, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
crate: belongsTo(),

mirage/models/mirage-session.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, belongsTo } from 'ember-cli-mirage';
1+
import { belongsTo, Model } from 'ember-cli-mirage';
22

33
/**
44
* This is a mirage-only model, that is used to keep track of the current

mirage/models/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, hasMany } from 'ember-cli-mirage';
1+
import { hasMany, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
followedCrates: hasMany('crate'),

mirage/models/version-download.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, belongsTo } from 'ember-cli-mirage';
1+
import { belongsTo, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
version: belongsTo(),

mirage/models/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, belongsTo } from 'ember-cli-mirage';
1+
import { belongsTo, Model } from 'ember-cli-mirage';
22

33
export default Model.extend({
44
crate: belongsTo(),

mirage/route-handlers/categories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { pageParams, compareStrings, withMeta, notFound } from './-utils';
1+
import { compareStrings, notFound, pageParams, withMeta } from './-utils';
22

33
export function register(server) {
44
server.get('/api/v1/categories', function (schema, request) {

mirage/route-handlers/keywords.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { pageParams, withMeta, notFound } from './-utils';
1+
import { notFound, pageParams, withMeta } from './-utils';
22

33
export function register(server) {
44
server.get('/api/v1/keywords', function (schema, request) {

tests/acceptance/404-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fillIn, currentURL, triggerEvent, visit } from '@ember/test-helpers';
1+
import { currentURL, fillIn, triggerEvent, visit } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/api-token-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { currentURL, findAll, click, fillIn } from '@ember/test-helpers';
1+
import { click, currentURL, fillIn, findAll } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/crate-following-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { visit, waitFor, settled, click } from '@ember/test-helpers';
1+
import { click, settled, visit, waitFor } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/crate-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { click, currentURL, currentRouteName, visit, waitFor } from '@ember/test-helpers';
1+
import { click, currentRouteName, currentURL, visit, waitFor } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
3-
import { module, test, skip } from 'qunit';
3+
import { module, skip, test } from 'qunit';
44

55
import percySnapshot from '@percy/ember';
66
import a11yAudit from 'ember-a11y-testing/test-support/audit';

tests/acceptance/front-page-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { currentURL, visit, click, waitFor, settled } from '@ember/test-helpers';
1+
import { click, currentURL, settled, visit, waitFor } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/invites-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { currentURL, click } from '@ember/test-helpers';
1+
import { click, currentURL } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/login-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { visit, currentURL, click, waitFor } from '@ember/test-helpers';
1+
import { click, currentURL, visit, waitFor } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/logout-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { visit, currentURL, click } from '@ember/test-helpers';
1+
import { click, currentURL, visit } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/acceptance/search-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { click, fillIn, currentURL, triggerEvent, visit, blur, waitFor, settled } from '@ember/test-helpers';
1+
import { blur, click, currentURL, fillIn, settled, triggerEvent, visit, waitFor } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/bugs/2329-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { currentURL, click, waitFor } from '@ember/test-helpers';
1+
import { click, currentURL, waitFor } from '@ember/test-helpers';
22
import { setupApplicationTest } from 'ember-qunit';
33
import { module, test } from 'qunit';
44

tests/helpers/visit-ignoring-abort.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { settled, visit as _visit } from '@ember/test-helpers';
1+
import { visit as _visit, settled } from '@ember/test-helpers';
22

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

0 commit comments

Comments
 (0)