Commit 77df5fd
authored
fix: update tests (#81)
* ambassador: add "Erica Hargreave"
* ambassador: unpublish "Erica Hargreave"
* ambassador: add "Erica Hargreave"
* cohort: add "Ambassadors 2025"
* cohort: delete "Ambassadors 2025"
* cohort: add "Ambassadors 2025"
* ambassador: add "Caroline Sinders"
* cohort: delete "Ambassadors 2025"
* cohort: add "Ambassadors 2024"
* cohort: delete "Ambassadors 2024"
* cohort: add "Ambassadors 2025"
* page: add "test-ambassadors" (en)
* page: unpublish "test-ambassadors" (en)
* page: add "test-ambassadors" (en)
* page: unpublish "test-ambassadors" (en)
* page: add "test-ambassadors" (en)
* page: unpublish "test-ambassadors" (en)
* page: add "test-ambassadors" (en)
* page: delete "test-ambassadors" (en)
* wip: ambassador and associated content
* cohort: add "alumni"
* page: add "ambassadors" (en)
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* remove cohort
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* page: unpublish "ambassadors" (en)
* page: add "ambassadors" (en)
* page: add "test-ambs" (en)
* page: delete "test-ambs" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* ambassador: unpublish "Erica Hargreave"
* ambassador: add "Erica Hargreave"
* ambassador: unpublish "Erica Hargreave"
* ambassador: add "Erica Hargreave"
* setup lifecycle and page to serialise and render ambassador
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* use ordering from strapi instead of sorting
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* fix page previews
* fix linter error
* lint and format
* format & lint
* ambassador: add "Jeremiah Lee"
* ambassador: add "Kokayi Issa"
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: unpublish "test-page" (en)
* page: add "test-page" (en)
* page: delete "test-page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* update readme with preview setup
* remove @astrojs/tailwind, fixes npm i
* Component - blockquote (#11)
Add BlockQuote as a component
* ambassador: add "Caroline Sinders"
* page: unpublish "test page" (en)
* page: add "test page" (en)
* ambassador: unpublish "Caroline Sinders"
* ambassador: add "Caroline Sinders"
* DRY the code
* error handling in ambassador lifecycle
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* remove order from ambassador colection
* make photo mandatory for ambassador
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* update readme, copy paths utils from main
* ambassador: add "test ambassador"
* ambassador: add "test ambassador 3"
* ambassador: unpublish "test ambassador 3"
* ambassador: add "test ambassador 3"
* ambassador: delete "test ambassador 3"
* ambassador: add "test mdx 4"
* switch to mdx for ambassadors and add import functionality
* ambassador: delete "Kokayi Issa"
* remove test data
* aria fixes
* cleanup
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* page: unpublish "test page" (en)
* page: add "test page" (en)
* refactor
* cleanup
* ambassador: add "Stephanie Perrin"
* page: unpublish "test page" (en)
* page: add "test page" (en)
* cleanup
* ambassador: add "Stephanie Perrin2"
* page: unpublish "test page" (en)
* page: add "test page" (en)
* make heading jsx prop for ambassador grid
* page: add "About Us" (en)
* page: add "Grant for web" (en)
* page: add "Internet of Opportunity" (en)
* page: add "Interledger 2026" (en)
* page: add "new page" (en)
* page: add "policy-and-advocacy" (en)
* update readme with future notes
* Post-merge: add ambassador/blockquote serializers + update @/ imports
- Create cms/src/serializers/blocks/ambassador.serializer.ts
- Create cms/src/serializers/blocks/ambassadors-grid.serializer.ts
- Create cms/src/serializers/blocks/blockquote.serializer.ts
- Register all three in cms/src/serializers/blocks/index.ts
- Update relative imports to @/ alias in ambassador/blockquote components
and page-preview.astro (AmbassadorGrid, AmbassadorBlock, AmbassadorsGridBlock,
BlockquoteBlock, Blockquote, page-preview)
* paths and autogenerated types
* lockfiles
* fix: lint — prettier format + eslint no-console in DynamicZone
* ambassador sync script with locale
* --force flag to allow sync from non main branches
* update readme, fix component inclusion in pages
* fix blockquote output
* format
* ci: use Node 20 and frozen lockfile in lint workflow
- Upgrade from EOL Node 18 to Node 20 to match local dev environment
and avoid subtle runtime differences in Prettier's MDX formatting
- Switch to --frozen-lockfile to prevent pnpm from re-resolving
dependencies on Linux, which could hoist the transitive prettier@3.3.3
(from cms workspace) over the pinned root prettier@3.8.1
* fix: pin prettier@3.8.1 in cms workspace and fix pnpm override format
The cms workspace's lockfile had prettier@3.3.3 as a transitive
dependency (via prettier-plugin-packagejson). On Linux, pnpm can
hoist this into root node_modules/.bin, overriding the root
workspace's prettier@3.8.1 and causing the lint CI to fail with
formatting errors on MDX files that pass locally.
- Add pnpm.overrides.prettier = "3.8.1" to cms/package.json so the
cms lockfile no longer resolves prettier@3.3.3
- Convert the pre-existing esbuild override from npm-style "overrides"
to pnpm-style "pnpm.overrides" so it's actually applied by pnpm
- Regenerate cms/pnpm-lock.yaml with prettier@3.8.1 throughout
* fix: add root pnpm override to eliminate prettier@3.3.3 from lockfile
The root pnpm-lock.yaml manages cms workspace deps including
prettier-plugin-packagejson which pulls in prettier@3.3.3 as a
transitive peer dep. With pnpm hoisting, this can put prettier@3.3.3
in root node_modules/.bin on Linux, shadowing the intended @3.8.1
and causing the lint CI to fail.
Adding "pnpm.overrides.prettier = 3.8.1" in root package.json
forces the root lockfile to resolve all prettier references to 3.8.1,
eliminating the conflicting version entirely.
The root devDependency alone does not prevent prettier@3.3.3 from
appearing in the lockfile — the override is required for that.
* remove bun lockfiles
* ci: add debug step to show exact prettier diff on Linux
* cleanup
* fix locale lifecycle
* format
* refactor
* format, remove compiled file
* fix tsconfig
* fix previews and quote rendering
* format
* format
* review
* fix(scripts/README): update content type mappings to current dirs
* fix tests
* format1 parent 0d937dc commit 77df5fd
4 files changed
Lines changed: 240 additions & 85 deletions
File tree
- cms/scripts/sync-mdx
- src/pages
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
35 | 39 | | |
36 | 40 | | |
37 | 41 | | |
| |||
89 | 93 | | |
90 | 94 | | |
91 | 95 | | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | | - | |
110 | | - | |
111 | | - | |
112 | | - | |
113 | | - | |
114 | 96 | | |
115 | 97 | | |
116 | | - | |
| 98 | + | |
117 | 99 | | |
118 | | - | |
119 | | - | |
120 | | - | |
121 | | - | |
122 | | - | |
123 | | - | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
128 | | - | |
129 | | - | |
130 | 100 | | |
131 | 101 | | |
132 | 102 | | |
133 | 103 | | |
134 | 104 | | |
135 | | - | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
136 | 108 | | |
137 | 109 | | |
138 | 110 | | |
| |||
143 | 115 | | |
144 | 116 | | |
145 | 117 | | |
146 | | - | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
147 | 123 | | |
148 | 124 | | |
149 | 125 | | |
| |||
154 | 130 | | |
155 | 131 | | |
156 | 132 | | |
157 | | - | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
158 | 138 | | |
159 | 139 | | |
160 | 140 | | |
| |||
165 | 145 | | |
166 | 146 | | |
167 | 147 | | |
168 | | - | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
169 | 153 | | |
170 | 154 | | |
171 | 155 | | |
| |||
189 | 173 | | |
190 | 174 | | |
191 | 175 | | |
192 | | - | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
193 | 181 | | |
194 | 182 | | |
195 | 183 | | |
| |||
209 | 197 | | |
210 | 198 | | |
211 | 199 | | |
212 | | - | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
213 | 205 | | |
214 | 206 | | |
215 | 207 | | |
| |||
227 | 219 | | |
228 | 220 | | |
229 | 221 | | |
230 | | - | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
231 | 227 | | |
232 | 228 | | |
233 | 229 | | |
| |||
244 | 240 | | |
245 | 241 | | |
246 | 242 | | |
247 | | - | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
| |||
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
268 | | - | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
269 | 273 | | |
270 | 274 | | |
271 | 275 | | |
| |||
280 | 284 | | |
281 | 285 | | |
282 | 286 | | |
283 | | - | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
284 | 292 | | |
285 | 293 | | |
286 | 294 | | |
| |||
301 | 309 | | |
302 | 310 | | |
303 | 311 | | |
304 | | - | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
305 | 317 | | |
306 | 318 | | |
307 | 319 | | |
| |||
319 | 331 | | |
320 | 332 | | |
321 | 333 | | |
322 | | - | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
323 | 339 | | |
324 | 340 | | |
325 | 341 | | |
| |||
341 | 357 | | |
342 | 358 | | |
343 | 359 | | |
344 | | - | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
345 | 365 | | |
346 | 366 | | |
347 | 367 | | |
| |||
361 | 381 | | |
362 | 382 | | |
363 | 383 | | |
364 | | - | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
365 | 389 | | |
366 | 390 | | |
367 | 391 | | |
| |||
374 | 398 | | |
375 | 399 | | |
376 | 400 | | |
377 | | - | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
378 | 406 | | |
379 | 407 | | |
380 | 408 | | |
| |||
391 | 419 | | |
392 | 420 | | |
393 | 421 | | |
394 | | - | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
395 | 427 | | |
396 | 428 | | |
397 | 429 | | |
| |||
405 | 437 | | |
406 | 438 | | |
407 | 439 | | |
408 | | - | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
409 | 445 | | |
410 | 446 | | |
411 | 447 | | |
| |||
419 | 455 | | |
420 | 456 | | |
421 | 457 | | |
422 | | - | |
| 458 | + | |
423 | 459 | | |
424 | 460 | | |
425 | 461 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | 13 | | |
18 | 14 | | |
19 | 15 | | |
| |||
22 | 18 | | |
23 | 19 | | |
24 | 20 | | |
25 | | - | |
26 | 21 | | |
27 | 22 | | |
28 | 23 | | |
29 | | - | |
30 | 24 | | |
31 | 25 | | |
32 | 26 | | |
| |||
41 | 35 | | |
42 | 36 | | |
43 | 37 | | |
| 38 | + | |
44 | 39 | | |
45 | 40 | | |
46 | 41 | | |
| |||
54 | 49 | | |
55 | 50 | | |
56 | 51 | | |
57 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
58 | 57 | | |
59 | | - | |
| 58 | + | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | | - | |
65 | | - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
66 | 72 | | |
67 | 73 | | |
68 | 74 | | |
| |||
135 | 141 | | |
136 | 142 | | |
137 | 143 | | |
138 | | - | |
| 144 | + | |
139 | 145 | | |
140 | | - | |
| 146 | + | |
141 | 147 | | |
142 | 148 | | |
143 | 149 | | |
| |||
161 | 167 | | |
162 | 168 | | |
163 | 169 | | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
| 170 | + | |
169 | 171 | | |
170 | 172 | | |
171 | 173 | | |
| |||
0 commit comments