From 7478388070d83e8802c873e8480dbf23ae3ace3a Mon Sep 17 00:00:00 2001 From: Nico Rehwaldt Date: Wed, 6 Apr 2022 21:38:27 +0200 Subject: [PATCH] deps: replace inherits with inherits-browser This increase the safety of our build; external consumers do no longer need to account for the `browser` field to bundle bpmn-js (or otherwise bundle a Node shim, unintentionally). --- lib/BaseModeler.js | 2 +- lib/BaseViewer.js | 2 +- lib/Modeler.js | 2 +- lib/NavigatedViewer.js | 2 +- lib/Viewer.js | 2 +- lib/draw/BpmnRenderer.js | 2 +- lib/features/auto-resize/BpmnAutoResize.js | 2 +- lib/features/auto-resize/BpmnAutoResizeProvider.js | 2 +- lib/features/drilldown/DrilldownOverlayBehavior.js | 2 +- lib/features/editor-actions/BpmnEditorActions.js | 2 +- .../grid-snapping/behavior/LayoutConnectionBehavior.js | 2 +- lib/features/keyboard/BpmnKeyboardBindings.js | 2 +- lib/features/modeling/BpmnLayouter.js | 2 +- lib/features/modeling/BpmnUpdater.js | 2 +- lib/features/modeling/ElementFactory.js | 2 +- lib/features/modeling/Modeling.js | 2 +- .../modeling/behavior/AdaptiveLabelPositioningBehavior.js | 2 +- lib/features/modeling/behavior/AppendBehavior.js | 2 +- lib/features/modeling/behavior/AssociationBehavior.js | 2 +- lib/features/modeling/behavior/AttachEventBehavior.js | 2 +- lib/features/modeling/behavior/BoundaryEventBehavior.js | 2 +- lib/features/modeling/behavior/CreateBehavior.js | 2 +- .../modeling/behavior/CreateDataObjectBehavior.js | 2 +- .../modeling/behavior/CreateParticipantBehavior.js | 2 +- .../modeling/behavior/DataInputAssociationBehavior.js | 2 +- lib/features/modeling/behavior/DataStoreBehavior.js | 2 +- lib/features/modeling/behavior/DeleteLaneBehavior.js | 2 +- lib/features/modeling/behavior/DetachEventBehavior.js | 2 +- lib/features/modeling/behavior/DropOnFlowBehavior.js | 2 +- .../modeling/behavior/EventBasedGatewayBehavior.js | 2 +- lib/features/modeling/behavior/GroupBehavior.js | 2 +- lib/features/modeling/behavior/IsHorizontalFix.js | 2 +- lib/features/modeling/behavior/LabelBehavior.js | 2 +- lib/features/modeling/behavior/MessageFlowBehavior.js | 2 +- lib/features/modeling/behavior/RemoveElementBehavior.js | 2 +- .../behavior/RemoveEmbeddedLabelBoundsBehavior.js | 2 +- .../modeling/behavior/RemoveParticipantBehavior.js | 2 +- .../modeling/behavior/ReplaceConnectionBehavior.js | 2 +- lib/features/modeling/behavior/ReplaceElementBehaviour.js | 2 +- .../modeling/behavior/RootElementReferenceBehavior.js | 2 +- lib/features/modeling/behavior/SubProcessPlaneBehavior.js | 2 +- .../modeling/behavior/SubProcessStartEventBehavior.js | 2 +- .../behavior/ToggleCollapseConnectionBehaviour.js | 2 +- .../modeling/behavior/ToggleElementCollapseBehaviour.js | 2 +- lib/features/modeling/behavior/UnclaimIdBehavior.js | 2 +- .../modeling/behavior/UnsetDefaultFlowBehavior.js | 2 +- .../modeling/behavior/UpdateFlowNodeRefsBehavior.js | 2 +- lib/features/ordering/BpmnOrderingProvider.js | 2 +- lib/features/replace-preview/BpmnReplacePreview.js | 2 +- lib/features/rules/BpmnRules.js | 2 +- lib/features/snapping/BpmnCreateMoveSnapping.js | 2 +- package-lock.json | 7 ++++++- package.json | 2 +- rollup.config.js | 8 +------- test/config/karma.unit.js | 1 - test/integration/custom-elements/CustomElementFactory.js | 2 +- test/integration/custom-elements/CustomRenderer.js | 2 +- test/integration/custom-elements/CustomRules.js | 2 +- test/integration/custom-elements/CustomUpdater.js | 2 +- test/spec/ViewerSpec.js | 2 +- .../features/modeling/LoggingCroppingConnectionDocking.js | 2 +- test/util/custom-rules/CustomRules.js | 2 +- 62 files changed, 66 insertions(+), 68 deletions(-) diff --git a/lib/BaseModeler.js b/lib/BaseModeler.js index 4d242a05..474c00e1 100644 --- a/lib/BaseModeler.js +++ b/lib/BaseModeler.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import Ids from 'ids'; diff --git a/lib/BaseViewer.js b/lib/BaseViewer.js index d5608472..c34d927e 100644 --- a/lib/BaseViewer.js +++ b/lib/BaseViewer.js @@ -25,7 +25,7 @@ import { import Diagram from 'diagram-js'; import BpmnModdle from 'bpmn-moddle'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { importBpmnDiagram diff --git a/lib/Modeler.js b/lib/Modeler.js index b0ec29d8..717232ba 100644 --- a/lib/Modeler.js +++ b/lib/Modeler.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import BaseModeler from './BaseModeler'; diff --git a/lib/NavigatedViewer.js b/lib/NavigatedViewer.js index 592f59dc..7da2ded2 100644 --- a/lib/NavigatedViewer.js +++ b/lib/NavigatedViewer.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import Viewer from './Viewer'; diff --git a/lib/Viewer.js b/lib/Viewer.js index 27a81bde..ac4a1db8 100644 --- a/lib/Viewer.js +++ b/lib/Viewer.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CoreModule from './core'; import TranslateModule from 'diagram-js/lib/i18n/translate'; diff --git a/lib/draw/BpmnRenderer.js b/lib/draw/BpmnRenderer.js index ee9bb649..936446b1 100644 --- a/lib/draw/BpmnRenderer.js +++ b/lib/draw/BpmnRenderer.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { isObject, diff --git a/lib/features/auto-resize/BpmnAutoResize.js b/lib/features/auto-resize/BpmnAutoResize.js index e518728e..fce4c5fa 100644 --- a/lib/features/auto-resize/BpmnAutoResize.js +++ b/lib/features/auto-resize/BpmnAutoResize.js @@ -1,6 +1,6 @@ import AutoResize from 'diagram-js/lib/features/auto-resize/AutoResize'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is } from '../../util/ModelUtil'; diff --git a/lib/features/auto-resize/BpmnAutoResizeProvider.js b/lib/features/auto-resize/BpmnAutoResizeProvider.js index 721b0810..7f23105d 100644 --- a/lib/features/auto-resize/BpmnAutoResizeProvider.js +++ b/lib/features/auto-resize/BpmnAutoResizeProvider.js @@ -1,6 +1,6 @@ import { is } from '../../util/ModelUtil'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { forEach } from 'min-dash'; diff --git a/lib/features/drilldown/DrilldownOverlayBehavior.js b/lib/features/drilldown/DrilldownOverlayBehavior.js index 738e9e21..7fd6d0d2 100644 --- a/lib/features/drilldown/DrilldownOverlayBehavior.js +++ b/lib/features/drilldown/DrilldownOverlayBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; import { is } from '../../util/ModelUtil'; diff --git a/lib/features/editor-actions/BpmnEditorActions.js b/lib/features/editor-actions/BpmnEditorActions.js index b5585884..c15b4080 100644 --- a/lib/features/editor-actions/BpmnEditorActions.js +++ b/lib/features/editor-actions/BpmnEditorActions.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import EditorActions from 'diagram-js/lib/features/editor-actions/EditorActions'; diff --git a/lib/features/grid-snapping/behavior/LayoutConnectionBehavior.js b/lib/features/grid-snapping/behavior/LayoutConnectionBehavior.js index 828ddb30..df8001f2 100644 --- a/lib/features/grid-snapping/behavior/LayoutConnectionBehavior.js +++ b/lib/features/grid-snapping/behavior/LayoutConnectionBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/keyboard/BpmnKeyboardBindings.js b/lib/features/keyboard/BpmnKeyboardBindings.js index fc940ff7..f85a5132 100644 --- a/lib/features/keyboard/BpmnKeyboardBindings.js +++ b/lib/features/keyboard/BpmnKeyboardBindings.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import KeyboardBindings from 'diagram-js/lib/features/keyboard/KeyboardBindings'; diff --git a/lib/features/modeling/BpmnLayouter.js b/lib/features/modeling/BpmnLayouter.js index 9cbbb78c..0f5d769f 100644 --- a/lib/features/modeling/BpmnLayouter.js +++ b/lib/features/modeling/BpmnLayouter.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { assign diff --git a/lib/features/modeling/BpmnUpdater.js b/lib/features/modeling/BpmnUpdater.js index 65a0e0c4..6eb8ba49 100644 --- a/lib/features/modeling/BpmnUpdater.js +++ b/lib/features/modeling/BpmnUpdater.js @@ -3,7 +3,7 @@ import { forEach } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { remove as collectionRemove, diff --git a/lib/features/modeling/ElementFactory.js b/lib/features/modeling/ElementFactory.js index 8f4c9ff4..195f8a37 100644 --- a/lib/features/modeling/ElementFactory.js +++ b/lib/features/modeling/ElementFactory.js @@ -4,7 +4,7 @@ import { isObject } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { getBusinessObject, diff --git a/lib/features/modeling/Modeling.js b/lib/features/modeling/Modeling.js index 0c7619e6..c2888d73 100644 --- a/lib/features/modeling/Modeling.js +++ b/lib/features/modeling/Modeling.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import BaseModeling from 'diagram-js/lib/features/modeling/Modeling'; diff --git a/lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js b/lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js index b56820db..be524523 100644 --- a/lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js +++ b/lib/features/modeling/behavior/AdaptiveLabelPositioningBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { getOrientation, diff --git a/lib/features/modeling/behavior/AppendBehavior.js b/lib/features/modeling/behavior/AppendBehavior.js index b569f56b..ffafd571 100644 --- a/lib/features/modeling/behavior/AppendBehavior.js +++ b/lib/features/modeling/behavior/AppendBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is } from '../../../util/ModelUtil'; diff --git a/lib/features/modeling/behavior/AssociationBehavior.js b/lib/features/modeling/behavior/AssociationBehavior.js index ee68f68a..d86c4d27 100644 --- a/lib/features/modeling/behavior/AssociationBehavior.js +++ b/lib/features/modeling/behavior/AssociationBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is } from '../../../util/ModelUtil'; diff --git a/lib/features/modeling/behavior/AttachEventBehavior.js b/lib/features/modeling/behavior/AttachEventBehavior.js index 22107901..f089fbd8 100644 --- a/lib/features/modeling/behavior/AttachEventBehavior.js +++ b/lib/features/modeling/behavior/AttachEventBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/BoundaryEventBehavior.js b/lib/features/modeling/behavior/BoundaryEventBehavior.js index 00984b14..4a074089 100644 --- a/lib/features/modeling/behavior/BoundaryEventBehavior.js +++ b/lib/features/modeling/behavior/BoundaryEventBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/CreateBehavior.js b/lib/features/modeling/behavior/CreateBehavior.js index b32471a0..98aaaed5 100644 --- a/lib/features/modeling/behavior/CreateBehavior.js +++ b/lib/features/modeling/behavior/CreateBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is } from '../../../util/ModelUtil'; diff --git a/lib/features/modeling/behavior/CreateDataObjectBehavior.js b/lib/features/modeling/behavior/CreateDataObjectBehavior.js index 57532feb..b0387f0a 100644 --- a/lib/features/modeling/behavior/CreateDataObjectBehavior.js +++ b/lib/features/modeling/behavior/CreateDataObjectBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/CreateParticipantBehavior.js b/lib/features/modeling/behavior/CreateParticipantBehavior.js index 8e3e0150..296c4d36 100644 --- a/lib/features/modeling/behavior/CreateParticipantBehavior.js +++ b/lib/features/modeling/behavior/CreateParticipantBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/DataInputAssociationBehavior.js b/lib/features/modeling/behavior/DataInputAssociationBehavior.js index eae529a0..f0e6a5d2 100644 --- a/lib/features/modeling/behavior/DataInputAssociationBehavior.js +++ b/lib/features/modeling/behavior/DataInputAssociationBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/DataStoreBehavior.js b/lib/features/modeling/behavior/DataStoreBehavior.js index c6643e7c..5f2af462 100644 --- a/lib/features/modeling/behavior/DataStoreBehavior.js +++ b/lib/features/modeling/behavior/DataStoreBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/DeleteLaneBehavior.js b/lib/features/modeling/behavior/DeleteLaneBehavior.js index 53bd506a..0e617e4e 100644 --- a/lib/features/modeling/behavior/DeleteLaneBehavior.js +++ b/lib/features/modeling/behavior/DeleteLaneBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/DetachEventBehavior.js b/lib/features/modeling/behavior/DetachEventBehavior.js index ae64a636..b5f4452d 100644 --- a/lib/features/modeling/behavior/DetachEventBehavior.js +++ b/lib/features/modeling/behavior/DetachEventBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/DropOnFlowBehavior.js b/lib/features/modeling/behavior/DropOnFlowBehavior.js index b30c7ba7..35f60087 100644 --- a/lib/features/modeling/behavior/DropOnFlowBehavior.js +++ b/lib/features/modeling/behavior/DropOnFlowBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { assign, diff --git a/lib/features/modeling/behavior/EventBasedGatewayBehavior.js b/lib/features/modeling/behavior/EventBasedGatewayBehavior.js index 8d6b4b94..503dfa19 100644 --- a/lib/features/modeling/behavior/EventBasedGatewayBehavior.js +++ b/lib/features/modeling/behavior/EventBasedGatewayBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/GroupBehavior.js b/lib/features/modeling/behavior/GroupBehavior.js index fd43293b..3067f9b3 100644 --- a/lib/features/modeling/behavior/GroupBehavior.js +++ b/lib/features/modeling/behavior/GroupBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/IsHorizontalFix.js b/lib/features/modeling/behavior/IsHorizontalFix.js index 7a5ebbb6..25fcc651 100644 --- a/lib/features/modeling/behavior/IsHorizontalFix.js +++ b/lib/features/modeling/behavior/IsHorizontalFix.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/LabelBehavior.js b/lib/features/modeling/behavior/LabelBehavior.js index b56cf07e..28a78973 100644 --- a/lib/features/modeling/behavior/LabelBehavior.js +++ b/lib/features/modeling/behavior/LabelBehavior.js @@ -2,7 +2,7 @@ import { assign } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is, diff --git a/lib/features/modeling/behavior/MessageFlowBehavior.js b/lib/features/modeling/behavior/MessageFlowBehavior.js index 44f52f5c..d7977232 100644 --- a/lib/features/modeling/behavior/MessageFlowBehavior.js +++ b/lib/features/modeling/behavior/MessageFlowBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/RemoveElementBehavior.js b/lib/features/modeling/behavior/RemoveElementBehavior.js index b22a3b89..0fb06f26 100644 --- a/lib/features/modeling/behavior/RemoveElementBehavior.js +++ b/lib/features/modeling/behavior/RemoveElementBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is } from '../../../util/ModelUtil'; diff --git a/lib/features/modeling/behavior/RemoveEmbeddedLabelBoundsBehavior.js b/lib/features/modeling/behavior/RemoveEmbeddedLabelBoundsBehavior.js index 72baf55d..d91996ae 100644 --- a/lib/features/modeling/behavior/RemoveEmbeddedLabelBoundsBehavior.js +++ b/lib/features/modeling/behavior/RemoveEmbeddedLabelBoundsBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/RemoveParticipantBehavior.js b/lib/features/modeling/behavior/RemoveParticipantBehavior.js index 60ce6780..500df227 100644 --- a/lib/features/modeling/behavior/RemoveParticipantBehavior.js +++ b/lib/features/modeling/behavior/RemoveParticipantBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/ReplaceConnectionBehavior.js b/lib/features/modeling/behavior/ReplaceConnectionBehavior.js index e3681230..99fa22bd 100644 --- a/lib/features/modeling/behavior/ReplaceConnectionBehavior.js +++ b/lib/features/modeling/behavior/ReplaceConnectionBehavior.js @@ -4,7 +4,7 @@ import { matchPattern } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/ReplaceElementBehaviour.js b/lib/features/modeling/behavior/ReplaceElementBehaviour.js index ecd3a378..d15445af 100644 --- a/lib/features/modeling/behavior/ReplaceElementBehaviour.js +++ b/lib/features/modeling/behavior/ReplaceElementBehaviour.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { forEach } from 'min-dash'; diff --git a/lib/features/modeling/behavior/RootElementReferenceBehavior.js b/lib/features/modeling/behavior/RootElementReferenceBehavior.js index 316acfe4..3ff5500d 100644 --- a/lib/features/modeling/behavior/RootElementReferenceBehavior.js +++ b/lib/features/modeling/behavior/RootElementReferenceBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { find, diff --git a/lib/features/modeling/behavior/SubProcessPlaneBehavior.js b/lib/features/modeling/behavior/SubProcessPlaneBehavior.js index f519d5ea..497acfcc 100644 --- a/lib/features/modeling/behavior/SubProcessPlaneBehavior.js +++ b/lib/features/modeling/behavior/SubProcessPlaneBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/SubProcessStartEventBehavior.js b/lib/features/modeling/behavior/SubProcessStartEventBehavior.js index ba115a20..e4c1720e 100644 --- a/lib/features/modeling/behavior/SubProcessStartEventBehavior.js +++ b/lib/features/modeling/behavior/SubProcessStartEventBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/ToggleCollapseConnectionBehaviour.js b/lib/features/modeling/behavior/ToggleCollapseConnectionBehaviour.js index b1cb182d..b677617e 100644 --- a/lib/features/modeling/behavior/ToggleCollapseConnectionBehaviour.js +++ b/lib/features/modeling/behavior/ToggleCollapseConnectionBehaviour.js @@ -1,5 +1,5 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/ToggleElementCollapseBehaviour.js b/lib/features/modeling/behavior/ToggleElementCollapseBehaviour.js index c0393ad6..55f259fb 100644 --- a/lib/features/modeling/behavior/ToggleElementCollapseBehaviour.js +++ b/lib/features/modeling/behavior/ToggleElementCollapseBehaviour.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/UnclaimIdBehavior.js b/lib/features/modeling/behavior/UnclaimIdBehavior.js index 49493fe4..ffafb878 100644 --- a/lib/features/modeling/behavior/UnclaimIdBehavior.js +++ b/lib/features/modeling/behavior/UnclaimIdBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/UnsetDefaultFlowBehavior.js b/lib/features/modeling/behavior/UnsetDefaultFlowBehavior.js index 9c6f1be4..18da9c7b 100644 --- a/lib/features/modeling/behavior/UnsetDefaultFlowBehavior.js +++ b/lib/features/modeling/behavior/UnsetDefaultFlowBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/modeling/behavior/UpdateFlowNodeRefsBehavior.js b/lib/features/modeling/behavior/UpdateFlowNodeRefsBehavior.js index b5d30832..7f9ea5c9 100644 --- a/lib/features/modeling/behavior/UpdateFlowNodeRefsBehavior.js +++ b/lib/features/modeling/behavior/UpdateFlowNodeRefsBehavior.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; diff --git a/lib/features/ordering/BpmnOrderingProvider.js b/lib/features/ordering/BpmnOrderingProvider.js index f302172f..c6ee0522 100644 --- a/lib/features/ordering/BpmnOrderingProvider.js +++ b/lib/features/ordering/BpmnOrderingProvider.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import OrderingProvider from 'diagram-js/lib/features/ordering/OrderingProvider'; diff --git a/lib/features/replace-preview/BpmnReplacePreview.js b/lib/features/replace-preview/BpmnReplacePreview.js index af7060bd..92f6c457 100644 --- a/lib/features/replace-preview/BpmnReplacePreview.js +++ b/lib/features/replace-preview/BpmnReplacePreview.js @@ -1,6 +1,6 @@ import CommandInterceptor from 'diagram-js/lib/command/CommandInterceptor'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import cssEscape from 'css.escape'; diff --git a/lib/features/rules/BpmnRules.js b/lib/features/rules/BpmnRules.js index 19ec96d1..47c8dcd2 100644 --- a/lib/features/rules/BpmnRules.js +++ b/lib/features/rules/BpmnRules.js @@ -5,7 +5,7 @@ import { some } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is, diff --git a/lib/features/snapping/BpmnCreateMoveSnapping.js b/lib/features/snapping/BpmnCreateMoveSnapping.js index 5319bcf1..a36a2481 100644 --- a/lib/features/snapping/BpmnCreateMoveSnapping.js +++ b/lib/features/snapping/BpmnCreateMoveSnapping.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import CreateMoveSnapping from 'diagram-js/lib/features/snapping/CreateMoveSnapping'; diff --git a/package-lock.json b/package-lock.json index 622b23de..ec3565cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5997,6 +5997,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, + "inherits-browser": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/inherits-browser/-/inherits-browser-0.0.1.tgz", + "integrity": "sha512-kaDA3DkCdCpvrKIo/1T/3yVn+qpFUHLjYtSHmTYewb+QfjfaQy6FGQ7LwBu7st0tG9UvYad/XAlqQmdIh6CICw==" + }, "ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", @@ -6627,7 +6632,7 @@ }, "json5": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true }, diff --git a/package.json b/package.json index cb1ead4c..302d24ab 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "diagram-js": "^8.3.0", "diagram-js-direct-editing": "^1.6.3", "ids": "^1.0.0", - "inherits": "^2.0.4", + "inherits-browser": "0.0.1", "min-dash": "^3.5.2", "min-dom": "^3.2.0", "object-refs": "^0.3.0", diff --git a/rollup.config.js b/rollup.config.js index 91df1e83..b4ec94d6 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -97,13 +97,7 @@ function pgl(plugins=[], env='production') { replace({ 'process.env.NODE_ENV': JSON.stringify(env) }), - nodeResolve({ - mainFields: [ - 'browser', - 'module', - 'main' - ] - }), + nodeResolve(), commonjs(), json(), ...plugins diff --git a/test/config/karma.unit.js b/test/config/karma.unit.js index ccacecd4..8f9ac4a5 100644 --- a/test/config/karma.unit.js +++ b/test/config/karma.unit.js @@ -83,7 +83,6 @@ module.exports = function(karma) { resolve: { mainFields: [ 'dev:module', - 'browser', 'module', 'main' ], diff --git a/test/integration/custom-elements/CustomElementFactory.js b/test/integration/custom-elements/CustomElementFactory.js index c31ceacf..a7d159c8 100644 --- a/test/integration/custom-elements/CustomElementFactory.js +++ b/test/integration/custom-elements/CustomElementFactory.js @@ -2,7 +2,7 @@ import { assign } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import BpmnElementFactory from 'lib/features/modeling/ElementFactory'; diff --git a/test/integration/custom-elements/CustomRenderer.js b/test/integration/custom-elements/CustomRenderer.js index 7e1964bd..d8d50c7e 100644 --- a/test/integration/custom-elements/CustomRenderer.js +++ b/test/integration/custom-elements/CustomRenderer.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import BaseRenderer from 'diagram-js/lib/draw/BaseRenderer'; diff --git a/test/integration/custom-elements/CustomRules.js b/test/integration/custom-elements/CustomRules.js index b2446887..caedea75 100644 --- a/test/integration/custom-elements/CustomRules.js +++ b/test/integration/custom-elements/CustomRules.js @@ -1,6 +1,6 @@ import { forEach } from 'min-dash'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import RuleProvider from 'diagram-js/lib/features/rules/RuleProvider'; diff --git a/test/integration/custom-elements/CustomUpdater.js b/test/integration/custom-elements/CustomUpdater.js index 73854f00..270ac5b8 100644 --- a/test/integration/custom-elements/CustomUpdater.js +++ b/test/integration/custom-elements/CustomUpdater.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { is as isBpmn diff --git a/test/spec/ViewerSpec.js b/test/spec/ViewerSpec.js index 7ff615ea..2dfcf564 100644 --- a/test/spec/ViewerSpec.js +++ b/test/spec/ViewerSpec.js @@ -6,7 +6,7 @@ import ViewerDefaultExport from '../../'; import Viewer from 'lib/Viewer'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import { createViewer diff --git a/test/spec/features/modeling/LoggingCroppingConnectionDocking.js b/test/spec/features/modeling/LoggingCroppingConnectionDocking.js index 17c29b5b..7ad964be 100644 --- a/test/spec/features/modeling/LoggingCroppingConnectionDocking.js +++ b/test/spec/features/modeling/LoggingCroppingConnectionDocking.js @@ -4,7 +4,7 @@ import { getOrientation } from 'diagram-js/lib/layout/LayoutUtil'; -import inherits from 'inherits'; +import inherits from 'inherits-browser'; export default function LoggingCroppingConnectionDocking(injector) { diff --git a/test/util/custom-rules/CustomRules.js b/test/util/custom-rules/CustomRules.js index 8ee4066d..6a5c9f57 100644 --- a/test/util/custom-rules/CustomRules.js +++ b/test/util/custom-rules/CustomRules.js @@ -1,4 +1,4 @@ -import inherits from 'inherits'; +import inherits from 'inherits-browser'; import RuleProvider from 'diagram-js/lib/features/rules/RuleProvider';