Skip to content

Commit 3edd69b

Browse files
committed
Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into fix-ng-changes-develop-sync
2 parents 17e617b + 74e8a7d commit 3edd69b

File tree

518 files changed

+6236
-3937
lines changed

Some content is hidden

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

518 files changed

+6236
-3937
lines changed

.eslintrc.cjs

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17+
const tsconfigPath = require('./tsconfig.json')
18+
1719
module.exports = {
1820
parser: '@typescript-eslint/parser',
19-
plugins: ['@typescript-eslint', 'react', 'prettier', 'import'],
21+
plugins: ['@typescript-eslint', 'react', 'prettier', 'import', 'simple-import-sort'],
2022
env: {
2123
browser: true,
2224
es2021: true,
@@ -109,6 +111,26 @@ module.exports = {
109111
'import/prefer-default-export': 'off',
110112
'no-restricted-exports': 'off',
111113
'import/named': 'off',
114+
'simple-import-sort/imports': [
115+
'error',
116+
{
117+
groups: [
118+
// Packages `react` related packages and external packages.
119+
['^react', '^@?\\w'],
120+
// Devtron packages
121+
['^@devtron-labs'],
122+
// Internal packages.
123+
[...Object.keys(tsconfigPath.compilerOptions.paths).map((alias) => alias.replace('/*', ''))],
124+
// Side effect imports.
125+
['^\\u0000'],
126+
// Put same-folder imports, `..` and `.` last. Other relative imports.
127+
['^\\.\\.(?!/?$)', '^\\.\\./?$', '^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$',],
128+
// Style imports.
129+
[ '^.+\\.?(css|scss)$'],
130+
],
131+
},
132+
],
133+
'simple-import-sort/exports': 'error',
112134
},
113135
overrides: [
114136
{

package-lock.json

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

package.json

Lines changed: 6 additions & 10 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.10.0-patch-8-ng",
3+
"version": "1.12.0-pre-6",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -60,20 +60,19 @@
6060
"eslint-plugin-prettier": "^5.1.2",
6161
"eslint-plugin-react": "^7.33.2",
6262
"eslint-plugin-react-hooks": "^4.6.0",
63+
"eslint-plugin-simple-import-sort": "^12.1.1",
6364
"glob": "^10.3.3",
6465
"husky": "^7.0.4",
6566
"json-schema": "^0.4.0",
6667
"lint-staged": "^12.5.0",
6768
"moment": "^2.29.4",
68-
"monaco-editor": "0.44.0",
69-
"monaco-yaml": "5.1.1",
7069
"prettier": "^3.1.1",
7170
"react-ga4": "^1.4.1",
7271
"react-toastify": "9.1.3",
7372
"sharp": "^0.33.5",
7473
"svgo": "^3.3.2",
7574
"typescript": "5.5.4",
76-
"vite": "5.4.14",
75+
"vite": "5.4.17",
7776
"vite-plugin-dts": "4.0.3",
7877
"vite-plugin-image-optimizer": "^1.1.8",
7978
"vite-plugin-lib-inject-css": "2.1.1",
@@ -108,10 +107,10 @@
108107
"@replit/codemirror-indentation-markers": "6.5.3",
109108
"@replit/codemirror-vscode-keymap": "6.0.2",
110109
"@types/react-dates": "^21.8.6",
111-
"@xyflow/react": "12.4.2",
112110
"@uiw/codemirror-extensions-hyper-link": "4.23.10",
113111
"@uiw/codemirror-theme-github": "4.23.7",
114112
"@uiw/react-codemirror": "4.23.7",
113+
"@xyflow/react": "12.4.2",
115114
"ansi_up": "^5.2.1",
116115
"codemirror-json-schema": "0.8.0",
117116
"dayjs": "^1.11.13",
@@ -120,12 +119,12 @@
120119
"jsonpath-plus": "^10.3.0",
121120
"marked": "^13.0.3",
122121
"nanoid": "^3.3.8",
122+
"qrcode.react": "^4.2.0",
123123
"react-canvas-confetti": "^2.0.7",
124124
"react-dates": "^21.8.0",
125125
"react-diff-viewer-continued": "^3.4.0",
126126
"react-draggable": "^4.4.5",
127127
"react-international-phone": "^4.5.0",
128-
"react-monaco-editor": "^0.54.0",
129128
"react-virtualized-sticky-tree": "^3.0.0-beta18",
130129
"sass": "^1.69.7",
131130
"tslib": "2.7.0"
@@ -136,11 +135,8 @@
136135
"react": "^17.0.2",
137136
"react-dom": "^17.0.2"
138137
},
139-
"react-monaco-editor": {
140-
"monaco-editor": "0.44.0"
141-
},
142138
"vite-plugin-svgr": {
143-
"vite": "5.4.14"
139+
"vite": "5.4.17"
144140
},
145141
"react-virtualized-sticky-tree": {
146142
"react": "^17.0.2",

src/Assets/Icon/ic-cpu.svg

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)