From 296f1c061d34e25a8b1caca23ac6155c43d7e0e4 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Tue, 5 Nov 2024 07:03:06 -0500 Subject: [PATCH] loading a tree of JS, but it's painful! --- app/assets/javascripts/core.js | 1 - app/javascript/application2.js | 27 +++++++++++++++++++++++++++ config/importmap.rb | 6 ++++++ config/initializers/assets.rb | 10 ++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/core.js b/app/assets/javascripts/core.js index e66f896ad..48b0ae02c 100644 --- a/app/assets/javascripts/core.js +++ b/app/assets/javascripts/core.js @@ -71,7 +71,6 @@ //= require_tree ./factories //= require_tree ./filters //= require_tree ./interceptors -//= require_tree ./services //= require_tree ./values //= require_tree ../templates //= require_tree ./components diff --git a/app/javascript/application2.js b/app/javascript/application2.js index 9ad64e8c5..3fdf83c6d 100644 --- a/app/javascript/application2.js +++ b/app/javascript/application2.js @@ -23,3 +23,30 @@ import "theme-chrome"; //import "tour" // Can't figure out how to get Shepherd.js to load import "footer" + +// Importing services +import "annotationsSvc"; +import "bookSvc"; +import "bootstrapSvc"; +import "caseCSVSvc"; +import "caseSvc"; +import "caseTryNavSvc"; +import "configurationSvc"; +import "diffResultsSvc"; +import "docCacheSvc"; +import "importRatingsSvc"; +import "paneSvc"; +import "queriesSvc"; +import "querySnapshotSvc"; +import "queryViewSvc"; +import "rateBulkSvc"; +import "rateElementSvc"; +import "ratingsStoreSvc"; +import "scorerControllerActionsSvc"; +import "scorerSvc"; +import "searchEndpointSvc"; +import "searchErrorTranslatorSvc"; +import "settingsSvc"; +import "teamSvc"; +import "userSvc"; +import "varExtractorSvc"; diff --git a/config/importmap.rb b/config/importmap.rb index b65ddd82c..a93172ec1 100644 --- a/config/importmap.rb +++ b/config/importmap.rb @@ -14,4 +14,10 @@ pin "theme-chrome", to: "ace-builds/src-min-noconflict/theme-chrome.js" pin 'footer', preload: true +#pin 'services/annotationsSvc.js' +# Pin each JavaScript file in the app/javascript/custom directory +Dir.glob(Rails.root.join('app', 'assets', 'javascripts','services', '*.js')).each do |file| + pin File.basename(file, '.js'), to: "services/#{File.basename(file)}" +end + # pin 'tour' // Can't figure out how to get Shepherd.js to load diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 5e1a46840..598efa21f 100755 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -24,6 +24,16 @@ # but now we list each individaul file. Rails.application.config.assets.precompile += %w[ footer.js ace_config.js ] +# JS from AngularJS app +Dir.glob(Rails.root.join('app', 'assets', 'javascripts', 'services', '*.js')).each do |file| + #relative_path = Pathname.new(file).relative_path_from(Pathname.new(Rails.root)).to_s + #puts "File.basename(file): #{relative_path}" + Rails.application.config.assets.precompile << "services/#{File.basename(file, '.js')}" +end +Rails.application.config.assets.precompile += %w[ + services/annotationsSvc.js +] + # JS from node modules Rails.application.config.assets.precompile += %w[ ace-builds/src-min-noconflict/ace.js