Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch most requires to imports #6935

Merged
merged 1 commit into from
Jan 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/controllers/controller.bar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

var DatasetController = require('../core/core.datasetController');
var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');
import DatasetController from '../core/core.datasetController';
import defaults from '../core/core.defaults';
import elements from '../elements';
import helpers from '../helpers';

var valueOrDefault = helpers.valueOrDefault;
const valueOrDefault = helpers.valueOrDefault;

defaults._set('bar', {
hover: {
Expand Down Expand Up @@ -184,7 +184,7 @@ function isFloatBar(custom) {
return custom && custom.barStart !== undefined && custom.barEnd !== undefined;
}

module.exports = DatasetController.extend({
export default DatasetController.extend({

dataElementType: elements.Rectangle,

Expand Down
10 changes: 5 additions & 5 deletions src/controllers/controller.bubble.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

const DatasetController = require('../core/core.datasetController');
const defaults = require('../core/core.defaults');
const elements = require('../elements/index');
const helpers = require('../helpers/index');
import DatasetController from '../core/core.datasetController';
import defaults from '../core/core.defaults';
import elements from '../elements';
import helpers from '../helpers';

const resolve = helpers.options.resolve;

Expand Down Expand Up @@ -34,7 +34,7 @@ defaults._set('bubble', {
}
});

module.exports = DatasetController.extend({
export default DatasetController.extend({
/**
* @protected
*/
Expand Down
18 changes: 9 additions & 9 deletions src/controllers/controller.doughnut.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use strict';

var DatasetController = require('../core/core.datasetController');
var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');
import DatasetController from '../core/core.datasetController';
import defaults from '../core/core.defaults';
import elements from '../elements';
import helpers from '../helpers';

var valueOrDefault = helpers.valueOrDefault;
const valueOrDefault = helpers.valueOrDefault;

var PI = Math.PI;
var DOUBLE_PI = PI * 2;
var HALF_PI = PI / 2;
const PI = Math.PI;
const DOUBLE_PI = PI * 2;
const HALF_PI = PI / 2;

defaults._set('doughnut', {
animation: {
Expand Down Expand Up @@ -98,7 +98,7 @@ defaults._set('doughnut', {
}
});

module.exports = DatasetController.extend({
export default DatasetController.extend({

dataElementType: elements.Arc,

Expand Down
6 changes: 3 additions & 3 deletions src/controllers/controller.horizontalBar.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var BarController = require('./controller.bar');
var defaults = require('../core/core.defaults');
import BarController from './controller.bar';
import defaults from '../core/core.defaults';

defaults._set('horizontalBar', {
hover: {
Expand Down Expand Up @@ -43,7 +43,7 @@ defaults._set('datasets', {
}
});

module.exports = BarController.extend({
export default BarController.extend({
/**
* @private
*/
Expand Down
10 changes: 5 additions & 5 deletions src/controllers/controller.line.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

const DatasetController = require('../core/core.datasetController');
const defaults = require('../core/core.defaults');
const elements = require('../elements/index');
const helpers = require('../helpers/index');
import DatasetController from '../core/core.datasetController';
import defaults from '../core/core.defaults';
import elements from '../elements';
import helpers from '../helpers';

const valueOrDefault = helpers.valueOrDefault;
const resolve = helpers.options.resolve;
Expand All @@ -26,7 +26,7 @@ defaults._set('line', {
}
});

module.exports = DatasetController.extend({
export default DatasetController.extend({

datasetElementType: elements.Line,

Expand Down
8 changes: 4 additions & 4 deletions src/controllers/controller.pie.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'use strict';

var DoughnutController = require('./controller.doughnut');
var defaults = require('../core/core.defaults');
var helpers = require('../helpers/index');
import DoughnutController from './controller.doughnut';
import defaults from '../core/core.defaults';
import helpers from '../helpers';

defaults._set('pie', helpers.clone(defaults.doughnut));
defaults._set('pie', {
cutoutPercentage: 0
});

// Pie charts are Doughnut chart with different defaults
module.exports = DoughnutController;
export default DoughnutController;
12 changes: 6 additions & 6 deletions src/controllers/controller.polarArea.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

var DatasetController = require('../core/core.datasetController');
var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');
import DatasetController from '../core/core.datasetController';
import defaults from '../core/core.defaults';
import elements from '../elements';
import helpers from '../helpers';

var resolve = helpers.options.resolve;
const resolve = helpers.options.resolve;

defaults._set('polarArea', {
animation: {
Expand Down Expand Up @@ -85,7 +85,7 @@ defaults._set('polarArea', {
}
});

module.exports = DatasetController.extend({
export default DatasetController.extend({

dataElementType: elements.Arc,

Expand Down
12 changes: 6 additions & 6 deletions src/controllers/controller.radar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

var DatasetController = require('../core/core.datasetController');
var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');
import DatasetController from '../core/core.datasetController';
import defaults from '../core/core.defaults';
import elements from '../elements';
import helpers from '../helpers';

var valueOrDefault = helpers.valueOrDefault;
const valueOrDefault = helpers.valueOrDefault;

defaults._set('radar', {
spanGaps: false,
Expand All @@ -21,7 +21,7 @@ defaults._set('radar', {
}
});

module.exports = DatasetController.extend({
export default DatasetController.extend({
datasetElementType: elements.Line,

dataElementType: elements.Point,
Expand Down
6 changes: 3 additions & 3 deletions src/controllers/controller.scatter.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var LineController = require('./controller.line');
var defaults = require('../core/core.defaults');
import LineController from './controller.line';
import defaults from '../core/core.defaults';

defaults._set('scatter', {
scales: {
Expand Down Expand Up @@ -34,4 +34,4 @@ defaults._set('datasets', {
});

// Scatter charts use line controllers
module.exports = LineController;
export default LineController;
20 changes: 10 additions & 10 deletions src/controllers/index.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
'use strict';

var bar = require('./controller.bar');
var bubble = require('./controller.bubble');
var doughnut = require('./controller.doughnut');
var horizontalBar = require('./controller.horizontalBar');
var line = require('./controller.line');
var polarArea = require('./controller.polarArea');
var pie = require('./controller.pie');
var radar = require('./controller.radar');
var scatter = require('./controller.scatter');
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]`).

module.exports = {
export default {
bar: bar,
bubble: bubble,
doughnut: doughnut,
Expand Down
4 changes: 2 additions & 2 deletions src/core/core.animation.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const helpers = require('../helpers/index');
import helpers from '../helpers';

const transparent = 'transparent';
const interpolators = {
Expand Down Expand Up @@ -89,4 +89,4 @@ class Animation {
}
}

module.exports = Animation;
export default Animation;
4 changes: 2 additions & 2 deletions src/core/core.animator.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

const helpers = require('../helpers/index');
import helpers from '../helpers';

function drawFPS(chart, count, date, lastDate) {
const fps = (1000 / (date - lastDate)) | 0;
Expand Down Expand Up @@ -207,4 +207,4 @@ class Animator {

const instance = new Animator();

module.exports = instance;
export default instance;
10 changes: 5 additions & 5 deletions src/core/core.datasetController.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';

var helpers = require('../helpers/index');
var Animations = require('./core.animations');
import helpers from '../helpers';
import Animations from './core.animations';

var resolve = helpers.options.resolve;
const resolve = helpers.options.resolve;

var arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
const arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];

/**
* Hooks the array methods that add or remove values ('push', pop', 'shift', 'splice',
Expand Down Expand Up @@ -1134,4 +1134,4 @@ helpers.extend(DatasetController.prototype, {

DatasetController.extend = helpers.inherits;

module.exports = DatasetController;
export default DatasetController;
8 changes: 4 additions & 4 deletions src/core/core.layouts.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

var defaults = require('./core.defaults');
var helpers = require('../helpers/index');
import defaults from './core.defaults';
import helpers from '../helpers';

var extend = helpers.extend;
const extend = helpers.extend;

const STATIC_POSITIONS = ['left', 'top', 'right', 'bottom'];

Expand Down Expand Up @@ -227,7 +227,7 @@ defaults._set('layout', {
// The layout service is very self explanatory. It's responsible for the layout within a chart.
// Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need
// It is this service's responsibility of carrying out that layout.
module.exports = {
export default {
defaults: {},

/**
Expand Down
6 changes: 3 additions & 3 deletions src/core/core.plugins.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

var defaults = require('./core.defaults');
var helpers = require('../helpers/index');
import defaults from './core.defaults';
import helpers from '../helpers/';

defaults._set('plugins', {});

Expand All @@ -10,7 +10,7 @@ defaults._set('plugins', {});
* @namespace Chart.plugins
* @since 2.1.0
*/
module.exports = {
export default {
/**
* Globally registered plugins.
* @private
Expand Down
10 changes: 5 additions & 5 deletions src/core/core.scale.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use strict';

const defaults = require('./core.defaults');
const Element = require('./core.element');
const helpers = require('../helpers/index');
const Ticks = require('./core.ticks');
import defaults from './core.defaults';
import Element from './core.element';
import helpers from '../helpers';
import Ticks from './core.ticks';

const alignPixel = helpers.canvas._alignPixel;
const isArray = helpers.isArray;
Expand Down Expand Up @@ -1438,4 +1438,4 @@ class Scale extends Element {

Scale.prototype._draw = Scale.prototype.draw;

module.exports = Scale;
export default Scale;
8 changes: 4 additions & 4 deletions src/core/core.scaleService.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

var defaults = require('./core.defaults');
var helpers = require('../helpers/index');
var layouts = require('./core.layouts');
import defaults from './core.defaults';
import helpers from '../helpers';
import layouts from './core.layouts';

module.exports = {
export default {
// Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
// use the new chart options to grab the correct scale
constructors: {},
Expand Down
6 changes: 3 additions & 3 deletions src/core/core.ticks.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'use strict';

var helpers = require('../helpers/index');
var math = helpers.math;
import helpers from '../helpers';
const math = helpers.math;

/**
* Namespace to hold static tick generation functions
* @namespace Chart.Ticks
*/
module.exports = {
export default {
/**
* Namespace to hold formatters for different types of ticks
* @namespace Chart.Ticks.formatters
Expand Down
Loading