From 3509cd409c823666bd89a59c1a44daca585acf82 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Sun, 14 May 2023 16:19:42 +0200 Subject: [PATCH] Remove turbo and importmap --- Gemfile | 3 --- Gemfile.lock | 29 +++++++++----------------- app/assets/config/manifest.js | 2 -- app/javascript/application.js | 3 --- app/views/layouts/application.html.erb | 1 - bin/importmap | 4 ---- config/importmap.rb | 4 ---- vendor/javascript/.keep | 0 8 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 app/javascript/application.js delete mode 100755 bin/importmap delete mode 100644 config/importmap.rb delete mode 100644 vendor/javascript/.keep diff --git a/Gemfile b/Gemfile index 656ecdc..b17bd5f 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,6 @@ gem "mysql2", "~> 0.5" gem "puma", "~> 5.0" -gem "importmap-rails" -gem "turbo-rails" - gem "sassc-rails" # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index b55bce7..efc0043 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,7 +72,7 @@ GEM bindex (0.8.1) builder (3.2.4) byebug (11.1.3) - capybara (3.39.0) + capybara (3.39.1) addressable matrix mini_mime (>= 0.1.3) @@ -94,14 +94,11 @@ GEM ffi (1.15.5) globalid (1.1.0) activesupport (>= 5.0) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) - importmap-rails (1.1.5) - actionpack (>= 6.0.0) - railties (>= 6.0.0) - loofah (2.20.0) + loofah (2.21.2) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -123,14 +120,14 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.14.3-x86_64-linux) + nokogiri (1.14.4-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) public_suffix (5.0.1) puma (5.6.5) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.7) rack-test (2.1.0) rack (>= 1.3) rails (7.0.4.3) @@ -160,7 +157,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rake (13.0.6) - regexp_parser (2.7.0) + regexp_parser (2.8.0) responders (3.1.0) actionpack (>= 5.2) railties (>= 5.2) @@ -174,7 +171,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.8.6) + selenium-webdriver (4.9.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -185,13 +182,9 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.2.1) + thor (1.2.2) tilt (2.1.0) timeout (0.3.2) - turbo-rails (1.4.0) - actionpack (>= 6.0.0) - activejob (>= 6.0.0) - railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) warden (1.2.9) @@ -211,7 +204,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.8) PLATFORMS x86_64-linux @@ -220,14 +213,12 @@ DEPENDENCIES byebug capybara devise - importmap-rails mysql2 (~> 0.5) puma (~> 5.0) rails (~> 7.0.4, >= 7.0.4.2) sassc-rails selenium-webdriver sprockets-rails - turbo-rails tzinfo-data web-console webdrivers diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index ddd546a..5918193 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,4 +1,2 @@ //= link_tree ../images //= link_directory ../stylesheets .css -//= link_tree ../../javascript .js -//= link_tree ../../../vendor/javascript .js diff --git a/app/javascript/application.js b/app/javascript/application.js deleted file mode 100644 index 0d1717e..0000000 --- a/app/javascript/application.js +++ /dev/null @@ -1,3 +0,0 @@ -// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails -import "@hotwired/turbo-rails" -Turbo.session.drive = false diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 49442b0..69b2716 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,6 @@ <%= csp_meta_tag %> <%= stylesheet_link_tag "application" %> - <%= javascript_importmap_tags %> diff --git a/bin/importmap b/bin/importmap deleted file mode 100755 index 36502ab..0000000 --- a/bin/importmap +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby - -require_relative "../config/application" -require "importmap/commands" diff --git a/config/importmap.rb b/config/importmap.rb deleted file mode 100644 index 26c5560..0000000 --- a/config/importmap.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Pin npm packages by running ./bin/importmap - -pin "application", preload: true -pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true diff --git a/vendor/javascript/.keep b/vendor/javascript/.keep deleted file mode 100644 index e69de29..0000000