diff --git a/.github/workflows/web-starter-playwright.yml b/.github/workflows/web-starter-playwright.yml
index e07622d5..5dcfc13c 100644
--- a/.github/workflows/web-starter-playwright.yml
+++ b/.github/workflows/web-starter-playwright.yml
@@ -6,10 +6,6 @@ on:
jobs:
test:
- defaults:
- run:
- working-directory: web-starter
-
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -30,24 +26,39 @@ jobs:
- name: Build circuits
run: |
- cd circuits && ./build.sh
+ cd web-starter/circuits && ./build.sh
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: lts/*
- - name: Install JS dependencies
- working-directory: web-starter/web
+ - name: Install JS dependencies (vite)
+ working-directory: web-starter/web/vite
+ run: |
+ yarn install
+
+ - name: Install Playwright Browsers (vite)
+ working-directory: web-starter/web/vite
+ run: |
+ yarn playwright install --with-deps
+
+ - name: Run Playwright tests (vite)
+ working-directory: web-starter/web/vite
+ run: |
+ yarn test:e2e
+
+ - name: Install JS dependencies (webpack)
+ working-directory: web-starter/web/webpack
run: |
yarn install
- - name: Install Playwright Browsers
- working-directory: web-starter/web
+ - name: Install Playwright Browsers (webpack)
+ working-directory: web-starter/web/webpack
run: |
yarn playwright install --with-deps
- - name: Run Playwright tests
- working-directory: web-starter/web
+ - name: Run Playwright tests (webpack)
+ working-directory: web-starter/web/webpack
run: |
yarn test:e2e
diff --git a/web-starter/.gitignore b/web-starter/.gitignore
index af2086a9..a474caa5 100644
--- a/web-starter/.gitignore
+++ b/web-starter/.gitignore
@@ -1,10 +1,10 @@
-cache
-out
-proofs
-broadcast
-.env
-plonk_vk.sol
-web/node_modules
-.DS_Store
-web/dist
-web/test-results
+**/dist/
+**/build/
+**/out/
+**/target/
+**/node_modules/
+**/.env*
+**/coverage/
+**/test-results/
+**/package-lock.json
+**/pnpm-lock.yaml
diff --git a/web-starter/README.md b/web-starter/README.md
index e13922e0..211c0608 100644
--- a/web-starter/README.md
+++ b/web-starter/README.md
@@ -9,15 +9,20 @@ Tested with Noir 1.0.0-beta.6 and bb 0.84.0
```bash
(cd circuits && ./build.sh)
-(cd web && yarn)
+
+# vite
+(cd web/vite && yarn install)
+
+# webpack
+(cd web/webpack && yarn install)
```
## Run
```bash
# vite
-(cd web && yarn vite:dev)
+(cd web/vite && yarn dev)
# webpack
-(cd web && yarn webpack:dev)
+(cd web/webpack && yarn dev)
```
diff --git a/web-starter/web/tests/proof-verification.spec.ts b/web-starter/web/tests/proof-verification.spec.ts
deleted file mode 100644
index a1b940a1..00000000
--- a/web-starter/web/tests/proof-verification.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { test, expect, Page } from '@playwright/test';
-
-test('proof verification works in the browser', async ({ page }: { page: Page }) => {
- await page.goto('/');
- await page.click('#generateProofBtn');
- // Wait for the result to contain 'Verified:'
- await expect(page.locator('#result')).toContainText('Verified:');
- // Check that the result contains 'Verified: true' (or similar)
- const resultText = await page.locator('#result').innerText();
- expect(resultText).toMatch(/Verified:\s*(true|1)/i);
-});
\ No newline at end of file
diff --git a/web-starter/web/vite/README.md b/web-starter/web/vite/README.md
new file mode 100644
index 00000000..eb7d7b7d
--- /dev/null
+++ b/web-starter/web/vite/README.md
@@ -0,0 +1,20 @@
+# Introduction
+
+A simple Noir circuit with browser proving with bb.js
+Has both webpack and vite bundling.
+
+Tested with Noir 1.0.0-beta.6 and bb 0.84.0
+
+## Setup
+
+```bash
+(cd ../../circuits && ./build.sh)
+yarn
+```
+
+## Run
+
+```bash
+# vite
+yarn dev
+```
diff --git a/web-starter/web/index.html b/web-starter/web/vite/index.html
similarity index 75%
rename from web-starter/web/index.html
rename to web-starter/web/vite/index.html
index 1a03506c..ce0bdc64 100644
--- a/web-starter/web/index.html
+++ b/web-starter/web/vite/index.html
@@ -3,15 +3,15 @@
- Noir UH Starter
+ Noir UH Starter (Vite)
-
Noir UH Starter
+
Noir UH Starter (Vite)