Skip to content

Commit e7a2cf6

Browse files
gspencergooggspencergoog
committed
build: migrate to Yarn Modern and Wireit, and update CI workflows
1 parent 15ee789 commit e7a2cf6

71 files changed

Lines changed: 30054 additions & 93846 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/composer_build_and_test.yml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,23 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v6
3333

34-
- name: Install pnpm
35-
uses: pnpm/action-setup@v4
36-
with:
37-
version: 10
38-
3934
- name: Set up Node.js
4035
uses: actions/setup-node@v6
4136
with:
4237
node-version: '20'
43-
cache: 'pnpm'
44-
cache-dependency-path: 'tools/composer/pnpm-lock.yaml'
38+
cache: 'yarn'
4539

4640
- name: Install dependencies
47-
working-directory: ./tools/composer
48-
run: pnpm install
41+
run: yarn install --immutable
4942

5043
- name: Lint
5144
working-directory: ./tools/composer
52-
run: pnpm lint
45+
run: yarn lint
5346

5447
- name: Build
5548
working-directory: ./tools/composer
56-
run: pnpm build
49+
run: yarn build
5750

5851
- name: Test
5952
working-directory: ./tools/composer
60-
run: pnpm test
53+
run: yarn test

‎.github/workflows/editor_build.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,25 @@ jobs:
3939
uses: actions/setup-node@v6
4040
with:
4141
node-version: '20'
42+
cache: 'yarn'
4243

4344
- name: Install web_core deps
44-
working-directory: ./renderers/web_core
45-
run: npm ci
45+
run: yarn install --immutable
4646

4747
- name: Build web_core
4848
working-directory: ./renderers/web_core
49-
run: npm run build
49+
run: yarn build
5050

5151
- name: Install lib's deps
52-
working-directory: ./renderers/lit
53-
run: npm ci
52+
run: yarn install --immutable
5453

5554
- name: Build lib
5655
working-directory: ./renderers/lit
57-
run: npm run build
56+
run: yarn build
5857

5958
- name: Install editor deps
60-
working-directory: ./tools/editor
61-
run: npm install
59+
run: yarn install --immutable
6260

6361
- name: Build editor
6462
working-directory: ./tools/editor
65-
run: npm run build
63+
run: yarn build

‎.github/workflows/inspector_build.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,25 @@ jobs:
4040
uses: actions/setup-node@v6
4141
with:
4242
node-version: '20'
43+
cache: 'yarn'
4344

4445
- name: Install web_core deps
45-
working-directory: ./renderers/web_core
46-
run: npm ci
46+
run: yarn install --immutable
4747

4848
- name: Build web_core
4949
working-directory: ./renderers/web_core
50-
run: npm run build
50+
run: yarn build
5151

5252
- name: Install lib's deps
53-
working-directory: ./renderers/lit
54-
run: npm ci
53+
run: yarn install --immutable
5554

5655
- name: Build lib
5756
working-directory: ./renderers/lit
58-
run: npm run build
57+
run: yarn build
5958

6059
- name: Install inspector deps
61-
working-directory: ./tools/inspector
62-
run: npm install
60+
run: yarn install --immutable
6361

6462
- name: Build inspector
6563
working-directory: ./tools/inspector
66-
run: npm run build
64+
run: yarn build

‎.github/workflows/lit_build_and_test.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,22 @@ jobs:
3838
uses: actions/setup-node@v6
3939
with:
4040
node-version: '20'
41+
cache: 'yarn'
4142

4243
- name: Install web_core dependencies
43-
working-directory: ./renderers/web_core
44-
run: npm i
44+
run: yarn install --immutable
4545

4646
- name: Build web_core
4747
working-directory: ./renderers/web_core
48-
run: npm run build
48+
run: yarn build
4949

5050
- name: Install Lit renderer dependencies
51-
working-directory: ./renderers/lit
52-
run: npm i
51+
run: yarn install --immutable
5352

5453
- name: Build Lit renderer
5554
working-directory: ./renderers/lit
56-
run: npm run build
55+
run: yarn build
5756

5857
- name: Run Lit renderer tests
5958
working-directory: ./renderers/lit
60-
run: npm test
59+
run: yarn test

‎.github/workflows/lit_samples_build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ jobs:
3434
uses: actions/setup-node@v6
3535
with:
3636
node-version: '20'
37+
cache: 'yarn'
3738

38-
- name: Build lit renderer and its dependencies
39-
working-directory: ./samples/client/lit
40-
run: npm run build:renderer
39+
- name: Install workspaces' dependencies
40+
run: yarn install --immutable
4141

42-
- name: Install all lit samples workspaces' dependencies
42+
- name: Build lit renderer and its dependencies
4343
working-directory: ./samples/client/lit
44-
run: npm install --workspaces
44+
run: yarn build:renderer
4545

4646
- name: Build all lit samples workspaces
4747
working-directory: ./samples/client/lit
48-
run: npm run build --workspaces
48+
run: yarn workspaces foreach -R --exclude '@a2ui/lit-samples' run build
4949

5050

‎.github/workflows/ng_build_and_test.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ jobs:
3434
uses: actions/setup-node@v6
3535
with:
3636
node-version: '20'
37+
cache: 'yarn'
3738

3839
- name: Install top-level deps
39-
working-directory: ./samples/client/angular
40-
run: npm i
40+
run: yarn install --immutable
4141

4242
- name: Build Angular renderer and its dependencies
4343
working-directory: ./samples/client/angular
44-
run: npm run build:renderer
44+
run: yarn build:renderer
4545

4646
- name: Build contact sample
4747
working-directory: ./samples/client/angular
48-
run: npm run build contact
48+
run: yarn ng build contact
4949

5050
- name: Build restaurant sample
5151
working-directory: ./samples/client/angular
52-
run: npm run build restaurant
52+
run: yarn ng build restaurant
5353

5454
- name: Build Rizzchart sample
5555
working-directory: ./samples/client/angular
56-
run: npm run build rizzcharts
56+
run: yarn ng build rizzcharts
5757

5858
- name: Build Orchestrator
5959
working-directory: ./samples/client/angular
60-
run: npm run build orchestrator
60+
run: yarn ng build orchestrator

‎.github/workflows/react_renderer.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ jobs:
4040
uses: actions/setup-node@v6
4141
with:
4242
node-version: '20'
43+
cache: 'yarn'
4344

4445
- name: Build web_core dependency
4546
working-directory: ./renderers/web_core
4647
run: |
47-
npm ci
48-
npm run build
48+
yarn install --immutable
49+
yarn build
4950
5051
- name: Install React renderer deps
51-
working-directory: ./renderers/react
52-
run: npm ci
52+
run: yarn install --immutable
5353

5454
- name: Build React renderer
5555
working-directory: ./renderers/react
56-
run: npm run build
56+
run: yarn build
5757

5858
- name: Test React renderer
5959
working-directory: ./renderers/react
60-
run: npm test
60+
run: yarn test
6161

6262
build-and-test-demo:
6363
runs-on: ubuntu-latest
@@ -69,24 +69,24 @@ jobs:
6969
uses: actions/setup-node@v6
7070
with:
7171
node-version: '20'
72+
cache: 'yarn'
7273

7374
- name: Build web_core dependency
7475
working-directory: ./renderers/web_core
7576
run: |
76-
npm ci
77-
npm run build
77+
yarn install --immutable
78+
yarn build
7879
7980
- name: Install React renderer deps
80-
working-directory: ./renderers/react
81-
run: npm ci
81+
run: yarn install --immutable
8282

8383
- name: Build React Demo
8484
working-directory: ./renderers/react
85-
run: npm run build:demo
85+
run: yarn build:demo
8686

8787
- name: Test React Demo
8888
working-directory: ./renderers/react
89-
run: npm run test:demo
89+
run: yarn test:demo
9090

9191
lint:
9292
runs-on: ubuntu-latest
@@ -98,18 +98,18 @@ jobs:
9898
uses: actions/setup-node@v6
9999
with:
100100
node-version: '20'
101+
cache: 'yarn'
101102

102103
- name: Build web_core dependency
103104
working-directory: ./renderers/web_core
104105
run: |
105-
npm ci
106-
npm run build
106+
yarn install --immutable
107+
yarn build
107108
108109
- name: Install React renderer deps
109-
working-directory: ./renderers/react
110-
run: npm ci
110+
run: yarn install --immutable
111111

112112
- name: Build React renderer and its dependencies
113113
working-directory: ./renderers/react
114-
run: npm run lint
114+
run: yarn lint
115115

‎.github/workflows/validate_specifications.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,19 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v6
3636

37-
- name: Install pnpm
38-
uses: pnpm/action-setup@v4
39-
with:
40-
version: 10
41-
4237
- name: Set up Node.js
4338
uses: actions/setup-node@v6
4439
with:
4540
node-version: '20'
41+
cache: 'yarn'
4642

4743
- name: Set up Python
4844
uses: actions/setup-python@v6
4945
with:
5046
python-version: '3.12'
5147

5248
- name: Install dependencies
53-
working-directory: ./specification/v0_9/test
54-
run: pnpm install
49+
run: yarn install --immutable
5550

5651
- name: Run validation script
5752
run: python3 specification/scripts/validate.py

‎.github/workflows/web_build_and_test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ jobs:
3636
uses: actions/setup-node@v6
3737
with:
3838
node-version: '20'
39+
cache: 'yarn'
3940

4041
- name: Install web_core dependencies
41-
working-directory: ./renderers/web_core
42-
run: npm i
42+
run: yarn install --immutable
4343

4444
- name: Build web_core
4545
working-directory: ./renderers/web_core
46-
run: npm run build
46+
run: yarn build
4747

4848
- name: Test web_core
4949
working-directory: ./renderers/web_core
50-
run: npm run test
50+
run: yarn test
5151
lint:
5252
steps:
5353
- uses: actions/checkout@v6
@@ -56,15 +56,15 @@ jobs:
5656
uses: actions/setup-node@v6
5757
with:
5858
node-version: '20'
59+
cache: 'yarn'
5960

6061
- name: Install web_core dependencies
61-
working-directory: ./renderers/web_core
62-
run: npm i
62+
run: yarn install --immutable
6363

6464
- name: Build web_core
6565
working-directory: ./renderers/web_core
66-
run: npm run build
66+
run: yarn build
6767

6868
- name: Lint web_core
6969
working-directory: ./renderers/web_core
70-
run: npm run lint
70+
run: yarn lint

‎.gitignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dist
99
__pycache__
1010
*.pyc
1111
.angular
12+
*.tsbuildinfo
1213

1314
# MkDocs build output
1415
site/
@@ -25,6 +26,15 @@ agent_sdks/python/src/a2ui/assets/**/*.json
2526
## Generated files for sandbox frame.
2627
samples/client/angular/projects/mcp_calculator/public/mcp_apps_inner_iframe/
2728

29+
# Yarn Modern
30+
.yarn/*
31+
!.yarn/patches
32+
!.yarn/plugins
33+
!.yarn/releases
34+
!.yarn/sdks
35+
!.yarn/versions
36+
.yarn/cache
37+
2838
## Generated files for a2ui-in-mcpapps
2939
samples/agent/mcp/a2ui-in-mcpapps/server/apps/dist
3040
samples/agent/mcp/a2ui-in-mcpapps/server/apps/public

0 commit comments

Comments
 (0)