Skip to content

Commit bc91cc1

Browse files
committed
Merge branch 'develop' into feat/hibernation-patch
2 parents b44314a + 0515c5f commit bc91cc1

File tree

86 files changed

+3823
-1319
lines changed

Some content is hidden

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

86 files changed

+3823
-1319
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ src/Common/CIPipeline.Types.ts
1111
src/Common/ChartVersionAndTypeSelector.tsx
1212
src/Common/Checkbox.tsx
1313
src/Common/ClipboardButton/__tests__/ClipboardButton.test.tsx
14+
src/Common/CodeEditor/CodeEditor.tsx
1415
src/Common/Common.service.ts
1516
src/Common/CustomInput/CustomInput.tsx
1617
src/Common/CustomTagSelector/PropagateTagInfo.tsx

package-lock.json

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

package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.6.12-beta-1",
3+
"version": "1.7.1",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -64,6 +64,8 @@
6464
"json-schema": "^0.4.0",
6565
"lint-staged": "^12.5.0",
6666
"moment": "^2.29.4",
67+
"monaco-editor": "0.44.0",
68+
"monaco-yaml": "5.1.1",
6769
"prettier": "^3.1.1",
6870
"react-ga4": "^1.4.1",
6971
"react-toastify": "9.1.3",
@@ -115,6 +117,7 @@
115117
"react-codemirror-merge": "4.23.6",
116118
"react-dates": "^21.8.0",
117119
"react-diff-viewer-continued": "^3.4.0",
120+
"react-monaco-editor": "^0.54.0",
118121
"react-virtualized-sticky-tree": "^3.0.0-beta18",
119122
"sass": "^1.69.7",
120123
"tslib": "2.7.0",
@@ -126,6 +129,9 @@
126129
"react": "^17.0.2",
127130
"react-dom": "^17.0.2"
128131
},
132+
"react-monaco-editor": {
133+
"monaco-editor": "0.44.0"
134+
},
129135
"vite-plugin-svgr": {
130136
"vite": "5.4.14"
131137
},

src/Assets/Icon/ic-aws-codecommit.svg

Lines changed: 26 additions & 0 deletions
Loading

src/Assets/Icon/ic-bitbucket.svg

Lines changed: 30 additions & 0 deletions
Loading

src/Assets/Icon/ic-calendar.svg

Lines changed: 2 additions & 2 deletions
Loading

src/Assets/Icon/ic-environment.svg

Lines changed: 20 additions & 0 deletions
Loading

src/Assets/Icon/ic-git.svg

Lines changed: 17 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)