From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 7 Dec 2019 00:44:53 +0000 (-0500)
Subject: Scale use modules (#6813)
X-Git-Tag: v3.0.0-alpha~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c41b6ae8a46ca21737601cb0f02d5c0e190c5f2;p=thirdparty%2FChart.js.git

Scale use modules (#6813)
---

diff --git a/src/scales/index.js b/src/scales/index.js
index 6de575b62..66e772f3b 100644
--- a/src/scales/index.js
+++ b/src/scales/index.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var category = require('./scale.category');
-var linear = require('./scale.linear');
-var logarithmic = require('./scale.logarithmic');
-var radialLinear = require('./scale.radialLinear');
-var time = require('./scale.time');
+import category from './scale.category';
+import linear from './scale.linear';
+import logarithmic from './scale.logarithmic';
+import radialLinear from './scale.radialLinear';
+import time from './scale.time';
 
-module.exports = {
+export default {
 	category: category,
 	linear: linear,
 	logarithmic: logarithmic,
diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 2a319c36f..147a42d3e 100644
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const Scale = require('../core/core.scale');
+import Scale from '../core/core.scale';
 
 const defaultConfig = {
 	position: 'bottom'
@@ -94,6 +94,6 @@ class CategoryScale extends Scale {
 	}
 }
 
-module.exports = CategoryScale;
 // INTERNAL: static default options, registered in src/index.js
-module.exports._defaults = defaultConfig;
+CategoryScale._defaults = defaultConfig;
+export default CategoryScale;
diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js
index f3015b260..2670eb513 100644
--- a/src/scales/scale.linear.js
+++ b/src/scales/scale.linear.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const helpers = require('../helpers/index');
-const LinearScaleBase = require('./scale.linearbase');
-const Ticks = require('../core/core.ticks');
+import helpers from '../helpers/index';
+import LinearScaleBase from './scale.linearbase';
+import Ticks from '../core/core.ticks';
 
 const defaultConfig = {
 	position: 'left',
@@ -72,6 +72,6 @@ class LinearScale extends LinearScaleBase {
 	}
 }
 
-module.exports = LinearScale;
 // INTERNAL: static default options, registered in src/index.js
-module.exports._defaults = defaultConfig;
+LinearScale._defaults = defaultConfig;
+export default LinearScale;
diff --git a/src/scales/scale.linearbase.js b/src/scales/scale.linearbase.js
index 2b529cc5f..60b6ad638 100644
--- a/src/scales/scale.linearbase.js
+++ b/src/scales/scale.linearbase.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const helpers = require('../helpers/index');
-const Scale = require('../core/core.scale');
+import helpers from '../helpers/index';
+import Scale from '../core/core.scale';
 
 const isNullOrUndef = helpers.isNullOrUndef;
 
@@ -256,4 +256,4 @@ class LinearScaleBase extends Scale {
 	}
 }
 
-module.exports = LinearScaleBase;
+export default LinearScaleBase;
diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
index 21d5ac4ae..a5ae779b8 100644
--- a/src/scales/scale.logarithmic.js
+++ b/src/scales/scale.logarithmic.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const defaults = require('../core/core.defaults');
-const helpers = require('../helpers/index');
-const Scale = require('../core/core.scale');
-const LinearScaleBase = require('./scale.linearbase');
-const Ticks = require('../core/core.ticks');
+import defaults from '../core/core.defaults';
+import helpers from '../helpers/index';
+import Scale from '../core/core.scale';
+import LinearScaleBase from './scale.linearbase';
+import Ticks from '../core/core.ticks';
 
 const valueOrDefault = helpers.valueOrDefault;
 const log10 = helpers.math.log10;
@@ -213,6 +213,6 @@ class LogarithmicScale extends Scale {
 	}
 }
 
-module.exports = LogarithmicScale;
 // INTERNAL: static default options, registered in src/index.js
-module.exports._defaults = defaultConfig;
+LogarithmicScale._defaults = defaultConfig;
+export default LogarithmicScale;
diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
index 746c05b75..34776ea00 100644
--- a/src/scales/scale.radialLinear.js
+++ b/src/scales/scale.radialLinear.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const defaults = require('../core/core.defaults');
-const helpers = require('../helpers/index');
-const LinearScaleBase = require('./scale.linearbase');
-const Ticks = require('../core/core.ticks');
+import defaults from '../core/core.defaults';
+import helpers from '../helpers/index';
+import LinearScaleBase from './scale.linearbase';
+import Ticks from '../core/core.ticks';
 
 const valueOrDefault = helpers.valueOrDefault;
 const valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
@@ -534,6 +534,6 @@ class RadialLinearScale extends LinearScaleBase {
 	_drawTitle() {}
 }
 
-module.exports = RadialLinearScale;
 // INTERNAL: static default options, registered in src/index.js
-module.exports._defaults = defaultConfig;
+RadialLinearScale._defaults = defaultConfig;
+export default RadialLinearScale;
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index e150e6229..3ad274833 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const adapters = require('../core/core.adapters');
-const defaults = require('../core/core.defaults');
-const helpers = require('../helpers/index');
-const Scale = require('../core/core.scale');
+import adapters from '../core/core.adapters';
+import defaults from '../core/core.defaults';
+import helpers from '../helpers/index';
+import Scale from '../core/core.scale';
 
 const resolve = helpers.options.resolve;
 const valueOrDefault = helpers.valueOrDefault;
@@ -756,6 +756,6 @@ class TimeScale extends Scale {
 	}
 }
 
-module.exports = TimeScale;
 // INTERNAL: static default options, registered in src/index.js
-module.exports._defaults = defaultConfig;
+TimeScale._defaults = defaultConfig;
+export default TimeScale;