From 4a84562d7e5669c2836835750822045d0e89a3d7 Mon Sep 17 00:00:00 2001 From: Matthew Riley MacPherson Date: Mon, 10 Jul 2017 01:48:34 +0100 Subject: [PATCH] chore: Fix eslint to deal with path bug See: https://github.com/benmosher/eslint-plugin-import/issues/793 --- src/amo/components/AddonReviewList.js | 1 + src/amo/sagas/categories.js | 4 ++++ src/amo/sagas/index.js | 9 ++++++--- src/amo/sagas/reviews.js | 4 ++++ src/core/sagas/addons.js | 4 ++++ tests/unit/core/sagas/testUtils.js | 6 +++++- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/amo/components/AddonReviewList.js b/src/amo/components/AddonReviewList.js index afc78603416..24496ba00bc 100644 --- a/src/amo/components/AddonReviewList.js +++ b/src/amo/components/AddonReviewList.js @@ -120,6 +120,7 @@ export class AddonReviewListBase extends React.Component { { authorName: review.userName, timestamp }); const reviewBodySanitized = sanitizeHTML(nl2br(review.body), ['br']); + // eslint-disable-next-line react/no-danger reviewBody =

; } else { byLine = ; diff --git a/src/amo/sagas/categories.js b/src/amo/sagas/categories.js index ec56873f63d..149d2d3d5a9 100644 --- a/src/amo/sagas/categories.js +++ b/src/amo/sagas/categories.js @@ -1,5 +1,9 @@ +// Disabled because of +// https://github.com/benmosher/eslint-plugin-import/issues/793 +/* eslint-disable import/order */ import { hideLoading, showLoading } from 'react-redux-loading-bar'; import { call, put, select, takeEvery } from 'redux-saga/effects'; +/* eslint-enable import/order */ import { categoriesFail, diff --git a/src/amo/sagas/index.js b/src/amo/sagas/index.js index 841deff4037..9539aea9d38 100644 --- a/src/amo/sagas/index.js +++ b/src/amo/sagas/index.js @@ -1,10 +1,13 @@ +// Disabled because of +// https://github.com/benmosher/eslint-plugin-import/issues/793 +/* eslint-disable import/order */ import { fork } from 'redux-saga/effects'; +/* eslint-enable import/order */ +import categories from 'amo/sagas/categories'; +import reviews from 'amo/sagas/reviews'; import addons from 'core/sagas/addons'; -import categories from './categories'; -import reviews from './reviews'; - // Export all sagas for this app so runSaga can consume them. export default function* rootSaga() { diff --git a/src/amo/sagas/reviews.js b/src/amo/sagas/reviews.js index 7c754b24e0d..a4a2e83a726 100644 --- a/src/amo/sagas/reviews.js +++ b/src/amo/sagas/reviews.js @@ -1,7 +1,11 @@ /* @flow */ /* global Generator */ +// Disabled because of +// https://github.com/benmosher/eslint-plugin-import/issues/793 +/* eslint-disable import/order */ import { hideLoading, showLoading } from 'react-redux-loading-bar'; import { call, put, select, takeEvery } from 'redux-saga/effects'; +/* eslint-enable import/order */ import { getReviews } from 'amo/api'; import { setAddonReviews } from 'amo/actions/reviews'; diff --git a/src/core/sagas/addons.js b/src/core/sagas/addons.js index 77dfeb99df6..175af370600 100644 --- a/src/core/sagas/addons.js +++ b/src/core/sagas/addons.js @@ -1,7 +1,11 @@ /* @flow */ /* global Generator */ +// Disabled because of +// https://github.com/benmosher/eslint-plugin-import/issues/793 +/* eslint-disable import/order */ import { hideLoading, showLoading } from 'react-redux-loading-bar'; import { call, put, select, takeEvery } from 'redux-saga/effects'; +/* eslint-enable import/order */ import { loadEntities } from 'core/actions'; import { fetchAddon as fetchAddonFromApi } from 'core/api'; diff --git a/tests/unit/core/sagas/testUtils.js b/tests/unit/core/sagas/testUtils.js index b58cc22222e..0de3c22909d 100644 --- a/tests/unit/core/sagas/testUtils.js +++ b/tests/unit/core/sagas/testUtils.js @@ -1,6 +1,10 @@ +// Disabled because of +// https://github.com/benmosher/eslint-plugin-import/issues/793 +/* eslint-disable import/order */ import { takeEvery } from 'redux-saga'; -import { put, select } from 'redux-saga/effects'; import SagaTester from 'redux-saga-tester'; +import { put, select } from 'redux-saga/effects'; +/* eslint-enable import/order */ import createStore from 'amo/store'; import { setClientApp, setLang } from 'core/actions';