From 7514d31c0a012e86befa04456081bd7c37695e44 Mon Sep 17 00:00:00 2001 From: lotfe-obaid Date: Mon, 10 Apr 2023 00:05:37 +0300 Subject: [PATCH 1/4] Upgrade js Dependencies and Rails version to 6.1 --- .ruby-version | 2 +- Gemfile | 2 +- app/assets/javascripts/abraham/index.js | 2 +- lib/abraham/version.rb | 2 +- package.json | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ruby-version b/.ruby-version index aedc15b..5154b3f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.3 +2.6 diff --git a/Gemfile b/Gemfile index 43849c9..f3fb0ec 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ end rails_version = ENV['RAILS_VERSION'] || 'default' rails = case rails_version when 'default' - '~> 5.2' + '~> 6.1.6' when 'master' {github: 'rails/rails'} else diff --git a/app/assets/javascripts/abraham/index.js b/app/assets/javascripts/abraham/index.js index 0a539eb..45d67be 100644 --- a/app/assets/javascripts/abraham/index.js +++ b/app/assets/javascripts/abraham/index.js @@ -1,4 +1,4 @@ -//= require js-cookie/src/js.cookie +//= require js-cookie/dist/js.cookie //= require shepherd.js/dist/js/shepherd var Abraham = new Object(); diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb index cd97839..92b2a81 100644 --- a/lib/abraham/version.rb +++ b/lib/abraham/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Abraham - VERSION = "2.5.1" + VERSION = "2.6" end diff --git a/package.json b/package.json index 7b3f2b4..ca427c3 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "abraham", "private": true, "dependencies": { - "js-cookie": "^2.2.0", - "shepherd.js": "^6.0.0-beta" + "js-cookie": "^3.0.1", + "shepherd.js": "^10" } } From 0da2f53ef8fb70c044ca47383579d900d8d58e59 Mon Sep 17 00:00:00 2001 From: lotfe-obaid Date: Mon, 10 Apr 2023 01:09:24 +0300 Subject: [PATCH 2/4] remove js modules from abraham --- app/assets/javascripts/abraham/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/javascripts/abraham/index.js b/app/assets/javascripts/abraham/index.js index 45d67be..c04262d 100644 --- a/app/assets/javascripts/abraham/index.js +++ b/app/assets/javascripts/abraham/index.js @@ -1,6 +1,3 @@ -//= require js-cookie/dist/js.cookie -//= require shepherd.js/dist/js/shepherd - var Abraham = new Object(); Abraham.tours = {}; From 4d124aeb16e4b0bab993d971250b5a79e9a57c17 Mon Sep 17 00:00:00 2001 From: lotfe-obaid Date: Mon, 10 Apr 2023 01:10:13 +0300 Subject: [PATCH 3/4] remove js modules from abraham --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index ca427c3..010efd7 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,5 @@ { "name": "abraham", - "private": true, - "dependencies": { - "js-cookie": "^3.0.1", - "shepherd.js": "^10" + "private": true } } From 3d6175d741959874655b18cca1e3397c56d9391e Mon Sep 17 00:00:00 2001 From: lotfe-obaid Date: Mon, 10 Apr 2023 01:18:48 +0300 Subject: [PATCH 4/4] Change gem version to 2.5.2 --- lib/abraham/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/abraham/version.rb b/lib/abraham/version.rb index 92b2a81..038e630 100644 --- a/lib/abraham/version.rb +++ b/lib/abraham/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Abraham - VERSION = "2.6" + VERSION = "2.5.2" end