From 60258d40c949e3967ec343f0d286ef7a614b2cb2 Mon Sep 17 00:00:00 2001 From: Oliver Eyton-Williams Date: Wed, 5 Jan 2022 23:05:50 +0100 Subject: [PATCH] fix: order import (again) (#44670) * refactor: reenable import ordering * refactor: require alphabetic ordered imports --- .eslintrc.json | 3 ++- client/src/redux/index.js | 2 +- client/src/templates/Introduction/components/legacy-links.tsx | 2 +- curriculum/getChallenges.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index cd77be785d..fed6b84748 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -33,7 +33,8 @@ "rules": { "import/named": 2, "import/no-named-as-default": 0, - "import/no-named-as-default-member": 0 + "import/no-named-as-default-member": 0, + "import/order": 2 }, "overrides": [ { diff --git a/client/src/redux/index.js b/client/src/redux/index.js index cd67c2475c..a4349a0058 100644 --- a/client/src/redux/index.js +++ b/client/src/redux/index.js @@ -5,6 +5,7 @@ import store from 'store'; import { SuperBlocks } from '../../../config/certification-settings'; import { actionTypes as challengeTypes } from '../templates/Challenges/redux/action-types'; import { CURRENT_CHALLENGE_KEY } from '../templates/Challenges/redux/current-challenge-saga'; +import { emailToABVariant } from '../utils/A-B-tester'; import { createAcceptTermsSaga } from './accept-terms-saga'; import { actionTypes } from './action-types'; import { createAppMountSaga } from './app-mount-saga'; @@ -12,7 +13,6 @@ import { createDonationSaga } from './donation-saga'; import failedUpdatesEpic from './failed-updates-epic'; import { createFetchUserSaga } from './fetch-user-saga'; import { createGaSaga } from './ga-saga'; -import { emailToABVariant } from '../utils/A-B-tester'; import hardGoToEpic from './hard-go-to-epic'; import { createReportUserSaga } from './report-user-saga'; diff --git a/client/src/templates/Introduction/components/legacy-links.tsx b/client/src/templates/Introduction/components/legacy-links.tsx index dfef060a46..4a4df993a7 100644 --- a/client/src/templates/Introduction/components/legacy-links.tsx +++ b/client/src/templates/Introduction/components/legacy-links.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; +import { Alert } from '@freecodecamp/react-bootstrap'; import { SuperBlocks } from '../../../../../config/certification-settings'; import { Link } from '../../../components/helpers'; -import { Alert } from '@freecodecamp/react-bootstrap'; interface LegacyLinksProps { superBlock: SuperBlocks; diff --git a/curriculum/getChallenges.js b/curriculum/getChallenges.js index 8e31e12ddb..1890d02d2d 100644 --- a/curriculum/getChallenges.js +++ b/curriculum/getChallenges.js @@ -4,7 +4,6 @@ const util = require('util'); const yaml = require('js-yaml'); const { findIndex } = require('lodash'); const readDirP = require('readdirp'); -const { getSuperOrder } = require('./utils'); const { helpCategoryMap } = require('../client/utils/challenge-types'); const { showUpcomingChanges } = require('../config/env.json'); const { curriculum: curriculumLangs } = @@ -19,6 +18,7 @@ const { const { isAuditedCert } = require('../utils/is-audited'); const { createPoly } = require('../utils/polyvinyl'); const { dasherize } = require('../utils/slugs'); +const { getSuperOrder } = require('./utils'); const access = util.promisify(fs.access);