From 8ed87f15cf94bfeb117eaf8db8e3eda75f96609f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Geonizeli?= Date: Thu, 12 Aug 2021 20:56:58 -0300 Subject: [PATCH] fix assets build --- app/assets/config/manifest.js | 1 - app/assets/stylesheets/application.scss | 0 app/javascript/packs/application.ts | 6 +----- app/javascript/packs/react.ts | 1 - app/javascript/stylesheets/tailwind.config.js | 8 +++++++- app/views/layouts/application.html.erb | 4 +--- app/views/layouts/devise.html.erb | 6 +++--- postcss.config.js | 20 ++++++++++--------- 8 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 app/assets/stylesheets/application.scss delete mode 100644 app/javascript/packs/react.ts diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 5918193..ac907b3 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,2 +1 @@ //= link_tree ../images -//= link_directory ../stylesheets .css diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/javascript/packs/application.ts b/app/javascript/packs/application.ts index d1f8140..9ceafff 100644 --- a/app/javascript/packs/application.ts +++ b/app/javascript/packs/application.ts @@ -1,8 +1,3 @@ -// This file is automatically compiled by Webpack, along with any other files -// present in this directory. You're encouraged to place your actual application logic in -// a relevant structure within app/javascript and only use these pack files to reference -// that code so it'll be compiled. - // import Rails from "@rails/ujs" // import Turbolinks from "turbolinks" // import * as ActiveStorage from "@rails/activestorage" @@ -14,3 +9,4 @@ import "stylesheets/application"; import "regenerator-runtime"; +import "src/index"; diff --git a/app/javascript/packs/react.ts b/app/javascript/packs/react.ts deleted file mode 100644 index 3077918..0000000 --- a/app/javascript/packs/react.ts +++ /dev/null @@ -1 +0,0 @@ -import "../src/index"; diff --git a/app/javascript/stylesheets/tailwind.config.js b/app/javascript/stylesheets/tailwind.config.js index 058b8b2..9e56d95 100644 --- a/app/javascript/stylesheets/tailwind.config.js +++ b/app/javascript/stylesheets/tailwind.config.js @@ -1,7 +1,13 @@ const defaultTheme = require("tailwindcss/defaultTheme"); module.exports = { - purge: [], + purge: [ + "./app/**/*.html.erb", + "./app/helpers/**/*.rb", + "./app/javascript/**/*.js", + "./app/javascript/**/*.ts", + "./app/javascript/**/*.tsx", + ], darkMode: false, // or 'media' or 'class' theme: { extend: { diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5c8025c..d065e3a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,9 +6,7 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'react', 'data-turbolinks-track': 'reload' %> + <%= javascript_pack_tag "application", "data-turbolinks-track": "reload" %> diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index ae29191..34fb6d8 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -1,13 +1,13 @@ - X Stake - Admin + X Stake <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_pack_tag "application", media: "all", "data-turbolinks-track": "reload" %> + <%= javascript_pack_tag "application", "data-turbolinks-track": "reload" %> diff --git a/postcss.config.js b/postcss.config.js index 3ff7f16..e475b91 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,13 +1,15 @@ +/* eslint-disable node/global-require */ module.exports = { plugins: [ - require('tailwindcss')("./app/javascript/stylesheets/tailwind.config.js"), - require('postcss-import'), - require('postcss-flexbugs-fixes'), - require('postcss-preset-env')({ + require("postcss-import"), + require("tailwindcss")("./app/javascript/stylesheets/tailwind.config.js"), + require("autoprefixer"), + require("postcss-flexbugs-fixes"), + require("postcss-preset-env")({ autoprefixer: { - flexbox: 'no-2009' + flexbox: "no-2009", }, - stage: 3 - }) - ] -} + stage: 3, + }), + ], +};