Problem: the hexagonal refactor churns the backend tree for nine more phases; the UI delivery stack (web/ SPA, cmd/desktop Wails wrapper, compose/web image) must move to its own repo first so doc/layout rewrites land once on a backend-only tree. Change: - New repo git.hubris.network/dtoro/oikos-web (v0.33.0): web/, desktop/ (updateURL repointed to oikos-web releases), compose/, own CI (web + desktop jobs), own deploy script (CI-green gate, TOCTOU guard, version-tagged images, prune-to-3), own webhook receiver on :9798 + launchd unit, own compose project publishing the same 8091:80. - Cutover executed on mac-mini in order: oikos stack's web service stopped+removed, oikos-web project brought up on 8091; outer Caddy untouched (targets the published port) — serving + Authentik flow + /wails 404 quirk verified post-cutover. - Stripped from oikos: web/, cmd/desktop/, compose/web/, desktop CI workflow, ci.yml web job, Makefile ui/desktop/desktop-package/install targets, the compose web service, oikos-web from deploy.sh's fallback prune list; wails + go-keyring dropped from go.mod, vendor synced. - README / CONTRIBUTING / AGENTS.md / .agents dev+operations docs now point at the new repo; mbse + mascot design docs carry a path note. Risk: production SPA serving depends on the new pipeline now; rollback is versioned-image re-up of the old web service from a pre-split checkout (port 8091). Desktop builds installed before the split still check dtoro/oikos releases — one manual reinstall, noted in the oikos-web release notes. Verification: go vet, make test (race), make generate-check, golangci (no new findings; baseline down 400→365); post-cutover curls — localhost:8091 200, /wails/runtime.js 404, outer Caddy 302 Authentik.
191 lines
3.5 KiB
TypeScript
191 lines
3.5 KiB
TypeScript
import _default from './colors.mjs';
|
|
|
|
type ArbitraryUtilityValue = {
|
|
kind: 'arbitrary';
|
|
/**
|
|
* ```
|
|
* bg-[color:var(--my-color)]
|
|
* ^^^^^
|
|
*
|
|
* bg-(color:--my-color)
|
|
* ^^^^^
|
|
* ```
|
|
*/
|
|
dataType: string | null;
|
|
/**
|
|
* ```
|
|
* bg-[#0088cc]
|
|
* ^^^^^^^
|
|
*
|
|
* bg-[var(--my_variable)]
|
|
* ^^^^^^^^^^^^^^^^^^
|
|
*
|
|
* bg-(--my_variable)
|
|
* ^^^^^^^^^^^^^^
|
|
* ```
|
|
*/
|
|
value: string;
|
|
};
|
|
type NamedUtilityValue = {
|
|
kind: 'named';
|
|
/**
|
|
* ```
|
|
* bg-red-500
|
|
* ^^^^^^^
|
|
*
|
|
* w-1/2
|
|
* ^
|
|
* ```
|
|
*/
|
|
value: string;
|
|
/**
|
|
* ```
|
|
* w-1/2
|
|
* ^^^
|
|
* ```
|
|
*/
|
|
fraction: string | null;
|
|
};
|
|
type ArbitraryModifier = {
|
|
kind: 'arbitrary';
|
|
/**
|
|
* ```
|
|
* bg-red-500/[50%]
|
|
* ^^^
|
|
* ```
|
|
*/
|
|
value: string;
|
|
};
|
|
type NamedModifier = {
|
|
kind: 'named';
|
|
/**
|
|
* ```
|
|
* bg-red-500/50
|
|
* ^^
|
|
* ```
|
|
*/
|
|
value: string;
|
|
};
|
|
type ArbitraryVariantValue = {
|
|
kind: 'arbitrary';
|
|
value: string;
|
|
};
|
|
type NamedVariantValue = {
|
|
kind: 'named';
|
|
value: string;
|
|
};
|
|
type Variant =
|
|
/**
|
|
* Arbitrary variants are variants that take a selector and generate a variant
|
|
* on the fly.
|
|
*
|
|
* E.g.: `[&_p]`
|
|
*/
|
|
{
|
|
kind: 'arbitrary';
|
|
selector: string;
|
|
relative: boolean;
|
|
}
|
|
/**
|
|
* Static variants are variants that don't take any arguments.
|
|
*
|
|
* E.g.: `hover`
|
|
*/
|
|
| {
|
|
kind: 'static';
|
|
root: string;
|
|
}
|
|
/**
|
|
* Functional variants are variants that can take an argument. The argument is
|
|
* either a named variant value or an arbitrary variant value.
|
|
*
|
|
* E.g.:
|
|
*
|
|
* - `aria-disabled`
|
|
* - `aria-[disabled]`
|
|
* - `@container-size` -> @container, with named value `size`
|
|
* - `@container-[inline-size]` -> @container, with arbitrary variant value `inline-size`
|
|
* - `@container` -> @container, with no value
|
|
*/
|
|
| {
|
|
kind: 'functional';
|
|
root: string;
|
|
value: ArbitraryVariantValue | NamedVariantValue | null;
|
|
modifier: ArbitraryModifier | NamedModifier | null;
|
|
}
|
|
/**
|
|
* Compound variants are variants that take another variant as an argument.
|
|
*
|
|
* E.g.:
|
|
*
|
|
* - `has-[&_p]`
|
|
* - `group-*`
|
|
* - `peer-*`
|
|
*/
|
|
| {
|
|
kind: 'compound';
|
|
root: string;
|
|
modifier: ArbitraryModifier | NamedModifier | null;
|
|
variant: Variant;
|
|
};
|
|
type Candidate =
|
|
/**
|
|
* Arbitrary candidates are candidates that register utilities on the fly with
|
|
* a property and a value.
|
|
*
|
|
* E.g.:
|
|
*
|
|
* - `[color:red]`
|
|
* - `[color:red]/50`
|
|
* - `[color:red]/50!`
|
|
*/
|
|
{
|
|
kind: 'arbitrary';
|
|
property: string;
|
|
value: string;
|
|
modifier: ArbitraryModifier | NamedModifier | null;
|
|
variants: Variant[];
|
|
important: boolean;
|
|
raw: string;
|
|
}
|
|
/**
|
|
* Static candidates are candidates that don't take any arguments.
|
|
*
|
|
* E.g.:
|
|
*
|
|
* - `underline`
|
|
* - `box-border`
|
|
*/
|
|
| {
|
|
kind: 'static';
|
|
root: string;
|
|
variants: Variant[];
|
|
important: boolean;
|
|
raw: string;
|
|
}
|
|
/**
|
|
* Functional candidates are candidates that can take an argument.
|
|
*
|
|
* E.g.:
|
|
*
|
|
* - `bg-red-500`
|
|
* - `bg-[#0088cc]`
|
|
* - `w-1/2`
|
|
*/
|
|
| {
|
|
kind: 'functional';
|
|
root: string;
|
|
value: ArbitraryUtilityValue | NamedUtilityValue | null;
|
|
modifier: ArbitraryModifier | NamedModifier | null;
|
|
variants: Variant[];
|
|
important: boolean;
|
|
raw: string;
|
|
};
|
|
|
|
type PluginUtils = {
|
|
theme: (keypath: string, defaultValue?: any) => any;
|
|
colors: typeof _default;
|
|
};
|
|
|
|
export type { Candidate as C, NamedUtilityValue as N, PluginUtils as P, Variant as V };
|