fixes

Author: ndbroadbent

.github/workflows/deploy-site.yml

@@ -42,6 +42,9 @@ jobs:
           cache: yarn
           cache-dependency-path: site/yarn.lock
 
+      - name: Install site dependencies
+        run: cd site && yarn install
+
       - name: Setup Pages
         uses: actions/configure-pages@v4
         with:

.github/workflows/test.yml

@@ -20,22 +20,21 @@ jobs:
           ruby-version: ".ruby-version"
           bundler-cache: true
 
-      - name: Setup Node.js (root)
+      - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "yarn"
-          cache-dependency-path: "yarn.lock"
-
-      - name: Setup Node.js (site)
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: "yarn"
-          cache-dependency-path: "site/yarn.lock"
+          cache-dependency-path: |
+            yarn.lock
+            site/yarn.lock
 
       - name: Install dependencies
         run: |
+          # Install root and site yarn dependencies
+          yarn install
+          cd site && yarn install && cd ..
+
           # Make sure bundler is using the correct Ruby version
           ruby -v
 
@@ -183,6 +182,9 @@ jobs:
           cache: "yarn"
           cache-dependency-path: "site/yarn.lock"
 
+      - name: Install site dependencies
+        run: cd site && yarn install
+
       - name: Export TypeScript types
         run: |
           ruby scripts/export_typescript_types.rb

tasks/yard.rake

@@ -1,32 +1,38 @@
 # frozen_string_literal: true
 
-require "yard"
-require "yard-sorbet"
-
-YARD::Rake::YardocTask.new(:yard) do |t|
-  t.files = ["lib/**/*.rb"]
-  t.options = ["--no-private", 
-               "--protected",
-               "--markup=markdown",
-               "--markup-provider=redcarpet",
-               "--readme=README.md",
-               "--title=LogStruct YARD Documentation",
-               "--output-dir=site/public/yard"]
-  t.stats_options = ["--list-undoc"]
-end
-
-desc "Generate YARD documentation and open in browser"
-task :'yard:open' => :yard do
-  require "launchy"
-  Launchy.open("site/public/yard/index.html")
+begin
+  require "yard"
+  require "yard-sorbet"
 rescue LoadError
-  puts "Install the 'launchy' gem to open docs automatically"
+  # Yard not available (e.g. from bundle install --without development on CI)
 end
 
-desc "Clean YARD documentation directory"
-task :'yard:clean' do
-  FileUtils.rm_rf("site/public/yard")
-end
+if defined?(YARD::Rake::YardocTask)
+  YARD::Rake::YardocTask.new(:yard) do |t|
+    t.files = ["lib/**/*.rb"]
+    t.options = ["--no-private",
+      "--protected",
+      "--markup=markdown",
+      "--markup-provider=redcarpet",
+      "--readme=README.md",
+      "--title=LogStruct YARD Documentation",
+      "--output-dir=site/public/yard"]
+    t.stats_options = ["--list-undoc"]
+  end
 
-desc "Regenerate YARD documentation"
-task :'yard:regen' => [:'yard:clean', :yard]
+  desc "Generate YARD documentation and open in browser"
+  task "yard:open": :yard do
+    require "launchy"
+    Launchy.open("site/public/yard/index.html")
+  rescue LoadError
+    puts "Install the 'launchy' gem to open docs automatically"
+  end
+
+  desc "Clean YARD documentation directory"
+  task :"yard:clean" do
+    FileUtils.rm_rf("site/public/yard")
+  end
+
+  desc "Regenerate YARD documentation"
+  task "yard:regen": [:"yard:clean", :yard]
+end