Skip to content

Commit 39240d6

Browse files
gspencergooggspencergoog
committed
Replaces independent npm workspaces with a centralized Yarn Modern (v4+)
workspace configuration. Key changes: - Adds root package.json and .yarnrc.yml for topological builds using `yarn workspaces foreach`. - Unifies `yarn.lock` at the repository root and removes localized package-lock.json and .npmrc files. - Refactors `npm run` steps in CI workflows to use `yarn build` and `yarn test`. - Fixes `a2a-chat-canvas` internal AST destructuring crash caused by incorrect tsconfig path mapping. Sets `paths` to the built `dist` folder. - Replaces static SSR imports in `widget-builder` shell with dynamic imports to prevent CustomElementRegistry hydration collisions. - Moves `@a2ui/angular` and `@a2ui/web_core` to peerDependencies in Angular sample projects.
1 parent 3b1dc2d commit 39240d6

118 files changed

Lines changed: 27543 additions & 90457 deletions

File tree

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: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,22 @@ 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'
4538

4639
- name: Install dependencies
47-
working-directory: ./tools/composer
48-
run: pnpm install
40+
run: yarn install --immutable
4941

5042
- name: Lint
5143
working-directory: ./tools/composer
52-
run: pnpm lint
44+
run: yarn lint
5345

5446
- name: Build
5547
working-directory: ./tools/composer
56-
run: pnpm build
48+
run: yarn build
5749

5850
- name: Test
5951
working-directory: ./tools/composer
60-
run: pnpm test
52+
run: yarn test

‎.github/workflows/editor_build.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,22 @@ jobs:
4141
node-version: '20'
4242

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

4746
- name: Build web_core
4847
working-directory: ./renderers/web_core
49-
run: npm run build
48+
run: yarn build
5049

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

5553
- name: Build lib
5654
working-directory: ./renderers/lit
57-
run: npm run build
55+
run: yarn build
5856

5957
- name: Install editor deps
60-
working-directory: ./tools/editor
61-
run: npm install
58+
run: yarn install --immutable
6259

6360
- name: Build editor
6461
working-directory: ./tools/editor
65-
run: npm run build
62+
run: yarn build

‎.github/workflows/inspector_build.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,22 @@ jobs:
4242
node-version: '20'
4343

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

4847
- name: Build web_core
4948
working-directory: ./renderers/web_core
50-
run: npm run build
49+
run: yarn build
5150

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

5654
- name: Build lib
5755
working-directory: ./renderers/lit
58-
run: npm run build
56+
run: yarn build
5957

6058
- name: Install inspector deps
61-
working-directory: ./tools/inspector
62-
run: npm install
59+
run: yarn install --immutable
6360

6461
- name: Build inspector
6562
working-directory: ./tools/inspector
66-
run: npm run build
63+
run: yarn build

‎.github/workflows/lit_build_and_test.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,19 @@ jobs:
4040
node-version: '20'
4141

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

4645
- name: Build web_core
4746
working-directory: ./renderers/web_core
48-
run: npm run build
47+
run: yarn build
4948

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

5452
- name: Build Lit renderer
5553
working-directory: ./renderers/lit
56-
run: npm run build
54+
run: yarn build
5755

5856
- name: Run Lit renderer tests
5957
working-directory: ./renderers/lit
60-
run: npm test
58+
run: yarn test

‎.github/workflows/lit_samples_build.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,15 @@ jobs:
3535
with:
3636
node-version: '20'
3737

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

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

4645
- name: Build all lit samples workspaces
4746
working-directory: ./samples/client/lit
48-
run: npm run build --workspaces
47+
run: yarn workspaces foreach -A run build
4948

5049

‎.github/workflows/ng_build_and_test.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,24 @@ jobs:
3636
node-version: '20'
3737

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

4241
- name: Build Angular renderer and its dependencies
4342
working-directory: ./samples/client/angular
44-
run: npm run build:renderer
43+
run: yarn build:renderer
4544

4645
- name: Build contact sample
4746
working-directory: ./samples/client/angular
48-
run: npm run build contact
47+
run: yarn ng build contact
4948

5049
- name: Build restaurant sample
5150
working-directory: ./samples/client/angular
52-
run: npm run build restaurant
51+
run: yarn ng build restaurant
5352

5453
- name: Build Rizzchart sample
5554
working-directory: ./samples/client/angular
56-
run: npm run build rizzcharts
55+
run: yarn ng build rizzcharts
5756

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

‎.github/workflows/react_renderer.yml‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,19 @@ jobs:
4444
- name: Build web_core dependency
4545
working-directory: ./renderers/web_core
4646
run: |
47-
npm ci
48-
npm run build
47+
yarn install --immutable
48+
yarn build
4949
5050
- name: Install React renderer deps
51-
working-directory: ./renderers/react
52-
run: npm ci
51+
run: yarn install --immutable
5352

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

5857
- name: Test React renderer
5958
working-directory: ./renderers/react
60-
run: npm test
59+
run: yarn test
6160

6261
build-and-test-demo:
6362
runs-on: ubuntu-latest
@@ -73,20 +72,19 @@ jobs:
7372
- name: Build web_core dependency
7473
working-directory: ./renderers/web_core
7574
run: |
76-
npm ci
77-
npm run build
75+
yarn install --immutable
76+
yarn build
7877
7978
- name: Install React renderer deps
80-
working-directory: ./renderers/react
81-
run: npm ci
79+
run: yarn install --immutable
8280

8381
- name: Build React Demo
8482
working-directory: ./renderers/react
85-
run: npm run build:demo
83+
run: yarn build:demo
8684

8785
- name: Test React Demo
8886
working-directory: ./renderers/react
89-
run: npm run test:demo
87+
run: yarn test:demo
9088

9189
lint:
9290
runs-on: ubuntu-latest
@@ -102,14 +100,13 @@ jobs:
102100
- name: Build web_core dependency
103101
working-directory: ./renderers/web_core
104102
run: |
105-
npm ci
106-
npm run build
103+
yarn install --immutable
104+
yarn build
107105
108106
- name: Install React renderer deps
109-
working-directory: ./renderers/react
110-
run: npm ci
107+
run: yarn install --immutable
111108

112109
- name: Build React renderer and its dependencies
113110
working-directory: ./renderers/react
114-
run: npm run lint
111+
run: yarn lint
115112

‎.github/workflows/validate_specifications.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ 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:
@@ -50,8 +45,7 @@ jobs:
5045
python-version: '3.12'
5146

5247
- name: Install dependencies
53-
working-directory: ./specification/v0_9/test
54-
run: pnpm install
48+
run: yarn install --immutable
5549

5650
- name: Run validation script
5751
run: python3 specification/scripts/validate.py

‎.github/workflows/web_build_and_test.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,15 @@ jobs:
3838
node-version: '20'
3939

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

4443
- name: Build web_core
4544
working-directory: ./renderers/web_core
46-
run: npm run build
45+
run: yarn build
4746

4847
- name: Test web_core
4948
working-directory: ./renderers/web_core
50-
run: npm run test
49+
run: yarn test
5150
lint:
5251
steps:
5352
- uses: actions/checkout@v6
@@ -58,13 +57,12 @@ jobs:
5857
node-version: '20'
5958

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

6462
- name: Build web_core
6563
working-directory: ./renderers/web_core
66-
run: npm run build
64+
run: yarn build
6765

6866
- name: Lint web_core
6967
working-directory: ./renderers/web_core
70-
run: npm run lint
68+
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/
@@ -24,3 +25,12 @@ a2a_agents/python/a2ui_agent/src/a2ui/assets/**/*.json
2425
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/
28+
29+
# Yarn Modern
30+
.yarn/*
31+
!.yarn/patches
32+
!.yarn/plugins
33+
!.yarn/releases
34+
!.yarn/sdks
35+
!.yarn/versions
36+
.yarn/cache

0 commit comments

Comments
 (0)