Merge pull request #160 from CruGlobal/js_fixes

Fix javascript sources/mime type error
CruGlobal · Apr 2, 2024 · a686ebe · a686ebe
2 parents e8a3f20 + b69ab80
commit a686ebe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -5,4 +5,4 @@ import 'jquery-form'
 import 'jquery-validation'
 import '@activeadmin/activeadmin'
 
-import './custom/active_admin_custom'
+import 'active_admin_custom'
diff --git a/config/importmap.rb b/config/importmap.rb
@@ -5,8 +5,10 @@
 
 # ActiveAdmin and dependencies
 pin "@activeadmin/activeadmin", to: "https://cdn.jsdelivr.net/npm/@activeadmin/[email protected]/app/assets/javascripts/active_admin/base.min.js"
-pin "jquery", to: "https://ga.jspm.io/npm:[email protected]/dist/jquery.js"
+pin "jquery", to: "https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.js"
 pin "jquery-ui", to: "https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery-ui.min.js"
 pin "jquery-ujs", to: "https://cdn.jsdelivr.net/npm/[email protected]/src/rails.min.js"
-pin "jquery-validation", to: "https://ga.jspm.io/npm:[email protected]/dist/jquery.validate.js"
-pin "jquery-form", to: "https://ga.jspm.io/npm:[email protected]/dist/jquery.form.min.js"
+pin "jquery-validation", to: "https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.validate.js"
+pin "jquery-form", to: "https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.form.min.js"
+
+pin "active_admin_custom", to: "custom/active_admin_custom.js"