@ape-egg/vibe-compiler 4.0.0 → 4.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ape-egg/vibe-compiler",
-  "version": "4.0.0",
+  "version": "4.1.1",
   "type": "module",
   "description": "Optional Rust compiler for Vibe — pre-renders, inlines components, and optimizes iterations. The runtime never needs it.",
   "homepage": "https://vibe.korte.kim",

package/src/Cargo.lock

@@ -1599,7 +1599,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vibe-compiler"
-version = "4.0.0"
+version = "4.1.1"
 dependencies = [
  "clap",
  "colored",

package/src/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vibe-compiler"
-version = "4.0.0"
+version = "4.1.1"
 edition = "2021"
 description = "Vibe framework compiler - compiles Vibe source files into optimized output"
 authors = ["Kim Korte"]

package/src/compiler/compile.rs

@@ -62,6 +62,53 @@ pub(crate) fn atomic_write(path: &Path, contents: &str) -> std::io::Result<()> {
 // Can be used as class (.vibe-fouc) or attribute ([vibe-fouc])
 const FOUC_CLASS_OR_ATTR: &str = "vibe-fouc";
 
+// vibe's own CSS, emitted inline into every compiled page's <head> so it
+// applies at parse time regardless of which stylesheets the consumer links.
+// The rules are EXTRACTED from vibe.css itself at build time — the file
+// (shipped as a sibling package in every layout, and next to this source in
+// the repo) is the single source of truth; no CSS text lives here to drift.
+// Split on the optional marker into two sheets:
+// - the cover half is load-bearing and always emitted: [vibe-staged] gates
+//   route/key remount staging on every page, and the fouc/animation rules
+//   cover pages that keep the marker (--fouc-as-is);
+// - the layout half is vibe's base styling (layout-transparent component
+//   wrappers), skipped by disableVibeCss.
+// Comments and newlines are stripped at emission: style content survives
+// minification verbatim, so the emitted form must already be newline-free.
+const VIBE_CSS_FILE: &str = include_str!("../../../vibe/vibe.css");
+// The marker literal is the one string shared with the file (and the vite
+// plugin) — scripts/check-release.js holds it in lockstep.
+const VIBE_CSS_OPTIONAL_MARKER: &str =
+    "/* vibe:optional — everything below is skipped by disableVibeCss */";
+
+fn strip_css_comments(css: &str) -> String {
+    let mut out = String::with_capacity(css.len());
+    let mut rest = css;
+    while let Some(start) = rest.find("/*") {
+        out.push_str(&rest[..start]);
+        rest = match rest[start..].find("*/") {
+            Some(end) => &rest[start + end + 2..],
+            None => "",
+        };
+    }
+    out.push_str(rest);
+    out
+}
+
+fn single_line_css(css: &str) -> String {
+    strip_css_comments(css)
+        .split_whitespace()
+        .collect::<Vec<_>>()
+        .join(" ")
+}
+
+fn vibe_css_sheets() -> (String, String) {
+    let (cover, layout) = VIBE_CSS_FILE
+        .split_once(VIBE_CSS_OPTIONAL_MARKER)
+        .expect("vibe.css lost its optional marker");
+    (single_line_css(cover), single_line_css(layout))
+}
+
 const MIRROR_EXTENSIONS: &[&str] = &[
     "css", "js",
     // Fonts
@@ -246,6 +293,34 @@ fn remove_fouc_prevention(html: String) -> String {
     result
 }
 
+/// Inject vibe's CSS right after <head> — ahead of consumer stylesheets, so
+/// their equal-specificity overrides still win the cascade. Idempotent
+/// (recompiles and already-covered sources pass through); fragments without a
+/// <head> are not pages and are left untouched. The cover sheet always emits;
+/// the layout sheet honors disableVibeCss.
+pub fn inject_vibe_css(html: String, disable_vibe_css: bool) -> String {
+    if html.contains("data-vibe-cover") {
+        return html;
+    }
+    let open_end = match html.find("<head") {
+        Some(at) => match html[at..].find('>') {
+            Some(close) => at + close + 1,
+            None => return html,
+        },
+        None => return html,
+    };
+    let (cover_css, layout_css) = vibe_css_sheets();
+    let mut style = format!("<style data-vibe-cover>{}</style>", cover_css);
+    if !disable_vibe_css {
+        style.push_str(&format!("<style data-vibe-css>{}</style>", layout_css));
+    }
+    let mut result = String::with_capacity(html.len() + style.len());
+    result.push_str(&html[..open_end]);
+    result.push_str(&style);
+    result.push_str(&html[open_end..]);
+    result
+}
+
 #[derive(Error, Debug)]
 pub enum CompileError {
     #[error("Source directory not found: {0}")]
@@ -1454,6 +1529,9 @@ impl Compiler {
             output = remove_fouc_prevention(output);
         }
 
+        // vibe's CSS rides every compiled page, present at parse time
+        output = inject_vibe_css(output, self.config.disable_vibe_css);
+
         // Write to output
         let output_path = self.get_output_path(path, relative_path)?;
         atomic_write(&output_path, &output).map_err(|e| CompileError::WriteError {
@@ -1739,6 +1817,9 @@ impl Compiler {
         } else {
             shell_processed
         };
+        // Same sheets the page pipeline emits — the shell serves every route,
+        // and [vibe-staged] gates its remount staging.
+        let shell_html = inject_vibe_css(shell_html, self.config.disable_vibe_css);
         let shell_path = self.config.output.join("index.html");
         atomic_write(&shell_path, &shell_html).map_err(|e| CompileError::WriteError {
             path: shell_path.display().to_string(),
@@ -2825,6 +2906,7 @@ mod tests {
             iterations_as_is: false,
             no_clean: false,
             fouc_as_is: false,
+            disable_vibe_css: false,
             spa: true,
             working_dir: dir.clone(),
         };
@@ -2913,6 +2995,7 @@ mod tests {
             iterations_as_is: false,
             no_clean: false,
             fouc_as_is: false,
+            disable_vibe_css: false,
             spa: true,
             working_dir: dir.clone(),
         };
@@ -3025,6 +3108,7 @@ mod tests {
             iterations_as_is: false,
             no_clean: false,
             fouc_as_is: false,
+            disable_vibe_css: false,
             spa: true,
             working_dir: dir.clone(),
         };
@@ -3096,6 +3180,7 @@ mod tests {
             iterations_as_is: false,
             no_clean: false,
             fouc_as_is: false,
+            disable_vibe_css: false,
             spa: false,
             working_dir: dir.clone(),
         };

package/src/config.rs

@@ -48,6 +48,8 @@ pub struct VibeCompilerConfig {
     pub no_clean: bool,
     #[serde(default)]
     pub fouc_as_is: bool,
+    #[serde(default)]
+    pub disable_vibe_css: bool,
     #[serde(default, deserialize_with = "deserialize_spa")]
     pub spa: bool,
 }
@@ -121,6 +123,7 @@ impl Default for VibeCompilerConfig {
             iterations_as_is: false,
             no_clean: false,
             fouc_as_is: false,
+            disable_vibe_css: false,
             spa: false,
         }
     }
@@ -147,6 +150,7 @@ pub struct Config {
     pub iterations_as_is: bool,
     pub no_clean: bool,
     pub fouc_as_is: bool,
+    pub disable_vibe_css: bool,
     pub spa: bool,
     pub working_dir: PathBuf,
 }
@@ -209,6 +213,7 @@ impl Config {
             iterations_as_is: config.iterations_as_is,
             no_clean: config.no_clean,
             fouc_as_is: config.fouc_as_is,
+            disable_vibe_css: config.disable_vibe_css,
             spa: config.spa,
             working_dir,
         }

package/src/main.rs

@@ -89,6 +89,10 @@ struct Args {
     #[arg(long, name = "fouc-as-is")]
     fouc_as_is: bool,
 
+    /// Skip emitting vibe's optional layout CSS (the cover rules always emit)
+    #[arg(long, name = "disable-vibe-css")]
+    disable_vibe_css: bool,
+
     /// Compile the pages tree to SPA output: fragments + route table + shell
     #[arg(long)]
     spa: bool,
@@ -171,6 +175,9 @@ fn main() {
     if args.fouc_as_is {
         config.fouc_as_is = true;
     }
+    if args.disable_vibe_css {
+        config.disable_vibe_css = true;
+    }
     if args.spa {
         overrides.spa = !original_spa;
         config.spa = true;