From 380473033b2333654c9bea58e332575e9ab7f84f Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Fri, 23 Oct 2020 12:02:37 -0400 Subject: [PATCH] Enable no-duplicate-imports eslint rule --- .eslintrc | 1 + modules/behavior/hash.js | 3 +-- modules/services/osm.js | 3 +-- modules/validations/impossible_oneway.js | 3 +-- modules/validations/suspicious_name.js | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.eslintrc b/.eslintrc index 5ac086f70..048fd467d 100644 --- a/.eslintrc +++ b/.eslintrc @@ -31,6 +31,7 @@ "no-console": "warn", "no-constructor-return": "error", "no-div-regex": "error", + "no-duplicate-imports": "warn", "no-eq-null": "error", "no-eval": "error", "no-extend-native": "error", diff --git a/modules/behavior/hash.js b/modules/behavior/hash.js index 4f7d1a600..7a7f7fe34 100644 --- a/modules/behavior/hash.js +++ b/modules/behavior/hash.js @@ -2,11 +2,10 @@ import _throttle from 'lodash-es/throttle'; import { select as d3_select } from 'd3-selection'; -import { utilDisplayLabel } from '../util'; import { geoSphericalDistance } from '../geo'; import { modeBrowse } from '../modes/browse'; import { modeSelect } from '../modes/select'; -import { utilObjectOmit, utilQsString, utilStringQs } from '../util'; +import { utilDisplayLabel, utilObjectOmit, utilQsString, utilStringQs } from '../util'; import { utilArrayIdentical } from '../util/array'; import { t } from '../core/localizer'; diff --git a/modules/services/osm.js b/modules/services/osm.js index d9887a5bf..557cee9eb 100644 --- a/modules/services/osm.js +++ b/modules/services/osm.js @@ -1,8 +1,7 @@ import _throttle from 'lodash-es/throttle'; import { dispatch as d3_dispatch } from 'd3-dispatch'; -import { xml as d3_xml } from 'd3-fetch'; -import { json as d3_json } from 'd3-fetch'; +import { json as d3_json, xml as d3_xml } from 'd3-fetch'; import osmAuth from 'osm-auth'; import RBush from 'rbush'; diff --git a/modules/validations/impossible_oneway.js b/modules/validations/impossible_oneway.js index 10567be98..fc1722174 100644 --- a/modules/validations/impossible_oneway.js +++ b/modules/validations/impossible_oneway.js @@ -1,5 +1,4 @@ -import { localizer } from '../core/localizer'; -import { t } from '../core/localizer'; +import { t, localizer } from '../core/localizer'; import { modeDrawLine } from '../modes/draw_line'; import { actionReverse } from '../actions/reverse'; import { utilDisplayLabel } from '../util'; diff --git a/modules/validations/suspicious_name.js b/modules/validations/suspicious_name.js index 584f1f07b..dba24465c 100644 --- a/modules/validations/suspicious_name.js +++ b/modules/validations/suspicious_name.js @@ -1,6 +1,5 @@ import { fileFetcher } from '../core/file_fetcher'; -import { localizer } from '../core/localizer'; -import { t } from '../core/localizer'; +import { t, localizer } from '../core/localizer'; import { presetManager } from '../presets'; import { validationIssue, validationIssueFix } from '../core/validation'; import { actionChangeTags } from '../actions/change_tags';