staticky 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d9999164be324b93ee59cb6602a46b0c703e6e5f543801d4173164644e3ae9
-  data.tar.gz: '0834f3f08d1d8cf469b846cec8349e5427c0809a419cbeaf845bf8ed66e07535'
+  metadata.gz: 95ec4e3725971f7989581aedde8a783407054a2874e697b35799c108c4c86caa
+  data.tar.gz: 7075eae02b43e7c953c730ec7d35c693d2f4c62bf55b46716fa1ae2f7d1f9e52
 SHA512:
-  metadata.gz: d762bb547a713f7c86e4de541c1ee81615b8d0b5ec6d70633b50a1ad77986addf27ae64b3fc133c7b9749267774093ff9c9b1c6be54c8294004503b7992b6e9b
-  data.tar.gz: 1103439135f08b7558e51eaf8a147febf2924f333f7f8b4b4c84ceeed24173d84c8ddc40d8aa4e25dd4fa4877a30a4b40bf37e3c14d23f78bac3391f1da324c2
+  metadata.gz: 44fdd85409d28bf9a036190576e6ad938fb1964155f6d67f141fb63394b96ef7f750567fb763b75af5743d163a90cf9f95e1ee46fd3e5efd96e34aecb041674d
+  data.tar.gz: 3a2724aa09955659477e37cd23b6d8fde2bc62dea6fefb3d14c3effb937cea12da05e7c2d4aee8421bbb14b9bcf2435ef1725f5544605886ccc4963bcf93ef4f

data/.rubocop.yml

@@ -7,8 +7,5 @@ inherit_gem:
     - config/default.yml
     - config/capybara.yml
 
-AllCops:
-  TargetRubyVersion: 3.3
-
 Lint/NumberConversion:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.3.1] - 202-12-09
+
+- Fixes flashes of unstyled content by adding `vite_stylesheet_tag`
+
 ## [0.3.0] - 2024-12-09
 
 - Adds live reloading of pages during development using server side events

data/lib/staticky/builder.rb

@@ -14,7 +14,7 @@ module Staticky
 
     def self.call(...) = new(...).call
 
-    def on(event_type, &block) = subscribe(event_type, &block)
+    def on(event_type, &) = subscribe(event_type, &)
 
     def call
       publish("started")

data/lib/staticky/cli/commands/generate.rb

@@ -7,25 +7,25 @@ module Staticky
         desc "Create new site"
 
         argument :path,
-                 required: true,
-                 desc: "Relative path where the site will be generated"
+          required: true,
+          desc: "Relative path where the site will be generated"
 
         option :url,
-               default: "https://example.com",
-               desc: "Site URL",
-               aliases: ["-u"]
+          default: "https://example.com",
+          desc: "Site URL",
+          aliases: ["-u"]
         option :title,
-               default: "Example",
-               desc: "Site title",
-               aliases: ["-t"]
+          default: "Example",
+          desc: "Site title",
+          aliases: ["-t"]
         option :description,
-               default: "Example site",
-               desc: "Site description",
-               aliases: ["-d"]
+          default: "Example site",
+          desc: "Site description",
+          aliases: ["-d"]
         option :twitter,
-               default: "",
-               desc: "Twitter handle",
-               aliases: ["-x"]
+          default: "",
+          desc: "Twitter handle",
+          aliases: ["-x"]
 
         def call(path:, **)
           path = Pathname.new(path).expand_path

data/lib/staticky/environment.rb

@@ -2,6 +2,7 @@
 
 module Staticky
   Environment = Data.define(:name) do
+    def production? = name == :production
     def development? = name == :development
     def test? = name == :test
   end

data/lib/staticky/generator.rb

@@ -24,34 +24,41 @@ module Staticky
 
     def call(output_dir, **)
       view_context = ViewContext.new(**)
-      output_dir = Pathname.new(output_dir).expand_path
+      output_dir = Pathname(output_dir).expand_path
 
-      Pathname.glob(@path.join("**/*"), File::FNM_DOTMATCH).each do |file|
-        build_file(file:, output_dir:, view_context:)
+      Pathname.glob(@path.join("**/*"), File::FNM_DOTMATCH).each do |input_path|
+        relative_path = input_path.relative_path_from(@path)
+        output_path = output_dir.join(relative_path)
+        build_file(input_path:, output_path:, view_context:)
       end
     end
 
     private
 
-    def build_file(file:, output_dir:, view_context:)
-      return if file.directory?
-
-      relative_path = file.relative_path_from(@path)
-      target = output_dir.join(relative_path)
+    def build_file(input_path:, output_path:, view_context:)
+      return if input_path.directory?
 
       # This handles files like:
       # - index.html.erb -> index.html
       # - site.erb -> site.rb
-      if target.extname == ".erb"
-        target = target.sub_ext("")
-        target = target.sub_ext(".rb") if target.extname == ""
+      # - .ruby-version.erb -> .ruby-version
+      output_path = output_path.then do |filepath|
+        next filepath unless filepath.extname == ".erb"
+
+        # Replace the .erb with nothing. Skip if its not a ruby file
+        # site.erb -> site
+        filepath = filepath.sub_ext("")
+        next filepath unless filepath.extname.empty?
+        next filepath if dotfile?(filepath)
+
+        filepath.sub_ext(".rb")
       end
 
-      build_template(file:, target:, view_context:)
+      build_template(input_path:, output_path:, view_context:)
     end
 
-    def build_template(file:, target:, view_context:)
-      files.write(target, render_template(file, view_context))
+    def build_template(input_path:, output_path:, view_context:)
+      files.write(output_path, render_template(input_path, view_context))
     end
 
     def render_template(file, view_context)
@@ -59,5 +66,9 @@ module Staticky
 
       Tilt::ERBTemplate.new(file).render(view_context)
     end
+
+    def dotfile?(path)
+      path.basename.to_s.start_with?(".")
+    end
   end
 end

data/lib/staticky/phlex/view_helpers.rb

@@ -4,12 +4,12 @@ module Staticky
   module Phlex
     module ViewHelpers
       def helpers
-        @_view_context
+        context[:helpers]
       end
 
       def staticky_live_reload_js(base_path = "/")
         script(type: :module) do
-          unsafe_raw Staticky::Utils.live_reload_js(base_path)
+          raw safe(Staticky::Utils.live_reload_js(base_path))
         end
       end
 

data/lib/staticky/resources/plugins/phlex.rb

@@ -31,7 +31,7 @@ module Staticky
           end
 
           def build(view_context: ViewContext.new(self))
-            component.call(view_context:)
+            component.call(context: { helpers: view_context })
           end
         end
       end

data/lib/staticky/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Staticky
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/site_template/.ruby-version.erb

@@ -0,0 +1 @@
+<%= RUBY_VERSION %>

data/site_template/Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Ruby runtime based on Alpine as a parent image
-FROM ruby:3.3-alpine AS builder
+FROM ruby:3.3.6-alpine AS builder
 
 ENV RACK_ENV="production" \
     NODE_ENV="production" \
@@ -10,26 +10,26 @@ ENV RACK_ENV="production" \
 RUN gem update --system --no-document && \
     gem install -N bundler
 
-# Install necessary packages including Node.js and Yarn
+# Install necessary packages including Node.js and pnpm
 RUN apk add --no-cache build-base nodejs npm git && \
-    npm install -g yarn
+  npm install -g pnpm
 
 # Set the working directory
 WORKDIR /app
 
 # Copy Gemfile and other necessary files
-COPY --link Gemfile Gemfile.lock .ruby-version package.json yarn.lock ./
+COPY --link Gemfile Gemfile.lock .ruby-version package.json pnpm-lock.yaml ./
 
 # Install dependencies
 RUN bundle install && \
-    yarn install --frozen-lockfile && \
+    pnpm install --frozen-lockfile && \
     rm -rf /root/.bundle/cache /usr/local/bundle/cache /var/cache/apk/*
 
 # Copy the rest of the application code
 COPY --link . .
 
 # Build the static site (e.g., using Jekyll)
-RUN bin/rake site:build
+RUN bin/vite build && bin/rake site:build
 
 # Use an official Nginx image based on Alpine to serve the static site
 FROM nginx:stable-alpine

data/site_template/Gemfile

@@ -21,7 +21,6 @@ gem "zeitwerk"
 group :test do
   gem "capybara", require: false
   gem "debug"
-  gem "phlex-testing-capybara"
   gem "rspec"
 end
 

data/site_template/app/views/application_component.rb

@@ -11,7 +11,7 @@ class ApplicationComponent < Protos::Component
   end
 
   def helpers
-    @_view_context ||= NullViewContext.new # rubocop:disable Naming/MemoizedInstanceVariableName
+    context[:helpers] ||= NullViewContext.new
   end
 
   def asset_path(...)

data/site_template/app/views/application_page.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ApplicationPage < ApplicationComponent
-  def around_template(&block) = render Layouts::Page.new(&block)
+  def around_template(&) = render Layouts::Site.new(&)
 end

data/site_template/app/views/errors/not_found.rb

@@ -4,11 +4,12 @@ module Errors
   class NotFound < ApplicationPage
     include Protos::Typography
 
-    def self.layout = Layouts::Error
+    def around_template(&) = render Layouts::Error.new(&)
 
     def view_template
+      span(class: "font-thin text-8xl") { "404" }
       h1 { "Page not found." }
-      link_to("Back to home", Pages::Home, class: "link")
+      link_to("Back to home", Pages::Home, class: "btn mt-sm")
     end
   end
 end

data/site_template/app/views/errors/service_error.rb

@@ -4,11 +4,12 @@ module Errors
   class ServiceError < ApplicationPage
     include Protos::Typography
 
-    def self.layout = Layouts::Error
+    def around_template(&) = render Layouts::Error.new(&)
 
     def view_template
+      span(class: "font-thin text-8xl") { "500" }
       h1 { "Something went wrong." }
-      link_to("Back to home", Pages::Home, class: "link")
+      link_to("Back to home", Pages::Home, class: "btn mt-sm")
     end
   end
 end

data/site_template/app/views/layouts/error.rb

@@ -3,7 +3,7 @@
 module Layouts
   class Error < Site
     def view_template(&)
-      div(class: "grid place-items-center h-[--main-scene]") do
+      div(class: "grid place-items-center h-screen") do
         section(class: "flex flex-col place-items-center gap-sm", &)
       end
     end

data/site_template/app/views/layouts/head.rb

@@ -11,7 +11,7 @@ module Layouts
         meta name: "description", content: @description
         meta charset: "utf-8"
         meta name: "viewport",
-             content: "width=device-width,initial-scale=1,viewport-fit=cover"
+          content: "width=device-width,initial-scale=1,viewport-fit=cover"
         meta name: "turbo-cache-control", content: "no-preview"
         meta name: "turbo-refresh-method", content: "morph"
         meta name: "turbo-refresh-scroll", content: "preserve"
@@ -22,16 +22,16 @@ module Layouts
         meta name: "apple-mobile-web-app-status-bar-style", content: "default"
         meta name: "apple-mobile-web-app-title", content: @title
 
-        link rel: "canonical", href: ::Site.url_for(helpers.current_path)
+        link rel: "canonical", href: ::Site.url_for(helpers.current_path).to_s
         link rel: "apple-touch-icon", href: "/apple-touch-icon.png"
         link rel: "icon",
-             type: "image/png",
-             sizes: "32x32",
-             href: "/favicon-32x32.png"
+          type: "image/png",
+          sizes: "32x32",
+          href: "/favicon-32x32.png"
         link rel: "icon",
-             type: "image/png",
-             sizes: "16x16",
-             href: "/favicon-16x16.png"
+          type: "image/png",
+          sizes: "16x16",
+          href: "/favicon-16x16.png"
         link rel: "manifest", href: "/site.webmanifest"
 
         meta property: "og:title", content: @title
@@ -44,6 +44,8 @@ module Layouts
         meta name: "twitter:site", content: ::Site.twitter
         meta name: "twitter:creator", content: ::Site.twitter
 
+        stylesheet_tag "stylesheets/syntax", media: "screen"
+        stylesheet_tag "stylesheets/application", media: "screen"
         javascript_tag "application"
 
         if Staticky.env.development?
@@ -58,5 +60,9 @@ module Layouts
     def javascript_tag(...)
       vite_javascript_tag(...)
     end
+
+    def stylesheet_tag(...)
+      vite_stylesheet_tag(...)
+    end
   end
 end

data/site_template/app/views/layouts/site.rb

@@ -10,16 +10,22 @@ module Layouts
       end
     end
 
-    def view_template(&block)
+    def view_template(&)
       render UI::Navbar.new(class: css[:navbar])
-      main(**attrs, &block)
+      main(**attrs, &)
       render UI::Footer.new(class: css[:footer])
     end
 
     private
 
-    def head(&block)
-      render Head.new(&block)
+    def head(&)
+      render Head.new(&)
+    end
+
+    def theme
+      {
+        container: "min-h-screen"
+      }
     end
   end
 end

data/site_template/app/views/pages/home.rb

@@ -6,15 +6,19 @@ module Pages
 
     def view_template
       render Protos::Hero.new(
-        class: "h-96",
+        class: "min-h-96",
         style: "background-image: url(#{asset_path("images/hero.jpg")})"
       ) do |hero|
-        hero.overlay(class: "opacity-90")
+        hero.overlay
         hero.content(class: "flex-col text-white") do
           h1 { "Ruby maximalism" }
-          p(margin: false) { "Zen vibes only" }
+          h2(margin: false, size: :sm) { "Zen vibes only" }
 
-          link_to("Learn more", Errors::NotFound)
+          link_to(
+            "Learn more",
+            Errors::NotFound,
+            class: "btn btn-primary mt-md"
+          )
         end
       end
     end

data/site_template/bin/setup

@@ -20,5 +20,5 @@ FileUtils.chdir APP_ROOT do
   system! "bundle binstubs --force bundler rubocop rspec-core vite_ruby rake"
 
   puts "\n== Installing javascript dependencies =="
-  system! "yarn install"
+  system! "pnpm install"
 end

data/site_template/config/puma.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# Run in single threaded mode
-threads 0, 1
+threads 3
 
 # Specifies the `port` that Puma will listen on to receive requests; default is
 # 3000.

data/site_template/config/vite.json

@@ -2,8 +2,12 @@
   "all": {
     "publicDir": "build",
     "sourceCodeDir": "frontend",
+    "additionalEntrypoints": [
+      "~/{images,stylesheets}/**/*"
+    ],
     "watchAdditionalPaths": [
-      "app/**/*.rb"
+      "app/**/*.rb",
+      "config/site.rb"
     ]
   },
   "development": {

data/site_template/frontend/entrypoints/application.js

@@ -1,7 +1,5 @@
 import "@fontsource-variable/inter"
+import * as Turbo from "@hotwired/turbo"
 import "protos-stimulus"
 
-import "~/stylesheets/application.css"
-import "~/stylesheets/syntax.css"
-
 import "~/controllers"

data/site_template/frontend/stylesheets/application.css

@@ -1,61 +1,122 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
+@import "tailwindcss";
+@config "../../tailwind.config.js";
+@plugin "daisyui";
+
+@plugin "daisyui/theme" {
+  name: "onedark";
+  default: true;
+  prefersdark: true;
+  color-scheme: "dark";
+
+  --color-base-100: oklch(35.07% 0.0193 260.66);
+  --color-base-200: oklch(29.25% 0.0157 264.3);
+  --color-base-300: oklch(25.15% 0.0122 264.33);
+  --color-neutral: oklch(17% 0.0157 260);
+  --color-neutral-content: oklch(86% 0.02 250);
+  --color-base-content: oklch(84.45% 0.0119 264.5);
+  --color-primary: oklch(0.7 0.15 240);
+  --color-primary-content: oklch(15% 0.091 265);
+  --color-secondary: oklch(0.8 0.1 80);
+  --color-secondary-content: oklch(10% 0.1 57);
+  --color-accent: oklch(0.7 0.2 310);
+  --color-accent-content: oklch(20% 0.149 300);
+  --color-info: oklch(72.31% 0.0916 200);
+  --color-info-content: oklch(20% 0.066 240);
+  --color-success: oklch(76.83% 0.1103 133);
+  --color-success-content: oklch(20% 0.077 169);
+  --color-warning: oklch(82.49% 0.097 82);
+  --color-warning-content: oklch(15% 0.112 46);
+  --color-error: oklch(67.09% 0.1448 17);
+  --color-error-content: oklch(20% 0.105 12);
+
+  --radius-selector: 8px;
+  --radius-field: 8px;
+  --radius-box: 8px;
+
+  --size-selector: 4px;
+  --size-field: 4px;
+
+  --border: 1px;
+  --depth: 0;
+  --noise: 0;
+}
+
+@theme inline {
+  --font-*: initial;
+  --font-sans: Inter Variable, ui-sans-serif, system-ui, sans-serif,
+    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --font-serif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
+  --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
+    "Liberation Mono", "Courier New", monospace;
+
+  --spacing: 4px;
+  --spacing-xs: clamp(8px, 1%, 16px);
+  --spacing-sm: clamp(12px, 3%, 18px);
+  --spacing-md: clamp(20px, 6%, 40px);
+  --spacing-lg: clamp(48px, 12%, 96px);
+  --spacing-xl: clamp(96px, 24%, 192px);
+
+  --gap: 4px;
+  --gap-xs: clamp(8px, 1vmax, 16px);
+  --gap-sm: clamp(16px, 3vmax, 40px);
+  --gap-md: clamp(24px, 6vmax, 48px);
+  --gap-lg: clamp(48px, 8vmax, 64px);
+  --gap-xl: clamp(64px, 12vmax, 96px);
+}
 
 @layer base {
   :root {
-    --spacing-xs: clamp(0.5rem, 1%, 1rem);
-    --spacing-sm: clamp(0.75rem, 3%, 1.2rem);
-    --spacing-md: clamp(1.25rem, 6%, 2.5rem);
-    --spacing-lg: clamp(3rem, 12%, 6rem);
-    --spacing-xl: clamp(6rem, 24%, 12rem);
-    --spacing-gap-xs: clamp(0.5rem, 1vmax, 1rem);
-    --spacing-gap-sm: clamp(1rem, 3vmax, 1.5rem);
-    --spacing-gap-md: clamp(1.5rem, 6vmax, 3rem);
-    --spacing-gap-lg: clamp(3rem, 8vmax, 4rem);
-    --spacing-gap-xl: clamp(4rem, 12vmax, 6rem);
-    --shadow-color: var(--b3);
-    --box-shadow-sm:
-      0.3px 0.5px 0.5px oklch(var(--shadow-color) / 0.49),
-      0.5px 0.7px 0.8px -1.9px oklch(var(--shadow-color) / 0.38),
-      1.3px 1.9px 2.2px -3.7px oklch(var(--shadow-color) / 0.27);
-    --box-shadow-md:
-      0.3px 0.5px 0.5px oklch(var(--shadow-color) / 0.51),
-      0.8px 1.2px 1.4px -1.2px oklch(var(--shadow-color) / 0.43),
-      2.3px 3.6px 4px -2.5px oklch(var(--shadow-color) / 0.34),
-      6.3px 9.6px 10.8px -3.7px oklch(var(--shadow-color) / 0.26);
-    --box-shadow-lg:
-      0.3px 0.5px 0.5px oklch(var(--shadow-color) / 0.54),
-      1.3px 1.9px 2.2px -0.6px oklch(var(--shadow-color) / 0.49),
-      2.7px 4.1px 4.6px -1.2px oklch(var(--shadow-color) / 0.44),
-      5.5px 8.4px 9.4px -1.9px oklch(var(--shadow-color) / 0.39),
-      10.6px 16.1px 18.1px -2.5px oklch(var(--shadow-color) / 0.34),
-      18.7px 28.4px 31.9px -3.1px oklch(var(--shadow-color) / 0.29),
-      30.7px 46.6px 52.3px -3.7px oklch(var(--shadow-color) / 0.23);
     --navbar-height: 64px;
     --main-scene: calc(100vh - var(--navbar-height));
-    --viewport-padding: var(--spacing-md);
   }
 
-  body {
-    @apply bg-base-400;
+  /* Chrome, Edge, and Safari */
+  *::-webkit-scrollbar {
+    width: 0.66rem;
+    background: var(--color-base-300);
   }
 
-  .prose pre {
-    @apply bg-base-300 border;
+  *::-webkit-scrollbar-track {
+    background: var(--color-base-200);
+    border-radius: 0px;
   }
 
-  * {
-    scrollbar-color: theme("colors.base-200") theme("colors.base-300");
-    border-color: theme("colors.base-200");
+  *::-webkit-scrollbar-thumb {
+    background-color: var(--color-base-100);
+    border-radius: var(--radius-md);
+    border-style: var(--tw-border-style);
+    border-width: 1px;
   }
 
-  /* Chrome, Edge, and Safari */
-  *::-webkit-scrollbar {
-    background: theme("colors.base-300")
+  /* Reset number input type styles */
+  /* Chrome, Safari, Edge, Opera */
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    appearance: none;
+    margin: 0;
+  }
+}
+
+@layer utilities {
+  /* Firefox */
+  input[type=number] {
+    -moz-appearance: textfield;
+    appearance: textfield;
   }
 
-  *::-webkit-scrollbar-track {
-    background: theme("colors.base-200");
+  .btn-ghost {
+    border: 0;
   }
 }
+
+*,
+::before,
+::after,
+::backdrop,
+::file-selector-button {
+  /* scrollbar-width: thin; */
+  scrollbar-color: var(--color-base-100) var(--color-base-200);
+  /* border-color: color-mix(in oklab, currentColor, black calc(var(--depth) * 50%)); */
+  border-color: color-mix(in oklch, var(--color-base-content) 20%, transparent);
+}

data/site_template/lib/icon.rb

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 class Icon < ApplicationComponent
+  SIZES = {
+    xs: "w-3 h-3",
+    sm: "w-4 h-4",
+    md: "w-5 h-5",
+    lg: "w-7 h-7"
+  }.freeze
+
   param :name, reader: false
   option :variant, reader: false, default: -> { }
   option :size, default: -> { :md }, reader: false
@@ -23,17 +30,12 @@ class Icon < ApplicationComponent
   end
 
   def size
-    {
-      xs: "w-3 h-3",
-      sm: "w-4 h-4",
-      md: "w-5 h-5",
-      lg: "w-7 h-7"
-    }.fetch(@size)
+    SIZES.fetch(@size)
   end
 
   def theme
     {
-      container: tokens(size, "opacity-90", "inline-block")
+      container: [size, "inline-block", "opacity-90"]
     }
   end
 end

data/site_template/lib/vite_helpers.rb

@@ -6,6 +6,14 @@ module ViteHelpers
     script(src:, type: :module)
   end
 
+  def vite_stylesheet_tag(*names, **options)
+    style_paths = names.map { |name| vite_asset_path(name, type: :stylesheet) }
+
+    style_paths.each do |href|
+      link(href:, rel: :stylesheet, **options)
+    end
+  end
+
   def vite_javascript_tag(
     *names,
     type: :module,

data/site_template/package.json

@@ -15,11 +15,10 @@
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/turbo": "^8.0.12",
     "@tailwindcss/typography": "^0.5.15",
-    "autoprefixer": "^10.4.20",
-    "daisyui": "^4.12.20",
-    "postcss": "^8.4.49",
-    "protos-stimulus": "^0.0.4",
-    "tailwindcss": "^3.4.16",
+    "@tailwindcss/vite": "^4.0.9",
+    "daisyui": "^5.0.0",
+    "protos-stimulus": "^0.1.0",
+    "tailwindcss": "^4.0.9",
     "vite": "^6.0.3",
     "vite-plugin-ruby": "^5.1.1"
   }

data/site_template/spec/spec_helper.rb

@@ -3,8 +3,6 @@
 require "./config/boot"
 Bundler.require(:test)
 
-require "capybara/rspec"
-require "phlex/testing/capybara"
 require "dry/inflector"
 
 inflector = Dry::Inflector.new
@@ -25,6 +23,6 @@ RSpec.configure do |config|
       metadata[:type] ||= inflector.singularize(type).to_sym
     end
   end
-
-  config.include Phlex::Testing::Capybara::ViewHelper, type: :view
 end
+
+Pathname.glob(Pathname(__dir__).join("support/**/*.rb")).each { |file| require file }

data/site_template/spec/support/phlex.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "capybara/rspec"
+
+module ComponentHelpers
+  def render(component, ...)
+    result = component.call(...)
+    @page = Capybara::Node::Simple.new(result)
+  end
+
+  def page
+    @page
+  end
+end
+
+RSpec.configure do |config|
+  config.include ComponentHelpers
+end

data/site_template/tailwind.config.js

@@ -1,87 +1,18 @@
-import defaultTheme from "tailwindcss/defaultTheme"
-import daisyui from "daisyui"
-import typography from "@tailwindcss/typography"
-import variableFonts from "./frontend/tailwindcss/variable_font_plugin"
-
 // For importing tailwind styles from protos gem
 import { execSync } from "child_process"
+import typography from "@tailwindcss/typography"
+
 const output = execSync("bundle show protos", { encoding: "utf-8" });
 const protos_path = output.trim() + "/**/*.rb";
 
 /** @type {import("tailwindcss").Config} */
 const config = {
   content: [
-    "./app/**/*.rb",
+    "./app/views/**/*.rb",
     "./lib/**/*.rb",
     protos_path
   ],
-  theme: {
-    fontFamily: {
-      ...defaultTheme.fontFamily,
-      sans: ["Inter Variable", ...defaultTheme.fontFamily.sans],
-    },
-    boxShadow: {
-      sm: "var(--box-shadow-sm)",
-      md: "var(--box-shadow-md)",
-      lg: "var(--box-shadow-lg)"
-    },
-    extend: {
-      colors: {
-        "base-400": "#1e2227",
-      },
-      spacing: {
-        xs: "var(--spacing-xs)",
-        sm: "var(--spacing-sm)",
-        md: "var(--spacing-md)",
-        lg: "var(--spacing-lg)",
-        xl: "var(--spacing-xl)",
-      },
-      gap: {
-        xs: "var(--spacing-gap-xs)",
-        sm: "var(--spacing-gap-sm)",
-        md: "var(--spacing-gap-md)",
-        lg: "var(--spacing-gap-lg)",
-        xl: "var(--spacing-gap-xl)",
-      },
-    },
-  },
-  daisyui: {
-    themes: [
-      {
-        onedark: {
-          "primary": "#61afef",
-          "secondary": "#e5c07b",
-          "accent": "#c678dd",
-          "neutral": "#545862",
-          "neutral-content": "#c8ccd4",
-          "base-100": "#3e4451",
-          "base-200": "#353b45",
-          "base-300": "#282c34",
-          "base-content": "#b6bdca",
-          "info": "#61afef",
-          "success": "#98c379",
-          "warning": "#e5c07b",
-          "error": "#e06c75",
-
-          "--rounded-box": "0.5rem", // border radius rounded-box utility class, used in card and other large boxes
-          "--rounded-btn": "0.25rem", // border radius rounded-btn utility class, used in buttons and similar element
-          "--rounded-badge": "1rem", // border radius rounded-badge utility class, used in badges and similar
-          "--animation-btn": "0.25s", // duration of animation when you click on button
-          "--animation-input": "0.2s", // duration of animation for inputs like checkbox, toggle, radio, etc
-          "--btn-text-case": "uppercase", // set default text transform for buttons
-          "--btn-focus-scale": "0.95", // scale transform of button when you focus on it
-          "--border-btn": "1px", // border width of buttons
-          "--tab-border": "1px", // border width of tabs
-          "--tab-radius": "0.25rem", // border radius of tabs
-        },
-      },
-    ]
-  },
-  plugins: [
-    daisyui,
-    typography,
-    variableFonts
-  ],
+  plugins: [typography]
 }
 
 export default config

data/site_template/vite.config.ts

@@ -1,9 +1,10 @@
 import { defineConfig } from "vite"
 import RubyPlugin from "vite-plugin-ruby"
+import tailwindcss from "@tailwindcss/vite"
 
 export default defineConfig({
-  server: { hmr: false },
   plugins: [
+    tailwindcss(),
     RubyPlugin(),
   ],
 })

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: staticky
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nolan J Tait
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -16,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -58,98 +57,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-monitor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: phlex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.83'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.83'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: staticky-files
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
 description: Static site
 email:
 - nolanjtait@gmail.com
@@ -225,7 +224,7 @@ files:
 - site_template/.prettierrc
 - site_template/.rspec
 - site_template/.rubocop.yml
-- site_template/.ruby-version
+- site_template/.ruby-version.erb
 - site_template/Dockerfile
 - site_template/Gemfile
 - site_template/Procfile.dev
@@ -269,7 +268,6 @@ files:
 - site_template/logs/.keep
 - site_template/nginx.conf
 - site_template/package.json
-- site_template/postcss.config.js
 - site_template/public/android-chrome-192x192.png
 - site_template/public/android-chrome-512x512.png
 - site_template/public/apple-touch-icon.png
@@ -280,6 +278,7 @@ files:
 - site_template/public/site.webmanifest.erb
 - site_template/public/sitemap.xml
 - site_template/spec/spec_helper.rb
+- site_template/spec/support/phlex.rb
 - site_template/spec/views/pages/home_spec.rb
 - site_template/tailwind.config.js
 - site_template/vite.config.ts
@@ -291,7 +290,6 @@ metadata:
   source_code_uri: https://github.com/nolantait/staticky
   changelog_uri: https://github.com/nolantait/staticky
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -306,8 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Static site
 test_files: []

data/site_template/.ruby-version

@@ -1 +0,0 @@
-3.3.5

data/site_template/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}