Skip to content

Commit dc058fb

Browse files
committed
Merge branch 'feat/devtron-license' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/license-manager
2 parents 559f732 + 1d47d27 commit dc058fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+718
-479
lines changed

package-lock.json

Lines changed: 30 additions & 74 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.8.10",
3+
"version": "1.9.5",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -102,6 +102,7 @@
102102
"@codemirror/language": "6.10.8",
103103
"@codemirror/legacy-modes": "6.4.2",
104104
"@codemirror/lint": "6.8.4",
105+
"@codemirror/merge": "^6.10.0",
105106
"@codemirror/search": "6.5.8",
106107
"@lezer/highlight": "1.2.1",
107108
"@replit/codemirror-indentation-markers": "6.5.3",
@@ -118,7 +119,7 @@
118119
"jsonpath-plus": "^10.3.0",
119120
"marked": "^13.0.3",
120121
"nanoid": "^3.3.8",
121-
"react-codemirror-merge": "4.23.6",
122+
"react-canvas-confetti": "^2.0.7",
122123
"react-dates": "^21.8.0",
123124
"react-diff-viewer-continued": "^3.4.0",
124125
"react-draggable": "^4.4.5",

src/Assets/IconV2/ic-add.svg

Lines changed: 19 additions & 0 deletions
Loading

src/Assets/IconV2/ic-azure.svg

Lines changed: 7 additions & 23 deletions
Loading

src/Assets/IconV2/ic-delete.svg

Lines changed: 19 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)