diff --git a/lib/Viewer.js b/lib/Viewer.js index ffe26b67..31cf1ce0 100644 --- a/lib/Viewer.js +++ b/lib/Viewer.js @@ -10,9 +10,9 @@ var assign = require('lodash/object/assign'), omit = require('lodash/object/omit'), isNumber = require('lodash/lang/isNumber'); -var domify = require('min-dom/lib/domify'), - domQuery = require('min-dom/lib/query'), - domRemove = require('min-dom/lib/remove'); +var domify = require('min-dom').domify, + domQuery = require('min-dom').query, + domRemove = require('min-dom').remove; var innerSVG = require('tiny-svg/lib/innerSVG'); @@ -472,7 +472,7 @@ Viewer.prototype._moddleExtensions = {}; /* */ var PoweredBy = require('./util/PoweredByUtil'), - domEvent = require('min-dom/lib/event'); + domEvent = require('min-dom').event; /** * Adds the project logo to the diagram container as diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js index a1c288a0..db2c8204 100644 --- a/lib/draw/BpmnRenderer.js +++ b/lib/draw/BpmnRenderer.js @@ -28,7 +28,7 @@ var getCirclePath = BpmnRenderUtil.getCirclePath, getFillColor = BpmnRenderUtil.getFillColor, getStrokeColor = BpmnRenderUtil.getStrokeColor; -var domQuery = require('min-dom/lib/query'); +var domQuery = require('min-dom').query; var svgAppend = require('tiny-svg/lib/append'), svgAttr = require('tiny-svg/lib/attr'), diff --git a/lib/features/replace-preview/BpmnReplacePreview.js b/lib/features/replace-preview/BpmnReplacePreview.js index a0cf5fe8..4032142b 100644 --- a/lib/features/replace-preview/BpmnReplacePreview.js +++ b/lib/features/replace-preview/BpmnReplacePreview.js @@ -7,7 +7,7 @@ var inherits = require('inherits'); var assign = require('lodash/object/assign'), forEach = require('lodash/collection/forEach'); -var domQuery = require('min-dom/lib/query'); +var domQuery = require('min-dom').query; var svgAttr = require('tiny-svg/lib/attr'); diff --git a/lib/util/PoweredByUtil.js b/lib/util/PoweredByUtil.js index 4678e104..361339b3 100644 --- a/lib/util/PoweredByUtil.js +++ b/lib/util/PoweredByUtil.js @@ -6,9 +6,9 @@ 'use strict'; -var domify = require('min-dom/lib/domify'); +var domify = require('min-dom').domify; -var domDelegate = require('min-dom/lib/delegate'); +var domDelegate = require('min-dom').delegate; // inlined ../../resources/logo.svg diff --git a/package-lock.json b/package-lock.json index 9b339f9d..9a1ec908 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5326,9 +5326,9 @@ "integrity": "sha512-Ff3XvILu4wfeG7fw5A7Aazigwnyym/XKj0xSPI5LNHQ5ndFnTbDIOAU0/Dt8TjsHYnths4dqhcqhMZR3MbZm8Q==" }, "min-dom": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-1.0.0.tgz", - "integrity": "sha512-YSr1ncvKSBDBV6yxNNzHTYBiqr19MSunlCBrwUkvWs6SGD9m0eRr2WR0s9vKACKALcJo7Ueu9SPQpcuET9tnSA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/min-dom/-/min-dom-2.0.1.tgz", + "integrity": "sha512-rbaR2x8XR1JyUI5mFcY+TAoLgUXPO7auRcoWAQR4F8eftAPBgZa4/xBDU2AZi6KHTMQb/QDciDXaIf3h4YCA/w==", "requires": { "closest": "0.0.1", "component-event": "0.1.4", diff --git a/package.json b/package.json index 768d6a25..d2ccf571 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "ids": "^0.2.0", "inherits": "^2.0.1", "lodash": "^3.0.1", - "min-dom": "^1.0.0", + "min-dom": "^2.0.1", "object-refs": "^0.1.1", "tiny-svg": "^0.1.3" } diff --git a/test/spec/draw/BpmnRendererSpec.js b/test/spec/draw/BpmnRendererSpec.js index d734c702..57156948 100644 --- a/test/spec/draw/BpmnRendererSpec.js +++ b/test/spec/draw/BpmnRendererSpec.js @@ -8,7 +8,7 @@ var coreModule = require('lib/core'), rendererModule = require('lib/draw'), modelingModule = require('lib/features/modeling'); -var domQuery = require('min-dom/lib/query'); +var domQuery = require('min-dom').query; /* global bootstrapViewer, bootstrapModeler, inject */ diff --git a/test/spec/features/context-pad/ContextPadProviderSpec.js b/test/spec/features/context-pad/ContextPadProviderSpec.js index feb49722..2eb15aa6 100644 --- a/test/spec/features/context-pad/ContextPadProviderSpec.js +++ b/test/spec/features/context-pad/ContextPadProviderSpec.js @@ -4,7 +4,8 @@ var getBpmnJS = require('../../../TestHelper').getBpmnJS; var TestContainer = require('mocha-test-container-support'); -var domQuery = require('min-dom/lib/query'); +var domQuery = require('min-dom').query, + domQueryAll = require('min-dom').queryAll; var is = require('lib/util/ModelUtil').is; @@ -462,7 +463,7 @@ describe('features - context-pad', function() { dragging.end(canvasEvent({ x: 50, y: 65 }, { ctrlKey: true, metaKey: true })); // then - var replaceMenu = domQuery.all('[data-id$="-boundary"]', popupMenu._current.container); + var replaceMenu = domQueryAll('[data-id$="-boundary"]', popupMenu._current.container); expect(replaceMenu).to.exist; expect(replaceMenu.length).to.eql(13); } diff --git a/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js b/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js index 57c6f35e..ccb0c41b 100644 --- a/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js +++ b/test/spec/features/modeling/behavior/ReplaceElementBehaviourSpec.js @@ -12,7 +12,7 @@ var replacePreviewModule = require('lib/features/replace-preview'), var is = require('lib/util/ModelUtil').is, canvasEvent = require('../../../../util/MockEvents').createCanvasEvent; -var domQuery = require('min-dom/lib/query'); +var domQuery = require('min-dom').query; var ATTACH = { attach: true }; diff --git a/test/spec/features/palette/PaletteProviderSpec.js b/test/spec/features/palette/PaletteProviderSpec.js index a0614a59..ae5a1e4d 100644 --- a/test/spec/features/palette/PaletteProviderSpec.js +++ b/test/spec/features/palette/PaletteProviderSpec.js @@ -8,7 +8,8 @@ var modelingModule = require('lib/features/modeling'), paletteModule = require('lib/features/palette'), coreModule = require('lib/core'); -var domQuery = require('min-dom/lib/query'); +var domQuery = require('min-dom').query, + domQueryAll = require('min-dom').queryAll; describe('features/palette', function() { @@ -24,7 +25,7 @@ describe('features/palette', function() { // when var paletteElement = domQuery('.djs-palette', canvas._container); - var entries = domQuery.all('.entry', paletteElement); + var entries = domQueryAll('.entry', paletteElement); // then expect(entries.length).to.equal(13); diff --git a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js index 402a7c89..57fad80b 100644 --- a/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js +++ b/test/spec/features/popup-menu/ReplaceMenuProviderSpec.js @@ -11,8 +11,8 @@ var coreModule = require('lib/core'), replaceMenuProviderModule = require('lib/features/popup-menu'), customRulesModule = require('../../../util/custom-rules'); -var domQuery = require('min-dom/lib/query'), - domClasses = require('min-dom/lib/classes'), +var domQuery = require('min-dom').query, + domClasses = require('min-dom').classes, find = require('lodash/collection/find'); var is = require('lib/util/ModelUtil').is, diff --git a/test/spec/import/ImporterSpec.js b/test/spec/import/ImporterSpec.js index da22a211..041989c8 100644 --- a/test/spec/import/ImporterSpec.js +++ b/test/spec/import/ImporterSpec.js @@ -7,7 +7,7 @@ var Diagram = require('diagram-js/lib/Diagram'), importBpmnDiagram = require('lib/import/Importer').importBpmnDiagram, Viewer = require('lib/Viewer'); -var domMatches = require('min-dom/lib/matches'); +var domMatches = require('min-dom').matches; var getChildrenGfx = require('diagram-js/lib/util/GraphicsUtil').getChildren;