@antv/layout 1.2.3 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/b58f316f11471e29113f.worker.js +2 -0
- package/dist/b58f316f11471e29113f.worker.js.map +1 -0
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/lib/circular.d.ts +1 -1
- package/lib/circular.js +11 -11
- package/lib/comboCombined.d.ts +32 -0
- package/lib/comboCombined.js +441 -0
- package/lib/comboCombined.js.map +1 -0
- package/lib/concentric.d.ts +1 -1
- package/lib/concentric.js +15 -15
- package/lib/force/index.d.ts +2 -2
- package/lib/force/index.js +44 -40
- package/lib/force/index.js.map +1 -1
- package/lib/index.d.ts +16 -15
- package/lib/index.js +16 -15
- package/lib/index.js.map +1 -1
- package/lib/registry.d.ts +1 -1
- package/lib/registry.js +13 -11
- package/lib/registry.js.map +1 -1
- package/lib/supervisor.d.ts +1 -1
- package/lib/supervisor.js +7 -10
- package/lib/supervisor.js.map +1 -1
- package/lib/types.d.ts +15 -6
- package/lib/util/math.d.ts +15 -2
- package/lib/util/math.js +43 -14
- package/lib/util/math.js.map +1 -1
- package/package.json +2 -2
- package/dist/4051326ec27047d2402d.worker.js +0 -2
- package/dist/4051326ec27047d2402d.worker.js.map +0 -1
package/lib/supervisor.js
CHANGED
|
@@ -23,12 +23,9 @@ var Supervisor = /** @class */ (function (_super) {
|
|
|
23
23
|
return _this;
|
|
24
24
|
}
|
|
25
25
|
Supervisor.prototype.spawnWorker = function () {
|
|
26
|
-
|
|
27
|
-
this.worker.terminate();
|
|
28
|
-
}
|
|
29
|
-
this.worker = Comlink.wrap(
|
|
26
|
+
this.proxy = Comlink.wrap(
|
|
30
27
|
// @ts-ignore
|
|
31
|
-
new Worker(new URL("./worker.js", import.meta.url)));
|
|
28
|
+
new Worker(new URL("./worker.js", import.meta.url), { type: 'module' }));
|
|
32
29
|
if (this.running) {
|
|
33
30
|
this.running = false;
|
|
34
31
|
this.execute();
|
|
@@ -55,7 +52,7 @@ var Supervisor = /** @class */ (function (_super) {
|
|
|
55
52
|
edges: this.graph.getAllEdges(),
|
|
56
53
|
};
|
|
57
54
|
arraybufferWithNodesEdges = new Float32Array([0]);
|
|
58
|
-
return [4 /*yield*/, this.
|
|
55
|
+
return [4 /*yield*/, this.proxy.calculateLayout(payload, [
|
|
59
56
|
arraybufferWithNodesEdges,
|
|
60
57
|
])];
|
|
61
58
|
case 1:
|
|
@@ -68,13 +65,13 @@ var Supervisor = /** @class */ (function (_super) {
|
|
|
68
65
|
Supervisor.prototype.stop = function () {
|
|
69
66
|
this.running = false;
|
|
70
67
|
// trigger `layout.stop()` if needed
|
|
71
|
-
this.
|
|
68
|
+
this.proxy.stopLayout();
|
|
72
69
|
return this;
|
|
73
70
|
};
|
|
74
71
|
Supervisor.prototype.kill = function () {
|
|
75
|
-
//
|
|
76
|
-
//
|
|
77
|
-
|
|
72
|
+
// allow the GC to collect wrapper port
|
|
73
|
+
// @see https://github.com/GoogleChromeLabs/comlink#comlinkreleaseproxy
|
|
74
|
+
this.proxy[Comlink.releaseProxy]();
|
|
78
75
|
// TODO: unbind listeners on graph.
|
|
79
76
|
// TODO: release attached memory
|
|
80
77
|
};
|
package/lib/supervisor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../src/supervisor.ts"],"names":[],"mappings":";AAAA,aAAa;AACb,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAuBnC;;;;;;;;;GASG;AACH;IAAgC,8BAAY;IAW1C,oBACU,KAAsB,EACtB,MAAmB,EACnB,OAAoC;QAH9C,YAKE,iBAAO,SAGR;QAPS,WAAK,GAAL,KAAK,CAAiB;QACtB,YAAM,GAAN,MAAM,CAAa;QACnB,aAAO,GAAP,OAAO,CAA6B;QAI5C,KAAI,CAAC,WAAW,EAAE,CAAC;;IACrB,CAAC;IAED,gCAAW,GAAX;QACE,IAAI,
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../src/supervisor.ts"],"names":[],"mappings":";AAAA,aAAa;AACb,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAuBnC;;;;;;;;;GASG;AACH;IAAgC,8BAAY;IAW1C,oBACU,KAAsB,EACtB,MAAmB,EACnB,OAAoC;QAH9C,YAKE,iBAAO,SAGR;QAPS,WAAK,GAAL,KAAK,CAAiB;QACtB,YAAM,GAAN,MAAM,CAAa;QACnB,aAAO,GAAP,OAAO,CAA6B;QAI5C,KAAI,CAAC,WAAW,EAAE,CAAC;;IACrB,CAAC;IAED,gCAAW,GAAX;QACE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI;QACvB,aAAa;QACb,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CACxE,CAAC;QAEF,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;IACH,CAAC;IAEK,4BAAO,GAAb;;;;;;;wBACE,IAAI,IAAI,CAAC,OAAO;4BAAE,sBAAO,IAAI,EAAC;wBAE9B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;wBAGd,KAAsB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAvC,MAAM,YAAA,EAAK,IAAI,cAAjB,UAAmB,CAAF,CAAyB;wBAC1C,OAAO,GAAG;4BACd,MAAM,EAAE;gCACN,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;gCAClB,OAAO,EAAE,IAAI;gCACb,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU;6BACrC;4BACD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;4BAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;yBAChC,CAAC;wBAOI,yBAAyB,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAWpC,qBAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE;gCAC5D,yBAAyB;6BAC1B,CAAC,EAAA;;wBAFI,KAAA,sBAAc,SAElB,KAAA,EAFK,SAAS,QAAA;wBAIhB,sBAAO,SAAS,EAAC;;;;KAClB;IAED,yBAAI,GAAJ;QACE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAErB,oCAAoC;QACpC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yBAAI,GAAJ;QACE,uCAAuC;QACvC,uEAAuE;QACvE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAEnC,mCAAmC;QAEnC,gCAAgC;IAClC,CAAC;IAED,8BAAS,GAAT;QACE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACH,iBAAC;AAAD,CAAC,AA/FD,CAAgC,YAAY,GA+F3C"}
|
package/lib/types.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Graph as IGraph, Node as INode, Edge as IEdge, PlainObject, GraphView as IGraphView, ID } from
|
|
1
|
+
import { Graph as IGraph, Node as INode, Edge as IEdge, PlainObject, GraphView as IGraphView, ID } from '@antv/graphlib';
|
|
2
2
|
export interface NodeData extends PlainObject {
|
|
3
3
|
size?: number | number[];
|
|
4
4
|
bboxSize?: number[];
|
|
@@ -117,7 +117,7 @@ export interface CircularLayoutOptions {
|
|
|
117
117
|
endRadius?: number | null;
|
|
118
118
|
clockwise?: boolean;
|
|
119
119
|
divisions?: number;
|
|
120
|
-
ordering?:
|
|
120
|
+
ordering?: 'topology' | 'topology-directed' | 'degree' | null;
|
|
121
121
|
angleRatio?: number;
|
|
122
122
|
startAngle?: number;
|
|
123
123
|
endAngle?: number;
|
|
@@ -180,8 +180,8 @@ export interface RadialLayoutOptions {
|
|
|
180
180
|
sortBy?: string;
|
|
181
181
|
sortStrength?: number;
|
|
182
182
|
}
|
|
183
|
-
export declare type DagreRankdir =
|
|
184
|
-
export declare type DagreAlign =
|
|
183
|
+
export declare type DagreRankdir = 'TB' | 'BT' | 'LR' | 'RL' | 'tb' | 'lr' | 'rl' | 'bt';
|
|
184
|
+
export declare type DagreAlign = 'UL' | 'UR' | 'DL' | 'DR';
|
|
185
185
|
export interface DagreLayoutOptions {
|
|
186
186
|
rankdir?: DagreRankdir;
|
|
187
187
|
align?: DagreAlign;
|
|
@@ -238,12 +238,21 @@ export interface CentripetalOptions {
|
|
|
238
238
|
centerStrength?: number;
|
|
239
239
|
};
|
|
240
240
|
}
|
|
241
|
+
export interface ComboCombinedLayoutOptions {
|
|
242
|
+
center?: PointTuple;
|
|
243
|
+
nodeSize?: number | number[] | ((d?: Node) => number);
|
|
244
|
+
spacing?: number | ((d?: Node) => number);
|
|
245
|
+
outerLayout?: Layout<any>;
|
|
246
|
+
innerLayout?: Layout<any>;
|
|
247
|
+
comboPadding?: ((d?: unknown) => number) | number | number[] | undefined;
|
|
248
|
+
treeKey?: string;
|
|
249
|
+
}
|
|
241
250
|
interface CommonForceLayoutOptions {
|
|
242
251
|
dimensions?: number;
|
|
243
252
|
center?: PointTuple;
|
|
244
253
|
minMovement?: number;
|
|
245
254
|
maxIteration?: number;
|
|
246
|
-
distanceThresholdMode?:
|
|
255
|
+
distanceThresholdMode?: 'mean' | 'max' | 'min';
|
|
247
256
|
/**
|
|
248
257
|
* If distance is specified, sets the maximum distance between nodes over which this force is considered.
|
|
249
258
|
* If distance is not specified, returns the current maximum distance, which defaults to infinity.
|
|
@@ -290,7 +299,7 @@ export interface ForceAtlas2LayoutOptions extends CommonForceLayoutOptions {
|
|
|
290
299
|
ks?: number;
|
|
291
300
|
ksmax?: number;
|
|
292
301
|
tao?: number;
|
|
293
|
-
mode?:
|
|
302
|
+
mode?: 'normal' | 'linlog';
|
|
294
303
|
preventOverlap?: boolean;
|
|
295
304
|
dissuadeHubs?: boolean;
|
|
296
305
|
barnesHut?: boolean;
|
package/lib/util/math.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { Matrix, Edge, Node, OutNode, Degree, Point } from
|
|
1
|
+
import type { Matrix, Edge, Node, OutNode, Degree, Point } from '../types';
|
|
2
|
+
import { Graph } from '@antv/graphlib';
|
|
2
3
|
export declare const floydWarshall: (adjMatrix: Matrix[]) => Matrix[];
|
|
3
4
|
export declare const getAdjMatrix: (data: {
|
|
4
5
|
nodes: Node[];
|
|
@@ -37,7 +38,7 @@ export declare const getAvgNodePosition: (nodes: OutNode[]) => {
|
|
|
37
38
|
x: number;
|
|
38
39
|
y: number;
|
|
39
40
|
};
|
|
40
|
-
export declare const getCoreNodeAndRelativeLeafNodes: (type:
|
|
41
|
+
export declare const getCoreNodeAndRelativeLeafNodes: (type: 'leaf' | 'all', node: Node, edges: Edge[], nodeClusterBy: string, degreesMap: {
|
|
41
42
|
[id: string]: Degree;
|
|
42
43
|
}, nodeMap: {
|
|
43
44
|
[id: string]: Node;
|
|
@@ -53,3 +54,15 @@ export declare const getCoreNodeAndRelativeLeafNodes: (type: "leaf" | "all", nod
|
|
|
53
54
|
* @returns
|
|
54
55
|
*/
|
|
55
56
|
export declare const getEuclideanDistance: (p1: Point, p2: Point) => number;
|
|
57
|
+
/**
|
|
58
|
+
* Depth first search begin from nodes in graphCore data.
|
|
59
|
+
* @param graphCore graphlib data structure
|
|
60
|
+
* @param nodes begin nodes
|
|
61
|
+
* @param fn will be called while visiting each node
|
|
62
|
+
* @param mode 'TB' - visit from top to bottom; 'BT' - visit from bottom to top;
|
|
63
|
+
* @returns
|
|
64
|
+
*/
|
|
65
|
+
export declare const graphTreeDfs: (graph: Graph<any, any>, nodes: Node[], fn: (n: Node) => void, mode: 'TB' | 'BT', treeKey: string, stopFns?: {
|
|
66
|
+
stopBranchFn?: (node: Node) => boolean;
|
|
67
|
+
stopAllFn?: (node: Node) => boolean;
|
|
68
|
+
}) => void;
|
package/lib/util/math.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { isNumber } from
|
|
2
|
-
import { isArray } from
|
|
1
|
+
import { isNumber } from '@antv/util';
|
|
2
|
+
import { isArray } from './array';
|
|
3
3
|
export var floydWarshall = function (adjMatrix) {
|
|
4
4
|
// initialize
|
|
5
5
|
var dist = [];
|
|
@@ -36,7 +36,7 @@ export var getAdjMatrix = function (data, directed) {
|
|
|
36
36
|
// map node with index in data.nodes
|
|
37
37
|
var nodeMap = {};
|
|
38
38
|
if (!nodes) {
|
|
39
|
-
throw new Error(
|
|
39
|
+
throw new Error('invalid nodes data!');
|
|
40
40
|
}
|
|
41
41
|
if (nodes) {
|
|
42
42
|
nodes.forEach(function (node, i) {
|
|
@@ -95,7 +95,7 @@ var traverseUp = function (data, fn) {
|
|
|
95
95
|
* if the fn returns false, terminate the traverse
|
|
96
96
|
*/
|
|
97
97
|
export var traverseTreeUp = function (data, fn) {
|
|
98
|
-
if (typeof fn !==
|
|
98
|
+
if (typeof fn !== 'function') {
|
|
99
99
|
return;
|
|
100
100
|
}
|
|
101
101
|
traverseUp(data, fn);
|
|
@@ -159,7 +159,7 @@ export var getAvgNodePosition = function (nodes) {
|
|
|
159
159
|
// 找出指定节点关联的边的起点或终点
|
|
160
160
|
var getCoreNode = function (type, node, edges) {
|
|
161
161
|
var _a, _b;
|
|
162
|
-
if (type ===
|
|
162
|
+
if (type === 'source') {
|
|
163
163
|
return (((_a = edges === null || edges === void 0 ? void 0 : edges.find(function (edge) { return edge.target === node.id; })) === null || _a === void 0 ? void 0 : _a.source) ||
|
|
164
164
|
{});
|
|
165
165
|
}
|
|
@@ -169,13 +169,13 @@ var getCoreNode = function (type, node, edges) {
|
|
|
169
169
|
var getRelativeNodeIds = function (type, coreNode, edges) {
|
|
170
170
|
var relativeNodes = [];
|
|
171
171
|
switch (type) {
|
|
172
|
-
case
|
|
172
|
+
case 'source':
|
|
173
173
|
relativeNodes = edges === null || edges === void 0 ? void 0 : edges.filter(function (edge) { return edge.source === coreNode.id; }).map(function (edge) { return edge.target; });
|
|
174
174
|
break;
|
|
175
|
-
case
|
|
175
|
+
case 'target':
|
|
176
176
|
relativeNodes = edges === null || edges === void 0 ? void 0 : edges.filter(function (edge) { return edge.target === coreNode.id; }).map(function (edge) { return edge.source; });
|
|
177
177
|
break;
|
|
178
|
-
case
|
|
178
|
+
case 'both':
|
|
179
179
|
relativeNodes = edges === null || edges === void 0 ? void 0 : edges.filter(function (edge) { return edge.source === coreNode.id; }).map(function (edge) { return edge.target; }).concat(edges === null || edges === void 0 ? void 0 : edges.filter(function (edge) { return edge.target === coreNode.id; }).map(function (edge) { return edge.source; }));
|
|
180
180
|
break;
|
|
181
181
|
default:
|
|
@@ -187,9 +187,9 @@ var getRelativeNodeIds = function (type, coreNode, edges) {
|
|
|
187
187
|
};
|
|
188
188
|
// 找出同类型的节点
|
|
189
189
|
var getSameTypeNodes = function (type, nodeClusterBy, node, relativeNodes, degreesMap) {
|
|
190
|
-
var typeName = node[nodeClusterBy] ||
|
|
190
|
+
var typeName = node[nodeClusterBy] || '';
|
|
191
191
|
var sameTypeNodes = (relativeNodes === null || relativeNodes === void 0 ? void 0 : relativeNodes.filter(function (item) { return item[nodeClusterBy] === typeName; })) || [];
|
|
192
|
-
if (type ===
|
|
192
|
+
if (type === 'leaf') {
|
|
193
193
|
sameTypeNodes = sameTypeNodes.filter(function (node) { var _a, _b; return ((_a = degreesMap[node.id]) === null || _a === void 0 ? void 0 : _a.in) === 0 || ((_b = degreesMap[node.id]) === null || _b === void 0 ? void 0 : _b.out) === 0; });
|
|
194
194
|
}
|
|
195
195
|
return sameTypeNodes;
|
|
@@ -201,13 +201,13 @@ export var getCoreNodeAndRelativeLeafNodes = function (type, node, edges, nodeCl
|
|
|
201
201
|
var relativeLeafNodes = [];
|
|
202
202
|
if (inDegree === 0) {
|
|
203
203
|
// 如果为没有出边的叶子节点，则找出与它关联的边的起点出发的所有一度节点
|
|
204
|
-
coreNode = getCoreNode(
|
|
205
|
-
relativeLeafNodes = getRelativeNodeIds(
|
|
204
|
+
coreNode = getCoreNode('source', node, edges);
|
|
205
|
+
relativeLeafNodes = getRelativeNodeIds('both', coreNode, edges).map(function (nodeId) { return nodeMap[nodeId]; });
|
|
206
206
|
}
|
|
207
207
|
else if (outDegree === 0) {
|
|
208
208
|
// 如果为没有入边边的叶子节点，则找出与它关联的边的起点出发的所有一度节点
|
|
209
|
-
coreNode = getCoreNode(
|
|
210
|
-
relativeLeafNodes = getRelativeNodeIds(
|
|
209
|
+
coreNode = getCoreNode('target', node, edges);
|
|
210
|
+
relativeLeafNodes = getRelativeNodeIds('both', coreNode, edges).map(function (nodeId) { return nodeMap[nodeId]; });
|
|
211
211
|
}
|
|
212
212
|
relativeLeafNodes = relativeLeafNodes.filter(function (node) {
|
|
213
213
|
return degreesMap[node.id] &&
|
|
@@ -225,4 +225,33 @@ export var getCoreNodeAndRelativeLeafNodes = function (type, node, edges, nodeCl
|
|
|
225
225
|
export var getEuclideanDistance = function (p1, p2) {
|
|
226
226
|
return Math.sqrt((p1.x - p2.x) * (p1.x - p2.x) + (p1.y - p2.y) * (p1.y - p2.y));
|
|
227
227
|
};
|
|
228
|
+
/**
|
|
229
|
+
* Depth first search begin from nodes in graphCore data.
|
|
230
|
+
* @param graphCore graphlib data structure
|
|
231
|
+
* @param nodes begin nodes
|
|
232
|
+
* @param fn will be called while visiting each node
|
|
233
|
+
* @param mode 'TB' - visit from top to bottom; 'BT' - visit from bottom to top;
|
|
234
|
+
* @returns
|
|
235
|
+
*/
|
|
236
|
+
export var graphTreeDfs = function (graph, nodes, fn, mode, treeKey, stopFns) {
|
|
237
|
+
if (mode === void 0) { mode = 'TB'; }
|
|
238
|
+
if (stopFns === void 0) { stopFns = {}; }
|
|
239
|
+
if (!(nodes === null || nodes === void 0 ? void 0 : nodes.length))
|
|
240
|
+
return;
|
|
241
|
+
var stopBranchFn = stopFns.stopBranchFn, stopAllFn = stopFns.stopAllFn;
|
|
242
|
+
for (var i = 0; i < nodes.length; i++) {
|
|
243
|
+
var node = nodes[i];
|
|
244
|
+
if (!graph.hasNode(node.id))
|
|
245
|
+
continue;
|
|
246
|
+
if (stopBranchFn === null || stopBranchFn === void 0 ? void 0 : stopBranchFn(node))
|
|
247
|
+
continue; // Stop this branch
|
|
248
|
+
if (stopAllFn === null || stopAllFn === void 0 ? void 0 : stopAllFn(node))
|
|
249
|
+
return; // Stop all
|
|
250
|
+
if (mode === 'TB')
|
|
251
|
+
fn(node); // Traverse from top to bottom
|
|
252
|
+
graphTreeDfs(graph, graph.getChildren(node.id, treeKey), fn, mode, treeKey, stopFns);
|
|
253
|
+
if (mode !== 'TB')
|
|
254
|
+
fn(node); // Traverse from bottom to top
|
|
255
|
+
}
|
|
256
|
+
};
|
|
228
257
|
//# sourceMappingURL=math.js.map
|
package/lib/util/math.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../src/util/math.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"math.js","sourceRoot":"","sources":["../../src/util/math.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antv/layout",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.5",
|
|
4
4
|
"description": "graph layout algorithm",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -59,4 +59,4 @@
|
|
|
59
59
|
"build:umd": "webpack --config webpack.config.js --mode production",
|
|
60
60
|
"publish:alpha": "npm publish --tag alpha"
|
|
61
61
|
}
|
|
62
|
-
}
|
|
62
|
+
}
|