Skip to content

Commit dad7282

Browse files
committed
Merge branch 'main' into development
2 parents 02a4e45 + 88bb5df commit dad7282

File tree

3 files changed

+279
-255
lines changed

3 files changed

+279
-255
lines changed

DOCS/repository_context.txt

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -17738,88 +17738,6 @@ tsconfig.json
1773817738
35: }
1773917739
````
1774017740

17741-
## File: .circleci/config.yml
17742-
````yaml
17743-
1: version: 2.1
17744-
2: orbs:
17745-
3: cypress: cypress-io/[email protected]
17746-
4: codecov: codecov/[email protected]
17747-
5: node: circleci/[email protected]
17748-
6: executors:
17749-
7: with-chrome-and-firefox:
17750-
8: docker:
17751-
9: - image: "cypress/browsers:node16.14.2-slim-chrome100-ff99-edge"
17752-
10: resource_class: large
17753-
11: jobs:
17754-
12: chromatic-deployment:
17755-
13: docker:
17756-
14: - image: cimg/node:23.11.1
17757-
15: working_directory: ~/chromatic
17758-
16: steps:
17759-
17: - checkout
17760-
18: - restore_cache:
17761-
19: keys:
17762-
20: - pnpm-packages-v1-{{ checksum "pnpm-lock.yaml" }}
17763-
21: - pnpm-packages-cache-v1
17764-
22: - run:
17765-
23: name: Install pnpm package manager
17766-
24: command: |
17767-
25: sudo corepack enable
17768-
26: sudo corepack prepare pnpm@latest-8 --activate
17769-
27: - run:
17770-
28: name: Install Dependencies
17771-
29: command: pnpm install --frozen-lockfile
17772-
30: - run: pnpm run chromatic -- --project-token=${CHROMATIC_PROJECT_TOKEN}
17773-
31: - save_cache:
17774-
32: key: pnpm-packages-v1-{{ checksum "pnpm-lock.yaml" }}
17775-
33: paths:
17776-
34: - ~/.pnpm-store
17777-
35: build:
17778-
36: working_directory: /home/circleci/dfweb
17779-
37: docker:
17780-
38: - image: cimg/node:23.11.1-browsers
17781-
39: steps:
17782-
40: - checkout
17783-
41: - restore_cache:
17784-
42: key: pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
17785-
43: - run:
17786-
44: name: Install pnpm package manager
17787-
45: command: |
17788-
46: sudo corepack enable
17789-
47: sudo corepack prepare pnpm@latest-8 --activate
17790-
48: - run:
17791-
49: name: Install Dependencies
17792-
50: command: pnpm install --no-frozen-lockfile
17793-
51: - run:
17794-
52: name: Chrome key start setup
17795-
53: command: sudo apt update -y
17796-
54: - run:
17797-
55: name: Chrome key finish setup
17798-
56: command: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
17799-
57: - run:
17800-
58: name: Chrome package download
17801-
59: command: sudo apt install ./google-chrome-stable_current_amd64.deb
17802-
60: - save_cache:
17803-
61: key: pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
17804-
62: paths:
17805-
63: - ~/.pnpm-store
17806-
64: - store_artifacts:
17807-
65: path: /root/.npm/_logs
17808-
66: - run:
17809-
67: name: Run Jest Tests
17810-
68: command: pnpm test
17811-
69: - run:
17812-
70: name: Make sure ~/.gnupg directory exists
17813-
71: command: mkdir -p ~/.gnupg
17814-
72: - codecov/upload
17815-
73: parallelism: 6
17816-
74: workflows:
17817-
75: chromatic-deploy:
17818-
76: jobs:
17819-
77: - build:
17820-
78: name: Build Next.js project
17821-
````
17822-
1782317741
## File: .github/workflows/repomix.yml
1782417742
````yaml
1782517743
1: name: Repository Documentation
@@ -17906,6 +17824,88 @@ tsconfig.json
1790617824
82: fi
1790717825
````
1790817826

17827+
## File: .circleci/config.yml
17828+
````yaml
17829+
1: version: 2.1
17830+
2: orbs:
17831+
3: cypress: cypress-io/[email protected]
17832+
4: codecov: codecov/[email protected]
17833+
5: node: circleci/[email protected]
17834+
6: executors:
17835+
7: with-chrome-and-firefox:
17836+
8: docker:
17837+
9: - image: "cypress/browsers:node16.14.2-slim-chrome100-ff99-edge"
17838+
10: resource_class: large
17839+
11: jobs:
17840+
12: chromatic-deployment:
17841+
13: docker:
17842+
14: - image: cimg/node:23.11.1
17843+
15: working_directory: ~/chromatic
17844+
16: steps:
17845+
17: - checkout
17846+
18: - restore_cache:
17847+
19: keys:
17848+
20: - pnpm-packages-v1-{{ checksum "pnpm-lock.yaml" }}
17849+
21: - pnpm-packages-cache-v1
17850+
22: - run:
17851+
23: name: Install pnpm package manager
17852+
24: command: |
17853+
25: sudo corepack enable
17854+
26: sudo corepack prepare pnpm@latest-8 --activate
17855+
27: - run:
17856+
28: name: Install Dependencies
17857+
29: command: pnpm install --frozen-lockfile
17858+
30: - run: pnpm run chromatic -- --project-token=${CHROMATIC_PROJECT_TOKEN}
17859+
31: - save_cache:
17860+
32: key: pnpm-packages-v1-{{ checksum "pnpm-lock.yaml" }}
17861+
33: paths:
17862+
34: - ~/.pnpm-store
17863+
35: build:
17864+
36: working_directory: /home/circleci/dfweb
17865+
37: docker:
17866+
38: - image: cimg/node:23.11.1-browsers
17867+
39: steps:
17868+
40: - checkout
17869+
41: - restore_cache:
17870+
42: key: pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
17871+
43: - run:
17872+
44: name: Install pnpm package manager
17873+
45: command: |
17874+
46: sudo corepack enable
17875+
47: sudo corepack prepare pnpm@latest-8 --activate
17876+
48: - run:
17877+
49: name: Install Dependencies
17878+
50: command: pnpm install --no-frozen-lockfile
17879+
51: - run:
17880+
52: name: Chrome key start setup
17881+
53: command: sudo apt update -y
17882+
54: - run:
17883+
55: name: Chrome key finish setup
17884+
56: command: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
17885+
57: - run:
17886+
58: name: Chrome package download
17887+
59: command: sudo apt install ./google-chrome-stable_current_amd64.deb
17888+
60: - save_cache:
17889+
61: key: pnpm-cache-v2-{{ checksum "pnpm-lock.yaml" }}
17890+
62: paths:
17891+
63: - ~/.pnpm-store
17892+
64: - store_artifacts:
17893+
65: path: /root/.npm/_logs
17894+
66: - run:
17895+
67: name: Run Jest Tests
17896+
68: command: pnpm test
17897+
69: - run:
17898+
70: name: Make sure ~/.gnupg directory exists
17899+
71: command: mkdir -p ~/.gnupg
17900+
72: - codecov/upload
17901+
73: parallelism: 6
17902+
74: workflows:
17903+
75: chromatic-deploy:
17904+
76: jobs:
17905+
77: - build:
17906+
78: name: Build Next.js project
17907+
````
17908+
1790917909
## File: .github/workflows/lighthouse.yml
1791017910
````yaml
1791117911
1: name: Lighthouse CI
@@ -18156,6 +18156,48 @@ tsconfig.json
1815618156
23: }
1815718157
````
1815818158

18159+
## File: .github/workflows/playwright.yml
18160+
````yaml
18161+
1: name: Playwright Tests
18162+
2: on:
18163+
3: push:
18164+
4: branches: [main, master]
18165+
5: pull_request:
18166+
6: branches: [main, master]
18167+
7: jobs:
18168+
8: test:
18169+
9: timeout-minutes: 60
18170+
10: runs-on: ubuntu-latest
18171+
11: steps:
18172+
12: - uses: actions/checkout@v5
18173+
13: - uses: pnpm/action-setup@v4
18174+
14: with:
18175+
15: version: 10
18176+
16: - uses: actions/setup-node@v4
18177+
17: with:
18178+
18: node-version: 22
18179+
19: cache: "pnpm"
18180+
20: - name: Install dependencies
18181+
21: run: pnpm install
18182+
22: - name: Install Playwright Browsers
18183+
23: run: pnpm exec playwright install --with-deps chromium firefox
18184+
24: - name: Build the project
18185+
25: run: pnpm build
18186+
26: - name: Start the application
18187+
27: run: pnpm start &
18188+
28: - name: Wait for the application to be ready
18189+
29: run: |
18190+
30: npx wait-on http://localhost:3000
18191+
31: - name: Run Playwright tests
18192+
32: run: pnpm exec playwright test
18193+
33: - uses: actions/upload-artifact@v4
18194+
34: if: always()
18195+
35: with:
18196+
36: name: playwright-report
18197+
37: path: playwright-report/
18198+
38: retention-days: 30
18199+
````
18200+
1815918201
## File: .github/workflows/cypress.yml
1816018202
````yaml
1816118203
1: name: Cypress Tests
@@ -18178,7 +18220,7 @@ tsconfig.json
1817818220
18: with:
1817918221
19: version: 10
1818018222
20: - name: Setup Node.js
18181-
21: uses: actions/setup-node@v5
18223+
21: uses: actions/setup-node@v4
1818218224
22: with:
1818318225
23: node-version: 20
1818418226
24: cache: 'pnpm'
@@ -18206,48 +18248,6 @@ tsconfig.json
1820618248
46: install: false
1820718249
````
1820818250

18209-
## File: .github/workflows/playwright.yml
18210-
````yaml
18211-
1: name: Playwright Tests
18212-
2: on:
18213-
3: push:
18214-
4: branches: [main, master]
18215-
5: pull_request:
18216-
6: branches: [main, master]
18217-
7: jobs:
18218-
8: test:
18219-
9: timeout-minutes: 60
18220-
10: runs-on: ubuntu-latest
18221-
11: steps:
18222-
12: - uses: actions/checkout@v5
18223-
13: - uses: pnpm/action-setup@v4
18224-
14: with:
18225-
15: version: 10
18226-
16: - uses: actions/setup-node@v4
18227-
17: with:
18228-
18: node-version: 22
18229-
19: cache: "pnpm"
18230-
20: - name: Install dependencies
18231-
21: run: pnpm install
18232-
22: - name: Install Playwright Browsers
18233-
23: run: pnpm exec playwright install --with-deps chromium firefox
18234-
24: - name: Build the project
18235-
25: run: pnpm build
18236-
26: - name: Start the application
18237-
27: run: pnpm start &
18238-
28: - name: Wait for the application to be ready
18239-
29: run: |
18240-
30: npx wait-on http://localhost:3000
18241-
31: - name: Run Playwright tests
18242-
32: run: pnpm exec playwright test
18243-
33: - uses: actions/upload-artifact@v4
18244-
34: if: always()
18245-
35: with:
18246-
36: name: playwright-report
18247-
37: path: playwright-report/
18248-
38: retention-days: 30
18249-
````
18250-
1825118251
## File: studio/package.json
1825218252
````json
1825318253
1: {

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"envalid": "^8.1.0",
3939
"jest": "^29.7.0",
4040
"motion": "^12.23.12",
41-
"next": "15.4.6",
41+
"next": "15.4.7",
4242
"next-sanity": "^10.0.12",
4343
"path-to-regexp": "^8.2.0",
4444
"react": "^19.1.1",
@@ -68,14 +68,14 @@
6868
"@types/node": "^22.17.2",
6969
"@types/react": "^19.1.10",
7070
"@types/react-dom": "^19.1.7",
71-
"@typescript-eslint/eslint-plugin": "^8.39.1",
72-
"@typescript-eslint/parser": "^8.39.1",
73-
"@typescript-eslint/utils": "^8.39.1",
71+
"@typescript-eslint/eslint-plugin": "^8.40.0",
72+
"@typescript-eslint/parser": "^8.40.0",
73+
"@typescript-eslint/utils": "^8.40.0",
7474
"axe-core": "^4.10.3",
7575
"cypress": "14.5.4",
7676
"cypress-axe": "^1.6.0",
7777
"eslint": "9.33.0",
78-
"eslint-config-next": "15.4.6",
78+
"eslint-config-next": "15.4.7",
7979
"eslint-config-prettier": "^10.1.8",
8080
"eslint-plugin-jest": "^29.0.1",
8181
"eslint-plugin-jsx-a11y": "^6.10.2",

0 commit comments

Comments
 (0)