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 ea06e34fdd02ae8b58e04f9f48eaeeed9eb9f870..fe38944dafce58e4d3b6b54d96a3ee2d2e0c1e04 100644 (file)
--- 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 7706a5e73c013cfd07742b65711a9d70c16a7a2e..2a53cce6d023b08b226fc75f4f783aab04d765cd 100644 (file)
--- 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 f57b8b2bfc60f8fb9319d1fb1d454eaf375cc1d4..533b93fcaab488f525a1f112b0ccbf0a85c89b38 100644 (file)
--- 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 a6cb6a946a5bc632f88339d54463ab2cad7c18fc..8de39312187ddd1a9b9c8b53b7cba0232556f35c 100644 (file)
--- 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 d6a07790cfae6aae814c3a64ec1cf75dbf15e516..f77512e3af2acf290cd2d006d94525cf82e80293 100644 (file)
--- 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 175c9660e1401340c50624ab4e88a2f24c9aa194..4877df6ba8847a67f6ba247943ddd1202367465a 100644 (file)
--- 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
+};