finish CSS delivery and generated type remediation

2026-08-10 00:17:25 +05:30
parent 232d8e6734
commit bca9549f3a
11 changed files with 277 additions and 18 deletions
@@ -91,6 +91,8 @@ export interface ProdOptions {
  inlineStyles?: string;
  /** `stylesPath` contains theme + UI + app CSS in cascade order. */
  stylesIncludeFramework?: boolean;
+  /** `stylesPath` already contains the shared Wire UI stylesheet. */
+  stylesIncludeUi?: boolean;
  /** Absolute path to the pre-built reactive runtime. */
  reactivePath?: string;
  /** Absolute path to the on-demand component controller runtime. */
@@ -501,6 +503,7 @@ export function createProductionHandlers(
    i18n: opts.i18n,
    inlineStyles: opts.inlineStyles,
    stylesIncludeFramework: opts.stylesIncludeFramework,
+    stylesIncludeUi: opts.stylesIncludeUi,
    assetVersion: opts.assetVersion,
    clientRuntimes: opts.clientRuntimes,
    head: opts.head,
@@ -160,6 +160,7 @@ export interface RuntimeDeps {
  hasFrameworkStyles?: boolean;
  /** App stylesheet already contains theme + UI CSS and is the only CSS request needed. */
  stylesIncludeFramework?: boolean;
+  stylesIncludeUi?: boolean;
  /** Resolved theme config: enables `/__wrnexus/theme.css` + `<html data-theme>`. */
  theme?: ResolvedTheme;
  /** Resolved i18n bundle: enables `ctx.t`, `<html lang>`, and `{t:key}` markers. */
@@ -940,12 +941,12 @@ export function createHandlers(deps: RuntimeDeps): Handlers {
  // Order: theme tokens, then Wire UI, then the app stylesheet — so the app's
  // own CSS (loaded last) can override both the tokens and the UI classes.
  const headParts: string[] = [];
-  if (deps.hasFrameworkStyles && !deps.stylesIncludeFramework) {
+  if (!deps.theme && deps.hasFrameworkStyles && !deps.stylesIncludeFramework) {
    headParts.push(
      `<link rel="stylesheet" href="${versionAssetUrl("/__wrnexus/framework.css", deps.assetVersion)}" />`,
    );
  }
-  if (deps.hasUi && !deps.hasFrameworkStyles && !deps.stylesIncludeFramework) {
+  if (deps.hasUi && !deps.stylesIncludeUi && !deps.stylesIncludeFramework) {
    headParts.push(
      `<link rel="stylesheet" href="${versionAssetUrl("/__wrnexus/ui.css", deps.assetVersion)}" />`,
    );
@@ -1847,7 +1848,7 @@ export function createHandlers(deps: RuntimeDeps): Handlers {
      if (accentName) {
        attrs.push(`data-accent="${accentName}"`);
      }
-      if (!deps.hasFrameworkStyles && !deps.stylesIncludeFramework) {
+      if (!deps.stylesIncludeFramework) {
        const themeHref = versionAssetUrl(
          activeThemeCssHref(themeName, accentName),
          deps.assetVersion,