bpmn-js 9.3.0 → 9.4.0

package/lib/features/ordering/BpmnOrderingProvider.js

@@ -24,10 +24,12 @@ export default function BpmnOrderingProvider(eventBus, canvas, translate) {
 
   var orders = [
     { type: 'bpmn:SubProcess', order: { level: 6 } },
+
+    // handle SequenceFlow(s) like message flows and render them always on top
     {
       type: 'bpmn:SequenceFlow',
       order: {
-        level: 3,
+        level: 9,
         containers: [
           'bpmn:Participant',
           'bpmn:FlowElementsContainer'

package/lib/features/replace/BpmnReplace.js

@@ -199,6 +199,18 @@ export default function BpmnReplace(
       // else if property is explicitly set, use it
       else if (target && has(target, 'isExpanded')) {
         newElement.isExpanded = target.isExpanded;
+
+        // assign default size of new expanded element
+        var defaultSize = elementFactory.getDefaultSize(newBusinessObject, {
+          isExpanded: newElement.isExpanded
+        });
+
+        newElement.width = defaultSize.width;
+        newElement.height = defaultSize.height;
+
+        // keep element centered
+        newElement.x = element.x - (newElement.width - element.width) / 2;
+        newElement.y = element.y - (newElement.height - element.height) / 2;
       }
 
       // TODO: need also to respect min/max Size

package/lib/features/search/index.js

@@ -7,6 +7,6 @@ export default {
   __depends__: [
     SearchPadModule
   ],
-  __init__: [ 'bpmnSearch'],
+  __init__: [ 'bpmnSearch' ],
   bpmnSearch: [ 'type', BpmnSearchProvider ]
 };

package/lib/import/BpmnImporter.js

@@ -186,11 +186,6 @@ BpmnImporter.prototype.add = function(semantic, di, parentElement) {
       parentElement = this._canvas.findRoot(parentElement);
     }
 
-    // insert sequence flows behind other flow nodes (cf. #727)
-    if (is(semantic, 'bpmn:SequenceFlow')) {
-      parentIndex = 0;
-    }
-
     this._canvas.addConnection(element, parentElement, parentIndex);
   } else {
     throw new Error(translate('unknown di {di} for element {semantic}', {

package/lib/util/CompatibilityUtil.js

@@ -65,6 +65,7 @@ export function ensureCompatDiRef(businessObject) {
   // bpmnElement can have multiple independent DIs
   if (!has(businessObject, 'di')) {
     Object.defineProperty(businessObject, 'di', {
+      enumerable: false,
       get: function() {
         throw new Error(DI_ERROR_MESSAGE);
       }

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "bpmn-js",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
-    ".babelrc",
     "dist",
     "lib",
     "test/util",
@@ -54,8 +53,11 @@
     "*.css"
   ],
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^19.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
+    "@babel/core": "^7.18.10",
+    "@rollup/plugin-commonjs": "^22.0.2",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "babel-loader": "^8.2.5",
+    "babel-plugin-istanbul": "^6.1.1",
     "bpmn-font": "^0.10.0",
     "camunda-bpmn-moddle": "^4.0.1",
     "chai": "4.1.2",
@@ -63,20 +65,17 @@
     "cpx": "^1.5.0",
     "cross-env": "^7.0.3",
     "del": "^6.0.0",
-    "eslint": "^7.29.0",
-    "eslint-plugin-bpmn-io": "^0.12.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint": "^8.22.0",
+    "eslint-plugin-bpmn-io": "^0.14.1",
+    "eslint-plugin-import": "^2.26.0",
     "execa": "^5.1.1",
-    "istanbul-instrumenter-loader": "^3.0.1",
-    "karma": "^6.3.4",
-    "karma-chrome-launcher": "^3.1.0",
-    "karma-coverage": "^2.0.3",
+    "karma": "^6.4.0",
+    "karma-chrome-launcher": "^3.1.1",
+    "karma-coverage": "^2.2.0",
     "karma-debug-launcher": "0.0.4",
     "karma-env-preprocessor": "^0.1.1",
-    "karma-firefox-launcher": "^2.1.1",
-    "karma-ie-launcher": "^1.0.0",
+    "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
-    "karma-phantomjs-launcher": "^1.0.4",
     "karma-safari-launcher": "^1.0.0",
     "karma-sinon-chai": "^2.0.2",
     "karma-webpack": "^5.0.0",
@@ -84,29 +83,27 @@
     "mocha": "^8.4.0",
     "mocha-test-container-support": "0.2.0",
     "npm-run-all": "^4.1.2",
-    "phantomjs-prebuilt": "^2.1.12",
     "promise-polyfill": "^8.2.0",
-    "puppeteer": "^10.0.0",
-    "raw-loader": "^1.0.0",
-    "rollup": "^2.52.2",
+    "puppeteer": "^16.1.1",
+    "rollup": "^2.78.0",
     "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-license": "^2.5.0",
+    "rollup-plugin-license": "^2.8.1",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-terser": "^7.0.2",
     "sinon": "^7.5.0",
     "sinon-chai": "^3.7.0",
-    "webpack": "^4.46.0"
+    "webpack": "^5.74.0"
   },
   "dependencies": {
-    "bpmn-moddle": "^7.1.2",
+    "bpmn-moddle": "^7.1.3",
     "css.escape": "^1.5.1",
-    "diagram-js": "^8.7.0",
+    "diagram-js": "^8.9.0",
     "diagram-js-direct-editing": "^1.7.0",
     "ids": "^1.0.0",
     "inherits-browser": "0.0.1",
     "min-dash": "^3.5.2",
-    "min-dom": "^3.2.0",
+    "min-dom": "^3.2.1",
     "object-refs": "^0.3.0",
-    "tiny-svg": "^2.2.2"
+    "tiny-svg": "^2.2.4"
   }
 }

package/test/helper/index.js

@@ -104,7 +104,7 @@ export function bootstrapBpmnJS(BpmnJS, diagram, options, locals) {
       var mockModule = {};
 
       forEach(_locals, function(v, k) {
-        mockModule[k] = ['value', v];
+        mockModule[k] = [ 'value', v ];
       });
 
       _options.modules = [].concat(_options.modules || [], [ mockModule ]);
@@ -267,6 +267,31 @@ export function createViewer(container, viewerInstance, xml, diagramId) {
   });
 }
 
+function logConfigured(type, force) {
+  var url = new URL(window.location.href);
+
+  var log = ('searchParams' in url) && url.searchParams.get('log') || '';
+
+  return force || log.includes('save-xml');
+}
+
+/**
+ * Enable logging on a modeler instance.
+ *
+ * @param  {import('bpmn-js')} modeler
+ * @param  {boolean} [force=false]
+ */
+export function enableLogging(modeler, force) {
+
+  var saveXML = logConfigured('save-xml', force);
+
+  saveXML && modeler.on('commandStack.changed', function() {
+    modeler.saveXML({ format: true }).then(function(result) {
+      console.log(result.xml);
+    });
+  });
+}
+
 export function setBpmnJS(instance) {
   BPMN_JS = instance;
 }

package/.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": [ "env" ]
-}

package/lib/features/distribute-elements/dist/distribute-horizontally-tool.svg

@@ -1 +0,0 @@
-data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201800%201800%22%3E%3Cpath%20style%3D%22fill%3Anone%3Bstroke%3AcurrentColor%3Bstroke-width%3A100%3Bstroke-linejoin%3Around%22%20d%3D%22M450%20400V150h900v250%22%2F%3E%3Crect%20x%3D%22150%22%20y%3D%22450%22%20width%3D%22600%22%20height%3D%221200%22%20rx%3D%221%22%20style%3D%22fill%3Anone%3Bstroke%3AcurrentColor%3Bstroke-width%3A100%22%2F%3E%3Crect%20x%3D%221050%22%20y%3D%22450%22%20width%3D%22600%22%20height%3D%22800%22%20rx%3D%221%22%20style%3D%22fill%3AcurrentColor%3Bstroke%3AcurrentColor%3Bstroke-width%3A100%3Bopacity%3A.5%22%2F%3E%3C%2Fsvg%3E

package/lib/features/distribute-elements/dist/distribute-vertically-tool.svg

@@ -1 +0,0 @@
-data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201800%201800%22%3E%3Cpath%20style%3D%22fill%3Anone%3Bstroke%3AcurrentColor%3Bstroke-width%3A100%3Bstroke-linejoin%3Around%22%20d%3D%22M400%201350H150V450h250%22%2F%3E%3Crect%20x%3D%22450%22%20y%3D%22150%22%20width%3D%221200%22%20height%3D%22600%22%20rx%3D%221%22%20style%3D%22fill%3Anone%3Bstroke%3AcurrentColor%3Bstroke-width%3A100%22%2F%3E%3Crect%20x%3D%22450%22%20y%3D%221050%22%20width%3D%22800%22%20height%3D%22600%22%20rx%3D%221%22%20style%3D%22fill%3AcurrentColor%3Bstroke%3AcurrentColor%3Bstroke-width%3A100%3Bopacity%3A.5%22%2F%3E%3C%2Fsvg%3E