Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ GEM
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
addressable (2.8.8)
public_suffix (>= 2.0.2, < 8.0)
arbre (2.2.1)
activesupport (>= 7.0)
base64 (0.3.0)
Expand All @@ -102,7 +102,7 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
connection_pool (3.0.2)
crass (1.0.6)
cssbundling-rails (1.4.2)
railties (>= 6.0.0)
Expand Down Expand Up @@ -145,7 +145,7 @@ GEM
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.16.0)
json (2.17.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -197,7 +197,7 @@ GEM
psych (5.2.6)
date
stringio
public_suffix (6.0.2)
public_suffix (7.0.0)
puma (7.1.0)
nio4r (~> 2.0)
racc (1.8.1)
Expand All @@ -207,7 +207,7 @@ GEM
rack (>= 3.0.0)
rack-test (2.2.0)
rack (>= 1.3)
rackup (2.2.1)
rackup (2.3.1)
rack (>= 3)
rails (8.1.1)
actioncable (= 8.1.1)
Expand Down Expand Up @@ -244,7 +244,7 @@ GEM
activerecord (>= 7.2)
activesupport (>= 7.2)
i18n
rdoc (6.15.1)
rdoc (6.16.1)
erb
psych (>= 4.0.0)
tsort
Expand Down Expand Up @@ -284,7 +284,7 @@ GEM
mini_portile2 (~> 2.8.0)
sqlite3 (2.8.1-arm64-darwin)
sqlite3 (2.8.1-x86_64-linux-gnu)
stringio (3.1.8)
stringio (3.1.9)
thor (1.4.0)
timeout (0.4.4)
tsort (0.2.0)
Expand Down Expand Up @@ -326,7 +326,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 3.4.7p58
ruby 3.4.7p58

BUNDLED WITH
2.7.2
4.0.0
6 changes: 3 additions & 3 deletions app/assets/stylesheets/active_admin.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import "tailwindcss";

@config "../../../tailwind-active_admin.config.js";
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "app",
"private": "true",
"type": "module",
"dependencies": {
"@activeadmin/activeadmin": "4.0.0-beta18",
"tailwindcss": "^3.4.18"
"@activeadmin/activeadmin": "4.0.0-beta19",
"tailwindcss": "^4.1.17"
},
"scripts": {
"build:css": "npx tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
"build:css": "npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"
},
"packageManager": "yarn@1.22.19"
}
8 changes: 5 additions & 3 deletions tailwind-active_admin.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
const execSync = require('child_process').execSync;
import { execSync } from 'child_process';
import activeAdminPlugin from '@activeadmin/activeadmin/plugin';

const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim();

module.exports = {
export default {
content: [
`${activeAdminPath}/vendor/javascript/flowbite.js`,
`${activeAdminPath}/plugin.js`,
Expand All @@ -14,6 +16,6 @@ module.exports = {
],
darkMode: "selector",
plugins: [
require(`@activeadmin/activeadmin/plugin`)
activeAdminPlugin
]
}
Loading