From f46558b4dd0bbdcfdf827f3f70abac62a415afb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 4 Mar 2024 01:23:52 +0100 Subject: [PATCH] Replace rails-assets.org with Node.js packages Now that we use NPM, we don't need the wrapper provided by rails-assets anymore. --- Gemfile | 4 -- Gemfile.lock | 6 --- app/assets/javascripts/application.js | 2 +- package-lock.json | 54 ++++++++++++++++++++++++++- package.json | 3 +- 5 files changed, 56 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index a3bfffd8a..8fb3c31b2 100644 --- a/Gemfile +++ b/Gemfile @@ -64,10 +64,6 @@ gem "whenever", "~> 1.0.0", require: false gem "wicked_pdf", "~> 2.8.0" gem "wkhtmltopdf-binary", "~> 0.12.6" -source "https://rails-assets.org" do - gem "rails-assets-markdown-it", "~> 9.0.1" -end - group :development, :test do gem "bullet", "~> 7.1.6" gem "byebug", "~> 11.1.3" diff --git a/Gemfile.lock b/Gemfile.lock index 4e99387cf..812862a53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,3 @@ -GEM - remote: https://rails-assets.org/ - specs: - rails-assets-markdown-it (9.0.1) - GEM remote: https://rubygems.org/ specs: @@ -770,7 +765,6 @@ DEPENDENCIES pronto-scss (~> 0.11.0) puma (~> 5.6.8) rails (= 6.1.7.7) - rails-assets-markdown-it (~> 9.0.1)! recipient_interceptor (~> 0.3.1) redcarpet (~> 3.6.0) responders (~> 3.1.1) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d98cd74ac..97e5154b6 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -86,7 +86,7 @@ //= require banners //= require social_share //= require checkbox_toggle -//= require markdown-it +//= require markdown-it/dist/markdown-it //= require markdown_editor //= require html_editor //= require cocoon diff --git a/package-lock.json b/package-lock.json index ff4f44760..d6745d891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,9 +10,23 @@ "jquery-ui": "^1.13.2", "jquery-ujs": "^1.2.3", "leaflet": "^1.9.4", - "leaflet.markercluster": "^1.5.3" + "leaflet.markercluster": "^1.5.3", + "markdown-it": "^9.0.1" } }, + "node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + }, "node_modules/jquery": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", @@ -46,6 +60,44 @@ "peerDependencies": { "leaflet": "^1.3.1" } + }, + "node_modules/linkify-it": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", + "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", + "dependencies": { + "uc.micro": "^1.0.1" + } + }, + "node_modules/markdown-it": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-9.0.1.tgz", + "integrity": "sha512-XC9dMBHg28Xi7y5dPuLjM61upIGPJG8AiHNHYqIaXER2KNnn7eKnM5/sF0ImNnyoV224Ogn9b1Pck8VH4k0bxw==", + "dependencies": { + "argparse": "^1.0.7", + "entities": "~1.1.1", + "linkify-it": "^2.0.0", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "bin": { + "markdown-it": "bin/markdown-it.js" + } + }, + "node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + }, + "node_modules/uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" } } } diff --git a/package.json b/package.json index 52840e44c..51ce7733c 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "jquery-ui": "^1.13.2", "jquery-ujs": "^1.2.3", "leaflet": "^1.9.4", - "leaflet.markercluster": "^1.5.3" + "leaflet.markercluster": "^1.5.3", + "markdown-it": "^9.0.1" } }