From 4ab09461e33bf87d7968d763ab1073464ce7e13f Mon Sep 17 00:00:00 2001 From: Philip Langer Date: Mon, 24 Jan 2022 21:08:45 +0100 Subject: [PATCH] Improve VSCode styling * Update GLSP dependency * Improve styling for VSCode * Change example file to the new format https://github.com/eclipse-glsp/glsp/issues/492 --- example/workflow/workspace/example1.wf | 1222 +++++++---------- .../css/diagram.css | 49 +- .../css/tool-palette.css | 38 +- yarn.lock | 357 +++-- 4 files changed, 728 insertions(+), 938 deletions(-) diff --git a/example/workflow/workspace/example1.wf b/example/workflow/workspace/example1.wf index 8c62525..33fe061 100644 --- a/example/workflow/workspace/example1.wf +++ b/example/workflow/workspace/example1.wf @@ -11,84 +11,50 @@ ], "children": [ { - "id": "task0_header", - "children": [ - { - "id": "task0_icon", - "children": [ - { - "id": "task0_ticon", - "type": "label:icon", - "position": { - "x": 7.65625, - "y": 5.0 - }, - "size": { - "width": 16.6875, - "height": 22.0 - }, - "text": "M", - "alignment": { - "x": 8.34375, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task0_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 48.90625, - "height": 22.0 - }, - "text": "Push", - "alignment": { - "x": 24.453125, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "task0_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 91.90625, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "task0_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 31.9375, + "height": 16.0 }, - "layout": "hbox" + "text": "Push", + "alignment": { + "x": 15.96875, + "y": 13.0 + } } ], "type": "task:manual", "position": { - "x": 40.0, - "y": 120.0 + "x": 70.0, + "y": 140.0 }, "size": { - "width": 101.90625, - "height": 52.0 + "width": 72.9375, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "paddingRight": 10.0, + "prefWidth": 72.921875, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -97,93 +63,59 @@ } }, { - "name": "ManualTask1", - "taskType": "manual", - "id": "task1", + "name": "Push2", + "taskType": "automated", + "id": "task0_automated", "cssClasses": [ "task", - "manual" + "automated" ], "children": [ { - "id": "task1_header", - "children": [ - { - "id": "task1_icon", - "children": [ - { - "id": "task1_ticon", - "type": "label:icon", - "position": { - "x": 7.65625, - "y": 5.0 - }, - "size": { - "width": 16.6875, - "height": 22.0 - }, - "text": "M", - "alignment": { - "x": 8.34375, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task1_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 52.5625, - "height": 22.0 - }, - "text": "RflWt", - "alignment": { - "x": 26.109375, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "task0_automated_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 95.5625, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "task0_automated_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 }, - "layout": "hbox" + "size": { + "width": 42.125, + "height": 16.0 + }, + "text": "ChkWt", + "alignment": { + "x": 21.0, + "y": 13.0 + } } ], - "type": "task:manual", + "type": "task:automated", "position": { - "x": 500.0, - "y": 20.0 + "x": 220.0, + "y": 90.0 }, "size": { - "width": 105.5625, - "height": 52.0 + "width": 83.125, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 75.6103515625, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -192,93 +124,177 @@ } }, { - "name": "ManualTask2", - "taskType": "manual", - "id": "task2", + "nodeType": "mergeNode", + "id": "activityNode1", + "type": "activityNode:merge", + "position": { + "x": 500.0, + "y": 90.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minHeight": 32.0, + "resizeContainer": false + } + }, + { + "nodeType": "decisionNode", + "id": "activityNode2", + "type": "activityNode:decision", + "position": { + "x": 330.0, + "y": 190.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minWidth": 32.0, + "minHeight": 32.0 + } + }, + { + "nodeType": "mergeNode", + "id": "activityNode4", + "type": "activityNode:merge", + "position": { + "x": 500.0, + "y": 190.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minHeight": 32.0, + "resizeContainer": false + } + }, + { + "nodeType": "decisionNode", + "id": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "type": "activityNode:decision", + "position": { + "x": 330.0, + "y": 90.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minWidth": 32.0, + "minHeight": 32.0 + } + }, + { + "nodeType": "forkNode", + "id": "bb2709f5-0ff0-4438-8853-b7e934b506d7", + "cssClasses": [ + "forkOrJoin" + ], + "type": "activityNode:fork", + "position": { + "x": 170.0, + "y": 130.0 + }, + "size": { + "width": 10.0, + "height": 50.0 + } + }, + { + "id": "d34c37e0-e45e-4cfe-a76f-0e9274ed8e60", + "type": "edge", + "sourceId": "task0", + "targetId": "bb2709f5-0ff0-4438-8853-b7e934b506d7" + }, + { + "nodeType": "joinNode", + "id": "bd94e44e-19f9-446e-89d4-97ca1a63c17b", + "cssClasses": [ + "forkOrJoin" + ], + "type": "activityNode:join", + "position": { + "x": 560.0, + "y": 130.0 + }, + "size": { + "width": 10.0, + "height": 50.0 + } + }, + { + "id": "7296b4a8-55c6-4c61-bddb-deacae77efa6", + "type": "edge", + "sourceId": "activityNode1", + "targetId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b" + }, + { + "id": "0471cae4-c754-4e89-8337-96ed1546dd02", + "type": "edge", + "sourceId": "activityNode4", + "targetId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b" + }, + { + "name": "AutomatedTask8", + "taskType": "automated", + "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04", "cssClasses": [ "task", - "manual" + "automated" ], "children": [ { - "id": "task2_header", - "children": [ - { - "id": "task2_icon", - "children": [ - { - "id": "task2_ticon", - "type": "label:icon", - "position": { - "x": 7.65625, - "y": 5.0 - }, - "size": { - "width": 16.6875, - "height": 22.0 - }, - "text": "M", - "alignment": { - "x": 8.34375, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task2_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 62.21875, - "height": 22.0 - }, - "text": "ChkTp", - "alignment": { - "x": 31.109375, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 105.21875, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 38.0, + "height": 16.0 }, - "layout": "hbox" + "text": "WtOK", + "alignment": { + "x": 18.671875, + "y": 13.0 + } } ], - "type": "task:manual", + "type": "task:automated", "position": { - "x": 240.0, - "y": 190.0 + "x": 390.0, + "y": 120.0 }, "size": { - "width": 115.21875, - "height": 52.0 + "width": 79.0, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 71.4931640625, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -287,93 +303,86 @@ } }, { - "name": "ManualTask3", + "id": "2317f24a-034e-4352-8857-d361dc8f5ed7", + "cssClasses": [ + "medium" + ], + "type": "edge:weighted", + "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "targetId": "e47d5eba-612d-4c43-9aba-2c5502ff4f04" + }, + { + "id": "0a57ab51-c0b6-4a51-b42e-0192bf3767dc", + "type": "edge", + "sourceId": "bb2709f5-0ff0-4438-8853-b7e934b506d7", + "targetId": "task0_automated", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "7a5d6bc3-c61e-4baa-8556-6015f33269c7", + "type": "edge", + "sourceId": "task0_automated", + "targetId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "Push", "taskType": "manual", - "id": "task3", + "id": "a63cfd87-da7c-4846-912b-29040b776bfb", "cssClasses": [ "task", "manual" ], "children": [ { - "id": "task3_header", - "children": [ - { - "id": "task3_icon", - "children": [ - { - "id": "task3_ticon", - "type": "label:icon", - "position": { - "x": 7.65625, - "y": 5.0 - }, - "size": { - "width": 16.6875, - "height": 22.0 - }, - "text": "M", - "alignment": { - "x": 8.34375, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task3_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 75.953125, - "height": 22.0 - }, - "text": "PreHeat", - "alignment": { - "x": 37.8125, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "54f08126-6041-44ce-9d8b-e7a549e48f91", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 118.953125, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "6e007d62-d441-4b08-8815-ad59de3b2ca8", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 34.328125, + "height": 16.0 }, - "layout": "hbox" + "text": "RflWt", + "alignment": { + "x": 17.109375, + "y": 13.0 + } } ], "type": "task:manual", "position": { - "x": 500.0, - "y": 230.0 + "x": 390.0, + "y": 70.0 }, "size": { - "width": 128.953125, - "height": 52.0 + "width": 75.328125, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 67.82421875, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -382,93 +391,86 @@ } }, { - "name": "ManualTask4", - "taskType": "manual", - "id": "task4", + "id": "9bb443d7-44f3-4192-8dd8-1a2782593373", + "cssClasses": [ + "medium" + ], + "type": "edge:weighted", + "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "targetId": "a63cfd87-da7c-4846-912b-29040b776bfb" + }, + { + "id": "a36985a7-3e61-499c-9bdb-5be2b00cb75c", + "type": "edge", + "sourceId": "a63cfd87-da7c-4846-912b-29040b776bfb", + "targetId": "activityNode1", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "8880cd08-8d90-4408-acd4-6eae218b1650", + "type": "edge", + "sourceId": "e47d5eba-612d-4c43-9aba-2c5502ff4f04", + "targetId": "activityNode1", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "AutomatedTask7", + "taskType": "automated", + "id": "7afd430b-5031-4082-8190-7e755c57cde9", "cssClasses": [ "task", - "manual" + "automated" ], "children": [ { - "id": "task4_header", - "children": [ - { - "id": "task4_icon", - "children": [ - { - "id": "task4_ticon", - "type": "label:icon", - "position": { - "x": 7.65625, - "y": 5.0 - }, - "size": { - "width": 16.6875, - "height": 22.0 - }, - "text": "M", - "alignment": { - "x": 8.34375, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task4_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 49.359375, - "height": 22.0 - }, - "text": "Brew", - "alignment": { - "x": 24.453125, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "7afd430b-5031-4082-8190-7e755c57cde9_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 92.359375, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "7afd430b-5031-4082-8190-7e755c57cde9_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 31.90625, + "height": 16.0 }, - "layout": "hbox" + "text": "Brew", + "alignment": { + "x": 15.953125, + "y": 13.0 + } } ], - "type": "task:manual", + "type": "task:automated", "position": { - "x": 830.0, - "y": 120.0 + "x": 600.0, + "y": 140.0 }, "size": { - "width": 102.359375, - "height": 52.0 + "width": 72.90625, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 72.90625, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -477,93 +479,68 @@ } }, { - "name": "ManualTask6", - "taskType": "manual", - "id": "task6", + "id": "81efd1ef-ae19-4ea6-a20b-20857b1c6552", + "type": "edge", + "sourceId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b", + "targetId": "7afd430b-5031-4082-8190-7e755c57cde9", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "AutomatedTask8", + "taskType": "automated", + "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17", "cssClasses": [ "task", - "manual" + "automated" ], "children": [ { - "id": "task6_header", - "children": [ - { - "id": "task6_icon", - "children": [ - { - "id": "task6_ticon", - "type": "label:icon", - "position": { - "x": 7.65625, - "y": 5.0 - }, - "size": { - "width": 16.6875, - "height": 22.0 - }, - "text": "M", - "alignment": { - "x": 8.34375, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task6_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 73.34375, - "height": 22.0 - }, - "text": "KeepTp", - "alignment": { - "x": 36.671875, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 116.34375, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 41.46875, + "height": 16.0 }, - "layout": "hbox" + "text": "ChkTp", + "alignment": { + "x": 20.625, + "y": 13.0 + } } ], - "type": "task:manual", + "type": "task:automated", "position": { - "x": 500.0, - "y": 160.0 + "x": 220.0, + "y": 170.0 }, "size": { - "width": 126.34375, - "height": 52.0 + "width": 82.46875, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 82.4482421875, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -571,94 +548,78 @@ "radiusBottomRight": 5.0 } }, + { + "id": "189aecf6-6043-4915-9f3e-7b2da8fd0d9c", + "type": "edge", + "sourceId": "bb2709f5-0ff0-4438-8853-b7e934b506d7", + "targetId": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "69e45ef0-9c74-41da-a3ab-0a5669f83f96", + "type": "edge", + "sourceId": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17", + "targetId": "activityNode2", + "args": { + "edgePadding": 10.0 + } + }, { "name": "AutomatedTask8", "taskType": "automated", - "id": "task8", + "id": "4b06ed95-c9be-47df-9941-98099259be4a", "cssClasses": [ "task", "automated" ], "children": [ { - "id": "task8_header", - "children": [ - { - "id": "task8_icon", - "children": [ - { - "id": "task8_ticon", - "type": "label:icon", - "position": { - "x": 8.4921875, - "y": 5.0 - }, - "size": { - "width": 15.015625, - "height": 22.0 - }, - "text": "A", - "alignment": { - "x": 7.671875, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task8_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 63.671875, - "height": 22.0 - }, - "text": "ChkWt", - "alignment": { - "x": 31.671875, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "4b06ed95-c9be-47df-9941-98099259be4a_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 106.671875, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "4b06ed95-c9be-47df-9941-98099259be4a_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 }, - "layout": "hbox" + "size": { + "width": 49.265625, + "height": 16.0 + }, + "text": "KeepTp", + "alignment": { + "x": 24.53125, + "y": 13.0 + } } ], "type": "task:automated", "position": { - "x": 240.0, - "y": 50.0 + "x": 390.0, + "y": 170.0 }, "size": { - "width": 116.671875, - "height": 52.0 + "width": 90.265625, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 82.748046875, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -669,91 +630,57 @@ { "name": "AutomatedTask9", "taskType": "automated", - "id": "task9", + "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6", "cssClasses": [ "task", "automated" ], "children": [ { - "id": "task9_header", - "children": [ - { - "id": "task9_icon", - "children": [ - { - "id": "task9_ticon", - "type": "label:icon", - "position": { - "x": 8.4921875, - "y": 5.0 - }, - "size": { - "width": 15.015625, - "height": 22.0 - }, - "text": "A", - "alignment": { - "x": 7.671875, - "y": 18.0 - } - } - ], - "type": "icon", - "position": { - "x": 5.0, - "y": 5.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layout": "stack", - "layoutOptions": { - "resizeContainer": false, - "hAlign": "center" - } - }, - { - "id": "task9_classname", - "type": "label:heading", - "position": { - "x": 38.0, - "y": 10.0 - }, - "size": { - "width": 56.109375, - "height": 22.0 - }, - "text": "WtOK", - "alignment": { - "x": 27.78125, - "y": 18.0 - } - } - ], - "type": "comp:header", + "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6_icon", + "type": "icon", "position": { "x": 5.0, "y": 5.0 }, "size": { - "width": 99.109375, - "height": 42.0 + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 51.484375, + "height": 16.0 }, - "layout": "hbox" + "text": "PreHeat", + "alignment": { + "x": 25.6875, + "y": 13.0 + } } ], "type": "task:automated", "position": { - "x": 500.0, - "y": 90.0 + "x": 390.0, + "y": 220.0 }, "size": { - "width": 109.109375, - "height": 52.0 + "width": 92.484375, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 84.96875, + "paddingRight": 10.0, + "prefHeight": 30.0 }, - "layout": "vbox", "args": { "radiusBottomLeft": 5.0, "radiusTopLeft": 5.0, @@ -762,214 +689,41 @@ } }, { - "nodeType": "mergeNode", - "id": "activityNode1", - "type": "activityNode:merge", - "position": { - "x": 670.0, - "y": 60.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layoutOptions": { - "minHeight": 32.0, - "resizeContainer": false - } - }, - { - "id": "edge4", - "type": "edge", - "sourceId": "task1", - "targetId": "activityNode1" - }, - { - "id": "edge5", - "type": "edge", - "sourceId": "task9", - "targetId": "activityNode1" - }, - { - "nodeType": "decisionNode", - "id": "activityNode2", - "type": "activityNode:decision", - "position": { - "x": 410.0, - "y": 200.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layoutOptions": { - "minWidth": 32.0, - "minHeight": 32.0 - } - }, - { - "id": "edge7", - "type": "edge", - "sourceId": "task2", - "targetId": "activityNode2" - }, - { - "nodeType": "mergeNode", - "id": "activityNode4", - "type": "activityNode:merge", - "position": { - "x": 680.0, - "y": 200.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layoutOptions": { - "minHeight": 32.0, - "resizeContainer": false - } - }, - { - "id": "edge11", - "type": "edge", - "sourceId": "task6", - "targetId": "activityNode4" - }, - { - "id": "edge12", - "type": "edge", - "sourceId": "task3", - "targetId": "activityNode4" - }, - { - "nodeType": "decisionNode", - "id": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", - "type": "activityNode:decision", - "position": { - "x": 400.0, - "y": 60.0 - }, - "size": { - "width": 32.0, - "height": 32.0 - }, - "layoutOptions": { - "minWidth": 32.0, - "minHeight": 32.0 - } - }, - { - "id": "69d7d698-c5ce-4e85-be06-d9bd9357322d", - "cssClasses": [ - "medium" - ], - "type": "edge:weighted", - "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", - "targetId": "task1" - }, - { - "nodeType": "forkNode", - "id": "bb2709f5-0ff0-4438-8853-b7e934b506d7", - "cssClasses": [ - "forkOrJoin" - ], - "type": "activityNode:fork", - "position": { - "x": 160.0, - "y": 120.0 - }, - "size": { - "width": 10.0, - "height": 50.0 - } - }, - { - "id": "d34c37e0-e45e-4cfe-a76f-0e9274ed8e60", - "type": "edge", - "sourceId": "task0", - "targetId": "bb2709f5-0ff0-4438-8853-b7e934b506d7" - }, - { - "id": "5eeaa218-ad56-4052-8b28-bbc08d82ed34", - "type": "edge", - "sourceId": "bb2709f5-0ff0-4438-8853-b7e934b506d7", - "targetId": "task2" - }, - { - "nodeType": "joinNode", - "id": "bd94e44e-19f9-446e-89d4-97ca1a63c17b", - "cssClasses": [ - "forkOrJoin" - ], - "type": "activityNode:join", - "position": { - "x": 770.0, - "y": 120.0 - }, - "size": { - "width": 10.0, - "height": 50.0 - } - }, - { - "id": "2f57af4e-2960-496e-992d-03c8b021d81a", + "id": "d04afaf8-0894-4284-b844-22b255893107", "cssClasses": [ "medium" ], "type": "edge:weighted", "sourceId": "activityNode2", - "targetId": "task6" + "targetId": "4b06ed95-c9be-47df-9941-98099259be4a" }, { - "id": "2c7427b0-9743-4bfb-b04c-078ba98f8d7e", + "id": "b9ef468f-2aaf-41b9-b408-29e2d08e490e", "cssClasses": [ "medium" ], "type": "edge:weighted", "sourceId": "activityNode2", - "targetId": "task3" + "targetId": "80d1792f-9c7e-41c0-8eca-eeb0509397b6" }, { - "id": "7296b4a8-55c6-4c61-bddb-deacae77efa6", + "id": "58657bcf-6d32-4e7d-b73a-f84fd8d7158b", "type": "edge", - "sourceId": "activityNode1", - "targetId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b" - }, - { - "id": "0471cae4-c754-4e89-8337-96ed1546dd02", - "type": "edge", - "sourceId": "activityNode4", - "targetId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b" - }, - { - "id": "2c3ec34b-291c-43ef-bdf9-035afc4764e6", - "type": "edge", - "sourceId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b", - "targetId": "task4" - }, - { - "id": "e9aa796a-aa5b-4e6d-8860-4b9c5a5b8d89", - "cssClasses": [ - "medium" - ], - "type": "edge:weighted", - "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", - "targetId": "task9" - }, - { - "id": "f49a588c-618c-4d9f-96fc-feee776a0ead", - "type": "edge", - "sourceId": "task8", - "targetId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4" + "sourceId": "4b06ed95-c9be-47df-9941-98099259be4a", + "targetId": "activityNode4", + "args": { + "edgePadding": 10.0 + } }, { - "id": "568d91e3-d5bf-464d-923e-9769a8a651f3", + "id": "39a75477-facf-4960-b0bb-1989be7fb57f", "type": "edge", - "sourceId": "bb2709f5-0ff0-4438-8853-b7e934b506d7", - "targetId": "task8" + "sourceId": "80d1792f-9c7e-41c0-8eca-eeb0509397b6", + "targetId": "activityNode4", + "args": { + "edgePadding": 10.0 + } } ], - "type": "graph", - "revision": 3 + "type": "graph" } \ No newline at end of file diff --git a/packages/vscode-integration-webview/css/diagram.css b/packages/vscode-integration-webview/css/diagram.css index c1e72b6..605f17d 100644 --- a/packages/vscode-integration-webview/css/diagram.css +++ b/packages/vscode-integration-webview/css/diagram.css @@ -1,5 +1,5 @@ /******************************************************************************** -* Copyright (c) 2020-2021 EclipseSource and others. +* Copyright (c) 2020-2022 EclipseSource and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -52,10 +52,51 @@ body { stroke: var(--vscode-editor-foreground); } -.sprotty-edge.arrow { +.sprotty-edge .arrow { fill: var(--vscode-editor-foreground); } -.sprotty-node.selected { - stroke: var(--vscode-menu-selectionBackground); +.sprotty-node.selected, +.sprotty-edge.selected { + stroke: var(--vscode-focusBorder); +} + +.sprotty-edge.selected .arrow { + fill: var(--vscode-focusBorder); + stroke: var(--vscode-focusBorder); +} + +.inactive .sprotty-node.selected { + stroke: var(--vscode-editor-inactiveSelectionBackground); +} + +.sprotty-resize-handle.selected, +.sprotty-resize-handle.active, +.sprotty-edge > .sprotty-routing-handle.selected, +.sprotty-edge > .sprotty-routing-handle.mouseover { + fill: var(--vscode-focusBorder); +} + +.inactive .sprotty-resize-handle, +.inactive .sprotty-routing-handle { + fill: var(--vscode-tab-unfocusedInactiveForeground); +} + +.sprotty-node.mouseover:not(.selected), +.sprotty-edge.mouseover:not(.selected) { + stroke: var(--vscode-editor-foreground); +} + +.sprotty-edge.mouseover:not(.selected) .arrow { + fill: var(--vscode-editor-foreground); + stroke: var(--vscode-editor-foreground); +} + +.sprotty-popup { + padding: 0px; + border-radius: 2px; + box-shadow: 0px 1px 6px var(--vscode-widget-shadow); + background-color: var(--vscode-editorHoverWidget-background); + color: var(--vscode-editorHoverWidget-foreground); + border: 1px solid var(--vscode-editorHoverWidget-border); } diff --git a/packages/vscode-integration-webview/css/tool-palette.css b/packages/vscode-integration-webview/css/tool-palette.css index 7c30aec..708764a 100644 --- a/packages/vscode-integration-webview/css/tool-palette.css +++ b/packages/vscode-integration-webview/css/tool-palette.css @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2020-2021 EclipseSource and others. + * Copyright (c) 2020-2022 EclipseSource and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at @@ -18,8 +18,16 @@ box-shadow: 0px 1px 6px var(--vscode-widget-shadow); } +.tool-palette :focus-visible { + outline: none; +} + +.tool-group { + background: var(--vscode-settings-dropdownBackground); +} + .tool-palette .palette-header { - background: var(--vscode-titleBar-activeBackground); + background: var(--vscode-settings-dropdownBackground); color: var(--vscode-titleBar-activeForeground); border: 0; font-weight: normal; @@ -31,20 +39,23 @@ } .tool-palette .palette-header .header-icon { - font-size: var(--vscode-ui-font-size1); float: left; padding: 0.2em; + font-size: 11px; + text-transform: uppercase; + font-weight: 400; } .tool-palette .palette-header .header-tools { - font-size: var(--vscode-ui-font-size3); float: right; + font-size: 11px; } .tool-palette .palette-header .header-tools i { border: none; width: 1em; text-align: center; + border-radius: 5px; } .tool-palette .palette-header .header-tools i:hover:not(.clicked) { @@ -58,35 +69,34 @@ .tool-palette .palette-body { border: 0; box-shadow: none; + background: var(--vscode-list-focusBackground); + color: var(--vscode-titleBar-activeForeground); } .tool-palette .palette-body .group-header { font-size: var(--vscode-ui-font-size1); - font-weight: normal; - background: var(--vscode-settings-dropdownBackground); + text-transform: uppercase; + font-weight: bold; + background: var(--vscode-editorHoverWidget-statusBarBackground); color: var(--vscode-titleBar-activeForeground); border: 0; } -.tool-palette .palette-body .tool-button { - background: var(--vscode-menu-background); +.tool-button { + background: var(--vscode-settings-dropdownBackground); color: var(--vscode-titleBar-activeForeground); } .tool-palette .palette-body .tool-button:hover:not(.clicked) { - background: var(--vscode-list-hoverBackground); + background: var(--vscode-menubar-selectionBackground); } .tool-palette .tool-button.clicked { - background: var(--vscode-menu-selectionBackground); - color: var(--vscode-menu-selectionForeground); + background: var(--vscode-inputOption-activeBackground); } .search-input { background: var(--vscode-input-background); color: var(--vscode-input-foreground); border: var(--vscode-border-width) solid var(--vscode-input-border); - font-family: var(--vscode-ui-font-family); - font-size: var(--vscode-ui-font-size1); - line-height: var(--vscode-content-line-height); } diff --git a/yarn.lock b/yarn.lock index 87cf19a..74cf1ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10,45 +10,45 @@ "@babel/highlight" "^7.10.4" "@babel/code-frame@^7.0.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: - "@babel/highlight" "^7.16.0" + "@babel/highlight" "^7.16.7" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b" + integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" "@discoveryjs/json-ext@^0.5.0": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" - integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== + version "0.5.6" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" + integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== "@eclipse-glsp-examples/workflow-glsp@next": - version "0.10.0-next.ab6a367.154" - resolved "https://registry.yarnpkg.com/@eclipse-glsp-examples/workflow-glsp/-/workflow-glsp-0.10.0-next.ab6a367.154.tgz#53999eaf93b57f83aa3db50352cd37af6bc3c422" - integrity sha512-v/lBr/1SdGnm7e4H7gmI3MiiUyxlRdCtXRQy8LWLmJptrZ5nrUXGyOQ5Bpt62jPvIhuFsy7P/fWAHTXKm54fTA== + version "0.10.0-next.5dad48d.159" + resolved "https://registry.yarnpkg.com/@eclipse-glsp-examples/workflow-glsp/-/workflow-glsp-0.10.0-next.5dad48d.159.tgz#f0b097b2ff9b126427f59d6ebda9a67343329773" + integrity sha512-jwjvfhD77CQevqeto7C6FkmvgGuCW3MJyAwvgbg8HskAkeXgNjaM+SMMa84NAYXc+T8kuDSzUo6TiAHvtA+ZDA== dependencies: - "@eclipse-glsp/client" "0.10.0-next.ab6a367.154+ab6a367" + "@eclipse-glsp/client" "0.10.0-next.5dad48d.159+5dad48d" balloon-css "^0.5.0" -"@eclipse-glsp/client@0.10.0-next.ab6a367.154+ab6a367", "@eclipse-glsp/client@next": - version "0.10.0-next.ab6a367.154" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-0.10.0-next.ab6a367.154.tgz#3a027c9864348049a3135aa212402a924a74fde1" - integrity sha512-TGFPaOoEWJZVWWTcHmQWr46XXgC9ap3PBeQvQ3rGbvUxvAOM7pu9MNVOFwTc+x+Hp/hA8hz5xrC/1FprYKgqSA== +"@eclipse-glsp/client@0.10.0-next.5dad48d.159+5dad48d", "@eclipse-glsp/client@next": + version "0.10.0-next.5dad48d.159" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-0.10.0-next.5dad48d.159.tgz#866a85925879fb34c2dd0e256e1c286f92faa0a1" + integrity sha512-slcwSriD4bKCZWuKMrQPgIgLWSSudj9JUD4ClBT8Q2X0Ra/9wvRR1U+pfS3wJdpL5Mrxf1WN0KwN+HDOs/AvYQ== dependencies: - "@eclipse-glsp/protocol" "0.10.0-next.ab6a367.154+ab6a367" + "@eclipse-glsp/protocol" "0.10.0-next.5dad48d.159+5dad48d" autocompleter "5.1.0" sprotty "0.10.0" @@ -80,10 +80,10 @@ resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-0.9.0.tgz#ba7c76f22f5710b8f2e7b8315670b871f963c7a8" integrity sha512-biwZQ4GHjH58UNpLEG5IEUNaVgSlvQxLlfOuehduDv+woBA+rTyYbTVVdzufVBhFc3A9mQCRbCrnNdYLAOkl5g== -"@eclipse-glsp/protocol@0.10.0-next.ab6a367.154+ab6a367", "@eclipse-glsp/protocol@next": - version "0.10.0-next.ab6a367.154" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-0.10.0-next.ab6a367.154.tgz#b5cd2334a01a1bab4254a174a3101029f43aa2f5" - integrity sha512-N8P/sYDKoLb+16CG0xsJrqJ9rI0JRR62Jl7qJo30H0X3DZwVrYw+fMeA1HCuITAyKjpAOOvb0wq60uWM5HrYHg== +"@eclipse-glsp/protocol@0.10.0-next.5dad48d.159+5dad48d", "@eclipse-glsp/protocol@next": + version "0.10.0-next.5dad48d.159" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-0.10.0-next.5dad48d.159.tgz#6c129e18d733eebf6f9283648dffe636b5b99465" + integrity sha512-JqM022+p4BToE5XCRXEMn7hHR5DV2ccxORhtnBGbaMgF1K4WKDFs74LAZfCaemwJTIaP6DT1eBMgvmdr+qTXpA== dependencies: inversify "^5.0.1" uuid "7.0.3" @@ -124,9 +124,9 @@ minimatch "^3.0.4" "@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== "@hutson/parse-repository-url@^3.0.0": version "3.0.2" @@ -1022,9 +1022,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@^12.12.0": - version "12.20.36" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.36.tgz#5bd54d2383e714fc4d2c258107ee70c5bad86d0c" - integrity sha512-+5haRZ9uzI7rYqzDznXgkuacqb6LJhAti8mzZKWxIXn/WEtvB+GHVJ7AuMwcN1HMvXOSJcrvA6PPoYHYOYYebA== + version "12.20.42" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.42.tgz#2f021733232c2130c26f9eabbdd3bfd881774733" + integrity sha512-aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1037,9 +1037,9 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/vscode@^1.54.0": - version "1.61.0" - resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.61.0.tgz#c54335b6f84c19c69b1435b17cc0ce3b2cecfeec" - integrity sha512-9k5Nwq45hkRwdfCFY+eKXeQQSbPoA114mF7U/4uJXRBJeGIO7MuJdhF1PnaDN+lllL9iKGQtd6FFXShBXMNaFg== + version "1.63.1" + resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.63.1.tgz#b40f9f18055e2c9498ae543d18c59fbd6ef2e8a3" + integrity sha512-Z+ZqjRcnGfHP86dvx/BtSwWyZPKQ/LBdmAVImY82TphyjOw2KgTKcp7Nx92oNwCTsHzlshwexAG/WiY2JuUm3g== "@typescript-eslint/eslint-plugin@^4.32.0": version "4.33.0" @@ -1334,9 +1334,9 @@ agent-base@6, agent-base@^6.0.2: debug "4" agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== + version "4.2.0" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.0.tgz#616ce94ccb41d1a39a45d203d8076fe98713062d" + integrity sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw== dependencies: debug "^4.1.0" depd "^1.1.2" @@ -1371,9 +1371,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== + version "8.9.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" + integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1959,9 +1959,9 @@ chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -2239,13 +2239,13 @@ conventional-changelog-preset-loader@^2.3.4: integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g== conventional-changelog-writer@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-5.0.0.tgz#c4042f3f1542f2f41d7d2e0d6cad23aba8df8eec" - integrity sha512-HnDh9QHLNWfL6E1uHz6krZEQOgm8hN7z/m7tT16xwd802fwgMN0Wqd7AQYVkhpsjDUx/99oo+nGgvKF657XP5g== + version "5.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359" + integrity sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ== dependencies: conventional-commits-filter "^2.0.7" dateformat "^3.0.0" - handlebars "^4.7.6" + handlebars "^4.7.7" json-stringify-safe "^5.0.1" lodash "^4.17.15" meow "^8.0.0" @@ -2262,9 +2262,9 @@ conventional-commits-filter@^2.0.7: modify-values "^1.0.0" conventional-commits-parser@^3.2.0: - version "3.2.3" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.3.tgz#fc43704698239451e3ef35fd1d8ed644f46bd86e" - integrity sha512-YyRDR7On9H07ICFpRm/igcdjIqebXbvf4Cff+Pf0BrBys1i1EOzx9iFXNlAbdrLAR8jf7bkUYkDAr8pEy0q4Pw== + version "3.2.4" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972" + integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q== dependencies: JSONStream "^1.0.4" is-text-path "^1.0.1" @@ -2442,7 +2442,7 @@ dateformat@^3.0.0: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@4, debug@^4.1.0: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -2463,13 +2463,6 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -2807,14 +2800,13 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" - integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== +eslint-module-utils@^2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129" + integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg== dependencies: debug "^3.2.7" find-up "^2.1.0" - pkg-dir "^2.0.0" eslint-plugin-header@^3.1.1: version "3.1.1" @@ -2822,23 +2814,23 @@ eslint-plugin-header@^3.1.1: integrity sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg== eslint-plugin-import@^2.24.2: - version "2.25.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.2.tgz#b3b9160efddb702fc1636659e71ba1d10adbe9e9" - integrity sha512-qCwQr9TYfoBHOFcVGKY9C9unq05uOxxdklmBXLVvcwo68y5Hta6/GzCZEMx2zQiu0woKNEER0LE7ZgaOfBU14g== + version "2.25.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" + integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.0" + eslint-module-utils "^2.7.2" has "^1.0.3" - is-core-module "^2.7.0" + is-core-module "^2.8.0" is-glob "^4.0.3" minimatch "^3.0.4" object.values "^1.1.5" resolve "^1.20.0" - tsconfig-paths "^3.11.0" + tsconfig-paths "^3.12.0" eslint-plugin-no-null@^1.0.2: version "1.0.2" @@ -3091,10 +3083,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== +fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -3215,9 +3207,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" - integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== + version "3.2.4" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2" + integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw== flush-write-stream@^1.0.0: version "1.1.1" @@ -3404,9 +3396,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" git-raw-commits@^2.0.8: - version "2.0.10" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.10.tgz#e2255ed9563b1c9c3ea6bd05806410290297bbc1" - integrity sha512-sHhX5lsbG9SOO6yXdlwgEMQ/ljIn7qMpAbJZCGfXX2fq5T8M5SrDnpYk9/4HswTildcIqatsWa91vty6VhWSaQ== + version "2.0.11" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" + integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A== dependencies: dargs "^7.0.0" lodash "^4.17.15" @@ -3487,23 +3479,23 @@ globals@^13.6.0, globals@^13.9.0: type-fest "^0.20.2" globby@^11.0.2, globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" slash "^3.0.0" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== -handlebars@^4.7.6: +handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -3635,9 +3627,9 @@ hosted-git-info@^2.1.4: integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -3742,10 +3734,10 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== +ignore@^5.1.8, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -3756,9 +3748,9 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: resolve-from "^4.0.0" import-local@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" - integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -3932,10 +3924,10 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.7.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== +is-core-module@^2.5.0, is-core-module@^2.8.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== dependencies: has "^1.0.3" @@ -4032,9 +4024,9 @@ is-lambda@^1.0.1: integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: version "1.0.6" @@ -4139,11 +4131,11 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-weakref@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" - integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" is-windows@^1.0.2: version "1.0.2" @@ -4397,9 +4389,9 @@ loader-utils@^1.0.2, loader-utils@^1.2.3: json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.1.tgz#3b8d4386f42378d6434d32d7bc08e7a52d39575e" - integrity sha512-g4miPa9uUrZz4iElkaVJgDFwKJGh8aQGM7pUL4ejXl6cu7kSb30seQOVGNMP6sW8j7DW77X68hJZ+GM7UGhXeQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -4433,11 +4425,6 @@ lodash._reinterpolate@^3.0.0: resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - lodash.ismatch@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" @@ -4635,7 +4622,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -4970,9 +4957,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-fetch@^2.6.0, node-fetch@^2.6.1: - version "2.6.6" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" - integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" @@ -5227,9 +5214,9 @@ object-copy@^0.1.0: kind-of "^3.0.3" object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + version "1.12.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -5575,7 +5562,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -5622,9 +5609,9 @@ picocolors@^0.2.1: integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^2.3.0: version "2.3.0" @@ -5646,13 +5633,6 @@ pify@^5.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" - pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -5705,9 +5685,9 @@ postcss-modules-values@^2.0.0: postcss "^7.0.6" postcss-selector-parser@^6.0.0: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + version "6.0.8" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914" + integrity sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -5731,9 +5711,9 @@ prelude-ls@^1.2.1: integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== prettier@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" - integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== + version "2.5.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" + integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== process-nextick-args@~2.0.0: version "2.0.1" @@ -5848,16 +5828,16 @@ q@^1.5.1: integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= qs@^6.9.4: - version "6.10.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe" - integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw== + version "6.10.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e" + integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ== dependencies: side-channel "^1.0.4" qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.5.3" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" + integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== query-string@^6.13.8: version "6.14.1" @@ -6159,12 +6139,13 @@ resolve-url@^0.2.1: integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= resolve@^1.10.0, resolve@^1.20.0, resolve@^1.9.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + version "1.21.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f" + integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" restore-cursor@^3.1.0: version "3.1.0" @@ -6375,9 +6356,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== slash@^3.0.0: version "3.0.0" @@ -6404,9 +6385,9 @@ smart-buffer@^4.1.0: integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== snabbdom@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.1.0.tgz#8ca931f562d3421de71c8b44e70c285cfa5f2dc9" - integrity sha512-mcmPJMMKbkkPDPeCQ5D7RzqMHlLUyjl+OxOGblsutkzDbuYijCQGBOWJInjnWZ85DtoHdElrDTjA9g85s2YQ5Q== + version "3.3.1" + resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.3.1.tgz#a2fb9a1c85cc19d6dc11c4c5e4c78cbbbaafff1f" + integrity sha512-FR9u20dCkktPd+qbedqwYNjMXzYhizhqlKTQzYZimLNeCJY0/5qgs0DtLVSmzIEL1bN3Dyb9sQpiHGCxUjyLnQ== snapdragon-node@^2.0.1: version "2.1.1" @@ -6507,9 +6488,9 @@ source-map-resolve@^0.5.0: urix "^0.1.0" source-map-support@^0.5.17, source-map-support@~0.5.12: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -6551,9 +6532,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" - integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== split-on-first@^1.0.0: version "1.1.0" @@ -6617,9 +6598,9 @@ sprotty@0.10.0, sprotty@0.11.0-next.ef11ae9, sprotty@0.9.0: tinyqueue "^2.0.3" sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + version "1.17.0" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" + integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -6830,13 +6811,17 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + table@^6.0.9: - version "6.7.2" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" - integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.3" @@ -7057,10 +7042,10 @@ ts-node@^9.1.1: source-map-support "^0.5.17" yn "3.1.1" -tsconfig-paths@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" - integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== +tsconfig-paths@^3.12.0: + version "3.12.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b" + integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" @@ -7146,14 +7131,14 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^4.4.3: - version "4.4.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c" - integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== + version "4.5.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8" + integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg== uglify-js@^3.1.4: - version "3.14.2" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.2.tgz#d7dd6a46ca57214f54a2d0a43cad0f35db82ac99" - integrity sha512-rtPMlmcO4agTUfz10CbgJ1k6UAoXM2gWb3GoMPPZB/+/Ackf8lNWk11K4rYi2D0apgoFRLtQOZhb+/iGNJq26A== + version "3.14.5" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.5.tgz#cdabb7d4954231d80cb4a927654c4655e51f4859" + integrity sha512-qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ== uid-number@0.0.6: version "0.0.6"