From 267dc0f16f2e90c1c17cc595a3703c240206f46a Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Thu, 6 Mar 2025 21:34:02 +0300 Subject: [PATCH] R: Fix build action sequence --- .github/workflows/frontend.yml | 4 ++-- rsconcept/frontend/package.json | 2 +- rsconcept/frontend/vite.config.ts | 5 ++++- scripts/dev/RunE2ETests.ps1 | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 95c2d772..9d94cd0c 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -35,14 +35,14 @@ jobs: - name: Build run: | npm install -g typescript vite jest playwright - npx playwright install --with-deps npm ci + npx playwright install --with-deps npm run build --if-present - name: Run CI run: | npm run lint npm test - npm run teste2e + npm run test:e2e - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: diff --git a/rsconcept/frontend/package.json b/rsconcept/frontend/package.json index 889f0c66..e5f93bd9 100644 --- a/rsconcept/frontend/package.json +++ b/rsconcept/frontend/package.json @@ -6,7 +6,7 @@ "scripts": { "generate": "lezer-generator src/components/RSInput/rslang/rslangFast.grammar -o src/components/RSInput/rslang/parser.ts && lezer-generator src/components/RSInput/rslang/rslangAST.grammar -o src/components/RSInput/rslang/parserAST.ts && lezer-generator src/components/RefsInput/parse/refsText.grammar -o src/components/RefsInput/parse/parser.ts", "test": "jest", - "teste2e": "playwright test", + "test:e2e": "playwright test", "dev": "vite --host", "build": "tsc && vite build", "lint": "eslint . --report-unused-disable-directives --max-warnings 0", diff --git a/rsconcept/frontend/vite.config.ts b/rsconcept/frontend/vite.config.ts index 568f7ea0..f2804cd0 100644 --- a/rsconcept/frontend/vite.config.ts +++ b/rsconcept/frontend/vite.config.ts @@ -57,7 +57,10 @@ export default ({ mode }: { mode: string }) => { muteWarningsPlugin(warningsToIgnore) ], server: { - port: Number(process.env.VITE_PORTAL_FRONT_PORT) + port: Number(process.env.VITE_PORTAL_FRONT_PORT), + watch: { + ignored: ['**/tests/**'] + } }, publicDir: 'public', build: { diff --git a/scripts/dev/RunE2ETests.ps1 b/scripts/dev/RunE2ETests.ps1 index e8064c1c..a97c8889 100644 --- a/scripts/dev/RunE2ETests.ps1 +++ b/scripts/dev/RunE2ETests.ps1 @@ -8,7 +8,7 @@ function RunTests() { function TestFrontend() { Set-Location $frontend - & npm run teste2e + & npm run test:e2e } RunTests \ No newline at end of file