From a99b33d236002be73ed14e755c935910fe43d48c Mon Sep 17 00:00:00 2001 From: Torsten Date: Fri, 9 Dec 2022 00:55:01 +0200 Subject: [PATCH] fix the darn two tailwind issue to get engines and apps styles --- app/views/layouts/application.haml | 3 +-- config/tailwind.config.js | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index d6fba6b..1faafd6 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -7,8 +7,7 @@ = csrf_meta_tags = csp_meta_tag = stylesheet_link_tag "application" - = stylesheet_link_tag "tailwind" , "inter-font", "data-turbo-track": "reload" - = stylesheet_link_tag "merged/merged" + = stylesheet_link_tag "tailwind" #, "inter-font", "data-turbo-track": "reload" = javascript_importmap_tags %body diff --git a/config/tailwind.config.js b/config/tailwind.config.js index c51706a..3ecd28d 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -1,12 +1,16 @@ const defaultTheme = require('tailwindcss/defaultTheme') +const execSync = require('child_process').execSync; +const output = execSync('bundle show merged', { encoding: 'utf-8' }); +const fullname = output.trim() + '/app/**/*.{haml,html,rb}' + module.exports = { content: [ './public/*.html', './app/helpers/**/*.rb', './app/javascript/**/*.js', './app/views/**/*.{erb,haml,html,slim}' , - '../app/views/**/*.{erb,haml,html,slim}' , + fullname ], theme: { extend: {