mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-11-08 07:21:03 +08:00
Merge pull request #5957 from artoscinote/jquery_node_modules
Require jQuery from node_modules
This commit is contained in:
commit
29458330c6
3 changed files with 4 additions and 4 deletions
3
app/assets/javascripts/jquery_bundle.js
vendored
3
app/assets/javascripts/jquery_bundle.js
vendored
|
|
@ -1,2 +1 @@
|
||||||
|
//= require jquery
|
||||||
//= require jquery.min
|
|
||||||
|
|
|
||||||
|
|
@ -138,3 +138,6 @@ Rails.application.config.assets.precompile += %w(big.min.js)
|
||||||
|
|
||||||
# JQuery related includes
|
# JQuery related includes
|
||||||
Rails.application.config.assets.precompile += %w(jquery_bundle.js)
|
Rails.application.config.assets.precompile += %w(jquery_bundle.js)
|
||||||
|
|
||||||
|
# Add stuff installed by yarn
|
||||||
|
Rails.application.config.assets.paths << Rails.root.join('node_modules')
|
||||||
|
|
|
||||||
2
vendor/assets/javascripts/jquery.min.js
vendored
2
vendor/assets/javascripts/jquery.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue