alchemy_cms 7.3.3 → 7.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fc89b86e7ab89f816ad550aaa8ef484c424b93f933ac96799e9da3996b8bd1
-  data.tar.gz: 12c3e0235a32fb0eb95a5adadb6c364a139c719f981bed352e06ad2ff1b949ef
+  metadata.gz: 2ff8fbcb9df4ac1650e6cf5d5db531ed1ff53d0aecef0120e8ce4a7e56ce3317
+  data.tar.gz: dbf230b6dc6becd8c21a1243c7fb48f0fe572bbd44e25cf1d99c1b3503bc5073
 SHA512:
-  metadata.gz: 7e9e0309e5c80d9ec7f97e67a70beb9079d03333b7b01a5ab6c29ecb538fef8d550616a73e6d474e36c6747d460f1320d6db8851aa4f6542420e07c84ee9fc11
-  data.tar.gz: 791c757bbf06634a94a4497e61c3c65f64138b7bca3e9d0d3eb100cb25d53e4a5ac8e7d6c4bf66202ee11a53a063eccf2e0462f6d89de11a9a6103f7b8dbe135
+  metadata.gz: 2f779c0a2073ed6689a0c28769c547b0b344a8939dbf5571483149fdb55be8e0d21f443a0674cc7a2bde2a987d0c26e7be87be0028e400b57db7259a15f5ffcd
+  data.tar.gz: 4beda833c869e3ba9aaeec6e2e1753646021a065e4937819c7c1f2c892212573b6495b7126771cdfdce0cfa22e2272a5be86012a3d9197a905a6f4653f576563

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 7.3.5 (2025-01-24)
+
+- [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))
+- [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))
+- [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))
+- [7.3-stable] CI: Set workflow permissions [#3140](https://github.com/AlchemyCMS/alchemy_cms/pull/3140) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.3-stable] Use safe redirect paths in admin redirects [#3137](https://github.com/AlchemyCMS/alchemy_cms/pull/3137) ([tvdeyen](https://github.com/tvdeyen))
+- [7.3-stable] CI: Run actions on ubuntu-22.04 [#3124](https://github.com/AlchemyCMS/alchemy_cms/pull/3124) ([tvdeyen](https://github.com/tvdeyen))
+- [7.3-stable] Fix image_overlay hidden form style [#3111](https://github.com/AlchemyCMS/alchemy_cms/pull/3111) ([tvdeyen](https://github.com/tvdeyen))
+- Fix tinymce fullscreen mode [#3100](https://github.com/AlchemyCMS/alchemy_cms/pull/3100) ([tvdeyen](https://github.com/tvdeyen))
+
+## 7.3.4 (2024-11-18)
+
+- [7.3-stable] chore: Fix rubocop styling issues [#3080](https://github.com/AlchemyCMS/alchemy_cms/pull/3080) ([tvdeyen](https://github.com/tvdeyen))
+- [7.3] Fix welcome screen stylesheet [#3078](https://github.com/AlchemyCMS/alchemy_cms/pull/3078) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 7.3.3 (2024-10-15)
 
 - [7.3-stable] Fix loading custom properties into Tinymce skin [#3070](https://github.com/AlchemyCMS/alchemy_cms/pull/3070) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -31,6 +31,13 @@ group :development, :test do
     if rails_version == "7.1"
       gem "actioncable", "~> #{rails_version}.0"
     end
+
+    # concurrent-ruby v1.3.5 has removed the dependency on logger,
+    # effecting Rails 6.1 up to including 7.0.
+    # https://github.com/rails/rails/pull/54264
+    if ("6.1".to_f.."7.0".to_f).cover?(rails_version.to_f)
+      gem "concurrent-ruby", "< 1.3.5"
+    end
   else
     gem "launchy"
     gem "annotate"
@@ -60,3 +67,5 @@ gem "web-console", "~> 4.2", group: :development
 gem "rails_live_reload", "~> 0.3.5"
 
 gem "dartsass-rails", "~> 0.5.0"
+
+gem "gem-release", "~> 2.2"

data/README.md

@@ -339,24 +339,45 @@ $ bin/start
 
 ## 📦 Releasing
 
-### Bump version
+### 🤖 Automated (recommended)
+
+There is a Rake task that helps you to release a new version of Alchemy.
+
+```bash
+$ bundle exec rake alchemy:release
+```
+
+> [!NOTE]
+> This will release a new patch level
+
+If you want to release a new minor or major version you can do so by setting the `VERSION` environment variable accordingly.
+
+```bash
+$ bundle exec rake alchemy:release VERSION=X.Y.Z
+```
+
+### 👷🏽‍♀️ Manual
+
+If something goes wrong with the automated release task you can still release a new version manually.
+
+#### 1. Bump version
 
 Bump the version number in `lib/alchemy/version.rb`.
 
-### Update the changelog
+#### 2. Update the changelog
 
 ```bash
 $ export GITHUB_ACCESS_TOKEN=...
 $ PREVIOUS_VERSION=4.1.0 bundle exec rake alchemy:changelog:update
 ```
 
-### Commit version bump
+#### 3. Commit version bump
 
 ```bash
 $ git commit -am "Bump version to vX.Y.Z"
 ```
 
-### Release a new version
+#### 4. Release a new version
 
 This task will publish the ruby gem.
 It also tags the latest commit.

data/Rakefile

@@ -63,11 +63,16 @@ namespace :alchemy do
       changes = `git rev-list v#{ENV["PREVIOUS_VERSION"]}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`.split("\n")
       changelog = File.read(original_file)
       File.open(new_file, "w") do |file|
+        file.puts "# Changelog"
+        file.puts ""
+        file.puts "## Unreleased"
+        file.puts ""
         changes.each do |change|
           next if changelog.include?(change)
           file.puts change
         end
         File.foreach(original_file) do |line|
+          next if line.include?("# Changelog")
           file.puts line
         end
         file.puts ""
@@ -77,4 +82,21 @@ namespace :alchemy do
       File.delete(backup)
     end
   end
+
+  desc "Release a new version of Alchemy to rubygems.org"
+  task :release do
+    require_relative "lib/alchemy/version"
+    ENV["PREVIOUS_VERSION"] = Alchemy::VERSION
+    system("bundle exec gem bump --version #{ENV.fetch("VERSION", "patch")}")
+    load "./lib/alchemy/version.rb"
+    new_version = Alchemy::VERSION
+    Rake::Task["alchemy:changelog:update"].invoke
+    changelog = File.read("CHANGELOG.md").gsub(/(##) Unreleased/, "## #{new_version} (#{Time.now.strftime("%Y-%m-%d")})")
+    File.open("CHANGELOG.md", "w") { |file| file.puts changelog }
+    system("git add CHANGELOG.md")
+    system("git commit --amend --no-edit")
+    system("gem tag")
+    Rake::Task["release"].invoke
+    system("git push --follow-tags")
+  end
 end