diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d58279b98..6c6f0f301 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,10 +13,6 @@ //= require rails-timeago //= require locales/jquery.timeago.de.js // -// lib/assets -//= require flash -//= require color_mode_picker -// // app/assets // --> Include some assets first, as they are used by other assets. // --> Hence, the order specified here is important. diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f828f9cd9..288b9ab71 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,10 +10,6 @@ * files in this directory. Styles in this file should be added after the last require_* statement. * It is generally better to create a new file per style scope. * - * lib/assets - *= require flash - * - * app/assets *= require_tree . *= require_self */ diff --git a/lib/assets/stylesheets/flash.css.scss b/app/assets/stylesheets/flash.css.scss similarity index 100% rename from lib/assets/stylesheets/flash.css.scss rename to app/assets/stylesheets/flash.css.scss diff --git a/app/javascript/application.js b/app/javascript/application.js index daaf6b697..9fb99abf5 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -88,3 +88,7 @@ window.ace = ace; // Publish ace in global namespace // Turbo import '@hotwired/turbo-rails'; import './turbo-migration'; + +// Import of Rails sprocket assets with minimal changes. After the initial migration these files should +// be moved to an appropriate place after some adjustments to fit modern Rails JS. +require('sprocket-asset-import'); diff --git a/lib/assets/javascripts/color_mode_picker.js b/app/javascript/sprocket-asset-import/color-mode-picker.js similarity index 100% rename from lib/assets/javascripts/color_mode_picker.js rename to app/javascript/sprocket-asset-import/color-mode-picker.js diff --git a/lib/assets/javascripts/flash.js b/app/javascript/sprocket-asset-import/flash.js similarity index 100% rename from lib/assets/javascripts/flash.js rename to app/javascript/sprocket-asset-import/flash.js diff --git a/app/javascript/sprocket-asset-import/index.js b/app/javascript/sprocket-asset-import/index.js new file mode 100644 index 000000000..89aaa6870 --- /dev/null +++ b/app/javascript/sprocket-asset-import/index.js @@ -0,0 +1,4 @@ +require('./flash'); +require('./color-mode-picker'); + +require('./request-for-comments'); diff --git a/app/assets/javascripts/request_for_comments.js b/app/javascript/sprocket-asset-import/request-for-comments.js similarity index 100% rename from app/assets/javascripts/request_for_comments.js rename to app/javascript/sprocket-asset-import/request-for-comments.js