Merge d02389a into 62e1e1d

.github/workflows/ci.yml

@@ -39,8 +39,8 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
-      - run: yarn install
+          cache: 'npm'
+      - run: npm ci
       - name: Test and Lint
         run: |
           sudo apt-get update

Dockerfile

@@ -10,10 +10,8 @@ ENV BUNDLE_FORCE_RUBY_PLATFORM 1
 
 COPY --from=node /usr/local/bin/node /usr/local/bin/node
 COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
-COPY --from=node /opt/yarn-* /opt/yarn
 
-RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm  \
-  && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn
+RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
 
 RUN apk add --no-cache tzdata libpq-dev build-base
 
@@ -31,8 +29,8 @@ RUN bundle config --local without 'development test' \
 COPY . /app
 
 RUN SECRET_KEY_BASE_DUMMY=1 bundle exec rails assets:precompile \
-  && yarn cache clean \
-  && rm -rf node_modules tmp/cache/* /tmp/* yarn.lock log/production.log app/javascript/* app/assets/* storage/*
+  && npm cache clean --force \
+  && rm -rf node_modules tmp/cache/* /tmp/* package-lock.json log/production.log app/javascript/* app/assets/* storage/*
 
 
 FROM base

Gemfile

@@ -14,10 +14,10 @@ gem "turbo-rails", "~> 1.5.0"
 gem "stimulus-rails", "~> 1.2.1"
 
 # Bundle and process CSS in Rails
-gem "cssbundling-rails", "~> 1.2.0"
+gem "cssbundling-rails", "~> 1.4.0"
 
 # Bundle and transpile JavaScript in Rails
-gem "jsbundling-rails", "~> 1.1.2"
+gem "jsbundling-rails", "~> 1.3.0"
 
 # Use Puma as the app server
 gem "puma", "~> 6.4.0"

Gemfile.lock

@@ -112,7 +112,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    cssbundling-rails (1.2.0)
+    cssbundling-rails (1.4.0)
       railties (>= 6.0.0)
     cuprite (0.14.3)
       capybara (~> 3.0)
@@ -166,7 +166,7 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jsbundling-rails (1.1.2)
+    jsbundling-rails (1.3.0)
       railties (>= 6.0.0)
     json (2.6.3)
     kamal (0.16.1)
@@ -389,15 +389,15 @@ DEPENDENCIES
   browser (~> 5.3.1)
   bullet (~> 7.1.0)
   capybara (~> 3.39.0)
-  cssbundling-rails (~> 1.2.0)
+  cssbundling-rails (~> 1.4.0)
   cuprite (~> 0.14.3)
   daemons (~> 1.4.0)
   debug
   erb_lint (~> 0.4.0)
   httparty (~> 0.21.0)
   image_processing (~> 1.12)
   jbuilder (~> 2.11.5)
-  jsbundling-rails (~> 1.1.2)
+  jsbundling-rails (~> 1.3.0)
   kamal (~> 0.16.1)
   listen (~> 3.8.0)
   litestack (~> 0.4.2)

Procfile.dev

@@ -1,3 +1,3 @@
-web: rails s -p 3000
-js: yarn build-dev --watch
-css: yarn build-dev:css --watch
+web: env RUBY_DEBUG_OPEN=true bin/rails server
+js: npm run build-dev -- --watch
+css: npm run build-dev:css -- --watch

README.md

@@ -139,7 +139,6 @@ $ docker pull ghcr.io/blackcandy-org/blackcandy:edge
 
 - Ruby 3.2
 - Node.js 20
-- Yarn
 - libvips
 - FFmpeg
 
@@ -154,7 +153,7 @@ bundle install
 ### Install JavaScript dependencies
 
 ```shell
-yarn install
+npm install
 ```
 
 ### Database Configuration

app/views/layouts/base.html.erb

@@ -7,7 +7,7 @@
     <%= csrf_meta_tags %>
     <%= favicon_link_tag "link_icon.png", type: "image/png" %>
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>
+    <%= javascript_include_tag "application", "data-turbo-track": "reload", type: "module" %>
     <%= yield(:head) %>
   </head>
 

bin/dev

@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
 
-if ! gem list foreman -i --silent; then
+if gem list --no-installed --exact --silent foreman; then
   echo "Installing foreman..."
   gem install foreman
 fi
 
 # Default to port 3000 if not specified
 export PORT="${PORT:-3000}"
 
-exec foreman start -f Procfile.dev "$@"
+exec foreman start -f Procfile.dev "$@"

lib/tasks/lint.rake

@@ -5,11 +5,11 @@ unless Rails.env.production?
 
   namespace :lint do
     task :js do
-      abort("rails lint:js failed") unless system("yarn run standard 'app/javascript/**/*.js'")
+      abort("rails lint:js failed") unless system("npx standard 'app/javascript/**/*.js'")
     end
 
     task :css do
-      abort("rails lint:css failed") unless system("yarn run stylelint 'app/assets/stylesheets/**/*.scss'")
+      abort("rails lint:css failed") unless system("npx stylelint 'app/assets/stylesheets/**/*.scss'")
     end
 
     task :erb do