diff --git a/lib/util/CreateOptionsUtil.js b/lib/util/CreateOptionsUtil.js index 1ae1877..f4263c1 100644 --- a/lib/util/CreateOptionsUtil.js +++ b/lib/util/CreateOptionsUtil.js @@ -488,6 +488,26 @@ export const SUBPROCESS = [ type: 'bpmn:SubProcess', isExpanded: true } + }, + { + label: 'Ad-hoc sub-process (collapsed)', + search: 'adhoc subprocess', + actionName: 'collapsed-ad-hoc-subprocess', + className: 'bpmn-icon-subprocess-collapsed', + target: { + type: 'bpmn:AdHocSubProcess', + isExpanded: false + } + }, + { + label: 'Ad-hoc sub-process (expanded)', + search: 'adhoc subprocess', + actionName: 'expanded-ad-hoc-subprocess', + className: 'bpmn-icon-subprocess-expanded', + target: { + type: 'bpmn:AdHocSubProcess', + isExpanded: true + } } ].map(option => ({ ...option, group: SUBPROCESS_GROUP })); diff --git a/package-lock.json b/package-lock.json index 9f61dfe..687f13d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,9 +18,9 @@ "@testing-library/preact": "^3.2.3", "babel-loader": "^9.2.1", "babel-plugin-istanbul": "^7.0.0", - "bpmn-js": "^18.0.0", - "bpmn-js-element-templates": "^2.0.0", - "bpmn-js-properties-panel": "^5.7.0", + "bpmn-js": "^18.2.0", + "bpmn-js-element-templates": "^2.5.1", + "bpmn-js-properties-panel": "^5.31.1", "cross-env": "^7.0.3", "downloadjs": "^1.4.7", "eslint": "^9.14.0", @@ -43,7 +43,7 @@ "sinon": "^18.0.1", "sinon-chai": "^3.7.0", "webpack": "^5.96.1", - "zeebe-bpmn-moddle": "^1.0.0" + "zeebe-bpmn-moddle": "^1.9.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -427,21 +427,21 @@ } }, "node_modules/@bpmn-io/element-templates-validator": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.1.0.tgz", - "integrity": "sha512-e8oYLUaZbL1ZuJjwXFyhhStbg0YgMNosIlzhKWdY7ysPhCFVMJlJ6yNYdaxyqfpPATTKb05uXMAsIgcqTQpoLg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.3.2.tgz", + "integrity": "sha512-Gr6pNSoFif2Sgd01+NdPVVLGrz4R/AICHbK29zBcF849RDH+iLq7qAUhbT8MwwUKOs9WHztXoDTEiKbF85lx5g==", "dev": true, "dependencies": { - "@camunda/element-templates-json-schema": "^0.18.0", - "@camunda/zeebe-element-templates-json-schema": "^0.20.0", + "@camunda/element-templates-json-schema": "^0.18.1", + "@camunda/zeebe-element-templates-json-schema": "^0.22.2", "json-source-map": "^0.6.1", "min-dash": "^4.1.1" } }, "node_modules/@bpmn-io/extract-process-variables": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-0.8.0.tgz", - "integrity": "sha512-yAS7ZYX+D56K+luC36u96eRMLb4VHcPUwTUqMZ/Z/Je2gou2DJLRbuBTHAB4jjKt4wFCHSG4B8Y+TrBciEYf4w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-1.0.1.tgz", + "integrity": "sha512-bisd1kL38HIjB+nmvtw3mpktH0Il3y55eiH/F7kKJs00jf+eksRBoUdr8q4Ge7w5uWxEKVszrasZCee5LTcYEw==", "dev": true, "dependencies": { "min-dash": "^4.0.0" @@ -512,15 +512,15 @@ } }, "node_modules/@camunda/element-templates-json-schema": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.18.0.tgz", - "integrity": "sha512-k2k+1Z7UiW1TSA1oAvDQamgFZljH3hkFjU9VSpjVXnPgcjVxJMLX0mrHjLVtXhEx2tw576FzYGqlfudw6OOMKg==", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.18.1.tgz", + "integrity": "sha512-gwQJHUYx1FrIJCgJISx2cpqTJYgnsqrJ6dpPX/R0p6ELyK6u4rHAi/m9QS1O4F6ua7dBlFFFOOtuIAbo5mAfAg==", "dev": true }, "node_modules/@camunda/zeebe-element-templates-json-schema": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.20.0.tgz", - "integrity": "sha512-7YRN32Nq73H8S1rCOy2/6cfx+fKiTnhveJYfP6aRaIi83ZSlhVomRJ5+pnPmlDJqdFeNcIx1qqQwVFAdgNPFhg==", + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.22.2.tgz", + "integrity": "sha512-qKUa64twO5Ewh6rN+z0n1cdTweuKYuwPCZH6VL7knsdfSYe4PBLnx8FwTXS6Hc5LZCP60rp+XXgQ5puQZfqlNQ==", "dev": true }, "node_modules/@codemirror/autocomplete": { @@ -2045,12 +2045,12 @@ } }, "node_modules/array-move": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/array-move/-/array-move-3.0.1.tgz", - "integrity": "sha512-H3Of6NIn2nNU1gsVDqDnYKY/LCdWvCMMOWifNGhKcVQgiZ6nOek39aESOvro6zmueP07exSl93YLvkN4fZOkSg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/array-move/-/array-move-4.0.0.tgz", + "integrity": "sha512-+RY54S8OuVvg94THpneQvFRmqWdAHeqtMzgMW6JNurHxe8rsS07cHQdfGkXnTUXiBcyZ0j3SiDIxxj0RPiqCkQ==", "dev": true, "engines": { - "node": ">=10" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -2394,12 +2394,12 @@ "dev": true }, "node_modules/bpmn-js": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.0.0.tgz", - "integrity": "sha512-eZR4hqk2BT0m9jAGGtp/f1TD0m7LXXKfYle99q75d+NjSmxetIuvxGn48S9W+H8arJ7vgsls2GELzXoDuEE0eg==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.2.0.tgz", + "integrity": "sha512-2wdOUe2WjR+hvDsHorzNyIe52Ep8l1a79FJPQsss0fm2Jrjx/Sf9hRs+C3cKIbogBTZPQkmuS/QoCFjniMevzg==", "dependencies": { "bpmn-moddle": "^9.0.1", - "diagram-js": "^15.1.0", + "diagram-js": "^15.2.4", "diagram-js-direct-editing": "^3.2.0", "ids": "^1.0.5", "inherits-browser": "^0.1.0", @@ -2412,21 +2412,22 @@ } }, "node_modules/bpmn-js-element-templates": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-2.0.0.tgz", - "integrity": "sha512-DYY/6fjq+mNAGmtm9TxI9UhCD1jApxUOAK6w6tAgRWwwCgRTL1Mdt4b5OOK+mgTrxGPW60rwCPUN8jrS3l4kLw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-2.5.1.tgz", + "integrity": "sha512-w08tAW0XQ+N1g4V7F/QmrrzDq88YjNao69nwbwyO83oTG2pB32Y3aDXDXJqvJJnNUnsjREKVXllNcZioGP1Dsg==", "dev": true, "dependencies": { - "@bpmn-io/element-templates-validator": "^2.1.0", - "@bpmn-io/extract-process-variables": "^0.8.0", - "bpmnlint": "^10.3.0", + "@bpmn-io/element-templates-validator": "^2.3.2", + "@bpmn-io/extract-process-variables": "^1.0.0", + "bpmnlint": "^11.0.0", "classnames": "^2.3.1", "ids": "^1.0.0", "min-dash": "^4.0.0", "min-dom": "^4.0.3", "preact-markup": "^2.1.1", + "semver": "^7.6.3", "semver-compare": "^1.0.0", - "uuid": "^10.0.0" + "uuid": "^11.0.0" }, "engines": { "node": "*" @@ -2439,17 +2440,29 @@ "diagram-js": ">= 11.9" } }, + "node_modules/bpmn-js-element-templates/node_modules/semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/bpmn-js-properties-panel": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-5.7.0.tgz", - "integrity": "sha512-6dbMf69FthXP+J3rLzN0ot88n55fyoVLMFO0vX2/yI1fgzhvi14TTOvZEYGi7KVvJIQDPV5YYtxSytUL3t0B9A==", + "version": "5.31.1", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-5.31.1.tgz", + "integrity": "sha512-DH+IYngB0SVGh5yqDhKoFQMIR3sgnQgh8NFua0OmjKiwyxIaT/nzrPmuY/QEGhS0YbmRPfNIH0xVlFJwGR6jeA==", "dev": true, "dependencies": { - "@bpmn-io/extract-process-variables": "^0.8.0", - "array-move": "^3.0.1", + "@bpmn-io/extract-process-variables": "^1.0.0", + "array-move": "^4.0.0", "ids": "^1.0.5", - "min-dash": "^4.1.1", - "min-dom": "^4.1.0" + "min-dash": "^4.2.1", + "min-dom": "^4.2.1" }, "engines": { "node": "*" @@ -2461,7 +2474,7 @@ "diagram-js": ">= 11.9" } }, - "node_modules/bpmn-js/node_modules/bpmn-moddle": { + "node_modules/bpmn-moddle": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.1.tgz", "integrity": "sha512-jO2P5RBx0cZCCd+imqhpNE5anttaYuGd71u76NEA/qMZwJSW1t5ETAtw9/E2InfiPU2w0TR8oxPyopJXRc9VQg==", @@ -2474,61 +2487,19 @@ "node": ">= 18" } }, - "node_modules/bpmn-js/node_modules/moddle": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/moddle/-/moddle-7.0.0.tgz", - "integrity": "sha512-Hpte2hfKDwoZWPvDngsEHjloPnO+sKMUVkAPc0r9PrpnVLqsyPUTV0ZQU8CAp87YmRZ9QzeQMJxdKbaP9vEIKA==", - "dependencies": { - "min-dash": "^4.2.1" - } - }, - "node_modules/bpmn-js/node_modules/moddle-xml": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-11.0.0.tgz", - "integrity": "sha512-L3Sseepfcq9Uy0iIfqEDTXSoYLva1Y/JGbN/4AMOeQ6cqbu8Ma/SDJIdOFm7smsAa64j2z3SwCGG3FIilQVnUg==", - "dependencies": { - "min-dash": "^4.0.0", - "saxen": "^10.0.0" - }, - "engines": { - "node": ">= 18" - }, - "peerDependencies": { - "moddle": ">= 6.2.0" - } - }, - "node_modules/bpmn-js/node_modules/saxen": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/saxen/-/saxen-10.0.0.tgz", - "integrity": "sha512-RXsmWok/SAWqOG/f5ADEz51DN9WtZEzqih3e08ranldcaXekxjx8NBKjGh/y5hlowjo0JH/LekBu6gtPFD1G6g==", - "engines": { - "node": ">= 18" - } - }, - "node_modules/bpmn-moddle": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-8.1.0.tgz", - "integrity": "sha512-yI5OAFfYVJwViKTsTsonVfCBPtB3MlefADUORwNIxxBOMp21vnoxuxsdgUWlPH/dvAEZh/+mr8UtqOBNu8NC5Q==", - "dev": true, - "dependencies": { - "min-dash": "^4.0.0", - "moddle": "^6.2.3", - "moddle-xml": "^10.1.0" - } - }, "node_modules/bpmnlint": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-10.3.0.tgz", - "integrity": "sha512-7z1j7erchQ+vPccUWUsSgQM/8XlMt3q7eKyRa67SeaQFwdswXi3cv1pqyKJhnKBxCbeTcU07q9fH4640CdRu+g==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-11.0.0.tgz", + "integrity": "sha512-7e8WGtK78xJTaRsQ6QhBSgwXynAOaY5P4Ny4/nDryBAiF4gjowI9aqARXZZrluO4lTxmgDYQRpmLVcTVE9ZYIw==", "dev": true, "dependencies": { "@bpmn-io/moddle-utils": "^0.2.1", "ansi-colors": "^4.1.3", - "bpmn-moddle": "^8.1.0", + "bpmn-moddle": "^9.0.1", "bpmnlint-utils": "^1.1.1", "cli-table": "^0.3.11", "color-support": "^1.1.3", - "min-dash": "^4.2.1", + "min-dash": "^4.2.2", "mri": "^1.2.0", "pluralize": "^7.0.0", "tiny-glob": "^0.2.9" @@ -2537,7 +2508,7 @@ "bpmnlint": "bin/bpmnlint.js" }, "engines": { - "node": ">= 16" + "node": ">= 20" } }, "node_modules/bpmnlint-utils": { @@ -3346,9 +3317,9 @@ "dev": true }, "node_modules/diagram-js": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.1.0.tgz", - "integrity": "sha512-Lrixuc4as/PGrkhf23k8yss+rLhyH2Zrln/CJxex0nOfC2P0ODb5lsDY0+MdDgjP2ADFFINqUXAGFcSSL8tw4g==", + "version": "15.2.4", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.4.tgz", + "integrity": "sha512-8v0U8AY6a5Vd6Cys5MdN7+yYRhs294/Q4ixkER/3v2ZPSbVCnK9XfbeYbB5QQfoCMkBnY7WBbLbcjvRNHTxnpw==", "dependencies": { "@bpmn-io/diagram-js-ui": "^0.2.3", "clsx": "^2.1.0", @@ -6459,9 +6430,9 @@ } }, "node_modules/min-dash": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.1.tgz", - "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.2.tgz", + "integrity": "sha512-qbhSYUxk6mBaF096B3JOQSumXbKWHenmT97cSpdNzgkWwGjhjhE/KZODCoDNhI2I4C9Cb6R/Q13S4BYkUSXoXQ==" }, "node_modules/min-dom": { "version": "4.2.1", @@ -6694,23 +6665,26 @@ } }, "node_modules/moddle": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/moddle/-/moddle-6.2.3.tgz", - "integrity": "sha512-bLVN+ZHL3aKnhxc19XtjUfvdJsS3EsiEJC7bT6YPD11qYmTzvsxrGgyYz1Ouof7TZuGw0lDJ1OLmEnxcpQWk3Q==", - "dev": true, + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/moddle/-/moddle-7.2.0.tgz", + "integrity": "sha512-x1+JREThy7JBOBR3g2hbOnOfrlC/YAWXX9RzrSZS5HhqeuBly9H/PCtOBtcQs+Y2sjRAXF+WTNSgHvn8Uq+6Yw==", "dependencies": { - "min-dash": "^4.0.0" + "min-dash": "^4.2.1" } }, "node_modules/moddle-xml": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-10.1.0.tgz", - "integrity": "sha512-erWckwLt+dYskewKXJso9u+aAZ5172lOiYxSOqKCPTy7L/xmqH1PoeoA7eVC7oJTt3PqF5TkZzUmbjGH6soQBg==", - "dev": true, + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-11.0.0.tgz", + "integrity": "sha512-L3Sseepfcq9Uy0iIfqEDTXSoYLva1Y/JGbN/4AMOeQ6cqbu8Ma/SDJIdOFm7smsAa64j2z3SwCGG3FIilQVnUg==", "dependencies": { "min-dash": "^4.0.0", - "moddle": "^6.0.0", - "saxen": "^8.1.2" + "saxen": "^10.0.0" + }, + "engines": { + "node": ">= 18" + }, + "peerDependencies": { + "moddle": ">= 6.2.0" } }, "node_modules/mri": { @@ -7986,10 +7960,12 @@ "dev": true }, "node_modules/saxen": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/saxen/-/saxen-8.1.2.tgz", - "integrity": "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw==", - "dev": true + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/saxen/-/saxen-10.0.0.tgz", + "integrity": "sha512-RXsmWok/SAWqOG/f5ADEz51DN9WtZEzqih3e08ranldcaXekxjx8NBKjGh/y5hlowjo0JH/LekBu6gtPFD1G6g==", + "engines": { + "node": ">= 18" + } }, "node_modules/schema-utils": { "version": "4.2.0", @@ -9012,16 +8988,16 @@ } }, "node_modules/uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz", + "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==", "dev": true, "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" ], "bin": { - "uuid": "dist/bin/uuid" + "uuid": "dist/esm/bin/uuid" } }, "node_modules/vary": { @@ -9442,9 +9418,9 @@ } }, "node_modules/zeebe-bpmn-moddle": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-1.0.0.tgz", - "integrity": "sha512-ZXEe+0s6Z1jf0hfK4VfRr71p4FcXkYz+MxVx6vMCiey2KVZqY1uj6KCpzK9+tEJzTdxGRS3FymK3oxAkjzs1GA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-1.9.0.tgz", + "integrity": "sha512-Y9ncIdP4m1PKbIBDqSghwZud2eiiBpfygE0bTApGqtnGlJMA/6Xanl/J7ujxG5zREoAliwf6rJyJFk3FZ75AYg==", "dev": true }, "node_modules/zod": { @@ -9750,21 +9726,21 @@ "requires": {} }, "@bpmn-io/element-templates-validator": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.1.0.tgz", - "integrity": "sha512-e8oYLUaZbL1ZuJjwXFyhhStbg0YgMNosIlzhKWdY7ysPhCFVMJlJ6yNYdaxyqfpPATTKb05uXMAsIgcqTQpoLg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@bpmn-io/element-templates-validator/-/element-templates-validator-2.3.2.tgz", + "integrity": "sha512-Gr6pNSoFif2Sgd01+NdPVVLGrz4R/AICHbK29zBcF849RDH+iLq7qAUhbT8MwwUKOs9WHztXoDTEiKbF85lx5g==", "dev": true, "requires": { - "@camunda/element-templates-json-schema": "^0.18.0", - "@camunda/zeebe-element-templates-json-schema": "^0.20.0", + "@camunda/element-templates-json-schema": "^0.18.1", + "@camunda/zeebe-element-templates-json-schema": "^0.22.2", "json-source-map": "^0.6.1", "min-dash": "^4.1.1" } }, "@bpmn-io/extract-process-variables": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-0.8.0.tgz", - "integrity": "sha512-yAS7ZYX+D56K+luC36u96eRMLb4VHcPUwTUqMZ/Z/Je2gou2DJLRbuBTHAB4jjKt4wFCHSG4B8Y+TrBciEYf4w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@bpmn-io/extract-process-variables/-/extract-process-variables-1.0.1.tgz", + "integrity": "sha512-bisd1kL38HIjB+nmvtw3mpktH0Il3y55eiH/F7kKJs00jf+eksRBoUdr8q4Ge7w5uWxEKVszrasZCee5LTcYEw==", "dev": true, "requires": { "min-dash": "^4.0.0" @@ -9826,15 +9802,15 @@ } }, "@camunda/element-templates-json-schema": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.18.0.tgz", - "integrity": "sha512-k2k+1Z7UiW1TSA1oAvDQamgFZljH3hkFjU9VSpjVXnPgcjVxJMLX0mrHjLVtXhEx2tw576FzYGqlfudw6OOMKg==", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/@camunda/element-templates-json-schema/-/element-templates-json-schema-0.18.1.tgz", + "integrity": "sha512-gwQJHUYx1FrIJCgJISx2cpqTJYgnsqrJ6dpPX/R0p6ELyK6u4rHAi/m9QS1O4F6ua7dBlFFFOOtuIAbo5mAfAg==", "dev": true }, "@camunda/zeebe-element-templates-json-schema": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.20.0.tgz", - "integrity": "sha512-7YRN32Nq73H8S1rCOy2/6cfx+fKiTnhveJYfP6aRaIi83ZSlhVomRJ5+pnPmlDJqdFeNcIx1qqQwVFAdgNPFhg==", + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@camunda/zeebe-element-templates-json-schema/-/zeebe-element-templates-json-schema-0.22.2.tgz", + "integrity": "sha512-qKUa64twO5Ewh6rN+z0n1cdTweuKYuwPCZH6VL7knsdfSYe4PBLnx8FwTXS6Hc5LZCP60rp+XXgQ5puQZfqlNQ==", "dev": true }, "@codemirror/autocomplete": { @@ -10948,9 +10924,9 @@ } }, "array-move": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/array-move/-/array-move-3.0.1.tgz", - "integrity": "sha512-H3Of6NIn2nNU1gsVDqDnYKY/LCdWvCMMOWifNGhKcVQgiZ6nOek39aESOvro6zmueP07exSl93YLvkN4fZOkSg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/array-move/-/array-move-4.0.0.tgz", + "integrity": "sha512-+RY54S8OuVvg94THpneQvFRmqWdAHeqtMzgMW6JNurHxe8rsS07cHQdfGkXnTUXiBcyZ0j3SiDIxxj0RPiqCkQ==", "dev": true }, "array.prototype.findlast": { @@ -11203,109 +11179,83 @@ } }, "bpmn-js": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.0.0.tgz", - "integrity": "sha512-eZR4hqk2BT0m9jAGGtp/f1TD0m7LXXKfYle99q75d+NjSmxetIuvxGn48S9W+H8arJ7vgsls2GELzXoDuEE0eg==", + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/bpmn-js/-/bpmn-js-18.2.0.tgz", + "integrity": "sha512-2wdOUe2WjR+hvDsHorzNyIe52Ep8l1a79FJPQsss0fm2Jrjx/Sf9hRs+C3cKIbogBTZPQkmuS/QoCFjniMevzg==", "requires": { "bpmn-moddle": "^9.0.1", - "diagram-js": "^15.1.0", + "diagram-js": "^15.2.4", "diagram-js-direct-editing": "^3.2.0", "ids": "^1.0.5", "inherits-browser": "^0.1.0", "min-dash": "^4.1.1", "min-dom": "^4.2.1", "tiny-svg": "^3.1.2" - }, - "dependencies": { - "bpmn-moddle": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.1.tgz", - "integrity": "sha512-jO2P5RBx0cZCCd+imqhpNE5anttaYuGd71u76NEA/qMZwJSW1t5ETAtw9/E2InfiPU2w0TR8oxPyopJXRc9VQg==", - "requires": { - "min-dash": "^4.2.1", - "moddle": "^7.0.0", - "moddle-xml": "^11.0.0" - } - }, - "moddle": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/moddle/-/moddle-7.0.0.tgz", - "integrity": "sha512-Hpte2hfKDwoZWPvDngsEHjloPnO+sKMUVkAPc0r9PrpnVLqsyPUTV0ZQU8CAp87YmRZ9QzeQMJxdKbaP9vEIKA==", - "requires": { - "min-dash": "^4.2.1" - } - }, - "moddle-xml": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-11.0.0.tgz", - "integrity": "sha512-L3Sseepfcq9Uy0iIfqEDTXSoYLva1Y/JGbN/4AMOeQ6cqbu8Ma/SDJIdOFm7smsAa64j2z3SwCGG3FIilQVnUg==", - "requires": { - "min-dash": "^4.0.0", - "saxen": "^10.0.0" - } - }, - "saxen": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/saxen/-/saxen-10.0.0.tgz", - "integrity": "sha512-RXsmWok/SAWqOG/f5ADEz51DN9WtZEzqih3e08ranldcaXekxjx8NBKjGh/y5hlowjo0JH/LekBu6gtPFD1G6g==" - } } }, "bpmn-js-element-templates": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-2.0.0.tgz", - "integrity": "sha512-DYY/6fjq+mNAGmtm9TxI9UhCD1jApxUOAK6w6tAgRWwwCgRTL1Mdt4b5OOK+mgTrxGPW60rwCPUN8jrS3l4kLw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/bpmn-js-element-templates/-/bpmn-js-element-templates-2.5.1.tgz", + "integrity": "sha512-w08tAW0XQ+N1g4V7F/QmrrzDq88YjNao69nwbwyO83oTG2pB32Y3aDXDXJqvJJnNUnsjREKVXllNcZioGP1Dsg==", "dev": true, "requires": { - "@bpmn-io/element-templates-validator": "^2.1.0", - "@bpmn-io/extract-process-variables": "^0.8.0", - "bpmnlint": "^10.3.0", + "@bpmn-io/element-templates-validator": "^2.3.2", + "@bpmn-io/extract-process-variables": "^1.0.0", + "bpmnlint": "^11.0.0", "classnames": "^2.3.1", "ids": "^1.0.0", "min-dash": "^4.0.0", "min-dom": "^4.0.3", "preact-markup": "^2.1.1", + "semver": "^7.6.3", "semver-compare": "^1.0.0", - "uuid": "^10.0.0" + "uuid": "^11.0.0" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true + } } }, "bpmn-js-properties-panel": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-5.7.0.tgz", - "integrity": "sha512-6dbMf69FthXP+J3rLzN0ot88n55fyoVLMFO0vX2/yI1fgzhvi14TTOvZEYGi7KVvJIQDPV5YYtxSytUL3t0B9A==", + "version": "5.31.1", + "resolved": "https://registry.npmjs.org/bpmn-js-properties-panel/-/bpmn-js-properties-panel-5.31.1.tgz", + "integrity": "sha512-DH+IYngB0SVGh5yqDhKoFQMIR3sgnQgh8NFua0OmjKiwyxIaT/nzrPmuY/QEGhS0YbmRPfNIH0xVlFJwGR6jeA==", "dev": true, "requires": { - "@bpmn-io/extract-process-variables": "^0.8.0", - "array-move": "^3.0.1", + "@bpmn-io/extract-process-variables": "^1.0.0", + "array-move": "^4.0.0", "ids": "^1.0.5", - "min-dash": "^4.1.1", - "min-dom": "^4.1.0" + "min-dash": "^4.2.1", + "min-dom": "^4.2.1" } }, "bpmn-moddle": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-8.1.0.tgz", - "integrity": "sha512-yI5OAFfYVJwViKTsTsonVfCBPtB3MlefADUORwNIxxBOMp21vnoxuxsdgUWlPH/dvAEZh/+mr8UtqOBNu8NC5Q==", - "dev": true, + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-9.0.1.tgz", + "integrity": "sha512-jO2P5RBx0cZCCd+imqhpNE5anttaYuGd71u76NEA/qMZwJSW1t5ETAtw9/E2InfiPU2w0TR8oxPyopJXRc9VQg==", "requires": { - "min-dash": "^4.0.0", - "moddle": "^6.2.3", - "moddle-xml": "^10.1.0" + "min-dash": "^4.2.1", + "moddle": "^7.0.0", + "moddle-xml": "^11.0.0" } }, "bpmnlint": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-10.3.0.tgz", - "integrity": "sha512-7z1j7erchQ+vPccUWUsSgQM/8XlMt3q7eKyRa67SeaQFwdswXi3cv1pqyKJhnKBxCbeTcU07q9fH4640CdRu+g==", + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/bpmnlint/-/bpmnlint-11.0.0.tgz", + "integrity": "sha512-7e8WGtK78xJTaRsQ6QhBSgwXynAOaY5P4Ny4/nDryBAiF4gjowI9aqARXZZrluO4lTxmgDYQRpmLVcTVE9ZYIw==", "dev": true, "requires": { "@bpmn-io/moddle-utils": "^0.2.1", "ansi-colors": "^4.1.3", - "bpmn-moddle": "^8.1.0", + "bpmn-moddle": "^9.0.1", "bpmnlint-utils": "^1.1.1", "cli-table": "^0.3.11", "color-support": "^1.1.3", - "min-dash": "^4.2.1", + "min-dash": "^4.2.2", "mri": "^1.2.0", "pluralize": "^7.0.0", "tiny-glob": "^0.2.9" @@ -11885,9 +11835,9 @@ "dev": true }, "diagram-js": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.1.0.tgz", - "integrity": "sha512-Lrixuc4as/PGrkhf23k8yss+rLhyH2Zrln/CJxex0nOfC2P0ODb5lsDY0+MdDgjP2ADFFINqUXAGFcSSL8tw4g==", + "version": "15.2.4", + "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-15.2.4.tgz", + "integrity": "sha512-8v0U8AY6a5Vd6Cys5MdN7+yYRhs294/Q4ixkER/3v2ZPSbVCnK9XfbeYbB5QQfoCMkBnY7WBbLbcjvRNHTxnpw==", "requires": { "@bpmn-io/diagram-js-ui": "^0.2.3", "clsx": "^2.1.0", @@ -14164,9 +14114,9 @@ } }, "min-dash": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.1.tgz", - "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/min-dash/-/min-dash-4.2.2.tgz", + "integrity": "sha512-qbhSYUxk6mBaF096B3JOQSumXbKWHenmT97cSpdNzgkWwGjhjhE/KZODCoDNhI2I4C9Cb6R/Q13S4BYkUSXoXQ==" }, "min-dom": { "version": "4.2.1", @@ -14336,23 +14286,20 @@ "dev": true }, "moddle": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/moddle/-/moddle-6.2.3.tgz", - "integrity": "sha512-bLVN+ZHL3aKnhxc19XtjUfvdJsS3EsiEJC7bT6YPD11qYmTzvsxrGgyYz1Ouof7TZuGw0lDJ1OLmEnxcpQWk3Q==", - "dev": true, + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/moddle/-/moddle-7.2.0.tgz", + "integrity": "sha512-x1+JREThy7JBOBR3g2hbOnOfrlC/YAWXX9RzrSZS5HhqeuBly9H/PCtOBtcQs+Y2sjRAXF+WTNSgHvn8Uq+6Yw==", "requires": { - "min-dash": "^4.0.0" + "min-dash": "^4.2.1" } }, "moddle-xml": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-10.1.0.tgz", - "integrity": "sha512-erWckwLt+dYskewKXJso9u+aAZ5172lOiYxSOqKCPTy7L/xmqH1PoeoA7eVC7oJTt3PqF5TkZzUmbjGH6soQBg==", - "dev": true, + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/moddle-xml/-/moddle-xml-11.0.0.tgz", + "integrity": "sha512-L3Sseepfcq9Uy0iIfqEDTXSoYLva1Y/JGbN/4AMOeQ6cqbu8Ma/SDJIdOFm7smsAa64j2z3SwCGG3FIilQVnUg==", "requires": { "min-dash": "^4.0.0", - "moddle": "^6.0.0", - "saxen": "^8.1.2" + "saxen": "^10.0.0" } }, "mri": { @@ -15262,10 +15209,9 @@ "dev": true }, "saxen": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/saxen/-/saxen-8.1.2.tgz", - "integrity": "sha512-xUOiiFbc3Ow7p8KMxwsGICPx46ZQvy3+qfNVhrkwfz3Vvq45eGt98Ft5IQaA1R/7Tb5B5MKh9fUR9x3c3nDTxw==", - "dev": true + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/saxen/-/saxen-10.0.0.tgz", + "integrity": "sha512-RXsmWok/SAWqOG/f5ADEz51DN9WtZEzqih3e08ranldcaXekxjx8NBKjGh/y5hlowjo0JH/LekBu6gtPFD1G6g==" }, "schema-utils": { "version": "4.2.0", @@ -16000,9 +15946,9 @@ "dev": true }, "uuid": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", - "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "version": "11.0.5", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.5.tgz", + "integrity": "sha512-508e6IcKLrhxKdBbcA2b4KQZlLVp2+J5UwQ6F7Drckkc5N9ZJwFa4TgWtsww9UG8fGHbm6gbV19TdM5pQ4GaIA==", "dev": true }, "vary": { @@ -16302,9 +16248,9 @@ "dev": true }, "zeebe-bpmn-moddle": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-1.0.0.tgz", - "integrity": "sha512-ZXEe+0s6Z1jf0hfK4VfRr71p4FcXkYz+MxVx6vMCiey2KVZqY1uj6KCpzK9+tEJzTdxGRS3FymK3oxAkjzs1GA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/zeebe-bpmn-moddle/-/zeebe-bpmn-moddle-1.9.0.tgz", + "integrity": "sha512-Y9ncIdP4m1PKbIBDqSghwZud2eiiBpfygE0bTApGqtnGlJMA/6Xanl/J7ujxG5zREoAliwf6rJyJFk3FZ75AYg==", "dev": true }, "zod": { diff --git a/package.json b/package.json index 9c408e2..dd8842e 100644 --- a/package.json +++ b/package.json @@ -48,9 +48,9 @@ "@testing-library/preact": "^3.2.3", "babel-loader": "^9.2.1", "babel-plugin-istanbul": "^7.0.0", - "bpmn-js": "^18.0.0", - "bpmn-js-element-templates": "^2.0.0", - "bpmn-js-properties-panel": "^5.7.0", + "bpmn-js": "^18.2.0", + "bpmn-js-element-templates": "^2.5.1", + "bpmn-js-properties-panel": "^5.31.1", "cross-env": "^7.0.3", "downloadjs": "^1.4.7", "eslint": "^9.14.0", @@ -73,7 +73,7 @@ "sinon": "^18.0.1", "sinon-chai": "^3.7.0", "webpack": "^5.96.1", - "zeebe-bpmn-moddle": "^1.0.0" + "zeebe-bpmn-moddle": "^1.9.0" }, "dependencies": { "@bpmn-io/element-template-chooser": "^1.0.0" diff --git a/test/spec/element-templates/replace-menu/RemoveTemplateReplaceProvider.spec.js b/test/spec/element-templates/replace-menu/RemoveTemplateReplaceProvider.spec.js index b6ff8fb..7c0c4ea 100644 --- a/test/spec/element-templates/replace-menu/RemoveTemplateReplaceProvider.spec.js +++ b/test/spec/element-templates/replace-menu/RemoveTemplateReplaceProvider.spec.js @@ -43,9 +43,10 @@ describe('', function() { elementTemplates.set(templates); })); + describe('display', function() { - it('should not display remove on plain task', inject(function(elementRegistry) { + it('should not display (task)', inject(function(elementRegistry) { // given const task = elementRegistry.get('Task_1'); @@ -54,71 +55,64 @@ describe('', function() { openPopup(task); // then - const entries = Object.keys(getEntries()); - expect(entries).not.to.include('replace-remove-element-template'); - })); - + const entries = getEntries(); - describe('display options to reset to plain element in correct order', function() { + expect(entries).not.to.have.property('replace-remove-element-template'); + })); - it('template service task -> service task', inject(function() { - // given - const element = applyTemplate( - 'ServiceTask_1', - 'com.camunda.example.MailTask' - ); + it('should display (template service task -> service task)', inject(function() { - // when - openPopup(element); + // given + const element = applyTemplate( + 'ServiceTask_1', + 'com.camunda.example.MailTask' + ); - // then - const entries = Object.keys(getEntries()); - const entryIndex = entries.indexOf('replace-remove-element-template'); + // when + openPopup(element); - // should be displayed on top - expect(entryIndex).to.be.lessThanOrEqual(2); - })); + // then + const entries = getEntries(); + expect(entries).to.have.property('replace-remove-element-template'); + })); - it('template task -> task', inject(function() { - // given - const element = applyTemplate( - 'Task_1', - 'example.TaskTemplate' - ); + it('should display (template task -> task)', inject(function() { - // when - openPopup(element); + // given + const element = applyTemplate( + 'Task_1', + 'example.TaskTemplate' + ); - // then - const entries = Object.keys(getEntries()); - const entryIndex = entries.indexOf('replace-remove-element-template'); + // when + openPopup(element); - expect(entryIndex).to.eql(0); - })); + // then + const entries = getEntries(); + expect(entries).to.have.property('replace-remove-element-template'); + })); - it('template transaction -> transaction', inject(function() { - // given - const element = applyTemplate( - 'SUB_PROCESS', - 'example.TransactionTemplate' - ); + it('should display (template transaction -> transaction)', inject(function() { - // when - openPopup(element); + // given + const element = applyTemplate( + 'SUB_PROCESS', + 'example.TransactionTemplate' + ); - // then - const entries = Object.keys(getEntries()); - const entryIndex = entries.indexOf('replace-remove-element-template'); + // when + openPopup(element); - expect(entryIndex).to.eql(0); - })); + // then + const entries = getEntries(); - }); + expect(entries).to.have.property('replace-remove-element-template'); + })); });