Skip to content

chore: Sync master into dev [dev]#3371

Merged
kumilingus merged 3 commits into
clientIO:devfrom
zbynekstara:sync-master-into-dev
Jun 15, 2026
Merged

chore: Sync master into dev [dev]#3371
kumilingus merged 3 commits into
clientIO:devfrom
zbynekstara:sync-master-into-dev

Conversation

@zbynekstara

@zbynekstara zbynekstara commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Sync master into dev before syncing back (#3372):

Changes included in this PR:

@zbynekstara zbynekstara changed the title chore: Sync master [dev] chore: Sync master into dev Jun 15, 2026
@zbynekstara zbynekstara requested review from Copilot and kumilingus and removed request for Copilot June 15, 2026 17:17
@zbynekstara zbynekstara changed the title chore: Sync master into dev chore: Sync master into dev [dev] Jun 15, 2026
@zbynekstara zbynekstara requested a review from Copilot June 15, 2026 17:44

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Synces changes from master into dev, primarily bumping workspace versions to 4.3.0-beta.1 while updating @joint/core packaging/tests and extending the core test suite with new regression coverage.

Changes:

  • Bumped versions across packages, demos, and examples to 4.3.0-beta.1 (plus a @joint/demo-joint-react version change).
  • Updated @joint/core exports configuration to rely on types path patterns; added a new TS “exports” type-check target wired into Grunt.
  • Added/extended QUnit regression tests for prototype-pollution hardening in util helpers and a right-angle router anchor edge case.

Reviewed changes

Copilot reviewed 96 out of 98 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
packages/joint-shapes-general/package.json Version bump to 4.3.0-beta.1.
packages/joint-shapes-general-tools/package.json Version bump to 4.3.0-beta.1.
packages/joint-react/src/types/cell.types.ts Update type-only import to use @joint/core/types/dia.
packages/joint-react/src/presets/paper-events.ts Update type-only import path for DOMElement to @joint/core/types/internal.
packages/joint-layout-msagl/package.json Version bump to 4.3.0-beta.1.
packages/joint-layout-directed-graph/package.json Version bump to 4.3.0-beta.1.
packages/joint-eslint-config/package.json Version bump to 4.3.0-beta.1.
packages/joint-decorators/package.json Version bump to 4.3.0-beta.1.
packages/joint-core/test/ts/tsconfig.json Comment formatting tweak in TS test config.
packages/joint-core/test/ts-exports/tsconfig.json New TS config for validating exports-based type resolution.
packages/joint-core/test/ts-exports/exports.test.ts New type-check-only regression test for exports types patterns.
packages/joint-core/test/ts-exports/exports.test.js.map Removed generated artifact.
packages/joint-core/test/ts-exports/exports.test.js Removed generated artifact.
packages/joint-core/test/jointjs/utilHelpers.js Added prototype-pollution regression tests for assign/defaults/defaultsDeep/clone/cloneDeep/omit/pick/merge/mergeWith.
packages/joint-core/test/jointjs/routers.js Added regression test for right-angle routing when anchor is outside element bbox.
packages/joint-core/test/jointjs/dia/Paper.js Minor object-literal formatting (trailing comma).
packages/joint-core/package.json Version bump; exports changed to pattern-based types exports; test-ts script updated.
packages/joint-core/grunt/config/ts.js Added ts:test-exports target.
packages/joint-core/grunt/config/aliases.js Wired test:ts alias to run both TS targets; updated main test alias.
packages/joint-core/eslint.config.mjs Updated ignore patterns for generated TS test outputs (including ts-exports).
packages/joint-core/demo/vuejs/package.json Version bump to 4.3.0-beta.1.
packages/joint-core/demo/ts-demo/package.json Version bump to 4.3.0-beta.1.
packages/joint-core/demo/rough/package.json Version bump to 4.3.0-beta.1.
packages/joint-core/demo/elk/package.json Version bump to 4.3.0-beta.1.
packages/joint-core/demo/custom-shapes/package.json Version bump to 4.3.0-beta.1.
packages/joint-core/.gitignore Updated ignore patterns for generated TS test outputs (including ts-exports).
package.json Root version bump to 4.3.0-beta.1.
examples/working-with-ports-js/package.json Version bump to 4.3.0-beta.1.
examples/use-case-diagram-js/package.json Version bump to 4.3.0-beta.1.
examples/tree-shake/package.json Version bump to 4.3.0-beta.1.
examples/tree-shake/index-M.ts Updated imports to use @joint/core root exports instead of subpath import.
examples/tree-shake/index-L.ts Updated imports to use @joint/core root exports instead of subpath import.
examples/tree-of-life/package.json Version bump to 4.3.0-beta.1.
examples/spreadsheet-shapes-with-handsontable-js/package.json Version bump to 4.3.0-beta.1.
examples/snap-links-to-themselves-js/package.json Version bump to 4.3.0-beta.1.
examples/shapes-general/package.json Version bump to 4.3.0-beta.1.
examples/shapes-drawing-js/package.json Version bump to 4.3.0-beta.1.
examples/serpentine-layout-js/package.json Version bump to 4.3.0-beta.1.
examples/scale-svgmarker-js/package.json Version bump to 4.3.0-beta.1.
examples/scale-option-for-tools-js/package.json Version bump to 4.3.0-beta.1.
examples/roi-calculator-js/package.json Version bump to 4.3.0-beta.1.
examples/right-angle-playground-js/package.json Version bump to 4.3.0-beta.1.
examples/resize-control-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/rectangular-layout-js/package.json Version bump to 4.3.0-beta.1.
examples/preserve-spaces-in-text-wrap-js/package.json Version bump to 4.3.0-beta.1.
examples/port-reordering-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/optional-ports-js/package.json Version bump to 4.3.0-beta.1.
examples/offscreen-rendering/package.json Version bump to 4.3.0-beta.1.
examples/nodejs-milestones-timeline-js/package.json Version bump to 4.3.0-beta.1.
examples/microsoft-adaptive-cards-js/package.json Version bump to 4.3.0-beta.1.
examples/list/package.json Version bump to 4.3.0-beta.1.
examples/link-labels-ts/package.json Version bump to 4.3.0-beta.1.
examples/link-connect-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/libavoid/package.json Version bump to 4.3.0-beta.1.
examples/layout-msagl/package.json Version bump to 4.3.0-beta.1.
examples/layout-elk-ts/package.json Version bump to 4.3.0-beta.1.
examples/layout-directed-graph/package.json Version bump to 4.3.0-beta.1.
examples/joint-react/package.json Version changed from 0.0.0 to 1.0.0-alpha.5.
examples/isometric/package.json Version bump to 4.3.0-beta.1.
examples/hover-link-connect-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/hover-element-connect-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/highlighterview-update-attribute-js/package.json Version bump to 4.3.0-beta.1.
examples/hierarchical-diagrams-js/package.json Version bump to 4.3.0-beta.1.
examples/hexagonal-grid-js/package.json Version bump to 4.3.0-beta.1.
examples/genogram-ts/package.json Version bump to 4.3.0-beta.1.
examples/fta-js/package.json Version bump to 4.3.0-beta.1.
examples/foreign-object-magnet-js/package.json Version bump to 4.3.0-beta.1.
examples/find-all-cells-between-2-elements-js/package.json Version bump to 4.3.0-beta.1.
examples/fills-js/package.json Version bump to 4.3.0-beta.1.
examples/fault-tree-analysis-js/package.json Version bump to 4.3.0-beta.1.
examples/external-svg-images-js/package.json Version bump to 4.3.0-beta.1.
examples/element-tags-and-badges-js/package.json Version bump to 4.3.0-beta.1.
examples/element-port-and-link-label-markup-js/package.json Version bump to 4.3.0-beta.1.
examples/element-connect-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/electric-generator-js/package.json Version bump to 4.3.0-beta.1.
examples/dynamic-status-icons-js/package.json Version bump to 4.3.0-beta.1.
examples/dynamic-font-size-js/package.json Version bump to 4.3.0-beta.1.
examples/dwdm/package.json Version bump to 4.3.0-beta.1.
examples/drop-image-as-shape-js/package.json Version bump to 4.3.0-beta.1.
examples/different-views-of-the-same-graph-js/package.json Version bump to 4.3.0-beta.1.
examples/decorators/package.json Version bump to 4.3.0-beta.1.
examples/curve-connector-js/package.json Version bump to 4.3.0-beta.1.
examples/counters-js/package.json Version bump to 4.3.0-beta.1.
examples/control-tool-js/package.json Version bump to 4.3.0-beta.1.
examples/content-driven-shapes-js/package.json Version bump to 4.3.0-beta.1.
examples/container/package.json Version bump to 4.3.0-beta.1.
examples/connector-arrows-js/package.json Version bump to 4.3.0-beta.1.
examples/connection-points-ts/package.json Version bump to 4.3.0-beta.1.
examples/circular-layout-js/package.json Version bump to 4.3.0-beta.1.
examples/chatgpt-timeline-js/package.json Version bump to 4.3.0-beta.1.
examples/callouts-js/package.json Version bump to 4.3.0-beta.1.
examples/bezier-js/package.json Version bump to 4.3.0-beta.1.
examples/animated-process-flow-diagram-js/package.json Version bump to 4.3.0-beta.1.
examples/angular-element-view-ts/package.json Version bump to 4.3.0-beta.1.
examples/anchors-ts/package.json Version bump to 4.3.0-beta.1.
examples/activity-diagram-js/package.json Version bump to 4.3.0-beta.1.
examples/absolute-port-layout-dynamic-port-sizes-js/package.json Version bump to 4.3.0-beta.1.
CHANGELOG Added v4.2.5 entry noting util prototype-pollution hardening.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread packages/joint-core/package.json
@kumilingus kumilingus merged commit dc3d09f into clientIO:dev Jun 15, 2026
@zbynekstara zbynekstara deleted the sync-master-into-dev branch June 17, 2026 14:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants