Skip to content

Commit 1884ad9

Browse files
committed
fix: fix d3 ESM error in ELN
1 parent c896f88 commit 1884ad9

File tree

19 files changed

+20
-37
lines changed

19 files changed

+20
-37
lines changed

dist/components/common/draw.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66
exports.drawMain = exports.drawLabel = exports.drawDisplay = exports.drawDestroy = exports.drawArrowOnCurve = void 0;
7-
var d3 = _interopRequireWildcard(require("d3"));
8-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
9-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
7+
const d3 = require('d3');
108
const drawMain = (klass, w, h) => {
119
d3.select(klass).append('svg').attr('class', 'd3Svg').attr('preserveAspectRatio', 'xMinYMin meet').attr('viewBox', `0 0 ${w} ${h}`);
1210
};

dist/components/d3_line/line_focus.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
55
value: true
66
});
77
exports.default = void 0;
8-
var d3 = _interopRequireWildcard(require("d3"));
98
var _init = require("../../helpers/init");
109
var _mount = require("../../helpers/mount");
1110
var _brush = _interopRequireDefault(require("../../helpers/brush"));
@@ -18,10 +17,9 @@ var _format = _interopRequireDefault(require("../../helpers/format"));
1817
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
1918
var _list_layout = require("../../constants/list_layout");
2019
var _calc = require("../../helpers/calc");
21-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
22-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
2320
/* eslint-disable prefer-object-spread, no-mixed-operators */
2421

22+
const d3 = require('d3');
2523
class LineFocus {
2624
constructor(props) {
2725
const {

dist/components/d3_multi/multi_focus.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
55
value: true
66
});
77
exports.default = void 0;
8-
var d3 = _interopRequireWildcard(require("d3"));
98
var _init = require("../../helpers/init");
109
var _mount = require("../../helpers/mount");
1110
var _converter = require("../../helpers/converter");
@@ -19,11 +18,9 @@ var _focus = require("../../helpers/focus");
1918
var _integration = require("../../helpers/integration");
2019
var _multiplicity_calc = require("../../helpers/multiplicity_calc");
2120
var _calc = require("../../helpers/calc");
22-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
23-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
2421
/* eslint-disable no-unused-vars, prefer-object-spread, no-mixed-operators,
2522
no-unneeded-ternary, arrow-body-style */
26-
23+
const d3 = require('d3');
2724
class MultiFocus {
2825
constructor(props) {
2926
const {

dist/components/d3_rect/rect_focus.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ Object.defineProperty(exports, "__esModule", {
55
value: true
66
});
77
exports.default = void 0;
8-
var d3 = _interopRequireWildcard(require("d3"));
98
var _init = require("../../helpers/init");
109
var _brush = _interopRequireDefault(require("../../helpers/brush"));
1110
var _mount = require("../../helpers/mount");
1211
var _compass = require("../../helpers/compass");
1312
var _converter = require("../../helpers/converter");
1413
var _list_layout = require("../../constants/list_layout");
15-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
16-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
14+
const d3 = require('d3');
1715
class RectFocus {
1816
constructor(props) {
1917
const {

dist/helpers/brush.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66
exports.default = void 0;
7-
var d3 = _interopRequireWildcard(require("d3"));
87
var _compass = require("./compass");
9-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
10-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
118
/* eslint-disable prefer-object-spread */
12-
9+
const d3 = require('d3');
1310
const wheeled = (focus, event) => {
1411
const {
1512
currentExtent,

dist/helpers/compass.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
55
value: true
66
});
77
exports.TfRescale = exports.MouseMove = exports.MountCompass = exports.ClickCompass = void 0;
8-
var d3 = _interopRequireWildcard(require("d3"));
98
var _format = _interopRequireDefault(require("./format"));
109
var _chem = require("./chem");
11-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
12-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
10+
const d3 = require('d3');
1311
const TfRescale = focus => {
1412
const xt = focus.scales.x;
1513
const yt = focus.scales.y;

dist/helpers/init.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
55
value: true
66
});
77
exports.InitTip = exports.InitScale = exports.InitPathCall = exports.InitAxisCall = void 0;
8-
var d3 = _interopRequireWildcard(require("d3"));
98
var _d3Tip = _interopRequireDefault(require("d3-tip"));
109
var _format = _interopRequireDefault(require("./format"));
11-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
12-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
10+
const d3 = require('d3');
1311
const InitScale = function (target) {
1412
let reverse = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
1513
const xRange = reverse ? [target.w, 0] : [0, target.w];

dist/helpers/zoom.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
66
exports.default = void 0;
7-
var d3 = _interopRequireWildcard(require("d3"));
8-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
9-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
7+
const d3 = require('d3');
108
const resetZoom = main => {
119
main.svg.call(main.zoom.transform, d3.zoomIdentity);
1210
main.svg.selectAll('.brush').call(main.brush.move, null);

src/__tests__/units/components/common/draw.test.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { render } from '@testing-library/react';
22
import '@testing-library/jest-dom';
33
import { drawArrowOnCurve, drawDestroy, drawDisplay, drawLabel, drawMain } from '../../../../components/common/draw';
44
import { useEffect } from 'react';
5-
import * as d3 from 'd3';
5+
const d3 = require('d3');
66

77
describe('common/draw', () => {
88
describe('.drawMain()', () => {

src/__tests__/units/helpers/brush.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import MountBrush from "../../../helpers/brush";
2-
import * as d3 from 'd3';
2+
const d3 = require('d3');
33

44
describe('Test MountBrush', () => {
55
//TODO: add more test

src/__tests__/units/helpers/mount.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useEffect } from "react";
22
import { MountBars, MountPath, MountRef, MountTags } from "../../../helpers/mount";
33
import { render } from "@testing-library/react";
44
import { drawMain } from "../../../components/common/draw";
5-
import * as d3 from 'd3';
5+
const d3 = require('d3');
66
import '@testing-library/jest-dom';
77

88
describe('helpers/mount', () => {

src/components/common/draw.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as d3 from 'd3';
1+
const d3 = require('d3');
22

33
const drawMain = (klass, w, h) => {
44
d3.select(klass).append('svg')

src/components/d3_line/line_focus.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* eslint-disable prefer-object-spread, no-mixed-operators */
2-
import * as d3 from 'd3';
32
import {
43
InitScale, InitAxisCall, InitTip,
54
} from '../../helpers/init';
@@ -18,6 +17,8 @@ import Cfg from '../../helpers/cfg';
1817
import { LIST_LAYOUT } from '../../constants/list_layout';
1918
import { calcSlope } from '../../helpers/calc';
2019

20+
const d3 = require('d3');
21+
2122
class LineFocus {
2223
constructor(props) {
2324
const {

src/components/d3_multi/multi_focus.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-unused-vars, prefer-object-spread, no-mixed-operators,
22
no-unneeded-ternary, arrow-body-style */
3-
import * as d3 from 'd3';
3+
const d3 = require('d3');
44
import {
55
InitScale, InitAxisCall, InitTip,
66
} from '../../helpers/init';

src/components/d3_rect/rect_focus.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as d3 from 'd3';
1+
const d3 = require('d3');
22
import {
33
InitScale, InitAxisCall, InitTip,
44
} from '../../helpers/init';

src/helpers/brush.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable prefer-object-spread */
2-
import * as d3 from 'd3';
2+
const d3 = require('d3');
33

44
import { MouseMove } from './compass';
55

src/helpers/compass.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as d3 from 'd3';
1+
const d3 = require('d3');
22
import Format from './format';
33
import { Convert2DValue } from './chem';
44

src/helpers/init.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as d3 from 'd3';
1+
const d3 = require('d3');
22
import d3Tip from 'd3-tip';
33
import FN from './format';
44

src/helpers/zoom.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as d3 from 'd3';
1+
const d3 = require('d3');
22

33
const resetZoom = (main) => {
44
main.svg.call(main.zoom.transform, d3.zoomIdentity);

0 commit comments

Comments
 (0)