Skip to content

Commit 7be62fa

Browse files
authored
Update Active Admin to 4.0.0.beta19 (Tailwind 4) (#920)
1 parent ecec69a commit 7be62fa

File tree

5 files changed

+32
-705
lines changed

5 files changed

+32
-705
lines changed

Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ GEM
8484
securerandom (>= 0.3)
8585
tzinfo (~> 2.0, >= 2.0.5)
8686
uri (>= 0.13.1)
87-
addressable (2.8.7)
88-
public_suffix (>= 2.0.2, < 7.0)
87+
addressable (2.8.8)
88+
public_suffix (>= 2.0.2, < 8.0)
8989
arbre (2.2.1)
9090
activesupport (>= 7.0)
9191
base64 (0.3.0)
@@ -102,7 +102,7 @@ GEM
102102
regexp_parser (>= 1.5, < 3.0)
103103
xpath (~> 3.2)
104104
concurrent-ruby (1.3.5)
105-
connection_pool (2.5.4)
105+
connection_pool (3.0.2)
106106
crass (1.0.6)
107107
cssbundling-rails (1.4.2)
108108
railties (>= 6.0.0)
@@ -145,7 +145,7 @@ GEM
145145
pp (>= 0.6.0)
146146
rdoc (>= 4.0.0)
147147
reline (>= 0.4.2)
148-
json (2.16.0)
148+
json (2.17.1)
149149
kaminari (1.2.2)
150150
activesupport (>= 4.1.0)
151151
kaminari-actionview (= 1.2.2)
@@ -197,7 +197,7 @@ GEM
197197
psych (5.2.6)
198198
date
199199
stringio
200-
public_suffix (6.0.2)
200+
public_suffix (7.0.0)
201201
puma (7.1.0)
202202
nio4r (~> 2.0)
203203
racc (1.8.1)
@@ -207,7 +207,7 @@ GEM
207207
rack (>= 3.0.0)
208208
rack-test (2.2.0)
209209
rack (>= 1.3)
210-
rackup (2.2.1)
210+
rackup (2.3.1)
211211
rack (>= 3)
212212
rails (8.1.1)
213213
actioncable (= 8.1.1)
@@ -244,7 +244,7 @@ GEM
244244
activerecord (>= 7.2)
245245
activesupport (>= 7.2)
246246
i18n
247-
rdoc (6.15.1)
247+
rdoc (6.16.1)
248248
erb
249249
psych (>= 4.0.0)
250250
tsort
@@ -284,7 +284,7 @@ GEM
284284
mini_portile2 (~> 2.8.0)
285285
sqlite3 (2.8.1-arm64-darwin)
286286
sqlite3 (2.8.1-x86_64-linux-gnu)
287-
stringio (3.1.8)
287+
stringio (3.1.9)
288288
thor (1.4.0)
289289
timeout (0.4.4)
290290
tsort (0.2.0)
@@ -326,7 +326,7 @@ DEPENDENCIES
326326
tzinfo-data
327327

328328
RUBY VERSION
329-
ruby 3.4.7p58
329+
ruby 3.4.7p58
330330

331331
BUNDLED WITH
332-
2.7.2
332+
4.0.0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import "tailwindcss";
2+
3+
@config "../../../tailwind-active_admin.config.js";

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"name": "app",
33
"private": "true",
4+
"type": "module",
45
"dependencies": {
5-
"@activeadmin/activeadmin": "4.0.0-beta18",
6-
"tailwindcss": "^3.4.18"
6+
"@activeadmin/activeadmin": "4.0.0-beta19",
7+
"tailwindcss": "^4.1.17"
78
},
89
"scripts": {
9-
"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"
10+
"build:css": "npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"
1011
},
1112
"packageManager": "yarn@1.22.19"
1213
}

tailwind-active_admin.config.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
const execSync = require('child_process').execSync;
1+
import { execSync } from 'child_process';
2+
import activeAdminPlugin from '@activeadmin/activeadmin/plugin';
3+
24
const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim();
35

4-
module.exports = {
6+
export default {
57
content: [
68
`${activeAdminPath}/vendor/javascript/flowbite.js`,
79
`${activeAdminPath}/plugin.js`,
@@ -14,6 +16,6 @@ module.exports = {
1416
],
1517
darkMode: "selector",
1618
plugins: [
17-
require(`@activeadmin/activeadmin/plugin`)
19+
activeAdminPlugin
1820
]
1921
}

0 commit comments

Comments
 (0)