Skip to content

Commit b0c22a2

Browse files
committed
Merge branch 'develop' into feat/audit-logs-ui
2 parents dd2f858 + 47735f3 commit b0c22a2

41 files changed

Lines changed: 1215 additions & 532 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
11
name: Node.js Package
22

33
on:
4-
release:
5-
types: [created]
4+
release:
5+
types: [created]
66

77
jobs:
8-
build-and-publish:
9-
name: Build and Publish to NPM Registry
10-
11-
runs-on: ubuntu-latest
12-
13-
steps:
14-
- name: Checkout repository
15-
uses: actions/checkout@v4
16-
17-
- name: Use Node.js
18-
uses: actions/setup-node@v4
19-
with:
20-
node-version-file: '.nvmrc'
21-
cache: 'npm'
22-
registry-url: 'https://registry.npmjs.org/'
23-
24-
- name: Install dependencies
25-
run: npm ci
26-
27-
- name: Execute test cases
28-
run: npm test
29-
30-
- name: Build Lib
31-
run: npm run build-lib
32-
33-
- name: Publish to NPM Registry
34-
run: npm publish --access public
35-
env:
36-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
8+
build-and-publish:
9+
name: Build and Publish to NPM Registry
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
17+
- name: Use Node.js
18+
uses: actions/setup-node@v4
19+
with:
20+
node-version-file: '.nvmrc'
21+
cache: 'npm'
22+
registry-url: 'https://registry.npmjs.org/'
23+
24+
- name: Install dependencies
25+
run: npm ci
26+
27+
- name: Execute test cases
28+
run: npm test
29+
30+
- name: Build Lib
31+
run: npm run build-lib
32+
33+
- name: Publish to NPM Registry
34+
run: |
35+
VERSION=$(node -p "require('./package.json').version")
36+
37+
if [[ $VERSION == *"-beta."* ]]; then
38+
npm publish --access public --tag beta
39+
40+
elif [[ $VERSION == *"-"* ]]; then
41+
npm publish --access public --tag next
42+
43+
else
44+
npm publish --access public
45+
fi
46+
env:
47+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22
1+
v24.14.1

package-lock.json

Lines changed: 204 additions & 195 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 & 7 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.23.4-beta-8",
3+
"version": "4.0.4-beta-1",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -44,7 +44,6 @@
4444
"@tanstack/react-query-devtools": "^5.91.3",
4545
"@tippyjs/react": "^4.2.0",
4646
"@typeform/embed-react": "2.20.0",
47-
"@types/dompurify": "^3.0.5",
4847
"@types/json-schema": "^7.0.15",
4948
"@types/node": "^25.5.0",
5049
"@types/react": "^19.2.14",
@@ -75,21 +74,21 @@
7574
"sharp": "^0.33.5",
7675
"svgo": "^3.3.2",
7776
"typescript": "5.5.4",
78-
"vite": "8.0.0",
77+
"vite": "8.0.8",
7978
"vite-plugin-dts": "4.5.4",
8079
"vite-plugin-lib-inject-css": "2.2.2",
8180
"vite-plugin-svgr": "4.5.0"
8281
},
8382
"peerDependencies": {
8483
"@typeform/embed-react": "2.20.0",
85-
"dompurify": "^3.2.4",
84+
"dompurify": "^3.3.3",
8685
"patch-package": "^8.0.0",
8786
"react": "^19.2.4",
8887
"react-dom": "^19.2.4",
8988
"react-router-dom": "^6.30.3",
9089
"react-select": "5.8.0",
9190
"rxjs": "^7.8.1",
92-
"yaml": "^2.4.1"
91+
"yaml": "^2.8.3"
9392
},
9493
"dependencies": {
9594
"@codemirror/autocomplete": "6.18.6",
@@ -108,6 +107,7 @@
108107
"@rjsf/utils": "^6.2.4",
109108
"@rjsf/validator-ajv8": "^6.2.4",
110109
"@tanstack/react-query": "^5.90.21",
110+
"@tanstack/react-virtual": "^3.13.24",
111111
"@uiw/codemirror-extensions-hyper-link": "4.23.10",
112112
"@uiw/codemirror-theme-github": "4.23.7",
113113
"@uiw/react-codemirror": "4.23.7",
@@ -140,14 +140,14 @@
140140
"eslint-plugin-react-hooks": "^5.2.0",
141141
"cross-spawn": "^7.0.5",
142142
"vite-plugin-svgr": {
143-
"vite": "8.0.0"
143+
"vite": "8.0.8"
144144
},
145145
"react-virtualized-sticky-tree": {
146146
"react": "^19.2.4",
147147
"react-dom": "^19.2.4"
148148
},
149149
"@laynezh/vite-plugin-lib-assets": {
150-
"vite": "8.0.0"
150+
"vite": "8.0.8"
151151
}
152152
}
153153
}
Lines changed: 12 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/Assets/IconV2/ic-hadolint.svg

Lines changed: 14 additions & 0 deletions
Loading
Lines changed: 63 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)