From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 23 Nov 2019 17:26:55 +0000 (-0500)
Subject: Convert elements to use ES6 modules (import/export) (#6776)
X-Git-Tag: v3.0.0-alpha~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62bbaeb98dfacd48df9c102eb7c3037dae2c3b76;p=thirdparty%2FChart.js.git

Convert elements to use ES6 modules (import/export) (#6776)

* Enable ES6 modules
* Convert elements to use import/export
* Need default export for backwards compatibility
* Remove dangling comma
---

diff --git a/.eslintrc.yml b/.eslintrc.yml
index ea06e34fd..fe38944da 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -6,5 +6,6 @@ env:
 
 parserOptions:
   ecmaVersion: 6
+  sourceType: 'module'
 
 plugins: ['html']
diff --git a/src/elements/element.arc.js b/src/elements/element.arc.js
index 7706a5e73..2a53cce6d 100644
--- a/src/elements/element.arc.js
+++ b/src/elements/element.arc.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const defaults = require('../core/core.defaults');
-const Element = require('../core/core.element');
-const helpers = require('../helpers/index');
+import defaults from '../core/core.defaults';
+import Element from '../core/core.element';
+import helpers from '../helpers';
 const TAU = Math.PI * 2;
 
 defaults._set('global', {
@@ -196,4 +196,4 @@ class Arc extends Element {
 
 Arc.prototype._type = 'arc';
 
-module.exports = Arc;
+export default Arc;
diff --git a/src/elements/element.line.js b/src/elements/element.line.js
index f57b8b2bf..533b93fca 100644
--- a/src/elements/element.line.js
+++ b/src/elements/element.line.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const defaults = require('../core/core.defaults');
-const Element = require('../core/core.element');
-const helpers = require('../helpers/index');
+import defaults from '../core/core.defaults';
+import Element from '../core/core.element';
+import helpers from '../helpers';
 
 const defaultColor = defaults.global.defaultColor;
 
@@ -184,4 +184,4 @@ class Line extends Element {
 
 Line.prototype._type = 'line';
 
-module.exports = Line;
+export default Line;
diff --git a/src/elements/element.point.js b/src/elements/element.point.js
index a6cb6a946..8de393121 100644
--- a/src/elements/element.point.js
+++ b/src/elements/element.point.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const defaults = require('../core/core.defaults');
-const Element = require('../core/core.element');
-const helpers = require('../helpers/index');
+import defaults from '../core/core.defaults';
+import Element from '../core/core.element';
+import helpers from '../helpers';
 
 const defaultColor = defaults.global.defaultColor;
 
@@ -91,4 +91,4 @@ class Point extends Element {
 
 Point.prototype._type = 'point';
 
-module.exports = Point;
+export default Point;
diff --git a/src/elements/element.rectangle.js b/src/elements/element.rectangle.js
index d6a07790c..f77512e3a 100644
--- a/src/elements/element.rectangle.js
+++ b/src/elements/element.rectangle.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const defaults = require('../core/core.defaults');
-const Element = require('../core/core.element');
-const helpers = require('../helpers/index');
+import defaults from '../core/core.defaults';
+import Element from '../core/core.element';
+import helpers from '../helpers';
 
 const defaultColor = defaults.global.defaultColor;
 
@@ -196,4 +196,4 @@ class Rectangle extends Element {
 
 Rectangle.prototype._type = 'rectangle';
 
-module.exports = Rectangle;
+export default Rectangle;
diff --git a/src/elements/index.js b/src/elements/index.js
index 175c9660e..4877df6ba 100644
--- a/src/elements/index.js
+++ b/src/elements/index.js
@@ -1,7 +1,13 @@
 'use strict';
 
-module.exports = {};
-module.exports.Arc = require('./element.arc');
-module.exports.Line = require('./element.line');
-module.exports.Point = require('./element.point');
-module.exports.Rectangle = require('./element.rectangle');
+import Arc from './element.arc';
+import Line from './element.line';
+import Point from './element.point';
+import Rectangle from './element.rectangle';
+
+export default {
+	Arc,
+	Line,
+	Point,
+	Rectangle
+};