Skip to content

Commit ab373cc

Browse files
Kirill LebedenkoKirill Lebedenko
authored andcommitted
chore remediate npm audit findings and pin CI tools - Upgrade Vite @crxjs/vite-plugin Cloudru eslint/stylelint/lint-staged and related deps - Add targeted pnpm overrides for vulnerable transitive packages - Use frozen lockfile in PR e2e; run license validator and publish-browser-extension via pinned npx
1 parent 054ac22 commit ab373cc

File tree

8 files changed

+827
-1118
lines changed

8 files changed

+827
-1118
lines changed

.github/actions/license/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ runs:
2121

2222
- name: Run license validator
2323
run: |
24-
pnpx @cloud-ru/ft-license-validator@latest
24+
npx --yes @cloud-ru/ft-license-validator@1.3.0
2525
shell: bash

.github/workflows/pr.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
cache: 'pnpm'
167167

168168
- name: Install dependencies
169-
run: pnpm install
169+
run: pnpm install --frozen-lockfile
170170

171171
- name: Download Chrome build artifact
172172
uses: actions/download-artifact@v4
@@ -188,17 +188,9 @@ jobs:
188188
needs: [pr-build, e2e-test]
189189
runs-on: ubuntu-latest
190190
steps:
191-
- name: Setup pnpm
192-
uses: pnpm/action-setup@v2
193-
with:
194-
version: 10.10.0
195-
196191
- name: Checkout
197192
uses: actions/checkout@v3
198193

199-
- name: Install publish-browser-extension
200-
run: pnpm install -save-dev publish-browser-extension
201-
202194
- name: Download Chrome build artifact
203195
uses: actions/download-artifact@v4
204196
with:
@@ -225,7 +217,7 @@ jobs:
225217
CHROME_REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
226218
CHROME_PUBLISH_TARGET: ${{ secrets.CHROME_PUBLISH_TARGET }}
227219
run: |
228-
npx publish-browser-extension \
220+
npx --yes publish-browser-extension@4.0.4 \
229221
--dry-run \
230222
--chrome-zip dist/chrome/cloudhood-chrome-${{ needs.pr-build.outputs.short_sha }}.zip \
231223
--chrome-extension-id ${{ env.CHROME_EXTENSION_ID }} \
@@ -240,7 +232,7 @@ jobs:
240232
FIREFOX_JWT_ISSUER: ${{ secrets.FIREFOX_JWT_ISSUER }}
241233
FIREFOX_JWT_SECRET: ${{ secrets.FIREFOX_JWT_SECRET }}
242234
run: |
243-
npx publish-browser-extension \
235+
npx --yes publish-browser-extension@4.0.4 \
244236
--dry-run \
245237
--firefox-zip dist/firefox/cloudhood-firefox-${{ needs.pr-build.outputs.short_sha }}.zip \
246238
--firefox-sources-zip dist/firefox-sources/cloudhood-firefox-sources-${{ needs.pr-build.outputs.short_sha }}.zip \

.github/workflows/release-all.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,6 @@ jobs:
111111
- name: Checkout code
112112
uses: actions/checkout@v3
113113

114-
- name: Setup pnpm
115-
uses: pnpm/action-setup@v2
116-
with:
117-
version: 10.10.0
118-
119-
- name: Install publish-browser-extension
120-
run: pnpm install -g publish-browser-extension
121-
122114
- name: Download Chrome build artifact
123115
uses: actions/download-artifact@v4
124116
with:
@@ -161,7 +153,7 @@ jobs:
161153
CHROME_REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
162154
CHROME_PUBLISH_TARGET: ${{ secrets.CHROME_PUBLISH_TARGET }}
163155
run: |
164-
npx publish-browser-extension \
156+
npx --yes publish-browser-extension@4.0.4 \
165157
--chrome-zip cloudhood-chrome.zip \
166158
--chrome-extension-id ${{ env.CHROME_EXTENSION_ID }} \
167159
--chrome-client-id ${{ env.CHROME_CLIENT_ID }} \
@@ -180,7 +172,7 @@ jobs:
180172
181173
echo "Debug: Firefox extension ID is set: ${{ secrets.FIREFOX_EXTENSION_ID != '' }}"
182174
183-
npx publish-browser-extension \
175+
npx --yes publish-browser-extension@4.0.4 \
184176
--firefox-zip cloudhood-firefox.zip \
185177
--firefox-sources-zip cloudhood-firefox-sources.zip \
186178
--firefox-extension-id ${{ env.FIREFOX_EXTENSION_ID }} \

.github/workflows/release-chrome.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
113113
echo "Debug: Chrome extension ID is set: ${{ secrets.CHROME_EXTENSION_ID != '' }}"
114114
115-
npx publish-browser-extension \
115+
npx --yes publish-browser-extension@4.0.4 \
116116
--chrome-zip cloudhood-chrome.zip \
117117
--chrome-extension-id ${{ env.CHROME_EXTENSION_ID }} \
118118
--chrome-client-id ${{ env.CHROME_CLIENT_ID }} \

.github/workflows/release-firefox.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
127127
echo "Debug: Firefox extension ID is set: ${{ secrets.FIREFOX_EXTENSION_ID != '' }}"
128128
129-
npx publish-browser-extension \
129+
npx --yes publish-browser-extension@4.0.4 \
130130
--firefox-zip cloudhood-firefox.zip \
131131
--firefox-sources-zip cloudhood-firefox-sources.zip \
132132
--firefox-extension-id ${{ env.FIREFOX_EXTENSION_ID }} \

package.json

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"test:e2e:screenshots:generate": "pnpm test:e2e:screenshots:docker:update"
3434
},
3535
"dependencies": {
36-
"@cloud-ru/ft-config-lint-staged": "1.1.2",
3736
"@dnd-kit/core": "6.3.1",
3837
"@dnd-kit/sortable": "10.0.0",
3938
"@emotion/react": "11.14.0",
@@ -60,11 +59,12 @@
6059
"vite-plugin-static-copy": "3.1.4"
6160
},
6261
"devDependencies": {
63-
"@cloud-ru/eslint-config": "3.0.0",
62+
"@cloud-ru/eslint-config": "3.1.5",
6463
"@cloud-ru/ft-config-commit-message": "1.1.2",
65-
"@cloud-ru/ft-config-stylelint": "3.0.0",
64+
"@cloud-ru/ft-config-lint-staged": "1.1.4",
65+
"@cloud-ru/ft-config-stylelint": "3.1.2",
6666
"@cloud-ru/ft-config-vitest": "1.2.2",
67-
"@crxjs/vite-plugin": "^2.0.2",
67+
"@crxjs/vite-plugin": "^2.4.0",
6868
"@eslint/compat": "1.2.9",
6969
"@playwright/test": "1.57.0",
7070
"@svgr/webpack": "8.1.0",
@@ -74,7 +74,7 @@
7474
"@types/webextension-polyfill": "0.12.3",
7575
"@types/ws": "8.18.1",
7676
"@vitejs/plugin-react": "^4.5.2",
77-
"concurrently": "9.2.0",
77+
"concurrently": "9.2.1",
7878
"eslint-plugin-effector": "0.16.0",
7979
"fs-extra": "11.3.0",
8080
"husky": "^9.1.6",
@@ -83,16 +83,24 @@
8383
"prettier": "3.5.3",
8484
"terser": "5.46.1",
8585
"typescript": "5.7.3",
86-
"vite": "^5.4.19",
86+
"vite": "6.4.2",
8787
"vite-plugin-svgr": "4.3.0",
8888
"vite-tsconfig-paths": "5.1.4",
8989
"webextension-polyfill": "0.12.0",
9090
"ws": "8.20.0"
9191
},
9292
"pnpm": {
9393
"overrides": {
94+
"brace-expansion": "2.0.3",
9495
"esbuild": "0.27.2",
95-
"glob": "10.5.0"
96+
"flatted": "3.4.2",
97+
"glob": "10.5.0",
98+
"minimatch": "9.0.9",
99+
"@eslint/eslintrc>minimatch": "3.1.5",
100+
"picomatch": "4.0.4",
101+
"rollup": "4.60.1",
102+
"svgo": "3.3.3",
103+
"yaml": "1.10.3"
96104
}
97105
},
98106
"packageManager": "pnpm@10.10.0",

0 commit comments

Comments
 (0)