From 1ab9d75fb3e972ea4056c0f78ac08c435572d211 Mon Sep 17 00:00:00 2001 From: Roman Bruckner Date: Thu, 1 Feb 2024 22:20:00 +0800 Subject: [PATCH] chore: update packages version (#2515) --- examples/decorators/package.json | 6 +- examples/decorators/src/index.ts | 2 +- examples/dwdm/package.json | 4 +- examples/dwdm/src/Monitor.ts | 2 +- examples/dwdm/src/data.ts | 2 +- examples/dwdm/src/index.ts | 2 +- examples/dwdm/src/layout.ts | 2 +- examples/dwdm/src/shapes/anchors.ts | 2 +- examples/dwdm/src/shapes/cards/Card.ts | 2 +- .../dwdm/src/shapes/cards/Demultiplexer.ts | 2 +- .../src/shapes/cards/FiberProtectionUnit.ts | 2 +- .../dwdm/src/shapes/cards/LeftAmplifier.ts | 2 +- examples/dwdm/src/shapes/cards/Multiplexer.ts | 2 +- .../shapes/cards/OpticalPowerMonitoring.ts | 2 +- .../dwdm/src/shapes/cards/ROADMultiplexer.ts | 2 +- .../dwdm/src/shapes/cards/RightAmplifier.ts | 2 +- examples/dwdm/src/shapes/highlighters.ts | 2 +- examples/dwdm/src/shapes/index.ts | 2 +- .../dwdm/src/shapes/links/ExternalLink.ts | 2 +- examples/dwdm/src/shapes/links/FiberLink.ts | 2 +- examples/dwdm/src/shapes/links/Link.ts | 2 +- examples/dwdm/src/shapes/links/NodeLink.ts | 2 +- examples/dwdm/src/shapes/nodes/Node.ts | 2 +- examples/dwdm/src/shapes/utils.ts | 2 +- examples/dwdm/src/theme.ts | 2 +- examples/fta-js/package.json | 6 +- examples/fta-js/src/index.js | 2 +- examples/isometric/package.json | 6 +- examples/isometric/src/index.ts | 2 +- examples/isometric/src/obstacles.ts | 2 +- examples/isometric/src/shapes/index.ts | 2 +- .../isometric/src/shapes/isometric-shape.ts | 2 +- examples/isometric/src/shapes/link/link.ts | 2 +- examples/isometric/src/shapes/user/user.ts | 2 +- .../src/tools/center-based-height-tool.ts | 2 +- .../src/tools/proportional-size-tool.ts | 2 +- .../src/tools/pyramid-height-tool.ts | 2 +- examples/isometric/src/tools/size-tool.ts | 2 +- examples/isometric/src/tools/tools.ts | 2 +- examples/isometric/src/utils.ts | 2 +- examples/layout-directed-graph/package.json | 6 +- .../src/directed-graph.mjs | 2 +- examples/list/package.json | 4 +- examples/list/src/index.ts | 2 +- examples/shapes-general/package.json | 6 +- examples/shapes-general/src/index.ts | 2 +- examples/tree-of-life/package.json | 4 +- examples/tree-of-life/src/index.ts | 2 +- package.json | 4 +- .../demo/custom-shapes/package.json | 2 +- packages/joint-core/demo/elk/package.json | 2 +- packages/joint-core/demo/rough/package.json | 2 +- .../joint-core/demo/shapes/src/textpath.js | 2 +- .../joint-core/demo/tree-shake/package.json | 2 +- packages/joint-core/demo/ts-demo/package.json | 2 +- packages/joint-core/demo/vuejs/package.json | 2 +- packages/joint-core/package.json | 4 +- packages/joint-core/tutorials/elements.html | 4 +- .../joint-core/tutorials/graph-and-paper.html | 4 +- .../joint-core/tutorials/hello-world.html | 2 +- .../joint-core/tutorials/installation.html | 2 +- packages/joint-core/tutorials/links.html | 4 +- packages/joint-decorators/README.md | 16 +- packages/joint-decorators/package.json | 4 +- .../joint-decorators/src/decorators/Model.ts | 2 +- .../src/decorators/SVGAttribute.ts | 2 +- .../joint-decorators/src/decorators/View.ts | 2 +- packages/joint-decorators/src/parser.ts | 2 +- .../DirectedGraph.d.ts | 2 +- .../DirectedGraph.mjs | 2 +- .../joint-layout-directed-graph/karma.conf.js | 2 +- .../joint-layout-directed-graph/package.json | 4 +- .../rollup.config.mjs | 6 +- .../test/index.html | 2 +- .../test/nodejs/nodejs.js | 2 +- .../test/requirejs/requirejs.js | 2 +- .../joint-shapes-general-tools/package.json | 6 +- .../src/ArrowOffsetControl.ts | 2 +- .../src/CardOffsetControl.ts | 2 +- .../src/CubeCornerTool.ts | 2 +- .../src/CylinderTiltControl.ts | 2 +- .../src/DocumentOffsetControl.ts | 2 +- .../src/HexagonOffsetControl.ts | 2 +- .../src/NoteOffsetControl.ts | 2 +- .../src/ParallelogramOffsetControl.ts | 2 +- .../src/PlusOffsetControl.ts | 2 +- .../src/RadiusControl.ts | 2 +- .../src/StepOffsetControl.ts | 2 +- .../src/TableDividerTool.ts | 2 +- .../src/TrapezoidOffsetControl.ts | 2 +- packages/joint-shapes-general/package.json | 6 +- .../joint-shapes-general/src/actor/actor.ts | 2 +- .../joint-shapes-general/src/arrow/arrow.ts | 4 +- .../joint-shapes-general/src/card/card.ts | 2 +- .../joint-shapes-general/src/cube/cube.ts | 2 +- .../src/document/document.ts | 2 +- .../src/hexagon/hexagon.ts | 14 +- packages/joint-shapes-general/src/input.ts | 2 +- .../src/linked-process.ts | 2 +- packages/joint-shapes-general/src/mark.ts | 2 +- .../joint-shapes-general/src/note/note.ts | 2 +- .../src/parallelogram/parallelogram.ts | 10 +- .../joint-shapes-general/src/plus/plus.ts | 4 +- .../src/shipment/shipment.ts | 2 +- .../joint-shapes-general/src/step/step.ts | 14 +- .../joint-shapes-general/src/table/table.ts | 2 +- .../src/trapezoid/trapezoid.ts | 2 +- yarn.lock | 154 +++++++++--------- 108 files changed, 235 insertions(+), 235 deletions(-) diff --git a/examples/decorators/package.json b/examples/decorators/package.json index a38c2c693..5cc7598db 100644 --- a/examples/decorators/package.json +++ b/examples/decorators/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-decorators", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.ts", "homepage": "https://jointjs.com", "author": { @@ -17,8 +17,8 @@ "tsc": "tsc" }, "dependencies": { - "@joint/decorators": "workspace:^", - "jointjs": "workspace:^" + "@joint/core": "workspace:^", + "@joint/decorators": "workspace:^" }, "devDependencies": { "css-loader": "^6.8.1", diff --git a/examples/decorators/src/index.ts b/examples/decorators/src/index.ts index 1d9d07455..0d6cf57f9 100644 --- a/examples/decorators/src/index.ts +++ b/examples/decorators/src/index.ts @@ -1,4 +1,4 @@ -import { g, dia, shapes } from 'jointjs'; +import { g, dia, shapes } from '@joint/core'; import { Model, View, On, SVGAttribute, Function } from '@joint/decorators'; const shapeNamespace = { diff --git a/examples/dwdm/package.json b/examples/dwdm/package.json index 20abcca8a..8b3b34380 100644 --- a/examples/dwdm/package.json +++ b/examples/dwdm/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-dwdm", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.ts", "homepage": "https://jointjs.com", "author": { @@ -17,7 +17,7 @@ "tsc": "tsc" }, "dependencies": { - "jointjs": "workspace:^" + "@joint/core": "workspace:^" }, "devDependencies": { "css-loader": "^3.6.0", diff --git a/examples/dwdm/src/Monitor.ts b/examples/dwdm/src/Monitor.ts index 1e121706d..de7cad7ba 100644 --- a/examples/dwdm/src/Monitor.ts +++ b/examples/dwdm/src/Monitor.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Card, ExternalLink } from './shapes'; interface MonitorComponent { diff --git a/examples/dwdm/src/data.ts b/examples/dwdm/src/data.ts index c2a4fba28..5ff211289 100644 --- a/examples/dwdm/src/data.ts +++ b/examples/dwdm/src/data.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Node, Link, NodeLink } from './shapes'; interface INode { diff --git a/examples/dwdm/src/index.ts b/examples/dwdm/src/index.ts index 9b7e575e1..43e9bebcd 100644 --- a/examples/dwdm/src/index.ts +++ b/examples/dwdm/src/index.ts @@ -1,4 +1,4 @@ -import { dia, routers } from 'jointjs'; +import { dia, routers } from '@joint/core'; import { Node, cellNamespace } from './shapes'; import { ExpandButton, NodePlaceholder, toggleCellAlert } from './shapes/highlighters'; import { multiLinkAnchor } from './shapes/anchors'; diff --git a/examples/dwdm/src/layout.ts b/examples/dwdm/src/layout.ts index 13ea0221e..9596d2bfb 100644 --- a/examples/dwdm/src/layout.ts +++ b/examples/dwdm/src/layout.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Node, ExternalLink } from './shapes'; import { NODE_MARGIN_HORIZONTAL, NODE_PADDING_VERTICAL, diff --git a/examples/dwdm/src/shapes/anchors.ts b/examples/dwdm/src/shapes/anchors.ts index d363d92bc..56fb724d1 100644 --- a/examples/dwdm/src/shapes/anchors.ts +++ b/examples/dwdm/src/shapes/anchors.ts @@ -1,4 +1,4 @@ -import { anchors } from 'jointjs'; +import { anchors } from '@joint/core'; import { getPortLinks, isCellHidden } from './utils'; // Shift the anchor point of a link to avoid overlapping with other links (max 2 links per port). diff --git a/examples/dwdm/src/shapes/cards/Card.ts b/examples/dwdm/src/shapes/cards/Card.ts index 049fdcfb8..f7879f0ed 100644 --- a/examples/dwdm/src/shapes/cards/Card.ts +++ b/examples/dwdm/src/shapes/cards/Card.ts @@ -1,4 +1,4 @@ -import { dia, util } from 'jointjs'; +import { dia, util } from '@joint/core'; import { isCellHidden } from '../utils'; import { CARD_PORT_BG_COLOR, CARD_PORT_COLOR, CARD_PORT_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/Demultiplexer.ts b/examples/dwdm/src/shapes/cards/Demultiplexer.ts index aaebe9e05..0795966dd 100644 --- a/examples/dwdm/src/shapes/cards/Demultiplexer.ts +++ b/examples/dwdm/src/shapes/cards/Demultiplexer.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/FiberProtectionUnit.ts b/examples/dwdm/src/shapes/cards/FiberProtectionUnit.ts index 8df9d3634..b3036d083 100644 --- a/examples/dwdm/src/shapes/cards/FiberProtectionUnit.ts +++ b/examples/dwdm/src/shapes/cards/FiberProtectionUnit.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/LeftAmplifier.ts b/examples/dwdm/src/shapes/cards/LeftAmplifier.ts index 7fe3030ce..ea255552c 100644 --- a/examples/dwdm/src/shapes/cards/LeftAmplifier.ts +++ b/examples/dwdm/src/shapes/cards/LeftAmplifier.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/Multiplexer.ts b/examples/dwdm/src/shapes/cards/Multiplexer.ts index ef09d3d3f..d3fe14ad2 100644 --- a/examples/dwdm/src/shapes/cards/Multiplexer.ts +++ b/examples/dwdm/src/shapes/cards/Multiplexer.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/OpticalPowerMonitoring.ts b/examples/dwdm/src/shapes/cards/OpticalPowerMonitoring.ts index 692089f25..f5eef25a5 100644 --- a/examples/dwdm/src/shapes/cards/OpticalPowerMonitoring.ts +++ b/examples/dwdm/src/shapes/cards/OpticalPowerMonitoring.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/ROADMultiplexer.ts b/examples/dwdm/src/shapes/cards/ROADMultiplexer.ts index dca00fd76..3cf635edd 100644 --- a/examples/dwdm/src/shapes/cards/ROADMultiplexer.ts +++ b/examples/dwdm/src/shapes/cards/ROADMultiplexer.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/cards/RightAmplifier.ts b/examples/dwdm/src/shapes/cards/RightAmplifier.ts index e124ed555..6bf620f1d 100644 --- a/examples/dwdm/src/shapes/cards/RightAmplifier.ts +++ b/examples/dwdm/src/shapes/cards/RightAmplifier.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; import { Card } from './Card'; import { CARD_BG_COLOR, CARD_COLOR, CARD_LABEL_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/highlighters.ts b/examples/dwdm/src/shapes/highlighters.ts index 5e8628435..bc7f4f7a2 100644 --- a/examples/dwdm/src/shapes/highlighters.ts +++ b/examples/dwdm/src/shapes/highlighters.ts @@ -1,4 +1,4 @@ -import { dia, highlighters, util } from 'jointjs'; +import { dia, highlighters, util } from '@joint/core'; import { Node } from '.'; import { ALERT_COLOR } from '../theme'; diff --git a/examples/dwdm/src/shapes/index.ts b/examples/dwdm/src/shapes/index.ts index fa8e55a00..3e25956f2 100644 --- a/examples/dwdm/src/shapes/index.ts +++ b/examples/dwdm/src/shapes/index.ts @@ -1,4 +1,4 @@ -import { shapes } from 'jointjs'; +import { shapes } from '@joint/core'; import Node from "./nodes/Node"; import Multiplexer from "./cards/Multiplexer"; import Demultiplexer from './cards/Demultiplexer'; diff --git a/examples/dwdm/src/shapes/links/ExternalLink.ts b/examples/dwdm/src/shapes/links/ExternalLink.ts index 8acdfc074..197f1fda5 100644 --- a/examples/dwdm/src/shapes/links/ExternalLink.ts +++ b/examples/dwdm/src/shapes/links/ExternalLink.ts @@ -1,4 +1,4 @@ -import { dia, util } from 'jointjs'; +import { dia, util } from '@joint/core'; import Link from './Link'; import { EXTERNAL_LINK_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/links/FiberLink.ts b/examples/dwdm/src/shapes/links/FiberLink.ts index 0c9beeb11..f6667adbc 100644 --- a/examples/dwdm/src/shapes/links/FiberLink.ts +++ b/examples/dwdm/src/shapes/links/FiberLink.ts @@ -1,4 +1,4 @@ -import { dia, util } from 'jointjs'; +import { dia, util } from '@joint/core'; import Link from './Link'; import { FIBER_LINK_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/links/Link.ts b/examples/dwdm/src/shapes/links/Link.ts index 21debfee7..0a95be954 100644 --- a/examples/dwdm/src/shapes/links/Link.ts +++ b/examples/dwdm/src/shapes/links/Link.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; export default abstract class Link extends dia.Link { diff --git a/examples/dwdm/src/shapes/links/NodeLink.ts b/examples/dwdm/src/shapes/links/NodeLink.ts index c23715ca4..b9e6cb4bf 100644 --- a/examples/dwdm/src/shapes/links/NodeLink.ts +++ b/examples/dwdm/src/shapes/links/NodeLink.ts @@ -1,4 +1,4 @@ -import { dia, util } from 'jointjs'; +import { dia, util } from '@joint/core'; import Link from './Link'; import { NODE_LINK_COLOR } from '../../theme'; diff --git a/examples/dwdm/src/shapes/nodes/Node.ts b/examples/dwdm/src/shapes/nodes/Node.ts index 0644c14eb..aa6a1f366 100644 --- a/examples/dwdm/src/shapes/nodes/Node.ts +++ b/examples/dwdm/src/shapes/nodes/Node.ts @@ -1,4 +1,4 @@ -import { dia, util } from 'jointjs'; +import { dia, util } from '@joint/core'; import { NODE_BG_COLOR, NODE_HEADER_BG_COLOR, NODE_HEADER_COLOR, NODE_IP_COLOR } from '../../theme'; export const HEADER_HEIGHT = 40; diff --git a/examples/dwdm/src/shapes/utils.ts b/examples/dwdm/src/shapes/utils.ts index 40e85f2e3..bdca69fca 100644 --- a/examples/dwdm/src/shapes/utils.ts +++ b/examples/dwdm/src/shapes/utils.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; export function isCellHidden(cell: dia.Cell): boolean { return Boolean(cell.get('hidden')); diff --git a/examples/dwdm/src/theme.ts b/examples/dwdm/src/theme.ts index d0fea8eab..f162c6317 100644 --- a/examples/dwdm/src/theme.ts +++ b/examples/dwdm/src/theme.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; const PATTERN_1 = (fgColor: string, bgColor: string) => { return { diff --git a/examples/fta-js/package.json b/examples/fta-js/package.json index 3eb8a27d6..a8c1739bb 100644 --- a/examples/fta-js/package.json +++ b/examples/fta-js/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-fta-js", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.js", "homepage": "https://jointjs.com", "author": { @@ -17,8 +17,8 @@ "tsc": "tsc" }, "dependencies": { - "@joint/layout-directed-graph": "workspace:^", - "jointjs": "workspace:^" + "@joint/core": "workspace:^", + "@joint/layout-directed-graph": "workspace:^" }, "devDependencies": { "css-loader": "3.5.3", diff --git a/examples/fta-js/src/index.js b/examples/fta-js/src/index.js index 8c135045b..4fc26bfd2 100644 --- a/examples/fta-js/src/index.js +++ b/examples/fta-js/src/index.js @@ -1,4 +1,4 @@ -import { dia, elementTools, shapes as defaultShapes, util } from 'jointjs'; +import { dia, elementTools, shapes as defaultShapes, util } from '@joint/core'; import { DirectedGraph } from '@joint/layout-directed-graph'; import '../css/fta.css' diff --git a/examples/isometric/package.json b/examples/isometric/package.json index 4da13530b..8e4e77392 100644 --- a/examples/isometric/package.json +++ b/examples/isometric/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-isometric", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.ts", "homepage": "https://jointjs.com", "author": { @@ -17,8 +17,8 @@ "tsc": "tsc" }, "dependencies": { - "@joint/decorators": "workspace:^", - "jointjs": "workspace:^" + "@joint/core": "workspace:^", + "@joint/decorators": "workspace:^" }, "devDependencies": { "css-loader": "^6.8.1", diff --git a/examples/isometric/src/index.ts b/examples/isometric/src/index.ts index d0c73270b..edc6f3cac 100644 --- a/examples/isometric/src/index.ts +++ b/examples/isometric/src/index.ts @@ -1,4 +1,4 @@ -import { g, dia } from 'jointjs'; +import { g, dia } from '@joint/core'; import Obstacles from './obstacles'; import IsometricShape, { View } from './shapes/isometric-shape'; import { Computer, Database, ActiveDirectory, User, Firewall, Switch, Router, Link, cellNamespace } from './shapes'; diff --git a/examples/isometric/src/obstacles.ts b/examples/isometric/src/obstacles.ts index df766a388..80716a9f2 100644 --- a/examples/isometric/src/obstacles.ts +++ b/examples/isometric/src/obstacles.ts @@ -1,4 +1,4 @@ -import { g, dia, mvc } from 'jointjs'; +import { g, dia, mvc } from '@joint/core'; import { GRID_COUNT, GRID_SIZE } from './theme'; // Simplified version of obstacle detection. diff --git a/examples/isometric/src/shapes/index.ts b/examples/isometric/src/shapes/index.ts index f5d720e55..73f4874fd 100644 --- a/examples/isometric/src/shapes/index.ts +++ b/examples/isometric/src/shapes/index.ts @@ -1,4 +1,4 @@ -import { shapes } from 'jointjs'; +import { shapes } from '@joint/core'; import { Link } from './link/link' import { Switch } from './switch/switch' diff --git a/examples/isometric/src/shapes/isometric-shape.ts b/examples/isometric/src/shapes/isometric-shape.ts index 970847a15..4915c0b9f 100644 --- a/examples/isometric/src/shapes/isometric-shape.ts +++ b/examples/isometric/src/shapes/isometric-shape.ts @@ -1,4 +1,4 @@ -import { dia, g, elementTools } from 'jointjs'; +import { dia, g, elementTools } from '@joint/core'; import { CenterBasedHeightControl, PyramidHeightControl, SizeControl, ProportionalSizeControl, CONNECT_TOOL_PRESET } from '../tools'; export const ISOMETRIC_HEIGHT_KEY = 'isometric-height'; diff --git a/examples/isometric/src/shapes/link/link.ts b/examples/isometric/src/shapes/link/link.ts index 22c3928bc..d4864f276 100644 --- a/examples/isometric/src/shapes/link/link.ts +++ b/examples/isometric/src/shapes/link/link.ts @@ -1,4 +1,4 @@ -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; import { TargetArrowHeadTool, RemoveTool } from '../../tools'; export class Link extends shapes.standard.Link { diff --git a/examples/isometric/src/shapes/user/user.ts b/examples/isometric/src/shapes/user/user.ts index d1ecbea3a..9a7fcd7f0 100644 --- a/examples/isometric/src/shapes/user/user.ts +++ b/examples/isometric/src/shapes/user/user.ts @@ -1,4 +1,4 @@ -import { g, elementTools } from 'jointjs'; +import { g, elementTools } from '@joint/core'; import { Model, Function } from '@joint/decorators'; import svg from './user.svg'; import IsometricShape, { CONNECT_KEY } from '../isometric-shape'; diff --git a/examples/isometric/src/tools/center-based-height-tool.ts b/examples/isometric/src/tools/center-based-height-tool.ts index 9a1c04916..34c6b11e0 100644 --- a/examples/isometric/src/tools/center-based-height-tool.ts +++ b/examples/isometric/src/tools/center-based-height-tool.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { GRID_SIZE } from '../theme'; import { ISOMETRIC_HEIGHT_TOOL_MARKUP } from './tools'; import IsometricShape from '../shapes/isometric-shape'; diff --git a/examples/isometric/src/tools/proportional-size-tool.ts b/examples/isometric/src/tools/proportional-size-tool.ts index 268a0f430..b1e144a5d 100644 --- a/examples/isometric/src/tools/proportional-size-tool.ts +++ b/examples/isometric/src/tools/proportional-size-tool.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import IsometricShape, { PyramidShape } from '../shapes/isometric-shape'; import { SIZE_TOOL_MARKUP } from './tools'; import { GRID_SIZE } from '../theme'; diff --git a/examples/isometric/src/tools/pyramid-height-tool.ts b/examples/isometric/src/tools/pyramid-height-tool.ts index 43d0b6310..cbff8e35c 100644 --- a/examples/isometric/src/tools/pyramid-height-tool.ts +++ b/examples/isometric/src/tools/pyramid-height-tool.ts @@ -1,4 +1,4 @@ -import { elementTools, dia, g } from 'jointjs'; +import { elementTools, dia, g } from '@joint/core'; import { PyramidShape } from '../shapes/isometric-shape'; import { ISOMETRIC_HEIGHT_TOOL_MARKUP } from './tools'; import { GRID_SIZE } from '../theme'; diff --git a/examples/isometric/src/tools/size-tool.ts b/examples/isometric/src/tools/size-tool.ts index b8a0c9b82..d54062841 100644 --- a/examples/isometric/src/tools/size-tool.ts +++ b/examples/isometric/src/tools/size-tool.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import IsometricShape from '../shapes/isometric-shape'; import { GRID_SIZE } from '../theme'; import { SIZE_TOOL_MARKUP } from './tools'; diff --git a/examples/isometric/src/tools/tools.ts b/examples/isometric/src/tools/tools.ts index ec31a8e24..7dc958178 100644 --- a/examples/isometric/src/tools/tools.ts +++ b/examples/isometric/src/tools/tools.ts @@ -1,4 +1,4 @@ -import { dia, linkTools, util } from 'jointjs'; +import { dia, linkTools, util } from '@joint/core'; import { BG_COLOR, GRID_SIZE, HIGHLIGHT_COLOR } from '../theme'; const SIZE = 6; diff --git a/examples/isometric/src/utils.ts b/examples/isometric/src/utils.ts index 807633d56..b91a72616 100644 --- a/examples/isometric/src/utils.ts +++ b/examples/isometric/src/utils.ts @@ -1,4 +1,4 @@ -import { g, V, dia, util } from 'jointjs'; +import { g, V, dia, util } from '@joint/core'; import IsometricShape, { View } from './shapes/isometric-shape'; import { GRID_COUNT, GRID_SIZE, SCALE, ISOMETRIC_SCALE, ROTATION_DEGREES } from './theme'; import { Link } from './shapes'; diff --git a/examples/layout-directed-graph/package.json b/examples/layout-directed-graph/package.json index d731c4ab5..c6d967d5d 100644 --- a/examples/layout-directed-graph/package.json +++ b/examples/layout-directed-graph/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-layout-directed-graph", - "version": "1.0.0", + "version": "4.0.0", "description": "JointJS - Directed Graph Layout Demo", "main": "./index.js", "homepage": "https://jointjs.com", @@ -19,8 +19,8 @@ "start": "webpack serve --config webpack.config.js" }, "dependencies": { - "@joint/layout-directed-graph": "workspace:^", - "jointjs": "workspace:^" + "@joint/core": "workspace:^", + "@joint/layout-directed-graph": "workspace:^" }, "devDependencies": { "@babel/core": "7.10.4", diff --git a/examples/layout-directed-graph/src/directed-graph.mjs b/examples/layout-directed-graph/src/directed-graph.mjs index c55a6aa6b..562675411 100644 --- a/examples/layout-directed-graph/src/directed-graph.mjs +++ b/examples/layout-directed-graph/src/directed-graph.mjs @@ -1,4 +1,4 @@ -import * as joint from 'jointjs'; +import * as joint from '@joint/core'; import { DirectedGraph } from '@joint/layout-directed-graph'; function val(view, selector, val) { diff --git a/examples/list/package.json b/examples/list/package.json index 98c411a2b..c21474ea4 100644 --- a/examples/list/package.json +++ b/examples/list/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-list", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.ts", "homepage": "https://jointjs.com", "author": { @@ -17,7 +17,7 @@ "tsc": "tsc" }, "dependencies": { - "jointjs": "workspace:^" + "@joint/core": "workspace:^" }, "devDependencies": { "css-loader": "3.5.3", diff --git a/examples/list/src/index.ts b/examples/list/src/index.ts index 1c76773ec..f911087d9 100644 --- a/examples/list/src/index.ts +++ b/examples/list/src/index.ts @@ -1,4 +1,4 @@ -import { dia, shapes, g, linkTools, util } from 'jointjs'; +import { dia, shapes, g, linkTools, util } from '@joint/core'; const GRID_SIZE = 8; const PADDING_S = GRID_SIZE; diff --git a/examples/shapes-general/package.json b/examples/shapes-general/package.json index 303c78b89..f4c15de56 100644 --- a/examples/shapes-general/package.json +++ b/examples/shapes-general/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-shapes-general", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.ts", "homepage": "https://jointjs.com", "author": { @@ -17,9 +17,9 @@ "tsc": "tsc" }, "dependencies": { + "@joint/core": "workspace:^", "@joint/shapes-general": "workspace:^", - "@joint/shapes-general-tools": "workspace:^", - "jointjs": "workspace:^" + "@joint/shapes-general-tools": "workspace:^" }, "devDependencies": { "css-loader": "^6.8.1", diff --git a/examples/shapes-general/src/index.ts b/examples/shapes-general/src/index.ts index ebdf58967..af57363bf 100644 --- a/examples/shapes-general/src/index.ts +++ b/examples/shapes-general/src/index.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { LinkedProcess, Input, diff --git a/examples/tree-of-life/package.json b/examples/tree-of-life/package.json index c4098d70f..7d1bf96c0 100644 --- a/examples/tree-of-life/package.json +++ b/examples/tree-of-life/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-tree-of-life", - "version": "1.0.0", + "version": "4.0.0", "main": "src/index.ts", "author": { "name": "client IO", @@ -16,7 +16,7 @@ "tsc": "tsc" }, "dependencies": { - "jointjs": "workspace:^", + "@joint/core": "workspace:^", "perfect-freehand": "^1.2.0" }, "devDependencies": { diff --git a/examples/tree-of-life/src/index.ts b/examples/tree-of-life/src/index.ts index d5f7bf680..7852a1106 100644 --- a/examples/tree-of-life/src/index.ts +++ b/examples/tree-of-life/src/index.ts @@ -8,7 +8,7 @@ import { attributes, elementTools, highlighters, -} from 'jointjs'; +} from '@joint/core'; import '../index.css' diff --git a/package.json b/package.json index c1c981698..88c3c65c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joint", - "version": "3.7.7", + "version": "4.0.0", "sideEffects": false, "homepage": "https://jointjs.com", "author": { @@ -25,7 +25,7 @@ "lint-fix": "yarn workspaces foreach -tvv run lint-fix", "dist": "yarn workspaces foreach -tvv run dist", "build-docs": "yarn workspaces foreach -tvv run build-docs", - "pack-all": "yarn workspaces foreach -tvv --include \"@joint/layout-directed-graph\" --include \"jointjs\" pack --out %s-%v.tgz" + "pack-all": "yarn workspaces foreach -tvv --include \"@joint/layout-directed-graph\" --include \"@joint/core\" pack --out %s-%v.tgz" }, "workspaces": [ "./packages/*", diff --git a/packages/joint-core/demo/custom-shapes/package.json b/packages/joint-core/demo/custom-shapes/package.json index c4fbb25aa..7c70290ed 100644 --- a/packages/joint-core/demo/custom-shapes/package.json +++ b/packages/joint-core/demo/custom-shapes/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-custom-shapes", - "version": "1.0.0", + "version": "4.0.0", "description": "JointJS - Custom Shapes Demo", "main": "index.html", "homepage": "https://jointjs.com", diff --git a/packages/joint-core/demo/elk/package.json b/packages/joint-core/demo/elk/package.json index 7dc7e6ce6..03d60fc25 100644 --- a/packages/joint-core/demo/elk/package.json +++ b/packages/joint-core/demo/elk/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-elk-graph", - "version": "1.1.0", + "version": "4.0.0", "description": "JointJS - Eclipse Layout Kernel Graph Demo", "main": "index.html", "homepage": "https://jointjs.com", diff --git a/packages/joint-core/demo/rough/package.json b/packages/joint-core/demo/rough/package.json index b038eb61a..103234e6e 100644 --- a/packages/joint-core/demo/rough/package.json +++ b/packages/joint-core/demo/rough/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-rough", - "version": "1.0.0", + "version": "4.0.0", "description": "JointJS - RoughJS Demo", "main": "index.html", "homepage": "https://jointjs.com", diff --git a/packages/joint-core/demo/shapes/src/textpath.js b/packages/joint-core/demo/shapes/src/textpath.js index 7749e24ad..de4dc05f5 100644 --- a/packages/joint-core/demo/shapes/src/textpath.js +++ b/packages/joint-core/demo/shapes/src/textpath.js @@ -45,7 +45,7 @@ var arrow1 = new joint.shapes.standard.Arrow({ size: { width: 100, height: 50 }, attrs: { label: { - text: 'JointJS', + text: '@joint/core', fontSize: 35, textPath: { d: 'M 0 50 Q 50 0 100 20' }, textVerticalAnchor: 'middle' diff --git a/packages/joint-core/demo/tree-shake/package.json b/packages/joint-core/demo/tree-shake/package.json index 157d7b7d8..595a53395 100644 --- a/packages/joint-core/demo/tree-shake/package.json +++ b/packages/joint-core/demo/tree-shake/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-tree-shake", - "version": "1.0.0", + "version": "4.0.0", "description": "JointJS - Tree Shake Demo", "main": "index.html", "homepage": "https://jointjs.com", diff --git a/packages/joint-core/demo/ts-demo/package.json b/packages/joint-core/demo/ts-demo/package.json index 6db96b21e..c96cfea69 100644 --- a/packages/joint-core/demo/ts-demo/package.json +++ b/packages/joint-core/demo/ts-demo/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-ts", - "version": "1.0.0", + "version": "4.0.0", "description": "JointJS - TypeScript Demo", "main": "index.html", "homepage": "https://jointjs.com", diff --git a/packages/joint-core/demo/vuejs/package.json b/packages/joint-core/demo/vuejs/package.json index 786cd2927..92899dbd1 100644 --- a/packages/joint-core/demo/vuejs/package.json +++ b/packages/joint-core/demo/vuejs/package.json @@ -1,6 +1,6 @@ { "name": "@joint/demo-vuejs", - "version": "1.0.0", + "version": "4.0.0", "description": "JointJS - VueJS Demo", "main": "index.html", "homepage": "https://jointjs.com", diff --git a/packages/joint-core/package.json b/packages/joint-core/package.json index 71090fd27..6ad78e645 100644 --- a/packages/joint-core/package.json +++ b/packages/joint-core/package.json @@ -1,7 +1,7 @@ { - "name": "jointjs", + "name": "@joint/core", "title": "JointJS", - "version": "4.0.0-alpha.4", + "version": "4.0.0", "description": "JavaScript diagramming library", "sideEffects": false, "main": "./dist/joint.min.js", diff --git a/packages/joint-core/tutorials/elements.html b/packages/joint-core/tutorials/elements.html index d0c2f0fff..e0c896cbf 100644 --- a/packages/joint-core/tutorials/elements.html +++ b/packages/joint-core/tutorials/elements.html @@ -43,7 +43,7 @@

Elements

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> @@ -225,7 +225,7 @@

Example

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> diff --git a/packages/joint-core/tutorials/graph-and-paper.html b/packages/joint-core/tutorials/graph-and-paper.html index 4b204de11..3350a2ef0 100644 --- a/packages/joint-core/tutorials/graph-and-paper.html +++ b/packages/joint-core/tutorials/graph-and-paper.html @@ -40,7 +40,7 @@

Graph & Paper

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> @@ -166,7 +166,7 @@

Paper Styling

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> diff --git a/packages/joint-core/tutorials/hello-world.html b/packages/joint-core/tutorials/hello-world.html index 79731a357..3cf2f767f 100644 --- a/packages/joint-core/tutorials/hello-world.html +++ b/packages/joint-core/tutorials/hello-world.html @@ -34,7 +34,7 @@

Hello world!

<div id="myholder"></div> <!-- dependencies --> - <script src="https://cdnjs.cloudflare.com/ajax/libs/jointjs/4.0.0/joint.js"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/@joint/core/4.0.0/joint.js"></script> <!-- code --> <script type="text/javascript"> diff --git a/packages/joint-core/tutorials/installation.html b/packages/joint-core/tutorials/installation.html index e32a7ad09..687e4622a 100644 --- a/packages/joint-core/tutorials/installation.html +++ b/packages/joint-core/tutorials/installation.html @@ -104,7 +104,7 @@

Installation

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> diff --git a/packages/joint-core/tutorials/links.html b/packages/joint-core/tutorials/links.html index 713fdf9bb..f110a5fa7 100644 --- a/packages/joint-core/tutorials/links.html +++ b/packages/joint-core/tutorials/links.html @@ -43,7 +43,7 @@

Links

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> @@ -482,7 +482,7 @@

Example

<div id="myholder"></div> <!-- dependencies --> - <script src="node_modules/jointjs/dist/joint.js"></script> + <script src="node_modules/@joint/core/dist/joint.js"></script> <!-- code --> <script type="text/javascript"> diff --git a/packages/joint-decorators/README.md b/packages/joint-decorators/README.md index 28180251d..c9d742bf8 100644 --- a/packages/joint-decorators/README.md +++ b/packages/joint-decorators/README.md @@ -41,7 +41,7 @@ The decorator allows you to: - introduce a new SVG attribute or change the behavior of an existing one ```ts -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Model } from '@joint/decorators'; @Model({ @@ -265,7 +265,7 @@ class MyElement extends dia.Element { The default attributes of the model. When creating an instance of the model, any unspecified attributes will be set to their default value. ```ts -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; import { Model } from '@joint/decorators'; @Model({ @@ -281,7 +281,7 @@ class MyElement extends dia.Element { is equivalent to ```ts -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; class MyElement extends dia.Element { @@ -303,7 +303,7 @@ class MyElement extends dia.Element { Syntactic sugar for adding a model to the namespace. ```ts -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; import { Model } from '@joint/decorators'; @Model({ @@ -317,7 +317,7 @@ class MyElement extends dia.Element { is equivalent to ```ts -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; class MyElement extends dia.Element { @@ -342,7 +342,7 @@ Object.assign(shapes, { Define a new cell view, which is automatically used by 2 different models. ```ts -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; import { View } from '@joint/decorators'; @View({ @@ -357,7 +357,7 @@ class MyElementView extends dia.ElementView { is equivalent to ```ts -import { dia, shapes } from 'jointjs'; +import { dia, shapes } from '@joint/core'; class MyElementView extends dia.ElementView { @@ -398,7 +398,7 @@ class MyElement extends dia.Element { Introduce new SVG attributes or redefine existing ones. ```ts -import { dia, g, attributes } from 'jointjs'; +import { dia, g, attributes } from '@joint/core'; import { Model, SVGAttribute } from '@joint/decorators'; @Model({ diff --git a/packages/joint-decorators/package.json b/packages/joint-decorators/package.json index 0cebc2917..fed89aa63 100644 --- a/packages/joint-decorators/package.json +++ b/packages/joint-decorators/package.json @@ -1,7 +1,7 @@ { "name": "@joint/decorators", "title": "JointJS Decorators", - "version": "0.3.0", + "version": "4.0.0", "description": "Decorators module for JointJS", "main": "build/index.js", "types": "build/index.d.ts", @@ -34,7 +34,7 @@ "./SECURITY.md" ], "dependencies": { - "jointjs": "workspace:^" + "@joint/core": "workspace:^" }, "devDependencies": { "typescript": "4.8.4" diff --git a/packages/joint-decorators/src/decorators/Model.ts b/packages/joint-decorators/src/decorators/Model.ts index 8e29159e1..856859080 100644 --- a/packages/joint-decorators/src/decorators/Model.ts +++ b/packages/joint-decorators/src/decorators/Model.ts @@ -1,4 +1,4 @@ -import { dia, util } from 'jointjs'; +import { dia, util } from '@joint/core'; import { parseFromSVGString } from '../parser'; export interface ModelOptions { diff --git a/packages/joint-decorators/src/decorators/SVGAttribute.ts b/packages/joint-decorators/src/decorators/SVGAttribute.ts index 43649f457..5e499c347 100644 --- a/packages/joint-decorators/src/decorators/SVGAttribute.ts +++ b/packages/joint-decorators/src/decorators/SVGAttribute.ts @@ -1,4 +1,4 @@ -import { util } from 'jointjs'; +import { util } from '@joint/core'; export enum SVGAttributeTypes { SET = 'set', diff --git a/packages/joint-decorators/src/decorators/View.ts b/packages/joint-decorators/src/decorators/View.ts index f1bd41a59..33b02f81b 100644 --- a/packages/joint-decorators/src/decorators/View.ts +++ b/packages/joint-decorators/src/decorators/View.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; export interface ViewOptions { namespace?: any; diff --git a/packages/joint-decorators/src/parser.ts b/packages/joint-decorators/src/parser.ts index 4cb94f2c3..2388b73f0 100644 --- a/packages/joint-decorators/src/parser.ts +++ b/packages/joint-decorators/src/parser.ts @@ -1,4 +1,4 @@ -import { util, dia, attributes } from 'jointjs'; +import { util, dia, attributes } from '@joint/core'; // type SVGParserBindings = Record>; diff --git a/packages/joint-layout-directed-graph/DirectedGraph.d.ts b/packages/joint-layout-directed-graph/DirectedGraph.d.ts index 27274b6b2..34f9cd051 100644 --- a/packages/joint-layout-directed-graph/DirectedGraph.d.ts +++ b/packages/joint-layout-directed-graph/DirectedGraph.d.ts @@ -1,4 +1,4 @@ -import { dia, g } from 'jointjs'; +import { dia, g } from '@joint/core'; export namespace DirectedGraph { diff --git a/packages/joint-layout-directed-graph/DirectedGraph.mjs b/packages/joint-layout-directed-graph/DirectedGraph.mjs index 84f79f35a..c9e65a9a6 100644 --- a/packages/joint-layout-directed-graph/DirectedGraph.mjs +++ b/packages/joint-layout-directed-graph/DirectedGraph.mjs @@ -1,6 +1,6 @@ import * as dagreUtil from '@dagrejs/dagre'; import * as graphlibUtil from '@dagrejs/graphlib'; -import { util, g, dia } from 'jointjs'; +import { util, g, dia } from '@joint/core'; export const DirectedGraph = { diff --git a/packages/joint-layout-directed-graph/karma.conf.js b/packages/joint-layout-directed-graph/karma.conf.js index d4371ecdd..95fc307b1 100644 --- a/packages/joint-layout-directed-graph/karma.conf.js +++ b/packages/joint-layout-directed-graph/karma.conf.js @@ -7,7 +7,7 @@ module.exports = function(config) { files: [ './node_modules/@dagrejs/graphlib/dist/graphlib.js', './node_modules/@dagrejs/dagre/dist/dagre.js', - './node_modules/jointjs/build/joint.js', + './node_modules/@joint/core/build/joint.js', './dist/DirectedGraph.js', './test/index.js' diff --git a/packages/joint-layout-directed-graph/package.json b/packages/joint-layout-directed-graph/package.json index b07f2977f..a20cfec0b 100644 --- a/packages/joint-layout-directed-graph/package.json +++ b/packages/joint-layout-directed-graph/package.json @@ -1,7 +1,7 @@ { "name": "@joint/layout-directed-graph", "title": "JointJS LayoutDirectedGraph", - "version": "4.0.0-alpha.4", + "version": "4.0.0", "description": "LayoutDirectedGraph module for JointJS", "main": "dist/DirectedGraph.js", "module": "./DirectedGraph.mjs", @@ -48,7 +48,7 @@ "dependencies": { "@dagrejs/dagre": "~1.0.4", "@dagrejs/graphlib": "~2.1.13", - "jointjs": "workspace:^" + "@joint/core": "workspace:^" }, "devDependencies": { "@rollup/plugin-node-resolve": "^15.2.3", diff --git a/packages/joint-layout-directed-graph/rollup.config.mjs b/packages/joint-layout-directed-graph/rollup.config.mjs index a70547896..f5fea6d3b 100644 --- a/packages/joint-layout-directed-graph/rollup.config.mjs +++ b/packages/joint-layout-directed-graph/rollup.config.mjs @@ -15,7 +15,7 @@ export default [ external: [ '@dagrejs/dagre', '@dagrejs/graphlib', - 'jointjs' + '@joint/core' ], output: [ { @@ -26,7 +26,7 @@ export default [ globals: { '@dagrejs/dagre': 'dagre', '@dagrejs/graphlib': 'graphlib', - 'jointjs': 'joint' + '@joint/core': 'joint' }, plugins: [ banner(() => bannerText) @@ -40,7 +40,7 @@ export default [ globals: { '@dagrejs/dagre': 'dagre', '@dagrejs/graphlib': 'graphlib', - 'jointjs': 'joint' + '@joint/core': 'joint' }, plugins: [ uglify({ output: { ascii_only: true }}), diff --git a/packages/joint-layout-directed-graph/test/index.html b/packages/joint-layout-directed-graph/test/index.html index 1dc33eafb..803744083 100644 --- a/packages/joint-layout-directed-graph/test/index.html +++ b/packages/joint-layout-directed-graph/test/index.html @@ -13,7 +13,7 @@ - + diff --git a/packages/joint-layout-directed-graph/test/nodejs/nodejs.js b/packages/joint-layout-directed-graph/test/nodejs/nodejs.js index fb57d7d51..7b1f7db86 100644 --- a/packages/joint-layout-directed-graph/test/nodejs/nodejs.js +++ b/packages/joint-layout-directed-graph/test/nodejs/nodejs.js @@ -1,7 +1,7 @@ 'use strict'; require('should'); -const joint = require('jointjs'); +const joint = require('@joint/core'); const m = require('../../dist/DirectedGraph'); describe('require jointjs', function() { diff --git a/packages/joint-layout-directed-graph/test/requirejs/requirejs.js b/packages/joint-layout-directed-graph/test/requirejs/requirejs.js index 0744dc7aa..33210b954 100644 --- a/packages/joint-layout-directed-graph/test/requirejs/requirejs.js +++ b/packages/joint-layout-directed-graph/test/requirejs/requirejs.js @@ -4,7 +4,7 @@ require.config({ 'qunit': 'node_modules/qunit/qunit/qunit', '@dagrejs/graphlib': 'node_modules/@dagrejs/graphlib/dist/graphlib', '@dagrejs/dagre': 'node_modules/@dagrejs/dagre/dist/dagre', - 'jointjs': 'node_modules/jointjs/build/joint' + '@joint/core': 'node_modules/@joint/core/build/joint' } }); diff --git a/packages/joint-shapes-general-tools/package.json b/packages/joint-shapes-general-tools/package.json index a98e54a8c..dd928c3df 100644 --- a/packages/joint-shapes-general-tools/package.json +++ b/packages/joint-shapes-general-tools/package.json @@ -1,7 +1,7 @@ { "name": "@joint/shapes-general-tools", "title": "JointJS General Shapes Tools", - "version": "0.0.1", + "version": "4.0.0", "description": "General Shapes Tools module for JointJS", "main": "build/index.js", "types": "build/index.d.ts", @@ -35,9 +35,9 @@ "./svg.d.ts" ], "dependencies": { + "@joint/core": "workspace:^", "@joint/decorators": "workspace:^", - "@joint/shapes-general": "workspace:^", - "jointjs": "workspace:^" + "@joint/shapes-general": "workspace:^" }, "devDependencies": { "typescript": "4.8.4" diff --git a/packages/joint-shapes-general-tools/src/ArrowOffsetControl.ts b/packages/joint-shapes-general-tools/src/ArrowOffsetControl.ts index 09bf7444c..67f77fb65 100644 --- a/packages/joint-shapes-general-tools/src/ArrowOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/ArrowOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools } from 'jointjs'; +import { dia, elementTools } from '@joint/core'; import { Arrow } from '@joint/shapes-general'; export interface ArrowOffsetControlOptions diff --git a/packages/joint-shapes-general-tools/src/CardOffsetControl.ts b/packages/joint-shapes-general-tools/src/CardOffsetControl.ts index 327d41c49..54c43e771 100644 --- a/packages/joint-shapes-general-tools/src/CardOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/CardOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools } from 'jointjs'; +import { dia, elementTools } from '@joint/core'; import { Card } from "@joint/shapes-general"; diff --git a/packages/joint-shapes-general-tools/src/CubeCornerTool.ts b/packages/joint-shapes-general-tools/src/CubeCornerTool.ts index 4134239fc..5d4c7ed2e 100644 --- a/packages/joint-shapes-general-tools/src/CubeCornerTool.ts +++ b/packages/joint-shapes-general-tools/src/CubeCornerTool.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { Cube } from "@joint/shapes-general"; export interface CubeCornerToolOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/CylinderTiltControl.ts b/packages/joint-shapes-general-tools/src/CylinderTiltControl.ts index 785d34a9e..8816cfc03 100644 --- a/packages/joint-shapes-general-tools/src/CylinderTiltControl.ts +++ b/packages/joint-shapes-general-tools/src/CylinderTiltControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, shapes } from 'jointjs'; +import { dia, elementTools, shapes } from '@joint/core'; export interface CylinderTiltControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/DocumentOffsetControl.ts b/packages/joint-shapes-general-tools/src/DocumentOffsetControl.ts index 7d5f5a6c4..a501fe813 100644 --- a/packages/joint-shapes-general-tools/src/DocumentOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/DocumentOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { Document } from '@joint/shapes-general'; export interface DocumentOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/HexagonOffsetControl.ts b/packages/joint-shapes-general-tools/src/HexagonOffsetControl.ts index 5302a3395..d665315df 100644 --- a/packages/joint-shapes-general-tools/src/HexagonOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/HexagonOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { Hexagon } from '@joint/shapes-general'; export interface HexagonOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/NoteOffsetControl.ts b/packages/joint-shapes-general-tools/src/NoteOffsetControl.ts index 2dfc36634..1e5ea9096 100644 --- a/packages/joint-shapes-general-tools/src/NoteOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/NoteOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools } from 'jointjs'; +import { dia, elementTools } from '@joint/core'; import { Note } from '@joint/shapes-general'; export interface NoteOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/ParallelogramOffsetControl.ts b/packages/joint-shapes-general-tools/src/ParallelogramOffsetControl.ts index 8bb5be74f..d5e798db8 100644 --- a/packages/joint-shapes-general-tools/src/ParallelogramOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/ParallelogramOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { Parallelogram } from '@joint/shapes-general'; export interface ParallelogramOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/PlusOffsetControl.ts b/packages/joint-shapes-general-tools/src/PlusOffsetControl.ts index cce2ebfe5..c84893a37 100644 --- a/packages/joint-shapes-general-tools/src/PlusOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/PlusOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools } from 'jointjs'; +import { dia, elementTools } from '@joint/core'; import { Plus } from '@joint/shapes-general'; export interface PlusOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/RadiusControl.ts b/packages/joint-shapes-general-tools/src/RadiusControl.ts index bf8895a9c..8cc453faf 100644 --- a/packages/joint-shapes-general-tools/src/RadiusControl.ts +++ b/packages/joint-shapes-general-tools/src/RadiusControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, V, Vectorizer } from 'jointjs'; +import { dia, elementTools, V, Vectorizer } from '@joint/core'; export interface RadiusControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/StepOffsetControl.ts b/packages/joint-shapes-general-tools/src/StepOffsetControl.ts index 5567381d6..6550fe853 100644 --- a/packages/joint-shapes-general-tools/src/StepOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/StepOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { Step } from '@joint/shapes-general'; export interface StepOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/TableDividerTool.ts b/packages/joint-shapes-general-tools/src/TableDividerTool.ts index 208621422..f6efcc03d 100644 --- a/packages/joint-shapes-general-tools/src/TableDividerTool.ts +++ b/packages/joint-shapes-general-tools/src/TableDividerTool.ts @@ -1,4 +1,4 @@ -import { dia, elementTools } from 'jointjs'; +import { dia, elementTools } from '@joint/core'; import { Table } from "@joint/shapes-general"; export interface TableDividerToolOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general-tools/src/TrapezoidOffsetControl.ts b/packages/joint-shapes-general-tools/src/TrapezoidOffsetControl.ts index f6a5da8de..4b01d6b14 100644 --- a/packages/joint-shapes-general-tools/src/TrapezoidOffsetControl.ts +++ b/packages/joint-shapes-general-tools/src/TrapezoidOffsetControl.ts @@ -1,4 +1,4 @@ -import { dia, elementTools, g } from 'jointjs'; +import { dia, elementTools, g } from '@joint/core'; import { Trapezoid } from '@joint/shapes-general'; export interface TrapezoidOffsetControlOptions extends elementTools.Control.Options { diff --git a/packages/joint-shapes-general/package.json b/packages/joint-shapes-general/package.json index dc571b22b..699fdb396 100644 --- a/packages/joint-shapes-general/package.json +++ b/packages/joint-shapes-general/package.json @@ -1,7 +1,7 @@ { "name": "@joint/shapes-general", "title": "JointJS General Shapes", - "version": "0.0.1", + "version": "4.0.0", "description": "General Shapes module for JointJS", "main": "src/index.ts", "homepage": "https://jointjs.com", @@ -34,8 +34,8 @@ "./svg.d.ts" ], "dependencies": { - "@joint/decorators": "workspace:^", - "jointjs": "workspace:^" + "@joint/core": "workspace:^", + "@joint/decorators": "workspace:^" }, "devDependencies": { "typescript": "4.8.4" diff --git a/packages/joint-shapes-general/src/actor/actor.ts b/packages/joint-shapes-general/src/actor/actor.ts index 9adf29232..401c83d6b 100644 --- a/packages/joint-shapes-general/src/actor/actor.ts +++ b/packages/joint-shapes-general/src/actor/actor.ts @@ -1,5 +1,5 @@ import { Model } from '@joint/decorators'; -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import svg from './actor.svg'; interface ActorAttributes extends dia.Element.Attributes { diff --git a/packages/joint-shapes-general/src/arrow/arrow.ts b/packages/joint-shapes-general/src/arrow/arrow.ts index 6dbfd9347..484f9fc77 100644 --- a/packages/joint-shapes-general/src/arrow/arrow.ts +++ b/packages/joint-shapes-general/src/arrow/arrow.ts @@ -1,5 +1,5 @@ //@ts-nocheck -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Model, Function } from '@joint/decorators'; import svg from './Arrow.svg'; @@ -24,7 +24,7 @@ export class Arrow extends dia.Element { data(): string { const { arrowHeight, thickness } = this; return ` - M calc(w-${arrowHeight}) 0 + M calc(w-${arrowHeight}) 0 L calc(w) calc(0.5*h) L calc(w -${arrowHeight}) calc(h) v -calc(h/2 - ${thickness / 2}) diff --git a/packages/joint-shapes-general/src/card/card.ts b/packages/joint-shapes-general/src/card/card.ts index 547e0bad8..c1de6f4e8 100644 --- a/packages/joint-shapes-general/src/card/card.ts +++ b/packages/joint-shapes-general/src/card/card.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Function, Model } from '@joint/decorators'; import svg from './card.svg'; diff --git a/packages/joint-shapes-general/src/cube/cube.ts b/packages/joint-shapes-general/src/cube/cube.ts index 26e561336..322a0e347 100644 --- a/packages/joint-shapes-general/src/cube/cube.ts +++ b/packages/joint-shapes-general/src/cube/cube.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Function, Model } from "@joint/decorators"; import svg from "./cube.svg"; diff --git a/packages/joint-shapes-general/src/document/document.ts b/packages/joint-shapes-general/src/document/document.ts index 79ffc7524..1d802879a 100644 --- a/packages/joint-shapes-general/src/document/document.ts +++ b/packages/joint-shapes-general/src/document/document.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Model, Function } from '@joint/decorators'; import svg from './document.svg'; diff --git a/packages/joint-shapes-general/src/hexagon/hexagon.ts b/packages/joint-shapes-general/src/hexagon/hexagon.ts index 1511730a2..51313c4db 100644 --- a/packages/joint-shapes-general/src/hexagon/hexagon.ts +++ b/packages/joint-shapes-general/src/hexagon/hexagon.ts @@ -1,5 +1,5 @@ import { Model, Function } from '@joint/decorators'; -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import svg from './hexagon.svg'; class HexagonAttributes implements dia.Element.Attributes { @@ -23,12 +23,12 @@ export class Hexagon extends dia.Element { const { offset } = this; return ` - M 0 calc(0.5 * h) - L ${offset} calc(h) - L calc(w-${offset}) calc(h) - L calc(w) calc(0.5 * h) - L calc(w-${offset}) 0 - L ${offset} 0 + M 0 calc(0.5 * h) + L ${offset} calc(h) + L calc(w-${offset}) calc(h) + L calc(w) calc(0.5 * h) + L calc(w-${offset}) 0 + L ${offset} 0 Z ` } diff --git a/packages/joint-shapes-general/src/input.ts b/packages/joint-shapes-general/src/input.ts index f0a89d70a..1eae58d31 100644 --- a/packages/joint-shapes-general/src/input.ts +++ b/packages/joint-shapes-general/src/input.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; /** * This is an input element. diff --git a/packages/joint-shapes-general/src/linked-process.ts b/packages/joint-shapes-general/src/linked-process.ts index 2235a0a0d..61aae0207 100644 --- a/packages/joint-shapes-general/src/linked-process.ts +++ b/packages/joint-shapes-general/src/linked-process.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; export class LinkedProcess extends dia.Element { diff --git a/packages/joint-shapes-general/src/mark.ts b/packages/joint-shapes-general/src/mark.ts index 0d747b459..bc8648d8e 100644 --- a/packages/joint-shapes-general/src/mark.ts +++ b/packages/joint-shapes-general/src/mark.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; /** * This is a test diff --git a/packages/joint-shapes-general/src/note/note.ts b/packages/joint-shapes-general/src/note/note.ts index 3b3e3562d..104efdc16 100644 --- a/packages/joint-shapes-general/src/note/note.ts +++ b/packages/joint-shapes-general/src/note/note.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Model, Function } from '@joint/decorators'; import svg from './note.svg'; diff --git a/packages/joint-shapes-general/src/parallelogram/parallelogram.ts b/packages/joint-shapes-general/src/parallelogram/parallelogram.ts index bdfe69382..fefa7582b 100644 --- a/packages/joint-shapes-general/src/parallelogram/parallelogram.ts +++ b/packages/joint-shapes-general/src/parallelogram/parallelogram.ts @@ -1,5 +1,5 @@ import { Model, Function } from '@joint/decorators'; -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import svg from './parallelogram.svg'; interface ParallelogramAttributes extends dia.Element.Attributes { @@ -22,10 +22,10 @@ export class Parallelogram extends dia.Element { const { offset } = this return ` - M 0 calc(h) - L ${offset} 0 - L calc(w) 0 - L calc(w-${offset}) calc(h) + M 0 calc(h) + L ${offset} 0 + L calc(w) 0 + L calc(w-${offset}) calc(h) Z ` } diff --git a/packages/joint-shapes-general/src/plus/plus.ts b/packages/joint-shapes-general/src/plus/plus.ts index 4655ac675..77f764d8b 100644 --- a/packages/joint-shapes-general/src/plus/plus.ts +++ b/packages/joint-shapes-general/src/plus/plus.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Model, Function } from '@joint/decorators'; import svg from './Plus.svg'; @@ -22,7 +22,7 @@ export class Plus extends dia.Element { return ` M ${offset} 0 L calc(w - ${offset}) 0 - v 0 ${offset} + v 0 ${offset} h ${offset} V calc(h - ${offset}) h ${-offset} diff --git a/packages/joint-shapes-general/src/shipment/shipment.ts b/packages/joint-shapes-general/src/shipment/shipment.ts index e0e165917..d6d2fba7a 100644 --- a/packages/joint-shapes-general/src/shipment/shipment.ts +++ b/packages/joint-shapes-general/src/shipment/shipment.ts @@ -1,5 +1,5 @@ import { Model, Function } from '@joint/decorators'; -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import svg from './shipment.svg'; interface ShipmentAttributes extends dia.Element.Attributes { diff --git a/packages/joint-shapes-general/src/step/step.ts b/packages/joint-shapes-general/src/step/step.ts index 45a4ff036..312e175a1 100644 --- a/packages/joint-shapes-general/src/step/step.ts +++ b/packages/joint-shapes-general/src/step/step.ts @@ -1,5 +1,5 @@ import { Model, Function } from '@joint/decorators'; -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import svg from './step.svg'; interface StepAttributes extends dia.Element.Attributes { @@ -23,12 +23,12 @@ export class Step extends dia.Element { const { offset } = this; return ` - M 0 0 - L ${offset} calc(0.5 * h) - L 0 calc(h) - L calc(w - ${offset}) calc(h) - L calc(w) calc(0.5 * h) - L calc(w - ${offset}) 0 + M 0 0 + L ${offset} calc(0.5 * h) + L 0 calc(h) + L calc(w - ${offset}) calc(h) + L calc(w) calc(0.5 * h) + L calc(w - ${offset}) 0 Z ` } diff --git a/packages/joint-shapes-general/src/table/table.ts b/packages/joint-shapes-general/src/table/table.ts index dd2e73fa4..b3ae63254 100644 --- a/packages/joint-shapes-general/src/table/table.ts +++ b/packages/joint-shapes-general/src/table/table.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Function, Model } from '@joint/decorators'; import svg from './table.svg'; diff --git a/packages/joint-shapes-general/src/trapezoid/trapezoid.ts b/packages/joint-shapes-general/src/trapezoid/trapezoid.ts index f0710c882..f57e2b370 100644 --- a/packages/joint-shapes-general/src/trapezoid/trapezoid.ts +++ b/packages/joint-shapes-general/src/trapezoid/trapezoid.ts @@ -1,4 +1,4 @@ -import { dia } from 'jointjs'; +import { dia } from '@joint/core'; import { Model, Function } from '@joint/decorators'; import svg from './trapezoid.svg'; diff --git a/yarn.lock b/yarn.lock index 2873f355c..ca8dd41b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1222,11 +1222,76 @@ __metadata: languageName: node linkType: hard +"@joint/core@workspace:^, @joint/core@workspace:packages/joint-core": + version: 0.0.0-use.local + resolution: "@joint/core@workspace:packages/joint-core" + dependencies: + "@microsoft/api-extractor": 7.33.7 + "@typescript-eslint/eslint-plugin": 5.48.1 + "@typescript-eslint/parser": 5.48.1 + async: 2.6.1 + chai: 4.2.0 + cheerio: 0.22.0 + core-js: ~3.8.3 + es-module-shims: 0.2.4 + eslint: 8.1.0 + express: 4.16.3 + grunt: ^1.3.0 + grunt-browserify: 5.3.0 + grunt-compile-docs: 1.2.1 + grunt-contrib-clean: 2.0.0 + grunt-contrib-concat: 1.0.1 + grunt-contrib-copy: 1.0.0 + grunt-contrib-qunit: 3.1.0 + grunt-contrib-uglify: 4.0.0 + grunt-contrib-watch: 1.1.0 + grunt-env: 0.4.4 + grunt-eslint: 21.0.0 + grunt-karma: 3.0.1 + grunt-mocha-test: 0.13.3 + grunt-newer: 1.3.0 + grunt-shell: 3.0.1 + grunt-ts: 6.0.0-beta.22 + grunt-webpack: 6.0.0 + handlebars: 4.7.7 + jit-grunt: 0.10.0 + jquery: ~3.7.1 + karma: 3.1.4 + karma-chrome-launcher: 2.2.0 + karma-coverage: 1.1.2 + karma-qunit: 2.1.0 + karma-sinon: 1.0.5 + load-grunt-config: 0.19.2 + lodash: ~4.17.21 + mocha: 5.2.0 + open-sans-fontface: "https://github.com/clientIO/open-sans/archive/1.4.2.tar.gz" + prism-themes: 1.9.0 + prismjs: 1.24.0 + puppeteer: 17.0.0 + qunit: 2.8.0 + requirejs: 2.3.6 + rollup: 1.20.3 + rollup-plugin-buble: 0.19.6 + rollup-plugin-commonjs: 9.2.0 + rollup-plugin-json: 4.0.0 + rollup-plugin-node-resolve: 4.0.0 + selenium-standalone: 6.15.3 + serve-static: 1.13.2 + should: 13.2.3 + sinon: 7.2.2 + time-grunt: 2.0.0 + typescript: 4.8.4 + webdriverio: 4.13.2 + webpack: 5.89.0 + webpack-dev-server: 4.15.1 + languageName: unknown + linkType: soft + "@joint/decorators@workspace:^, @joint/decorators@workspace:packages/joint-decorators": version: 0.0.0-use.local resolution: "@joint/decorators@workspace:packages/joint-decorators" dependencies: - jointjs: "workspace:^" + "@joint/core": "workspace:^" typescript: 4.8.4 languageName: unknown linkType: soft @@ -1235,9 +1300,9 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-decorators@workspace:examples/decorators" dependencies: + "@joint/core": "workspace:^" "@joint/decorators": "workspace:^" css-loader: ^6.8.1 - jointjs: "workspace:^" raw-loader: ^4.0.2 style-loader: ^3.3.3 ts-loader: ^9.2.5 @@ -1252,8 +1317,8 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-dwdm@workspace:examples/dwdm" dependencies: + "@joint/core": "workspace:^" css-loader: ^3.6.0 - jointjs: "workspace:^" style-loader: ^1.3.0 ts-loader: ^9.2.5 typescript: ^4.4.3 @@ -1267,9 +1332,9 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-fta-js@workspace:examples/fta-js" dependencies: + "@joint/core": "workspace:^" "@joint/layout-directed-graph": "workspace:^" css-loader: 3.5.3 - jointjs: "workspace:^" style-loader: 1.2.1 webpack: ^5.61.0 webpack-cli: ^4.8.0 @@ -1281,9 +1346,9 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-isometric@workspace:examples/isometric" dependencies: + "@joint/core": "workspace:^" "@joint/decorators": "workspace:^" css-loader: ^6.8.1 - jointjs: "workspace:^" raw-loader: ^4.0.2 style-loader: ^3.3.3 ts-loader: ^9.2.5 @@ -1300,13 +1365,13 @@ __metadata: dependencies: "@babel/core": 7.10.4 "@babel/preset-env": 7.10.4 + "@joint/core": "workspace:^" "@joint/layout-directed-graph": "workspace:^" babel-loader: 8.1.0 copy-webpack-plugin: 5.1.1 core-js: 3.6.1 css-loader: 3.5.3 file-loader: 6.0.0 - jointjs: "workspace:^" regenerator-runtime: 0.13.5 sass: 1.26.8 sass-loader: 8.0.2 @@ -1323,8 +1388,8 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-list@workspace:examples/list" dependencies: + "@joint/core": "workspace:^" css-loader: 3.5.3 - jointjs: "workspace:^" style-loader: 1.2.1 ts-loader: ^9.2.5 typescript: ^4.4.3 @@ -1338,10 +1403,10 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-shapes-general@workspace:examples/shapes-general" dependencies: + "@joint/core": "workspace:^" "@joint/shapes-general": "workspace:^" "@joint/shapes-general-tools": "workspace:^" css-loader: ^6.8.1 - jointjs: "workspace:^" raw-loader: ^4.0.2 style-loader: ^3.3.3 ts-loader: ^9.2.5 @@ -1356,8 +1421,8 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/demo-tree-of-life@workspace:examples/tree-of-life" dependencies: + "@joint/core": "workspace:^" css-loader: ^6.8.1 - jointjs: "workspace:^" perfect-freehand: ^1.2.0 style-loader: ^3.3.3 ts-loader: ^9.2.5 @@ -1374,8 +1439,8 @@ __metadata: dependencies: "@dagrejs/dagre": ~1.0.4 "@dagrejs/graphlib": ~2.1.13 + "@joint/core": "workspace:^" "@rollup/plugin-node-resolve": ^15.2.3 - jointjs: "workspace:^" karma: ^6.4.2 karma-chrome-launcher: ^3.2.0 karma-coverage: ^2.2.1 @@ -1395,9 +1460,9 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/shapes-general-tools@workspace:packages/joint-shapes-general-tools" dependencies: + "@joint/core": "workspace:^" "@joint/decorators": "workspace:^" "@joint/shapes-general": "workspace:^" - jointjs: "workspace:^" typescript: 4.8.4 languageName: unknown linkType: soft @@ -1406,8 +1471,8 @@ __metadata: version: 0.0.0-use.local resolution: "@joint/shapes-general@workspace:packages/joint-shapes-general" dependencies: + "@joint/core": "workspace:^" "@joint/decorators": "workspace:^" - jointjs: "workspace:^" typescript: 4.8.4 languageName: unknown linkType: soft @@ -9049,71 +9114,6 @@ __metadata: languageName: unknown linkType: soft -"jointjs@workspace:^, jointjs@workspace:packages/joint-core": - version: 0.0.0-use.local - resolution: "jointjs@workspace:packages/joint-core" - dependencies: - "@microsoft/api-extractor": 7.33.7 - "@typescript-eslint/eslint-plugin": 5.48.1 - "@typescript-eslint/parser": 5.48.1 - async: 2.6.1 - chai: 4.2.0 - cheerio: 0.22.0 - core-js: ~3.8.3 - es-module-shims: 0.2.4 - eslint: 8.1.0 - express: 4.16.3 - grunt: ^1.3.0 - grunt-browserify: 5.3.0 - grunt-compile-docs: 1.2.1 - grunt-contrib-clean: 2.0.0 - grunt-contrib-concat: 1.0.1 - grunt-contrib-copy: 1.0.0 - grunt-contrib-qunit: 3.1.0 - grunt-contrib-uglify: 4.0.0 - grunt-contrib-watch: 1.1.0 - grunt-env: 0.4.4 - grunt-eslint: 21.0.0 - grunt-karma: 3.0.1 - grunt-mocha-test: 0.13.3 - grunt-newer: 1.3.0 - grunt-shell: 3.0.1 - grunt-ts: 6.0.0-beta.22 - grunt-webpack: 6.0.0 - handlebars: 4.7.7 - jit-grunt: 0.10.0 - jquery: ~3.7.1 - karma: 3.1.4 - karma-chrome-launcher: 2.2.0 - karma-coverage: 1.1.2 - karma-qunit: 2.1.0 - karma-sinon: 1.0.5 - load-grunt-config: 0.19.2 - lodash: ~4.17.21 - mocha: 5.2.0 - open-sans-fontface: "https://github.com/clientIO/open-sans/archive/1.4.2.tar.gz" - prism-themes: 1.9.0 - prismjs: 1.24.0 - puppeteer: 17.0.0 - qunit: 2.8.0 - requirejs: 2.3.6 - rollup: 1.20.3 - rollup-plugin-buble: 0.19.6 - rollup-plugin-commonjs: 9.2.0 - rollup-plugin-json: 4.0.0 - rollup-plugin-node-resolve: 4.0.0 - selenium-standalone: 6.15.3 - serve-static: 1.13.2 - should: 13.2.3 - sinon: 7.2.2 - time-grunt: 2.0.0 - typescript: 4.8.4 - webdriverio: 4.13.2 - webpack: 5.89.0 - webpack-dev-server: 4.15.1 - languageName: unknown - linkType: soft - "jquery@npm:~3.7.1": version: 3.7.1 resolution: "jquery@npm:3.7.1"