Merge pull request #293 from aleksei-burlakov/dev-enable-sprockets-4.2

Dev: make sprockets-4.2 compatible
ClusterLabs · Dec 8, 2024 · 36d3ca1 · 36d3ca1
2 parents 1d325f4 + 307b96b
commit 36d3ca1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/hawk/app/assets/config/manifest.js b/hawk/app/assets/config/manifest.js
@@ -1,4 +1,3 @@
 //= link_tree ../images
-//= link_directory ../stylesheets .css
-//= link_tree ../../assets/javascripts .js
-//= link_tree ../../../vendor/assets/javascripts .js
+//= link_directory ../javascripts .js
+//= link_directory ../javascripts/locale .js
diff --git a/hawk/config/initializers/assets.rb b/hawk/config/initializers/assets.rb
@@ -4,26 +4,13 @@
 Rails.application.config.tap do |config|
   config.assets.version = "1.0"
 
-  config.assets.precompile = [
-    /locale\/.+\.(css|js)$/,
-    /gettext\.(css|js)$/,
-    /application\.(css|js)$/,
-    /authentication\.(css|js)$/,
-    /dashboard.(css|js)$/,
-    /ie\.(css|js)$/,
-    /vendor\.(css|js)$/,
-    /\.(jpg|png|gif|svg|ico|eot|woff|woff2|ttf)$/
+  config.assets.precompile = %w( manifest.js )
+  config.assets.precompile << [
+    "gettext.css", "gettext.js",
+    "application.css","application.js",
+    "authentication.css", "authentication.js",
+    "dashboard.css", "dashboard.js",
+    "ie.css", "ie.js",
+    "vendor.css", "vendor.js"
   ]
-
-  config.assets.paths << config.root.join(
-    "vendor",
-    "assets",
-    "fonts"
-  )
-
-  config.assets.paths << config.root.join(
-    "vendor",
-    "assets",
-    "images"
-  )
 end