8000 Bump tailwind from 3.4.17 to 4.1.11 · activeadmin/activeadmin@f9c44a3 · GitHub
[go: up one dir, main page]
Skip to content

Commit f9c44a3

Browse files
mgrunbergtagliala
mgrunberg
authored and
tagliala
committed
Bump tailwind from 3.4.17 to 4.1.11
- Remove tailwind v3 downgrade from test-application - Use tailwind cli to compile css - Delete generated files that are not used - Add a reference to old javascript config file - Remove `@tailwind` directive - Remove config argument when adding `build:css` script to test app - Rename deprecated utilities https://tailwindcss.com/docs/upgrade-guide#renamed-utilities
1 parent c5943e9 commit f9c44a3

File tree

6 files changed

+33
-596
lines changed

6 files changed

+33
-596
lines changed

‎lib/generators/active_admin/assets/templates/active_admin.css

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"eslint": "^9.29.0",
3030
"gherkin-lint": "^4.2.2",
3131
"rollup": "^4.44.0",
32-
"tailwindcss": "^3.4.17",
32+
"tailwindcss": "^4.1.11",
3333
"vitepress": "^1.6.3"
3434
},
3535
"scripts": {

‎plugin.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ export default plugin(
307307
visibility: 'hidden',
308308
},
309309
'[type=checkbox]': {
310-
'@apply w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600': {}
310+
'@apply w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded-sm focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600': {}
311311
},
312312
'[type=radio]': {
313313
'@apply w-4 h-4 border-gray-300 focus:ring-2 focus:ring-blue-300 dark:focus:ring-blue-600 dark:focus:bg-blue-600 dark:bg-gray-700 dark:border-gray-600': {}
@@ -321,7 +321,7 @@ export default plugin(
321321
});
322322
addComponents({
323323
'.action-item-button': {
324-
'@apply py-2 px-3 text-sm font-medium no-underline text-gray-900 focus:outline-none bg-white rounded-md border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700': {}
324+
'@apply py-2 px-3 text-sm font-medium no-underline text-gray-900 focus:outline-hidden bg-white rounded-md border border-gray-200 hover:bg-gray-100 hover:text-blue-700 focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700': {}
325325
},
326326
'.index-data-table-toolbar': {
327327
'@apply flex flex-col lg:flex-row gap-4 mb-4': {}
@@ -346,7 +346,7 @@ export default plugin(
346346
'@apply inline-flex items-center justify-center rounded-full bg-indigo-200/80 text-indigo-800 dark:bg-indigo-800 dark:text-indigo-200 px-1.5 py-1 text-xs font-normal ms-2 leading-none': {}
347347
},
348348
'.paginated-collection': {
349-
'@apply border border-gray-200 dark:border-gray-800 rounded-md shadow-sm overflow-hidden': {}
349+
'@apply border border-gray-200 dark:border-gray-800 rounded-md shadow-xs overflow-hidden': {}
350350
},
351351
'.paginated-collection-contents' 10000 : {
352352
'@apply overflow-x-auto': {}
@@ -412,7 +412,7 @@ export default plugin(
412412
'@apply flex gap-2 items-center': {}
413413
},
414414
'.filters-form-submit': {
415-
'@apply min-w-[6rem] font-bold text-white bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:outline-none focus:ring-blue-300 rounded-md px-3 py-2 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 cursor-pointer': {}
415+
'@apply min-w-[6rem] font-bold text-white bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:outline-hidden focus:ring-blue-300 rounded-md px-3 py-2 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 cursor-pointer': {}
416416
},
417417
'.filters-form-clear': {
418418
'@apply rounded-md px-3 py-2 font-semibold text-gray-700 hover:bg-gray-100 no-underline dark:text-gray-400 dark:hover:bg-inherit dark:hover:text-gray-100 dark:focus:ring-blue-800': {}
@@ -433,13 +433,13 @@ export default plugin(
433433
'@apply w-2.5 h-2.5': {}
434434
},
435435
'.batch-actions-dropdown-menu': {
436-
'@apply z-10 hidden min-w-[7rem] bg-white rounded-md shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none dark:bg-gray-700 py-1 text-sm text-gray-700 dark:text-gray-200': {}
436+
'@apply z-10 hidden min-w-[7rem] bg-white rounded-md shadow-lg ring-1 ring-black/5 focus:outline-hidden dark:bg-gray-700 py-1 text-sm text-gray-700 dark:text-gray-200': {}
437437
},
438438
'.batch-actions-dropdown-menu :where(li > a)': {
439439
'@apply block px-2.5 py-2 no-underline text-gray-700 hover:bg-gray-100 hover:text-gray-900 dark:text-white dark:hover:bg-gray-600 dark:hover:text-white': {}
440440
},
441441
'.panel': {
442-
'@apply mb-6 border border-gray-200 rounded-md shadow-sm dark:border-gray-800': {}
442+
'@apply mb-6 border border-gray-200 rounded-md shadow-xs dark:border-gray-800': {}
443443
},
444444
'.panel-title': {
445445
'@apply font-bold bg-gray-100 dark:bg-gray-900 rounded-t-md p-3': {}
@@ -448,7 +448,7 @@ export default plugin(
448448
'@apply py-5 px-3': {}
449449
},
450450
'.attributes-table': {
451-
'@apply overflow-hidden mb-6 border border-gray-200 rounded-md shadow-sm dark:border-gray-800': {}
451+
'@apply overflow-hidden mb-6 border border-gray-200 rounded-md shadow-xs dark:border-gray-800': {}
452452
},
453453
'.attributes-table > :where(table)': {
454454
'@apply w-full text-sm text-gray-800 dark:text-gray-300': {}
@@ -530,7 +530,7 @@ export default plugin(
530530
'@apply flex items-center gap-6': {}
531531
},
532532
'.formtastic :where([type=submit], [type=button], button)': {
533-
'@apply font-bold text-white bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:outline-none focus:ring-blue-300 rounded-lg px-4 py-2 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 cursor-pointer': {}
533+
'@apply font-bold text-white bg-blue-600 hover:bg-blue-700 focus:ring-4 focus:outline-hidden focus:ring-blue-300 rounded-lg px-4 py-2 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 cursor-pointer': {}
534534
},
535535
'.formtastic :where(.actions .cancel-link)': {
536536
'@apply font-semibold leading-6 text-gray-900 dark:text-white no-underline': {}

‎spec/support/rails_template.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
create_file "app/assets/config/manifest.js"
77

88
rails_command "css:install:tailwind"
9+
# Remove default configuration generated: https://github.com/rails/cssbundling-rails/blob/v1.4.2/lib/install/tailwind/install.rb#L7
10+
remove_file "app/assets/stylesheets/application.tailwind.css"
11+
912
rails_command "importmap:install"
1013

1114
initial_timestamp = Time.now.strftime("%Y%m%d%H%M%S").to_i

‎tasks/test_application.rb

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,8 @@ def soft_generate
2121
Kernel.system("rake dependencies:vendor") # ensure flowbite is updated for test app
2222
Dir.chdir(app_dir) do
2323
Kernel.system("yarn add @activeadmin/activeadmin")
24-
Kernel.system('npm pkg set scripts.build:css="tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"')
24+
Kernel.system('npm pkg set scripts.build:css="npx @tailwindcss/cli -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify"')
2525
Kernel.system("yarn install")
26-
27-
# Temporary workaround: Downgrade Tailwind CSS to v3.
28-
# The `css:install:tailwind` task installs Tailwind CSS v4 by default,
29-
# which is suitable for new applications.
30-
# Related issues:
31-
# - activeadmin/activeadmin#8611
32-
# - rails/cssbundling-rails#163
33-
# TODO: Remove this workaround once Tailwind CSS v4 is supported.
34-
Kernel.system('yarn upgrade "tailwindcss@^3.4.17"')
35-
3626
Kernel.system("yarn build:css")
3727
end
3828
end

0 commit comments

Comments
 (0)
0