Merge branch 'master' into develop

This commit is contained in:
Nico Rehwaldt 2020-03-13 20:44:56 +01:00
commit d44a25ef28
3 changed files with 50 additions and 48 deletions

View File

@ -6,6 +6,12 @@ All notable changes to [bpmn-js](https://github.com/bpmn-io/bpmn-js) are documen
___Note:__ Yet to be released changes appear here._ ___Note:__ Yet to be released changes appear here._
## 6.3.3
* `FIX`: resize empty text annotations
* `CHORE`: bump `min-dom` version
* `CHORE`: bump to `diagram-js@6.4.1`
## 6.3.2 ## 6.3.2
* `FIX`: correctly move flows when adding lane ([#1287](https://github.com/bpmn-io/bpmn-js/pull/1287)) * `FIX`: correctly move flows when adding lane ([#1287](https://github.com/bpmn-io/bpmn-js/pull/1287))

86
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "bpmn-js", "name": "bpmn-js",
"version": "6.3.2", "version": "6.3.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -416,9 +416,9 @@
} }
}, },
"acorn": { "acorn": {
"version": "6.1.1", "version": "6.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
"integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
"dev": true "dev": true
}, },
"acorn-jsx": { "acorn-jsx": {
@ -1002,8 +1002,7 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
} }
} }
@ -1502,9 +1501,9 @@
}, },
"dependencies": { "dependencies": {
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
} }
} }
@ -1958,9 +1957,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
} }
} }
@ -2026,16 +2025,16 @@
"dev": true "dev": true
}, },
"diagram-js": { "diagram-js": {
"version": "6.4.0", "version": "6.4.1",
"resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-6.4.0.tgz", "resolved": "https://registry.npmjs.org/diagram-js/-/diagram-js-6.4.1.tgz",
"integrity": "sha512-E3U63Xh+79DAe7vl6UGe6JdgYWxQLBi03RpvsKGJpgJvv9cWnGDLVj6PBdVLCBZ1d3tXqQyGZIr0thswZhhBCA==", "integrity": "sha512-VqzydNl6RmnWuHT1B82VId7mH+TG+yZYkgEDp5BizaVDJyhl2F9Z1/q+X9FUQaBq08ZMW1NQP/Bljn56nGHjKw==",
"requires": { "requires": {
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"didi": "^4.0.0", "didi": "^4.0.0",
"hammerjs": "^2.0.1", "hammerjs": "^2.0.1",
"inherits": "^2.0.1", "inherits": "^2.0.1",
"min-dash": "^3.5.0", "min-dash": "^3.5.0",
"min-dom": "^3.0.0", "min-dom": "^3.1.2",
"object-refs": "^0.3.0", "object-refs": "^0.3.0",
"path-intersection": "^2.2.0", "path-intersection": "^2.2.0",
"tiny-svg": "^2.2.1" "tiny-svg": "^2.2.1"
@ -5623,11 +5622,10 @@
"integrity": "sha512-fOWMCwOr7DwL8Lfgj3MvvCRtwfkG5CmrtZ7Cm1QUk9y/z+01S5sYK84HCXqgIsuOxUY5SzyQACnmyo4Mfy01QA==" "integrity": "sha512-fOWMCwOr7DwL8Lfgj3MvvCRtwfkG5CmrtZ7Cm1QUk9y/z+01S5sYK84HCXqgIsuOxUY5SzyQACnmyo4Mfy01QA=="
}, },
"min-dom": { "min-dom": {
"version": "3.1.1", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/min-dom/-/min-dom-3.1.1.tgz", "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-3.1.2.tgz",
"integrity": "sha512-qvURYMN2jHw9kPg1oFKdOd/VNJOsUNGV5H5j+zpJLkFVyP49tqmTQN8xWMYCDpIKetyQAC6jV5JjskNZr+JHpg==", "integrity": "sha512-JmI31A4l0G/PeOd1TQcM6U3GNofxJKF9hw2ERta8pCuIFvAIMZNGI4PJT/kbnq6Yh8rvqVTTZLVKyVtuZqqhiQ==",
"requires": { "requires": {
"closest": "0.0.1",
"component-event": "^0.1.4", "component-event": "^0.1.4",
"delegate-events": "^1.1.1", "delegate-events": "^1.1.1",
"domify": "^1.3.1", "domify": "^1.3.1",
@ -5917,9 +5915,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
} }
} }
@ -6911,9 +6909,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
} }
} }
@ -7290,9 +7288,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
}, },
"micromatch": { "micromatch": {
@ -7934,9 +7932,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
}, },
"micromatch": { "micromatch": {
@ -8117,9 +8115,9 @@
}, },
"dependencies": { "dependencies": {
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
} }
} }
@ -8282,8 +8280,7 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
} }
} }
@ -9709,8 +9706,7 @@
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true "dev": true
}, },
"micromatch": { "micromatch": {
@ -9774,9 +9770,9 @@
}, },
"dependencies": { "dependencies": {
"acorn": { "acorn": {
"version": "6.2.0", "version": "6.4.1",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
"integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==", "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
"dev": true "dev": true
}, },
"arr-diff": { "arr-diff": {
@ -10027,9 +10023,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
"dev": true "dev": true
}, },
"micromatch": { "micromatch": {

View File

@ -1,6 +1,6 @@
{ {
"name": "bpmn-js", "name": "bpmn-js",
"version": "6.3.2", "version": "6.3.3",
"description": "A bpmn 2.0 toolkit and web modeler", "description": "A bpmn 2.0 toolkit and web modeler",
"scripts": { "scripts": {
"all": "run-s lint test distro test:distro", "all": "run-s lint test distro test:distro",
@ -82,12 +82,12 @@
"bpmn-font": "^0.9.3", "bpmn-font": "^0.9.3",
"bpmn-moddle": "^6.0.2", "bpmn-moddle": "^6.0.2",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"diagram-js": "^6.4.0", "diagram-js": "^6.4.1",
"diagram-js-direct-editing": "^1.6.1", "diagram-js-direct-editing": "^1.6.1",
"ids": "^1.0.0", "ids": "^1.0.0",
"inherits": "^2.0.1", "inherits": "^2.0.1",
"min-dash": "^3.5.1", "min-dash": "^3.5.1",
"min-dom": "^3.0.0", "min-dom": "^3.1.2",
"object-refs": "^0.3.0", "object-refs": "^0.3.0",
"tiny-svg": "^2.2.1" "tiny-svg": "^2.2.1"
} }