mirror of
https://github.com/hanzoai/gui.git
synced 2026-10-25 02:31:41 +00:00
zeekayandHanzo Dev
69c6e860d7
This repo could never sync. There was NO merge-base with tamagui — 372 commits
here against 15,791 there, unrelated histories — because it began as a
copy-paste rebrand with a flattened layout. Every "sync" since was a hand
re-application that drifted, which is why the tree sat on 7.3.1 while upstream
shipped fixes we then rediscovered by hand.
This commit's PARENT IS TAMAGUI. A future sync is `git merge tama/main` then
`node scripts/rebrand.mjs` — a real merge, because the history is now shared.
174 packages: 166 upstream, our 8 restored (chrome, shell, telemetry, recipes,
get, font-geist-{sans,mono}, @hanzo/booker), bento-get gained. 170/170 build.
Our patches to files UPSTREAM ALSO OWNS are carried, which the package-level
delta missed and which was where the value actually was:
- useMedia's server snapshot (`initState ?? getMedia()`). Upstream still
returns undefined there, so every Tamagui Dialog kills a prerender — the
exact crash hanzo.app spent a day on.
- data-slot on web host nodes, absent upstream entirely.
Both applied ONTO upstream's newer files (it rewrote useMedia +150/-63 and
createComponent +160/-55), marked `PATCH (ours, carried across the transplant)`.
Seven traps are encoded in scripts/rebrand.mjs, each found by a gate:
skip itself and lockfiles; special-case the double-branded names in BOTH scoped
and bare form; map path strings, not just paths; drop a level for the flattened
group; check disk rather than a stale index.
Rust build artifacts are NOT committed. An earlier draft of this commit swept
apps/desktop/src-tauri/target/debug in via `git add -A` — 3,859 files including
a 272MB .a, over GitHub's 100MB cap, so the push could never have landed. They
are gitignored now.
Co-Authored-By: Hanzo Dev <[email protected]>
77 lines
3.0 KiB
JavaScript
77 lines
3.0 KiB
JavaScript
// workaround: expo-modules-core 55.x ships Swift 6 strict concurrency
|
|
// which requires SWIFT_VERSION=6 to compile (uses @MainActor in conformance clauses).
|
|
// SWIFT_STRICT_CONCURRENCY=minimal suppresses the resulting concurrency warnings
|
|
// that would otherwise become errors in swift 6 mode.
|
|
// tracking issue: https://github.com/expo/expo/issues/42525
|
|
// remove this plugin once expo-modules-core ships a fix or expo SDK 56+ resolves it.
|
|
const { withDangerousMod } = require('@expo/config-plugins')
|
|
const fs = require('fs')
|
|
const path = require('path')
|
|
|
|
module.exports = function withExpoModulesCoreSwift6(config) {
|
|
return withDangerousMod(config, [
|
|
'ios',
|
|
async (config) => {
|
|
const podfilePath = path.join(config.modRequest.platformProjectRoot, 'Podfile')
|
|
|
|
// the Podfile may not exist yet during early prebuild phases - skip if so
|
|
if (!fs.existsSync(podfilePath)) {
|
|
return config
|
|
}
|
|
|
|
let podfile = fs.readFileSync(podfilePath, 'utf8')
|
|
|
|
// avoid double-injection
|
|
if (podfile.includes('# workaround: expo-modules-core 55.x')) {
|
|
return config
|
|
}
|
|
|
|
const workaround = `
|
|
# workaround: expo-modules-core 55.x requires Swift 6 mode with isolated
|
|
# conformances (SE-0470) for @MainActor in protocol conformance syntax.
|
|
# SWIFT_STRICT_CONCURRENCY=minimal suppresses concurrency warnings/errors.
|
|
installer.pods_project.targets.each do |target|
|
|
if target.name == 'ExpoModulesCore'
|
|
target.build_configurations.each do |build_config|
|
|
build_config.build_settings['SWIFT_VERSION'] = '6'
|
|
build_config.build_settings['SWIFT_STRICT_CONCURRENCY'] = 'minimal'
|
|
flags = build_config.build_settings['OTHER_SWIFT_FLAGS'] || '$(inherited)'
|
|
unless flags.include?('IsolatedConformances')
|
|
build_config.build_settings['OTHER_SWIFT_FLAGS'] = "#{flags} -enable-upcoming-feature IsolatedConformances"
|
|
end
|
|
end
|
|
end
|
|
# workaround: ContextMenuAuxiliaryPreview uses deprecated transform: .default
|
|
# which is an error in Xcode 26 / Swift 6.2 strict mode.
|
|
if target.name == 'ContextMenuAuxiliaryPreview'
|
|
target.build_configurations.each do |build_config|
|
|
build_config.build_settings['SWIFT_TREAT_WARNINGS_AS_ERRORS'] = 'NO'
|
|
build_config.build_settings['GCC_TREAT_WARNINGS_AS_ERRORS'] = 'NO'
|
|
end
|
|
end
|
|
end
|
|
`
|
|
// insert before the closing `end` of post_install block
|
|
const updated = podfile.replace(
|
|
/(post_install do \|installer\|.*?)(^\s+end\s*\nend)/ms,
|
|
`$1${workaround}$2`
|
|
)
|
|
|
|
if (updated === podfile) {
|
|
console.warn(
|
|
'[expo-modules-core-swift6] WARNING: could not find post_install block in Podfile - workaround not applied'
|
|
)
|
|
} else {
|
|
console.log(
|
|
'[expo-modules-core-swift6] applied ExpoModulesCore Swift 6 workaround to Podfile'
|
|
)
|
|
}
|
|
|
|
if (updated !== podfile) {
|
|
fs.writeFileSync(podfilePath, updated)
|
|
}
|
|
return config
|
|
},
|
|
])
|
|
}
|