Repository navigation
feat: use the shared Colony accent colours and current themes, and adopt the Colony repository layout - #14
Merged
Conversation
…opt the Colony repository layout Move the Tauri scaffold to the organisation layout: the crate manifests, build.rs and tauri.conf.json at the root, the Rust code in src/, the interface in src/ui/, the icons in assets/icons/ and the capabilities in config/capabilities/. tauri-build regenerates permissions/ and gen/schemas/ on every build, so they are ignored instead of committed. release-please switches to release-type rust, which bumps Cargo.toml and Cargo.lock itself, and the Tauri identifier becomes io.github.project-colony.memorystick. Vendor the Colony themes, themes.json and colony-accents.css from Project-Colony-Resources 7247b81, whose generated/ matches colony-ui 0.1.6. The accent override and the Preferences swatches now both read their colour from colony-accents.css, loaded before the themes so each theme keeps its own accent until the user picks one. CI compares all three files with upstream, and the themes check also requires every listed accent to exist there.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Repository layout (LAY-9, REL-2)
The Tauri scaffold moves to the Project Colony layout with
git mv, so history follows:src-tauri/Cargo.toml,Cargo.lock,build.rs,tauri.conf.jsonsrc-tauri/src/*.rssrc/dist/(HTML, CSS, JS, fonts, i18n, vendor)src/ui/src-tauri/icons/assets/icons/src-tauri/capabilities/config/capabilities/src-tauri/permissions/autogenerated/permissions/on every build, now ignored with/gen/schemas/and/target/tauri.conf.json:frontendDistissrc/ui, the bundle icons areassets/icons/*, and the identifier moves fromcom.memorystick.appto the ownedio.github.project-colony.memorystick. No migration is needed: the web view is private, its folder is set explicitly underColony/MemoryStick, and the preferences do not use the identifier.build.rsreads the capabilities fromconfig/capabilities/**/*and watches that folder, since tauri-build only watches its default one. The licence walk still runscargo metadataon the root manifest, offline.release-please-config.jsonswitches torelease-type: rust, which bumpsCargo.tomlandCargo.lockitself, so theextra-filesblock is gone. Open release PR chore(main): release 0.2.0 #13 still touchessrc-tauri/: release-please regenerates it after this merges, and its diff must bump the rootCargo.tomlandCargo.lockbefore it is merged.working-directory), the Dependabot cargo directory is/, and the release build no longer needs--manifest-path.docs/third-party-notices.mdand both check scripts use the new paths.git grep 'src-tauri\|dist/'finds nothing outside CHANGELOG.md and vendored minified code.Colony themes and accents (THM-2)
colony-themes.css,themes.jsonandcolony-accents.cssare vendored from Project-Colony-Resources7247b814fd9afbb17e3c4f44315ec9333c3a31b0, whosegenerated/is identical to the commit colony-ui 0.1.6 was published from.themes.jsonpicks up the Stellar Blade notes rewording and Dracula's new family icon, which the bundled JetBrains Mono Nerd Font has.index.htmlloadscolony-accents.cssbeforecolony-themes.css. Both set--colony-accent-blueon the root with the same specificity, so each theme keeps its own accent until the user picks one.theme.jsgainsaccentColor(), which reads an accent's colour from the:rootrule ofcolony-accents.css. The override and the Preferences swatches both use it, so they come from one shared file. It reads the rule rather than the computed style because every theme sets its own--colony-accent-blue, so the blue accent would otherwise resolve to the theme's.check-colony-themes.pytreats variables fromcolony-accents.cssas defined in every theme, and fails if an accent listed inthemes.jsonis missing there.Checks
cargo check --locked --all-targetsandcargo fmt --checkpass. The capability resolved fromconfig/capabilities/(checked in the generatedgen/schemas/capabilities.json).cargo test: the preferences key-parity, Colony/MemoryStick path and third-party licence tests pass.python3 .github/scripts/check-colony-themes.pyandcheck-document-filter.pypass. The vendored files are byte-identical to upstream.The only dashes in the diff are in the generated header of
colony-accents.css, which has to stay byte-identical to upstream.