Skip to content

Commit 3a424d8

Browse files
authored
Merge pull request #375 from SFTtech/milo/nx-exodus
chore(web): migrate away from nx, use pnpm workspaces instead
2 parents 65f716a + 91b85b6 commit 3a424d8

42 files changed

Lines changed: 2917 additions & 11185 deletions

Some content is hidden

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

.github/workflows/frontend.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install dependencies
3838
run: pnpm install
3939
- name: Build web app
40-
run: npx nx run-many --target test
40+
run: pnpm -w -r run test
4141

4242
lint:
4343
runs-on: ubuntu-latest
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install dependencies
5656
run: pnpm install
5757
- name: Build web app
58-
run: npx oxlint
58+
run: pnpm exec oxlint
5959

6060
build:
6161
runs-on: ubuntu-latest
@@ -73,4 +73,4 @@ jobs:
7373
- name: Install dependencies
7474
run: pnpm install
7575
- name: Build web app
76-
run: npx nx build web
76+
run: pnpm --filter web run build

.github/workflows/push_on_master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }}
8989

9090
- name: Build Frontend
91-
run: npx nx build web
91+
run: pnpm --filter web run build
9292

9393
- name: Build Frontend Image
9494
id: build-frontend-image

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
test:
33
uv run pytest tests --doctest-modules --cov=abrechnung
44

5+
.PHONY: dev-web
6+
dev-web:
7+
pnpm --filter web run dev
8+
59
.PHONY: format
610
format:
711
uv run ruff format
@@ -46,4 +50,4 @@ serve-docs:
4650
generate-openapi:
4751
mkdir -p api
4852
uv run abrechnung -c config.yaml show-openapi > api/openapi.json
49-
npx nx run-many --target generate-openapi
53+
pnpm -w -r run generate-openapi

apps/web-e2e/playwright.config.ts

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

apps/web-e2e/project.json

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

apps/web-e2e/src/example.spec.ts

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

apps/web-e2e/tsconfig.json

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

apps/web/package.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "web",
3+
"version": "0.0.0",
4+
"private": true,
5+
"scripts": {
6+
"dev": "vite",
7+
"build": "vite build",
8+
"preview": "vite preview --port 4200",
9+
"generate-openapi": "pnpm exec @rtk-query/codegen-openapi openapi-config.ts",
10+
"prebuild": "cp -rf ../../assets/* public/assets/ && cp ../../assets/logo.png public/favicon.png"
11+
}
12+
}

apps/web/project.json

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

apps/web/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"types": ["node", "@nx/react/typings/cssmodule.d.ts", "@nx/react/typings/image.d.ts", "vite/client"]
5+
"types": ["node", "vite/client"]
66
},
77
"exclude": [
88
"src/**/*.spec.ts",

0 commit comments

Comments
 (0)