alchemy_cms 7.3.4 → 7.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (134) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +67 -1
  3. data/Gemfile +10 -3
  4. data/README.md +2 -2
  5. data/Rakefile +2 -0
  6. data/alchemy_cms.gemspec +1 -4
  7. data/app/assets/builds/alchemy/admin.css +9 -1
  8. data/app/assets/builds/alchemy/admin.css.map +1 -1
  9. data/app/assets/builds/alchemy/custom-properties.css +1 -1
  10. data/app/assets/builds/alchemy/custom-properties.css.map +1 -1
  11. data/app/assets/builds/alchemy/preview.min.js +1 -0
  12. data/app/assets/builds/alchemy/welcome.css +1 -1
  13. data/app/assets/builds/alchemy/welcome.css.map +1 -1
  14. data/app/assets/builds/tinymce/skins/content/alchemy/content.min.css +1 -1
  15. data/app/assets/builds/tinymce/skins/content/alchemy/content.min.css.map +1 -1
  16. data/app/assets/config/alchemy_manifest.js +0 -4
  17. data/app/assets/javascripts/alchemy/admin.js +8 -6
  18. data/app/assets/stylesheets/alchemy/admin/elements.scss +43 -7
  19. data/app/assets/stylesheets/alchemy/admin/forms.scss +4 -0
  20. data/app/assets/stylesheets/alchemy/admin/image_library.scss +40 -26
  21. data/app/assets/stylesheets/alchemy/admin/navigation.scss +9 -1
  22. data/app/assets/stylesheets/alchemy/admin/preview_window.scss +22 -17
  23. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  24. data/app/assets/stylesheets/alchemy/custom-properties.css +2 -1
  25. data/app/components/alchemy/ingredients/link_view.rb +7 -1
  26. data/app/components/alchemy/ingredients/picture_view.rb +5 -2
  27. data/app/components/alchemy/ingredients/text_view.rb +4 -1
  28. data/app/components/concerns/alchemy/ingredients/link_target.rb +18 -0
  29. data/app/controllers/alchemy/admin/base_controller.rb +34 -5
  30. data/app/controllers/alchemy/admin/elements_controller.rb +2 -2
  31. data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
  32. data/app/controllers/alchemy/admin/layoutpages_controller.rb +1 -0
  33. data/app/controllers/alchemy/admin/pages_controller.rb +6 -6
  34. data/app/controllers/alchemy/admin/resources_controller.rb +1 -1
  35. data/app/controllers/alchemy/elements_controller.rb +3 -0
  36. data/app/helpers/alchemy/admin/form_helper.rb +1 -1
  37. data/app/helpers/alchemy/admin/navigation_helper.rb +22 -1
  38. data/app/javascript/alchemy_admin/components/action.js +2 -1
  39. data/app/javascript/alchemy_admin/components/dialog_link.js +3 -18
  40. data/app/javascript/alchemy_admin/components/element_editor.js +9 -0
  41. data/app/javascript/alchemy_admin/components/elements_window.js +34 -0
  42. data/app/javascript/alchemy_admin/components/elements_window_handle.js +65 -0
  43. data/app/javascript/alchemy_admin/components/icon.js +2 -2
  44. data/app/javascript/alchemy_admin/components/index.js +1 -0
  45. data/app/javascript/alchemy_admin/components/preview_window.js +5 -5
  46. data/app/javascript/alchemy_admin/components/uploader/file_upload.js +1 -1
  47. data/app/javascript/alchemy_admin/confirm_dialog.js +9 -11
  48. data/app/javascript/alchemy_admin/dialog.js +329 -0
  49. data/app/javascript/alchemy_admin/hotkeys.js +3 -2
  50. data/app/javascript/alchemy_admin/image_cropper.js +57 -40
  51. data/app/javascript/alchemy_admin/image_overlay.js +73 -0
  52. data/app/javascript/alchemy_admin/initializer.js +51 -2
  53. data/app/javascript/alchemy_admin/link_dialog.js +2 -1
  54. data/app/javascript/alchemy_admin/node_tree.js +3 -1
  55. data/app/javascript/alchemy_admin/page_sorter.js +1 -1
  56. data/app/javascript/alchemy_admin/picture_selector.js +2 -1
  57. data/app/javascript/alchemy_admin/shoelace_theme.js +2 -2
  58. data/app/javascript/alchemy_admin/templates/compiled.js +1 -0
  59. data/app/javascript/alchemy_admin.js +10 -6
  60. data/app/javascript/preview.js +117 -0
  61. data/app/models/alchemy/image_cropper_settings.rb +3 -4
  62. data/app/views/alchemy/_menubar.html.erb +1 -1
  63. data/app/views/alchemy/_preview_mode_code.html.erb +1 -1
  64. data/app/views/alchemy/admin/crop.html.erb +19 -16
  65. data/app/views/alchemy/admin/dashboard/info.html.erb +1 -1
  66. data/app/views/alchemy/admin/elements/_add_nested_element_form.html.erb +9 -8
  67. data/app/views/alchemy/admin/elements/_clipboard_button.html.erb +14 -0
  68. data/app/views/alchemy/admin/elements/_element.html.erb +2 -0
  69. data/app/views/alchemy/admin/elements/_form.html.erb +15 -13
  70. data/app/views/alchemy/admin/elements/create.turbo_stream.erb +34 -0
  71. data/app/views/alchemy/admin/elements/index.html.erb +3 -15
  72. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +1 -1
  73. data/app/views/alchemy/admin/layoutpages/edit.html.erb +7 -5
  74. data/app/views/alchemy/admin/nodes/_form.html.erb +1 -1
  75. data/app/views/alchemy/admin/pages/_current_page.html.erb +1 -1
  76. data/app/views/alchemy/admin/pages/_form.html.erb +43 -40
  77. data/app/views/alchemy/admin/pages/_locked_page.html.erb +1 -1
  78. data/app/views/alchemy/admin/pages/_page_layout_filter.html.erb +1 -1
  79. data/app/views/alchemy/admin/pages/_sitemap.html.erb +1 -1
  80. data/app/views/alchemy/admin/pages/_table.html.erb +2 -2
  81. data/app/views/alchemy/admin/pages/edit.html.erb +1 -1
  82. data/app/views/alchemy/admin/pages/update.turbo_stream.erb +39 -0
  83. data/app/views/alchemy/admin/partials/_main_navigation_entry.html.erb +3 -4
  84. data/app/views/alchemy/admin/pictures/_picture_description_field.html.erb +7 -5
  85. data/app/views/alchemy/admin/pictures/index.html.erb +13 -9
  86. data/app/views/alchemy/admin/resources/_filter_bar.html.erb +1 -1
  87. data/app/views/layouts/alchemy/admin.html.erb +8 -4
  88. data/bun.lockb +0 -0
  89. data/bundles/tinymce.js +2 -0
  90. data/config/alchemy/config.yml +3 -3
  91. data/config/alchemy/modules.yml +7 -6
  92. data/config/importmap.rb +4 -0
  93. data/config/routes.rb +1 -1
  94. data/lib/alchemy/engine.rb +6 -0
  95. data/lib/alchemy/modules.rb +0 -27
  96. data/lib/alchemy/resource.rb +14 -4
  97. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +10 -10
  98. data/lib/alchemy/tinymce.rb +2 -1
  99. data/lib/alchemy/upgrader/seven_point_four.rb +26 -0
  100. data/lib/alchemy/version.rb +1 -1
  101. data/lib/alchemy.rb +14 -0
  102. data/lib/alchemy_cms.rb +0 -2
  103. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +5 -0
  104. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -1
  105. data/lib/generators/alchemy/ingredient/templates/view_component.rb.tt +10 -0
  106. data/lib/generators/alchemy/install/install_generator.rb +0 -1
  107. data/lib/generators/alchemy/install/templates/elements.yml.tt +1 -1
  108. data/lib/tasks/alchemy/upgrade.rake +19 -20
  109. data/rollup.config.mjs +44 -1
  110. data/vendor/javascript/cropperjs.min.js +10 -0
  111. data/vendor/javascript/handlebars.min.js +29 -0
  112. data/vendor/javascript/jquery.min.js +2 -0
  113. data/vendor/javascript/select2.min.js +23 -0
  114. data/vendor/javascript/tinymce.min.js +1 -1
  115. metadata +40 -94
  116. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +0 -271
  117. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +0 -54
  118. data/app/assets/javascripts/alchemy/alchemy.preview.js.coffee +0 -97
  119. data/app/assets/javascripts/alchemy/preview.js +0 -1
  120. data/app/assets/javascripts/alchemy/templates/index.js +0 -2
  121. data/app/javascript/alchemy_admin/gui.js +0 -12
  122. data/app/views/alchemy/admin/elements/create.js.erb +0 -35
  123. data/app/views/alchemy/admin/pages/update.js.erb +0 -43
  124. data/lib/alchemy/upgrader/seven_point_zero.rb +0 -36
  125. data/vendor/assets/images/Jcrop.gif +0 -0
  126. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +0 -7
  127. data/vendor/assets/javascripts/jquery_plugins/select2.js +0 -3729
  128. data/vendor/assets/stylesheets/jquery.Jcrop.min.css +0 -2
  129. data/vendor/assets/stylesheets/tinymce/skins/content/default/content.min.css +0 -1
  130. /data/app/{assets/javascripts/alchemy → javascript/alchemy_admin}/templates/node_folder.hbs +0 -0
  131. /data/app/{assets/javascripts/alchemy → javascript/alchemy_admin}/templates/page_folder.hbs +0 -0
  132. /data/app/{assets/javascripts/tinymce/icons/remixicons/icons.js → javascript/tinymce/icons/remixicons/index.js} +0 -0
  133. /data/app/{assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js → javascript/tinymce/plugins/alchemy_link/index.js} +0 -0
  134. /data/vendor/assets/{fonts → images}/remixicon.symbol.svg +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 279893174c10713f9a126baecd9627b90b9657271a432ef1ebda40b8c7b22d15
4
- data.tar.gz: 2216a3cb47a1558c3bb2a6b009a28d6e702ff2316dce2462ebc910ecc96545af
3
+ metadata.gz: 6729def1a438f7c45fbcdc61e32f2f1349e20577dc59bb44518a4fcced32c159
4
+ data.tar.gz: e0b25b32737ab76965a3467387715278209d31a686514dad2fe8b3ff291c659f
5
5
  SHA512:
6
- metadata.gz: af4f9dd42c434e074a3045dfbca42b783d58291b207153ccc457ed3eeca7fc3de9931eacf836f4677a23e557f2af284dc0cec9dda187803db2095aba3fb18952
7
- data.tar.gz: d682cbc7df52388e0dd9714a22545d9116eb2bb7668ad1cffe64251df4e9615a00414e8b9bf542e42edb12e6409710739a2a7c3c7cdadc6436c887669c81ece3
6
+ metadata.gz: 4fe0a1011e576db55a1438b0685bf69426c59c8dc5542a7daf8ce3908d42c6ad4f8d11ba775df569def6be686e25c0d2a273cbaa763575c490704986154811b3
7
+ data.tar.gz: 8f5444f8449679dd7b308dba77313bd13a0fa18343a95e084e0967ad5f13c6ef979bdb5f442cd0b24057aa4c48a59fac63bbbac2981655d0bd0b8e5d7307f16e
data/CHANGELOG.md CHANGED
@@ -1,5 +1,72 @@
1
1
  # Changelog
2
2
 
3
+ ## 7.4.0 (2025-02-07)
4
+
5
+ - Add specs for format matchers [#3182](https://github.com/AlchemyCMS/alchemy_cms/pull/3182) ([mamhoff](https://github.com/mamhoff))
6
+ - Allow additional stylesheets to be included in the admin UI [#3179](https://github.com/AlchemyCMS/alchemy_cms/pull/3179) ([tvdeyen](https://github.com/tvdeyen))
7
+ - fix(Uploader): Handle HTML Errors during upload [#3176](https://github.com/AlchemyCMS/alchemy_cms/pull/3176) ([tvdeyen](https://github.com/tvdeyen))
8
+ - Add rel="noopener noreferrer" to external links [#3175](https://github.com/AlchemyCMS/alchemy_cms/pull/3175) ([tvdeyen](https://github.com/tvdeyen))
9
+ - Remove coffee-rails dependency [#3172](https://github.com/AlchemyCMS/alchemy_cms/pull/3172) ([tvdeyen](https://github.com/tvdeyen))
10
+ - fix missing logger issue in github actions [#3154](https://github.com/AlchemyCMS/alchemy_cms/pull/3154) ([robinboening](https://github.com/robinboening))
11
+ - fix attribute sorting across Ruby versions [#3153](https://github.com/AlchemyCMS/alchemy_cms/pull/3153) ([robinboening](https://github.com/robinboening))
12
+ - Fix Alchemy Guides links [#3148](https://github.com/AlchemyCMS/alchemy_cms/pull/3148) ([zirni](https://github.com/zirni))
13
+ - Correct element guides link in elements.yml.tt [#3146](https://github.com/AlchemyCMS/alchemy_cms/pull/3146) ([zirni](https://github.com/zirni))
14
+ - CI: Brakeman needs security-events: write permissions [#3145](https://github.com/AlchemyCMS/alchemy_cms/pull/3145) ([tvdeyen](https://github.com/tvdeyen))
15
+ - CI: Set workflow permissions [#3139](https://github.com/AlchemyCMS/alchemy_cms/pull/3139) ([tvdeyen](https://github.com/tvdeyen))
16
+ - Use safe redirect paths in admin redirects [#3129](https://github.com/AlchemyCMS/alchemy_cms/pull/3129) ([tvdeyen](https://github.com/tvdeyen))
17
+ - CI: Run actions on ubuntu-22.04 [#3122](https://github.com/AlchemyCMS/alchemy_cms/pull/3122) ([tvdeyen](https://github.com/tvdeyen))
18
+ - Fix image_overlay hidden form style [#3110](https://github.com/AlchemyCMS/alchemy_cms/pull/3110) ([tvdeyen](https://github.com/tvdeyen))
19
+ - [js] Update all development npm dependencies (2024-12-26) [#3109](https://github.com/AlchemyCMS/alchemy_cms/pull/3109) ([depfu](https://github.com/apps/depfu))
20
+ - [ruby - main] Update rails_live_reload to version 0.4.0 [#3105](https://github.com/AlchemyCMS/alchemy_cms/pull/3105) ([depfu](https://github.com/apps/depfu))
21
+ - Test with Ruby 3.4.1 [#3103](https://github.com/AlchemyCMS/alchemy_cms/pull/3103) ([tvdeyen](https://github.com/tvdeyen))
22
+ - Resizable elements window [#3097](https://github.com/AlchemyCMS/alchemy_cms/pull/3097) ([tvdeyen](https://github.com/tvdeyen))
23
+ - Move element hint into header (again) [#3096](https://github.com/AlchemyCMS/alchemy_cms/pull/3096) ([tvdeyen](https://github.com/tvdeyen))
24
+ - Prevent redefining 'alchemy-menubar' custom element when using Turbo [#3095](https://github.com/AlchemyCMS/alchemy_cms/pull/3095) ([gdott9](https://github.com/gdott9))
25
+ - Use `#send` in navigation helper [#3094](https://github.com/AlchemyCMS/alchemy_cms/pull/3094) ([mamhoff](https://github.com/mamhoff))
26
+ - Verify module controllers at runtime [#3093](https://github.com/AlchemyCMS/alchemy_cms/pull/3093) ([mamhoff](https://github.com/mamhoff))
27
+ - Add dependabot bundler version updates [#3090](https://github.com/AlchemyCMS/alchemy_cms/pull/3090) ([tvdeyen](https://github.com/tvdeyen))
28
+ - Convert Sass `@import` into `@use` [#3088](https://github.com/AlchemyCMS/alchemy_cms/pull/3088) ([tvdeyen](https://github.com/tvdeyen))
29
+ - dev: Update rspec-rails to v7.1 [#3084](https://github.com/AlchemyCMS/alchemy_cms/pull/3084) ([tvdeyen](https://github.com/tvdeyen))
30
+ - CI: Remove rexml gem [#3082](https://github.com/AlchemyCMS/alchemy_cms/pull/3082) ([tvdeyen](https://github.com/tvdeyen))
31
+ - Update importmap-rails to v2.0.3 [#3081](https://github.com/AlchemyCMS/alchemy_cms/pull/3081) ([tvdeyen](https://github.com/tvdeyen))
32
+ - chore: Fix rubocop styling issues [#3079](https://github.com/AlchemyCMS/alchemy_cms/pull/3079) ([tvdeyen](https://github.com/tvdeyen))
33
+ - Fix loading custom properties into Tinymce skin [#3071](https://github.com/AlchemyCMS/alchemy_cms/pull/3071) ([tvdeyen](https://github.com/tvdeyen))
34
+ - Fix filtering associated models by id [#3067](https://github.com/AlchemyCMS/alchemy_cms/pull/3067) ([tvdeyen](https://github.com/tvdeyen))
35
+ - Add support for Propshaft [#3066](https://github.com/AlchemyCMS/alchemy_cms/pull/3066) ([tvdeyen](https://github.com/tvdeyen))
36
+ - Add tinymce skin files to Sprockets manifest [#3062](https://github.com/AlchemyCMS/alchemy_cms/pull/3062) ([tvdeyen](https://github.com/tvdeyen))
37
+ - [js] Update all development npm dependencies (2024-10-03) [#3061](https://github.com/AlchemyCMS/alchemy_cms/pull/3061) ([depfu](https://github.com/apps/depfu))
38
+ - fix new page form [#3060](https://github.com/AlchemyCMS/alchemy_cms/pull/3060) ([zp1984](https://github.com/zp1984))
39
+ - Generate a view component in ingredient generator [#3058](https://github.com/AlchemyCMS/alchemy_cms/pull/3058) ([kulturbande](https://github.com/kulturbande))
40
+ - Remove frontend elements controller [#3057](https://github.com/AlchemyCMS/alchemy_cms/pull/3057) ([tvdeyen](https://github.com/tvdeyen))
41
+ - Fix locked pages tab height [#3056](https://github.com/AlchemyCMS/alchemy_cms/pull/3056) ([tvdeyen](https://github.com/tvdeyen))
42
+ - Use turbo streams to update page from configure dialog [#3054](https://github.com/AlchemyCMS/alchemy_cms/pull/3054) ([tvdeyen](https://github.com/tvdeyen))
43
+ - Use turbo frame and stream to create element [#3053](https://github.com/AlchemyCMS/alchemy_cms/pull/3053) ([tvdeyen](https://github.com/tvdeyen))
44
+ - Picture alt text form field height [#3051](https://github.com/AlchemyCMS/alchemy_cms/pull/3051) ([tvdeyen](https://github.com/tvdeyen))
45
+ - Convert dialog class into esm [#3050](https://github.com/AlchemyCMS/alchemy_cms/pull/3050) ([tvdeyen](https://github.com/tvdeyen))
46
+ - Load jQuery via importmap [#3049](https://github.com/AlchemyCMS/alchemy_cms/pull/3049) ([tvdeyen](https://github.com/tvdeyen))
47
+ - Load Select2 via importmap [#3048](https://github.com/AlchemyCMS/alchemy_cms/pull/3048) ([tvdeyen](https://github.com/tvdeyen))
48
+ - Use cropperjs instead of Jcrop [#3047](https://github.com/AlchemyCMS/alchemy_cms/pull/3047) ([tvdeyen](https://github.com/tvdeyen))
49
+ - Preload SVG Icon Sprite [#3046](https://github.com/AlchemyCMS/alchemy_cms/pull/3046) ([tvdeyen](https://github.com/tvdeyen))
50
+ - Precompile alchem/preview.js [#3045](https://github.com/AlchemyCMS/alchemy_cms/pull/3045) ([tvdeyen](https://github.com/tvdeyen))
51
+ - Use Handlebars templates from npm [#3044](https://github.com/AlchemyCMS/alchemy_cms/pull/3044) ([tvdeyen](https://github.com/tvdeyen))
52
+ - Bundle alchemy_link plugin into tinymce bundle [#3043](https://github.com/AlchemyCMS/alchemy_cms/pull/3043) ([tvdeyen](https://github.com/tvdeyen))
53
+ - Replace MySQL build with SQLite [#3042](https://github.com/AlchemyCMS/alchemy_cms/pull/3042) ([tvdeyen](https://github.com/tvdeyen))
54
+ - Remove 7.x deprecations [#3041](https://github.com/AlchemyCMS/alchemy_cms/pull/3041) ([tvdeyen](https://github.com/tvdeyen))
55
+ - Remove 7.x upgraders [#3039](https://github.com/AlchemyCMS/alchemy_cms/pull/3039) ([tvdeyen](https://github.com/tvdeyen))
56
+ - Make page select portable [#3037](https://github.com/AlchemyCMS/alchemy_cms/pull/3037) ([tvdeyen](https://github.com/tvdeyen))
57
+ - Allow Rails 8.0 [#3032](https://github.com/AlchemyCMS/alchemy_cms/pull/3032) ([tvdeyen](https://github.com/tvdeyen))
58
+
59
+ ## 7.3.5 (2025-01-24)
60
+
61
+ - [7.3-stable] Prevent redefining 'alchemy-menubar' custom element when using Turbo [#3166](https://github.com/AlchemyCMS/alchemy_cms/pull/3166) ([alchemycms-bot](https://github.com/alchemycms-bot))
62
+ - [7.3-stable] fix attribute sorting across Ruby versions [#3163](https://github.com/AlchemyCMS/alchemy_cms/pull/3163) ([alchemycms-bot](https://github.com/alchemycms-bot))
63
+ - [7.3-stable] fix missing logger issue in github actions [#3158](https://github.com/AlchemyCMS/alchemy_cms/pull/3158) ([alchemycms-bot](https://github.com/alchemycms-bot))
64
+ - [7.3-stable] CI: Set workflow permissions [#3140](https://github.com/AlchemyCMS/alchemy_cms/pull/3140) ([alchemycms-bot](https://github.com/alchemycms-bot))
65
+ - [7.3-stable] Use safe redirect paths in admin redirects [#3137](https://github.com/AlchemyCMS/alchemy_cms/pull/3137) ([tvdeyen](https://github.com/tvdeyen))
66
+ - [7.3-stable] CI: Run actions on ubuntu-22.04 [#3124](https://github.com/AlchemyCMS/alchemy_cms/pull/3124) ([tvdeyen](https://github.com/tvdeyen))
67
+ - [7.3-stable] Fix image_overlay hidden form style [#3111](https://github.com/AlchemyCMS/alchemy_cms/pull/3111) ([tvdeyen](https://github.com/tvdeyen))
68
+ - Fix tinymce fullscreen mode [#3100](https://github.com/AlchemyCMS/alchemy_cms/pull/3100) ([tvdeyen](https://github.com/tvdeyen))
69
+
3
70
  ## 7.3.4 (2024-11-18)
4
71
 
5
72
  - [7.3-stable] chore: Fix rubocop styling issues [#3080](https://github.com/AlchemyCMS/alchemy_cms/pull/3080) ([tvdeyen](https://github.com/tvdeyen))
@@ -1911,4 +1978,3 @@ No changes
1911
1978
  ## 3.0.0 (2014-07-03)
1912
1979
 
1913
1980
  [Release Notes](https://github.com/AlchemyCMS/alchemy_cms/releases/tag/v3.0.0)
1914
-
data/Gemfile CHANGED
@@ -4,11 +4,11 @@ source "https://rubygems.org"
4
4
 
5
5
  gemspec
6
6
 
7
- rails_version = ENV.fetch("RAILS_VERSION", "7.2")
7
+ rails_version = ENV.fetch("RAILS_VERSION", "8.0")
8
8
  gem "rails", "~> #{rails_version}.0"
9
9
 
10
10
  if ENV["DB"].nil? || ENV["DB"] == "sqlite"
11
- gem "sqlite3", "~> 1.7.0"
11
+ gem "sqlite3", (rails_version == "7.0") ? "~> 1.7" : "~> 2.0"
12
12
  end
13
13
  if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
14
14
  gem "mysql2", "~> 0.5.1"
@@ -31,6 +31,13 @@ group :development, :test do
31
31
  if rails_version == "7.1"
32
32
  gem "actioncable", "~> #{rails_version}.0"
33
33
  end
34
+
35
+ # concurrent-ruby v1.3.5 has removed the dependency on logger,
36
+ # effecting Rails 6.1 up to including 7.0.
37
+ # https://github.com/rails/rails/pull/54264
38
+ if ("6.1".to_f.."7.0".to_f).cover?(rails_version.to_f)
39
+ gem "concurrent-ruby", "< 1.3.5"
40
+ end
34
41
  else
35
42
  gem "launchy"
36
43
  gem "annotate"
@@ -57,7 +64,7 @@ end
57
64
 
58
65
  gem "web-console", "~> 4.2", group: :development
59
66
 
60
- gem "rails_live_reload", "~> 0.3.5"
67
+ gem "rails_live_reload", "~> 0.4.0"
61
68
 
62
69
  gem "dartsass-rails", "~> 0.5.0"
63
70
 
data/README.md CHANGED
@@ -1,11 +1,11 @@
1
1
  # AlchemyCMS
2
2
 
3
- [![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy_cms/actions)
3
+ [![Build & Test](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/build_test.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/build_test.yml)
4
4
  [![Brakeman Scan](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/brakeman-analysis.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/brakeman-analysis.yml)
5
+ [![Lint](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/lint.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/lint.yml)
5
6
 
6
7
  [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](https://badge.fury.io/rb/alchemy_cms)
7
8
  [![codecov](https://codecov.io/gh/AlchemyCMS/alchemy_cms/graph/badge.svg?token=uUHQGfB2xe)](https://codecov.io/gh/AlchemyCMS/alchemy_cms)
8
- [![Lint](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/lint.yml/badge.svg)](https://github.com/AlchemyCMS/alchemy_cms/actions/workflows/lint.yml)
9
9
  [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
10
10
 
11
11
  [![Backers on Open Collective](https://opencollective.com/alchemy_cms/backers/badge.svg?color=blue)](#backers)
data/Rakefile CHANGED
@@ -95,6 +95,8 @@ namespace :alchemy do
95
95
  File.open("CHANGELOG.md", "w") { |file| file.puts changelog }
96
96
  system("git add CHANGELOG.md")
97
97
  system("git commit --amend --no-edit")
98
+ system("gem tag")
98
99
  Rake::Task["release"].invoke
100
+ system("git push --follow-tags")
99
101
  end
100
102
  end
data/alchemy_cms.gemspec CHANGED
@@ -29,21 +29,18 @@ Gem::Specification.new do |gem|
29
29
  activesupport
30
30
  railties
31
31
  ].each do |rails_gem|
32
- gem.add_runtime_dependency rails_gem, [">= 7.0", "< 7.3"]
32
+ gem.add_runtime_dependency rails_gem, [">= 7.0", "< 8.1"]
33
33
  end
34
34
 
35
35
  gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.14"]
36
36
  gem.add_runtime_dependency "acts_as_list", [">= 0.3", "< 2"]
37
37
  gem.add_runtime_dependency "awesome_nested_set", ["~> 3.1", ">= 3.7.0"]
38
38
  gem.add_runtime_dependency "cancancan", [">= 2.1", "< 4.0"]
39
- gem.add_runtime_dependency "coffee-rails", [">= 4.0", "< 6.0"]
40
39
  gem.add_runtime_dependency "csv", ["~> 3.3"]
41
40
  gem.add_runtime_dependency "dragonfly", ["~> 1.4"]
42
41
  gem.add_runtime_dependency "dragonfly_svg", ["~> 0.0.4"]
43
42
  gem.add_runtime_dependency "gutentag", ["~> 2.2", ">= 2.2.1"]
44
- gem.add_runtime_dependency "handlebars_assets", ["~> 0.23"]
45
43
  gem.add_runtime_dependency "importmap-rails", ["~> 1.2", ">= 1.2.1"]
46
- gem.add_runtime_dependency "jquery-rails", ["~> 4.0", ">= 4.0.4"]
47
44
  gem.add_runtime_dependency "kaminari", ["~> 1.1"]
48
45
  gem.add_runtime_dependency "originator", ["~> 3.1"]
49
46
  gem.add_runtime_dependency "ransack", [">= 1.8", "< 5.0"]