From 37633c221ac41b4a4cbcc5093b2049c83bee19b8 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Thu, 21 May 2020 23:44:49 +0300 Subject: [PATCH] Remove default export from controllers/index (#7388) Remove default export from controllers/index --- src/controllers/index.js | 34 +++++++++------------------------- src/core/core.controller.js | 5 +++-- src/index.js | 4 ++-- 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/controllers/index.js b/src/controllers/index.js index 090bd291e..8977bd2f7 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -1,25 +1,9 @@ -import bar from './controller.bar'; -import bubble from './controller.bubble'; -import doughnut from './controller.doughnut'; -import horizontalBar from './controller.horizontalBar'; -import line from './controller.line'; -import polarArea from './controller.polarArea'; -import pie from './controller.pie'; -import radar from './controller.radar'; -import scatter from './controller.scatter'; - -// NOTE export a map in which the key represents the controller type, not -// the class, and so must be CamelCase in order to be correctly retrieved -// by the controller in core.controller.js (`controllers[meta.type]`). - -export default { - bar, - bubble, - doughnut, - horizontalBar, - line, - polarArea, - pie, - radar, - scatter -}; +export {default as bar} from './controller.bar'; +export {default as bubble} from './controller.bubble'; +export {default as doughnut} from './controller.doughnut'; +export {default as horizontalBar} from './controller.horizontalBar'; +export {default as line} from './controller.line'; +export {default as polarArea} from './controller.polarArea'; +export {default as pie} from './controller.pie'; +export {default as radar} from './controller.radar'; +export {default as scatter} from './controller.scatter'; diff --git a/src/core/core.controller.js b/src/core/core.controller.js index e7754a1e4..cdcc1d7af 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -1,5 +1,6 @@ -import Animator from './core.animator'; -import controllers from '../controllers/index'; +/* eslint-disable import/no-namespace, import/namespace */ +import {default as Animator} from './core.animator'; +import * as controllers from '../controllers'; import defaults from './core.defaults'; import Interaction from './core.interaction'; import layouts from './core.layouts'; diff --git a/src/index.js b/src/index.js index 7b9ca7f73..015d00017 100644 --- a/src/index.js +++ b/src/index.js @@ -8,9 +8,9 @@ import Chart from './core/core.controller'; import helpers from './helpers/index'; import _adapters from './core/core.adapters'; import Animation from './core/core.animation'; -import Animator from './core/core.animator'; +import {default as Animator} from './core/core.animator'; import animationService from './core/core.animations'; -import controllers from './controllers/index'; +import * as controllers from './controllers'; import DatasetController from './core/core.datasetController'; import defaults from './core/core.defaults'; import Element from './core/core.element'; -- 2.47.2