Use node packages to install jQuery and jQuery UI
Other packages depend on jQuery, so that's why these are the first one we move from the Gemfile to the package.json file. This way we can also test whether dependabot correctly opens pull requests to update Node packages. I've tried several configuration options for the asset pipeline in order to be able to include images referenced in jQuery UI CSS files. So far, adding the `node_modules/jquery-ui/themes/base` folder to the assets paths is the only way I've found to make it work. Hopefully we can find a better solution in the future so we don't have to study the internals of every Node package in order to integrate it with the assets pipeline.
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -33,8 +33,6 @@ gem "image_processing", "~> 1.12.2"
|
|||||||
gem "initialjs-rails", "~> 0.2.0.9"
|
gem "initialjs-rails", "~> 0.2.0.9"
|
||||||
gem "invisible_captcha", "~> 2.1.0"
|
gem "invisible_captcha", "~> 2.1.0"
|
||||||
gem "jquery-fileupload-rails"
|
gem "jquery-fileupload-rails"
|
||||||
gem "jquery-rails", "~> 4.6.0"
|
|
||||||
gem "jquery-ui-rails", "~> 6.0.1"
|
|
||||||
gem "kaminari", "~> 1.2.2"
|
gem "kaminari", "~> 1.2.2"
|
||||||
gem "leaflet-rails", "~> 1.9.3"
|
gem "leaflet-rails", "~> 1.9.3"
|
||||||
gem "mini_magick", "~> 4.12.0"
|
gem "mini_magick", "~> 4.12.0"
|
||||||
|
|||||||
@@ -287,12 +287,6 @@ GEM
|
|||||||
actionpack (>= 3.1)
|
actionpack (>= 3.1)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
sassc
|
sassc
|
||||||
jquery-rails (4.6.0)
|
|
||||||
rails-dom-testing (>= 1, < 3)
|
|
||||||
railties (>= 4.2.0)
|
|
||||||
thor (>= 0.14, < 2.0)
|
|
||||||
jquery-ui-rails (6.0.1)
|
|
||||||
railties (>= 3.2.16)
|
|
||||||
json (2.6.3)
|
json (2.6.3)
|
||||||
jwt (2.7.1)
|
jwt (2.7.1)
|
||||||
kaminari (1.2.2)
|
kaminari (1.2.2)
|
||||||
@@ -727,8 +721,6 @@ DEPENDENCIES
|
|||||||
initialjs-rails (~> 0.2.0.9)
|
initialjs-rails (~> 0.2.0.9)
|
||||||
invisible_captcha (~> 2.1.0)
|
invisible_captcha (~> 2.1.0)
|
||||||
jquery-fileupload-rails
|
jquery-fileupload-rails
|
||||||
jquery-rails (~> 4.6.0)
|
|
||||||
jquery-ui-rails (~> 6.0.1)
|
|
||||||
kaminari (~> 1.2.2)
|
kaminari (~> 1.2.2)
|
||||||
knapsack_pro (~> 5.7.0)
|
knapsack_pro (~> 5.7.0)
|
||||||
launchy (~> 2.5.2)
|
launchy (~> 2.5.2)
|
||||||
|
|||||||
@@ -10,35 +10,46 @@
|
|||||||
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
|
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
|
||||||
// about supported directives.
|
// about supported directives.
|
||||||
//
|
//
|
||||||
//= require jquery3
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery-ujs
|
||||||
//= require jquery-ui/widgets/datepicker
|
//= require jquery-ui/ui/version
|
||||||
//= require jquery-ui/i18n/datepicker-ar
|
//= require jquery-ui/ui/data
|
||||||
//= require jquery-ui/i18n/datepicker-bs
|
//= require jquery-ui/ui/ie
|
||||||
//= require jquery-ui/i18n/datepicker-cs
|
//= require jquery-ui/ui/keycode
|
||||||
//= require jquery-ui/i18n/datepicker-da
|
//= require jquery-ui/ui/position
|
||||||
//= require jquery-ui/i18n/datepicker-de
|
//= require jquery-ui/ui/safe-active-element
|
||||||
//= require jquery-ui/i18n/datepicker-el
|
//= require jquery-ui/ui/scroll-parent
|
||||||
//= require jquery-ui/i18n/datepicker-es
|
//= require jquery-ui/ui/unique-id
|
||||||
//= require jquery-ui/i18n/datepicker-fa
|
//= require jquery-ui/ui/widget
|
||||||
//= require jquery-ui/i18n/datepicker-fr
|
//= require jquery-ui/ui/widgets/menu
|
||||||
//= require jquery-ui/i18n/datepicker-gl
|
//= require jquery-ui/ui/widgets/mouse
|
||||||
//= require jquery-ui/i18n/datepicker-he
|
//= require jquery-ui/ui/widgets/datepicker
|
||||||
//= require jquery-ui/i18n/datepicker-hr
|
//= require jquery-ui/ui/i18n/datepicker-ar
|
||||||
//= require jquery-ui/i18n/datepicker-id
|
//= require jquery-ui/ui/i18n/datepicker-bs
|
||||||
//= require jquery-ui/i18n/datepicker-it
|
//= require jquery-ui/ui/i18n/datepicker-cs
|
||||||
//= require jquery-ui/i18n/datepicker-nl
|
//= require jquery-ui/ui/i18n/datepicker-da
|
||||||
//= require jquery-ui/i18n/datepicker-pl
|
//= require jquery-ui/ui/i18n/datepicker-de
|
||||||
//= require jquery-ui/i18n/datepicker-pt-BR
|
//= require jquery-ui/ui/i18n/datepicker-el
|
||||||
//= require jquery-ui/i18n/datepicker-ru
|
//= require jquery-ui/ui/i18n/datepicker-es
|
||||||
//= require jquery-ui/i18n/datepicker-sl
|
//= require jquery-ui/ui/i18n/datepicker-fa
|
||||||
//= require jquery-ui/i18n/datepicker-sq
|
//= require jquery-ui/ui/i18n/datepicker-fr
|
||||||
//= require jquery-ui/i18n/datepicker-sv
|
//= require jquery-ui/ui/i18n/datepicker-gl
|
||||||
//= require jquery-ui/i18n/datepicker-zh-CN
|
//= require jquery-ui/ui/i18n/datepicker-he
|
||||||
//= require jquery-ui/i18n/datepicker-zh-TW
|
//= require jquery-ui/ui/i18n/datepicker-hr
|
||||||
//= require jquery-ui/i18n/datepicker-en-GB
|
//= require jquery-ui/ui/i18n/datepicker-id
|
||||||
//= require jquery-ui/widgets/autocomplete
|
//= require jquery-ui/ui/i18n/datepicker-it
|
||||||
//= require jquery-ui/widgets/sortable
|
//= require jquery-ui/ui/i18n/datepicker-nl
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-pl
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-pt-BR
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-ru
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-sl
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-sq
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-sv
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-zh-CN
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-zh-TW
|
||||||
|
//= require jquery-ui/ui/i18n/datepicker-en-GB
|
||||||
|
//= require jquery-ui/ui/widgets/autocomplete
|
||||||
|
//= require jquery-ui/ui/widgets/sortable
|
||||||
//= require jquery-fileupload/basic
|
//= require jquery-fileupload/basic
|
||||||
//= require foundation
|
//= require foundation
|
||||||
//= require turbolinks
|
//= require turbolinks
|
||||||
|
|||||||
@@ -7,9 +7,10 @@
|
|||||||
@import "font-awesome/path";
|
@import "font-awesome/path";
|
||||||
@import "font-awesome/mixins";
|
@import "font-awesome/mixins";
|
||||||
@import "font-awesome/core";
|
@import "font-awesome/core";
|
||||||
@import "jquery-ui/autocomplete";
|
@import "jquery-ui/themes/base/theme";
|
||||||
@import "jquery-ui/datepicker";
|
@import "jquery-ui/themes/base/autocomplete";
|
||||||
@import "jquery-ui/sortable";
|
@import "jquery-ui/themes/base/datepicker";
|
||||||
|
@import "jquery-ui/themes/base/sortable";
|
||||||
@import "leaflet";
|
@import "leaflet";
|
||||||
|
|
||||||
@import "foundation_and_overrides";
|
@import "foundation_and_overrides";
|
||||||
|
|||||||
@@ -117,6 +117,7 @@ module Consul
|
|||||||
|
|
||||||
config.assets.paths << Rails.root.join("app", "assets", "fonts")
|
config.assets.paths << Rails.root.join("app", "assets", "fonts")
|
||||||
config.assets.paths << Rails.root.join("vendor", "assets", "fonts")
|
config.assets.paths << Rails.root.join("vendor", "assets", "fonts")
|
||||||
|
config.assets.paths << Rails.root.join("node_modules", "jquery-ui", "themes", "base")
|
||||||
config.assets.paths << Rails.root.join("node_modules")
|
config.assets.paths << Rails.root.join("node_modules")
|
||||||
|
|
||||||
# Add lib to the autoload path
|
# Add lib to the autoload path
|
||||||
|
|||||||
25
package-lock.json
generated
25
package-lock.json
generated
@@ -4,7 +4,30 @@
|
|||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "consuldemocracy"
|
"name": "consuldemocracy",
|
||||||
|
"dependencies": {
|
||||||
|
"jquery": "^3.6.0",
|
||||||
|
"jquery-ui": "^1.12.1",
|
||||||
|
"jquery-ujs": "^1.2.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/jquery": {
|
||||||
|
"version": "3.6.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
|
||||||
|
"integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
|
||||||
|
},
|
||||||
|
"node_modules/jquery-ui": {
|
||||||
|
"version": "1.12.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
|
||||||
|
"integrity": "sha512-K/kDBMXkTky5LH+gqbMvttU1ipqCTaecKyAFjwHjUnPTVfm5I5PZC7We31iNR3yWtAHNqoxkLoit06lR/gKVlA=="
|
||||||
|
},
|
||||||
|
"node_modules/jquery-ujs": {
|
||||||
|
"version": "1.2.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/jquery-ujs/-/jquery-ujs-1.2.2.tgz",
|
||||||
|
"integrity": "sha512-8AlF0ww/8mDdrT/Z2Nmv16r9LI2Xw/H3LiHNpPJYp4gnk/zIAfJTnhLcBRm6FZqQ/bWfW/rPl6j16lhO35DvOg==",
|
||||||
|
"dependencies": {
|
||||||
|
"jquery": ">=1.8.0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "consuldemocracy"
|
"name": "consuldemocracy",
|
||||||
|
"dependencies": {
|
||||||
|
"jquery": "^3.6.0",
|
||||||
|
"jquery-ui": "^1.12.1",
|
||||||
|
"jquery-ujs": "^1.2.2"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user