Commit bc6a1ae
feat(spm): translate podspec preprocessor defines into scaffolded targets
Some community libs inject required preprocessor defines via their podspec's
pod_target_xcconfig — worklets sets `-DWORKLETS_VERSION=#{package['version']}`
(and a `-DWORKLETS_FEATURE_FLAGS="[...]"` string-literal macro) in OTHER_CFLAGS,
plus `HERMES_ENABLE_DEBUGGER=1` in a Debug-only GCC_PREPROCESSOR_DEFINITIONS.
Without them the build fails (`use of undeclared identifier
WORKLETS_VERSION_STRING`). The scaffolder dropped these on the floor.
Generic fix (no per-library knowledge — same shape as the existing
HEADER_SEARCH_PATHS handling): `pod ipc` already resolves the Ruby, so read the
resolved values and emit `.define(...)`.
- read-podspec.js: lift defines from pod_target_xcconfig across all subspecs —
`-D` tokens from OTHER_CFLAGS and NAME[=VALUE] entries from
GCC_PREPROCESSOR_DEFINITIONS (incl. per-config `[config=*Debug*/Release*]`).
A shell-aware tokenizer keeps quoted values intact (a naive whitespace split
would shred `-DFOO="[a:b]"`). Safety filters: only `-D` flags (arbitrary
compiler flags dropped), strip `$(inherited)`, skip unresolved `$(...)`
tokens and non-identifier names. New `PreprocessorDefine` model field.
- scaffold-package-swift.js: emit `.define("NAME", to: "VALUE", .when(...))`
in cSettings + cxxSettings, escaping the value as a Swift string literal
(WORKLETS_FEATURE_FLAGS's value contains embedded quotes) and honoring the
per-config scope. SCAFFOLDER_VERSION 11 → 12.
- spm-types.js: PreprocessorDefine type; preprocessorDefines on PodspecModel +
SpmScaffoldSpec; podspecPath already on AutolinkingIosPlatform.
- Tests: define parsing (worklets shape, quoted value, per-config, dropped
non-define/unresolved tokens) and `.define(...)` emission.
Verified: re-scaffolding worklets auto-emits `.define("WORKLETS_VERSION", to:
"0.9.2")` + the escaped feature-flags macro + the Debug-scoped Hermes debugger
define; the `WORKLETS_VERSION_STRING` build error is gone. The build now fails
only on `<hermes/hermes.h>` (the Hermes-headers artifact gap, tracked
separately).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>1 parent 841e98e commit bc6a1ae
5 files changed
Lines changed: 242 additions & 5 deletions
File tree
- packages/react-native/scripts/spm
- __tests__
Lines changed: 55 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
201 | 201 | | |
202 | 202 | | |
203 | 203 | | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
204 | 259 | | |
205 | 260 | | |
206 | 261 | | |
| |||
Lines changed: 30 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
348 | 349 | | |
349 | 350 | | |
350 | 351 | | |
| 352 | + | |
351 | 353 | | |
352 | 354 | | |
353 | 355 | | |
| |||
453 | 455 | | |
454 | 456 | | |
455 | 457 | | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
456 | 485 | | |
457 | 486 | | |
458 | 487 | | |
| |||
825 | 854 | | |
826 | 855 | | |
827 | 856 | | |
| 857 | + | |
828 | 858 | | |
829 | 859 | | |
830 | 860 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
| |||
315 | 315 | | |
316 | 316 | | |
317 | 317 | | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
318 | 351 | | |
319 | 352 | | |
320 | 353 | | |
| |||
413 | 446 | | |
414 | 447 | | |
415 | 448 | | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
| 521 | + | |
| 522 | + | |
| 523 | + | |
| 524 | + | |
| 525 | + | |
416 | 526 | | |
417 | 527 | | |
418 | 528 | | |
| |||
483 | 593 | | |
484 | 594 | | |
485 | 595 | | |
| 596 | + | |
486 | 597 | | |
487 | 598 | | |
488 | 599 | | |
| |||
Lines changed: 26 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
| 93 | + | |
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
| |||
324 | 324 | | |
325 | 325 | | |
326 | 326 | | |
| 327 | + | |
327 | 328 | | |
328 | 329 | | |
329 | 330 | | |
| |||
383 | 384 | | |
384 | 385 | | |
385 | 386 | | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
386 | 406 | | |
387 | | - | |
388 | | - | |
389 | | - | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
390 | 412 | | |
391 | 413 | | |
392 | 414 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
326 | 326 | | |
327 | 327 | | |
328 | 328 | | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
329 | 340 | | |
330 | 341 | | |
331 | 342 | | |
| |||
363 | 374 | | |
364 | 375 | | |
365 | 376 | | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
366 | 382 | | |
367 | 383 | | |
368 | 384 | | |
| |||
389 | 405 | | |
390 | 406 | | |
391 | 407 | | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
392 | 411 | | |
393 | 412 | | |
394 | 413 | | |
| |||
0 commit comments