From ac117abf687562ed3b8397cfa1689ccfd1df7f8a Mon Sep 17 00:00:00 2001
From: Santiago Bartesaghi <sbartesaghi@hotmail.com>
Date: Mon, 8 Jan 2024 14:25:16 -0300
Subject: [PATCH] Use Rails default directory for JS

---
 .github/workflows/ci.yml                               | 5 +++--
 .gitignore                                             | 1 +
 app/{assets/javascripts => javascript}/active_admin.js | 2 +-
 app/{assets/javascripts => javascript/admin}/jquery.js | 0
 esbuild.config.mjs                                     | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename app/{assets/javascripts => javascript}/active_admin.js (92%)
 rename app/{assets/javascripts => javascript/admin}/jquery.js (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6507fdcc..e401d104 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,8 +97,9 @@ jobs:
       - name: Setup Database
         run: bundle exec rake parallel:load_schema
       - name: Run yarn commands
-        run: |
-          yarn install
+        run: yarn install
+      - name: Precompile assets
+        run: bundle exec rails assets:precompile
       - name: Check for untracked changes in schema.rb
         uses: rootstrap/check_untracked_changes@v1
         with:
diff --git a/.gitignore b/.gitignore
index 7970f97d..b2e38fa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 /log
 /node_modules
 /public/system
+/public/assets
 /spec/tmp
 /storage
 /tmp
diff --git a/app/assets/javascripts/active_admin.js b/app/javascript/active_admin.js
similarity index 92%
rename from app/assets/javascripts/active_admin.js
rename to app/javascript/active_admin.js
index 25504d8e..55f946c4 100644
--- a/app/assets/javascripts/active_admin.js
+++ b/app/javascript/active_admin.js
@@ -1,4 +1,4 @@
-import './jquery'
+import './admin/jquery'
 import 'jquery-ui/ui/widget'
 import 'jquery-ui/ui/widgets/datepicker'
 import 'jquery-ui/ui/widgets/mouse'
diff --git a/app/assets/javascripts/jquery.js b/app/javascript/admin/jquery.js
similarity index 100%
rename from app/assets/javascripts/jquery.js
rename to app/javascript/admin/jquery.js
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
index ab7158dc..d8b17a61 100644
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -1,7 +1,7 @@
 import * as esbuild from 'esbuild'
 
 const config = {
-  entryPoints: ['app/assets/javascripts/*'],
+  entryPoints: ['app/javascript/*.js'],
   bundle: true,
   sourcemap: process.env.RAILS_ENV !== 'production',
   minify: process.env.RAILS_ENV === 'production',