Skip to content

Commit bf45194

Browse files
committed
Merge branch 'main' into feat/dotnet-user-secrets-migration
2 parents 24e6858 + dd14cad commit bf45194

File tree

102 files changed

+3084
-773
lines changed

Some content is hidden

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

102 files changed

+3084
-773
lines changed

.github/workflows/backend-checks-linux.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
- name: Install required packages
2020
run: sudo apt-get update && sudo apt-get install -y attr
2121

22+
# Setup Node.js (needed for integrated frontend build in dotnet build)
23+
- uses: voidzero-dev/setup-vp@v1
24+
2225
# Setup .NET
2326
- name: Setup .NET
2427
uses: actions/setup-dotnet@v4

.github/workflows/backend-checks-windows.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717

18+
# Setup Node.js (needed for integrated frontend build in dotnet build)
19+
- uses: voidzero-dev/setup-vp@v1
20+
1821
# Setup .NET
1922
- name: Setup .NET
2023
uses: actions/setup-dotnet@v4

.github/workflows/dotnet-auto-format.yml

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

.github/workflows/e2e-docs-tests.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
# Setup Node.js and frontend first
16+
# Setup Node.js (needed for integrated frontend build in dotnet build)
1717
- uses: voidzero-dev/setup-vp@v1
1818

19-
- name: Install frontend dependencies
20-
working-directory: ./src/frontend
21-
run: vp install
22-
23-
- name: Build frontend
24-
working-directory: ./src/frontend
25-
run: vp build
26-
27-
# Setup .NET and build backend (now with frontend assets available)
19+
# Setup .NET and build backend (triggers frontend build automatically)
2820
- name: Setup .NET
2921
uses: actions/setup-dotnet@v4
3022
with:

.github/workflows/e2e-samples-tests.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
# Setup Node.js and frontend first
16+
# Setup Node.js (needed for integrated frontend build in dotnet build)
1717
- uses: voidzero-dev/setup-vp@v1
1818

19-
- name: Install frontend dependencies
20-
working-directory: ./src/frontend
21-
run: vp install
22-
23-
- name: Build frontend
24-
working-directory: ./src/frontend
25-
run: vp build
26-
27-
# Setup .NET and build backend (now with frontend assets available)
19+
# Setup .NET and build backend (triggers frontend build automatically)
2820
- name: Setup .NET
2921
uses: actions/setup-dotnet@v4
3022
with:

.gitignore

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

.husky/pre-commit

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

.plans/review/481-IvyFramework-Feature-DataTableFooterAndRowClick-v4.md

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

CONTRIBUTING.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This project and everyone participating in it is governed by our [Code of Conduc
3535
### Prerequisites
3636

3737
- [.NET 10 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
38-
- [Node.js 22.12+ & npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
38+
- [Node.js 22.12+ & vp CLI](https://github.com/voidzero-dev/vite-plus)
3939
- **Ivy Console Tool** (for development):
4040

4141
```bash
@@ -78,31 +78,31 @@ Ivy Framework uses multiple testing approaches to ensure code quality:
7878
### Unit Testing
7979

8080
- **Backend (C#)**: Run `dotnet test` in the root directory
81-
- **Frontend (TypeScript)**: Run `npm run test` in the `src/frontend/` directory
81+
- **Frontend (TypeScript)**: Run `vp test` in the `src/frontend/` directory
8282

8383
### End-to-End Testing
8484

85-
E2E tests are written using Playwright and are located in `src/frontend/e2e/`. We provide npm scripts for running these tests:
85+
E2E tests are written using Playwright and are located in `src/frontend/e2e/`. We provide `vp` scripts for running these tests:
8686

8787
```bash
8888
# Run all E2E tests
89-
npm run e2e
89+
vp run e2e
9090

9191
# Run only Ivy.Docs E2E tests
92-
npm run e2e:docs
92+
vp run e2e:docs
9393

9494
# Run only Ivy.Samples E2E tests
95-
npm run e2e:samples
95+
vp run e2e:samples
9696
```
9797

98-
**Important**: Always use the npm scripts (`npm run e2e*`) instead of `npx playwright test` to ensure consistent usage of the locally installed Playwright version and avoid version conflicts.
98+
**Important**: Always use the `vp` scripts (`vp run e2e*`) instead of `npx playwright test` to ensure consistent usage of the locally installed Playwright version and avoid version conflicts.
9999

100100
Additional Playwright options can be passed after `--`:
101101

102102
```bash
103-
npm run e2e -- --headed # Run tests in headed mode
104-
npm run e2e -- --debug # Run tests in debug mode
105-
npm run e2e:samples -- --project=chromium # Run samples tests in Chrome only
103+
vp run e2e -- --headed # Run tests in headed mode
104+
vp run e2e -- --debug # Run tests in debug mode
105+
vp run e2e:samples -- --project=chromium # Run samples tests in Chrome only
106106
```
107107

108108
## Contributing Guidelines
@@ -260,15 +260,15 @@ Before submitting your code, ensure it follows the project's linting and formatt
260260

261261
#### Frontend (TypeScript/React)
262262

263-
- Use `npm run lint:fix` to automatically fix ESLint issues
264-
- Use `npm run format` to format code with Prettier
263+
- Use `vp lint --fix .` to automatically fix ESLint issues
264+
- Use `vp fmt .` to format code with Oxfmt
265265
- These commands should be run from the `src/frontend/` directory
266266

267267
#### Pre-commit Hooks
268268

269269
The project uses pre-commit hooks that will automatically run linting and formatting on staged files. Make sure your code passes these checks before committing. More details how pre-commit hooks are being set up can be found in `src/frontend/README.md`
270270

271-
TL;DR, if you have run `npm install` in the `src/frontend`, most likely all pre-commit hooks will be working for you, that cover linting and formatting for Ivy-Framework.
271+
TL;DR, if you have run `vp install` in the `src/frontend`, most likely all pre-commit hooks will be working for you, that cover linting and formatting for Ivy-Framework.
272272

273273
### C# Guidelines
274274

@@ -336,15 +336,15 @@ dotnet test src/Ivy.Test
336336

337337
# Run frontend unit tests
338338
cd src/frontend
339-
npm run test
339+
vp test
340340

341341
# Run all frontend E2E tests
342342
cd src/frontend
343-
npm run e2e
343+
vp run e2e
344344

345345
# Run specific E2E test suites
346-
npm run e2e:docs # Ivy.Docs tests only
347-
npm run e2e:samples # Ivy.Samples tests only
346+
vp run e2e:docs # Ivy.Docs tests only
347+
vp run e2e:samples # Ivy.Samples tests only
348348
```
349349

350350
### Writing Tests

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,14 @@ Make sure you have the [.NET 10 SDK installed](https://dotnet.microsoft.com/en-u
8888
dotnet tool install -g Ivy.Console
8989
```
9090

91-
2. **Create a new project**:
91+
2. **Install Vite+ CLI**:
92+
Ivy uses the `vp` (Vite+) CLI for frontend orchestration. Install it globally:
93+
94+
```bash
95+
npm install -g vite-plus
96+
```
97+
98+
3. **Create a new project**:
9299

93100
```bash
94101
ivy init --hello

0 commit comments

Comments
 (0)