Skip to content

Commit 147e77d

Browse files
Copilotfbacall
Copilot
and
fbacall
committed
Replace rails-assets.org gems with yarn/npm packages
Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
1 parent 651afe9 commit 147e77d

8 files changed

Lines changed: 152 additions & 35 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ config/ontologies/*.cache
4040

4141
tess.crontab
4242

43-
app-secrets*
43+
app-secrets*
44+
node_modules/

‎Gemfile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,6 @@ gem 'validate_url'
7474
gem 'whenever', require: false # Work around https://github.com/javan/whenever/issues/831
7575
gem 'will_paginate'
7676

77-
source 'https://rails-assets.org' do
78-
gem 'rails-assets-clipboard', '~> 1.5.12'
79-
gem 'rails-assets-devbridge-autocomplete', '~> 1.4.9'
80-
gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 4.17.42'
81-
gem 'rails-assets-markdown-it', '~> 7.0.1'
82-
gem 'rails-assets-moment', '~> 2.30.1'
83-
gem 'rails-assets-select2', '~> 4.0.8'
84-
end
85-
8677
group :development, :test do
8778
gem 'byebug'
8879
gem 'pry-byebug'

‎Gemfile.lock‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@ GIT
66
tess_rdf_extractors (1.1.0)
77
linkeddata (~> 3.2.0)
88

9-
GEM
10-
remote: https://rails-assets.org/
11-
specs:
12-
rails-assets-clipboard (1.5.16)
13-
rails-assets-devbridge-autocomplete (1.4.9)
14-
rails-assets-jquery (>= 1.7)
15-
rails-assets-eonasdan-bootstrap-datetimepicker (4.17.49)
16-
rails-assets-jquery (>= 1.8.3)
17-
rails-assets-moment (>= 2.10.5)
18-
rails-assets-jquery (3.7.0)
19-
rails-assets-markdown-it (7.0.1)
20-
rails-assets-moment (2.30.1)
21-
rails-assets-select2 (4.0.8)
22-
239
GEM
2410
remote: https://rubygems.org/
2511
specs:
@@ -872,12 +858,6 @@ DEPENDENCIES
872858
pundit
873859
rack-cors
874860
rails (= 7.2.2.2)
875-
rails-assets-clipboard (~> 1.5.12)!
876-
rails-assets-devbridge-autocomplete (~> 1.4.9)!
877-
rails-assets-eonasdan-bootstrap-datetimepicker (~> 4.17.42)!
878-
rails-assets-markdown-it (~> 7.0.1)!
879-
rails-assets-moment (~> 2.30.1)!
880-
rails-assets-select2 (~> 4.0.8)!
881861
rails-controller-testing
882862
rails-i18n
883863
rails_admin

‎app/assets/javascripts/application.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
//= require markdown-it
2727
//= require URI
2828
//= require moment
29-
//= require eonasdan-bootstrap-datetimepicker
30-
//= require devbridge-autocomplete
29+
//= require bootstrap-datetimepicker
30+
//= require jquery.autocomplete
3131
//= require clipboard
3232
//= require ardc_vocab_widget_v2
3333
//= require select2

‎app/assets/stylesheets/application.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
// Vendor
4848
@import "cytoscape-panzoom";
4949
@import "jquery.simplecolorpicker";
50-
@import "eonasdan-bootstrap-datetimepicker";
50+
@import "bootstrap-datetimepicker";
5151
@import "ardc_vocab_widget_v2";
5252
@import "jquery.qtip.min";
5353
@import "select2";

‎config/initializers/assets.rb‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,20 @@
33
# Version of your assets, change this if you want to expire all your assets.
44
Rails.application.config.assets.version = "1.0"
55

6-
# Add additional assets to the asset load path.
7-
# Rails.application.config.assets.paths << Emoji.images_path
6+
# Add node_modules subdirectories to the Sprockets asset load path so that
7+
# JS/CSS packages installed via yarn can be referenced with //= require and @import.
8+
%w[
9+
clipboard/dist
10+
devbridge-autocomplete/dist
11+
eonasdan-bootstrap-datetimepicker/src/js
12+
eonasdan-bootstrap-datetimepicker/build/css
13+
markdown-it/dist
14+
moment
15+
select2/dist/js
16+
select2/dist/css
17+
].each do |path|
18+
Rails.application.config.assets.paths << Rails.root.join("node_modules/#{path}")
19+
end
820

921
# Precompile additional assets.
1022
# application.js, application.css, and all non-JS/CSS in the app/assets

‎package.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "tess",
3+
"private": true,
4+
"dependencies": {
5+
"clipboard": "^1.5.16",
6+
"devbridge-autocomplete": "^1.4.9",
7+
"eonasdan-bootstrap-datetimepicker": "^4.17.49",
8+
"markdown-it": "^7.0.1",
9+
"moment": "^2.30.1",
10+
"select2": "^4.0.8"
11+
}
12+
}

‎yarn.lock‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
argparse@^1.0.7:
6+
version "1.0.10"
7+
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
8+
integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
9+
dependencies:
10+
sprintf-js "~1.0.2"
11+
12+
bootstrap@^3.3:
13+
version "3.4.1"
14+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
15+
integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
16+
17+
clipboard@^1.5.16:
18+
version "1.7.1"
19+
resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"
20+
integrity sha512-smkaRaIQsrnKN1F3wd1/vY9Q+DeR4L8ZCXKeHCFC2j8RZuSBbuImcLdnIO4GTxmzJxQuDGNKkyfpGoPW7Ua5bQ==
21+
dependencies:
22+
good-listener "^1.2.2"
23+
select "^1.1.2"
24+
tiny-emitter "^2.0.0"
25+
26+
delegate@^3.1.2:
27+
version "3.2.0"
28+
resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
29+
integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
30+
31+
devbridge-autocomplete@^1.4.9:
32+
version "1.5.0"
33+
resolved "https://registry.yarnpkg.com/devbridge-autocomplete/-/devbridge-autocomplete-1.5.0.tgz#b630ef596f00ab511e2d41ae91788368e968ee01"
34+
integrity sha512-yz6W76PyXS9DtuyYbQtVcpxtkI8pQ02EQwZeNWnqUJXmM5jSmsPFKmpFEBneImcHwYJrMf3+6m86Hj2MRPELGQ==
35+
36+
entities@~1.1.1:
37+
version "1.1.2"
38+
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
39+
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
40+
41+
eonasdan-bootstrap-datetimepicker@^4.17.49:
42+
version "4.17.49"
43+
resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz#5534ba581c1e7eb988dbf773e2fed8a7f48cc76a"
44+
integrity sha512-7KZeDpkj+A6AtPR3XjX8gAnRPUkPSfW0OmMANG1dkUOPMtLSzbyoCjDIdEcfRtQPU5X0D9Gob7wWKn0h4QWy7A==
45+
dependencies:
46+
bootstrap "^3.3"
47+
jquery "^3.5.1"
48+
moment "^2.10"
49+
moment-timezone "^0.4.0"
50+
51+
good-listener@^1.2.2:
52+
version "1.2.2"
53+
resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
54+
integrity sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==
55+
dependencies:
56+
delegate "^3.1.2"
57+
58+
jquery@^3.5.1:
59+
version "3.7.1"
60+
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
61+
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
62+
63+
linkify-it@^2.0.0:
64+
version "2.2.0"
65+
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
66+
integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
67+
dependencies:
68+
uc.micro "^1.0.1"
69+
70+
markdown-it@^7.0.1:
71+
version "7.0.1"
72+
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-7.0.1.tgz#f12d8b88a93e64254348dfd183bd70bf60567a42"
73+
integrity sha512-etdzRx/pMUtILytasHAo4+9xCPjdsNFvwBr+ye3edqNc128whm/dJ47pVc5ng584v7Ko35X8mMM9Rc5TicKXKg==
74+
dependencies:
75+
argparse "^1.0.7"
76+
entities "~1.1.1"
77+
linkify-it "^2.0.0"
78+
mdurl "^1.0.1"
79+
uc.micro "^1.0.1"
80+
81+
mdurl@^1.0.1:
82+
version "1.0.1"
83+
resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
84+
integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
85+
86+
moment-timezone@^0.4.0:
87+
version "0.4.1"
88+
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz#81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"
89+
integrity sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==
90+
dependencies:
91+
moment ">= 2.6.0"
92+
93+
"moment@>= 2.6.0", moment@^2.10, moment@^2.30.1:
94+
version "2.30.1"
95+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
96+
integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
97+
98+
select2@^4.0.8:
99+
version "4.0.13"
100+
resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d"
101+
integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==
102+
103+
select@^1.1.2:
104+
version "1.1.2"
105+
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
106+
integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
107+
108+
sprintf-js@~1.0.2:
109+
version "1.0.3"
110+
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
111+
integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
112+
113+
tiny-emitter@^2.0.0:
114+
version "2.1.0"
115+
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
116+
integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
117+
118+
uc.micro@^1.0.1:
119+
version "1.0.6"
120+
resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
121+
integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==

0 commit comments

Comments
 (0)