solidus_static_content 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a98d396588682a74ff937428388774a578806c8161da21195131e282244c0f9
-  data.tar.gz: 6247ace2e49037b397ae2adaca3456cf121a5d0fd242d7d8f5fc15c742afadc3
+  metadata.gz: 36a00320fd2554bbb2414bc64b45691610c1fdd6446e026e57d162553a39d47b
+  data.tar.gz: d2480b136fc1ecc8f64cf8eebd20e3e5b597966df697e102bda3c4aecbab6e0a
 SHA512:
-  metadata.gz: 4a7ec81a975abfc2d02b987787db16c99d33536525981fa0f30693d274bd519bc5e6721629f6cdae1dff8a1c30d33d323be79d23abb897a04b320130b38687d6
-  data.tar.gz: 4fe5ad4a7eae624705fd593d604c5bef9ac44ec91f3de12f5bd9293dc71086ad8b975fef2ef35f31b7d6b44cce8949091f2b543d6a07006ee0cf2dd7e0531664
+  metadata.gz: 33d3223b1fe7f2aebd01751af23414834c0dc02edf4d22a29a80fffc7b0043a9138abd3dca03149160abec35e3aaeebfd2e35732d1ea77dd0d348cbcfb8e6f15
+  data.tar.gz: f4fdf74889347f53dd93ac6d441bd813c36b97eb145f312c18afa460a1ab013a232766b895ed655e59fe1dfe8e7a015f0a512e09f8b97ee1f40e60d0389d7d28

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: solidus_core
+    versions:
+    - 3.0.0.rc2

data/.github/workflows/lint.yml

@@ -0,0 +1,29 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: lint-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+permissions:
+  contents: read
+
+jobs:
+  standardrb:
+    name: StandardRB
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+          rubygems: latest
+      - name: Run StandardRB
+        run: bundle exec standardrb

data/.github/workflows/test.yml

@@ -0,0 +1,25 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 4" # every Thursday
+
+concurrency:
+  group: test-${{ github.ref_name }}
+  cancel-in-progress: ${{ github.ref_name != 'main' }}
+
+permissions:
+  contents: read
+
+jobs:
+  rspec:
+    uses: solidusio/test-solidus-extension/.github/workflows/test.yml@main
+    with:
+      ruby_versions: '["3.4"]'
+      rails_versions: '["8.0", "7.2"]'
+      solidus_branches: '["v4.7"]'
+      databases: '["postgresql", "sqlite"]'

data/.gitignore

@@ -18,3 +18,4 @@ spec/examples.txt
 .rvmrc
 .ruby-version
 .ruby-gemset
+vendor

data/.standard.yml

@@ -0,0 +1,6 @@
+parallel: true
+format: progress
+ruby_version: 3.1
+ignore:
+  - 'spec/dummy/**/*'
+  - 'sandbox/**/*'

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [v2.1.0](https://github.com/solidusio-contrib/solidus_static_content/tree/v2.1.0) (2026-08-25)
+
+[Full Changelog](https://github.com/solidusio-contrib/solidus_static_content/compare/v2.0.0...v2.1.0)
+
+**Closed issues:**
+
+- Not compatible with Solidus 4 [\#87](https://github.com/solidusio-contrib/solidus_static_content/issues/87)
+- Not compatible with Ruby 3.1.2 [\#85](https://github.com/solidusio-contrib/solidus_static_content/issues/85)
+- Support for Ruby 3.0 [\#83](https://github.com/solidusio-contrib/solidus_static_content/issues/83)
+- Dependabot can't resolve your Ruby dependency files [\#78](https://github.com/solidusio-contrib/solidus_static_content/issues/78)
+- Prepare Solidus Static Content for Solidus 3.0 [\#75](https://github.com/solidusio-contrib/solidus_static_content/issues/75)
+- Dependabot can't resolve your Ruby dependency files [\#74](https://github.com/solidusio-contrib/solidus_static_content/issues/74)
+- Dependabot can't resolve your Ruby dependency files [\#73](https://github.com/solidusio-contrib/solidus_static_content/issues/73)
+- wrong translation key [\#72](https://github.com/solidusio-contrib/solidus_static_content/issues/72)
+- Version conflict on newest version \(deface compatibility\) [\#65](https://github.com/solidusio-contrib/solidus_static_content/issues/65)
+
+**Merged pull requests:**
+
+- Add privilege and category method to permission sets [\#93](https://github.com/solidusio-contrib/solidus_static_content/pull/93) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Move to Standardrb [\#92](https://github.com/solidusio-contrib/solidus_static_content/pull/92) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Run tests on GitHub [\#91](https://github.com/solidusio-contrib/solidus_static_content/pull/91) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Add updated Menu Item for Solidus 4.2 [\#89](https://github.com/solidusio-contrib/solidus_static_content/pull/89) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Restore solidus\_static\_content on Solidus 4.0 [\#88](https://github.com/solidusio-contrib/solidus_static_content/pull/88) ([JustShah](https://github.com/JustShah))
+- Update to use forked solidus\_frontend when needed [\#84](https://github.com/solidusio-contrib/solidus_static_content/pull/84) ([waiting-for-dev](https://github.com/waiting-for-dev))
+- English Translation Key Fix  [\#82](https://github.com/solidusio-contrib/solidus_static_content/pull/82) ([QuintinAdam](https://github.com/QuintinAdam))
+- Updates Gemspec to allow Ruby 3 [\#81](https://github.com/solidusio-contrib/solidus_static_content/pull/81) ([QuintinAdam](https://github.com/QuintinAdam))
+- Upgrade to GitHub-native Dependabot [\#80](https://github.com/solidusio-contrib/solidus_static_content/pull/80) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Solidus version update to v3.0.0 [\#79](https://github.com/solidusio-contrib/solidus_static_content/pull/79) ([webhive](https://github.com/webhive))
+- Scroll Update button into view before clicking [\#76](https://github.com/solidusio-contrib/solidus_static_content/pull/76) ([jarednorman](https://github.com/jarednorman))
+
 ## [v2.0.0](https://github.com/solidusio-contrib/solidus_static_content/tree/v2.0.0) (2020-06-05)
 
 [Full Changelog](https://github.com/solidusio-contrib/solidus_static_content/compare/v1.0.0...v2.0.0)
@@ -36,7 +66,7 @@
 **Closed issues:**
 
 - Couldn't find Spree::Page [\#33](https://github.com/solidusio-contrib/solidus_static_content/issues/33)
-- Spree::PagesHelper doesn't have `render\_snippet` method [\#25](https://github.com/solidusio-contrib/solidus_static_content/issues/25)
+- Spree::PagesHelper doesn't have `render_snippet` method [\#25](https://github.com/solidusio-contrib/solidus_static_content/issues/25)
 - admin menu item 'Pages' still appears after logout [\#9](https://github.com/solidusio-contrib/solidus_static_content/issues/9)
 - Problem with solidus 2.1.0.beta1 and solidus\_static\_content [\#5](https://github.com/solidusio-contrib/solidus_static_content/issues/5)
 - DB Migration not working [\#4](https://github.com/solidusio-contrib/solidus_static_content/issues/4)

data/Gemfile

@@ -1,26 +1,47 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
-gem 'solidus', github: 'solidusio/solidus', branch: branch
+branch = ENV.fetch("SOLIDUS_BRANCH", "main")
+gem "solidus", github: "solidusio/solidus", branch: branch
 
-# Needed to help Bundler figure out how to resolve dependencies,
-# otherwise it takes forever to resolve them.
-# See https://github.com/bundler/bundler/issues/6677
-gem 'rails', '>0.a'
+# The solidus_frontend gem has been pulled out since v3.2
+if branch >= "v3.2"
+  gem "solidus_frontend"
+elsif branch == "main"
+  gem "solidus_frontend", github: "solidusio/solidus_frontend"
+else
+  gem "solidus_frontend", github: "solidusio/solidus", branch: branch
+end
+
+rails_version = ENV.fetch("RAILS_VERSION", "~> 7.0")
+# CI passes bare versions such as "8.0", which Bundler reads as an exact
+# requirement that no released gem satisfies. Treat them as pessimistic instead.
+rails_version = "~> #{rails_version}.0" if rails_version.match?(/\A\d+\.\d+\z/)
+gem "rails", rails_version
+
+# Extract the minimum Rails version from the version requirement.
+# For example, both "~> 7.0" and ">= 7.0" translate to a minimum of "7.0".
+rails_req = Gem::Requirement.new(rails_version)
+min_rails_version = rails_req.requirements.map(&:last).min || Gem::Version.new("0")
 
-# Provides basic authentication functionality for testing parts of your engine
-gem 'solidus_auth_devise'
+# Determine the sqlite3 version based on the minimum Rails version.
+# If the minimum Rails version is less than 7.2, use "~> 1.4"; otherwise, use "~> 2.0".
+sqlite_version =
+  if min_rails_version < Gem::Version.new("7.2")
+    "~> 1.4"
+  else
+    "~> 2.0"
+  end
 
-case ENV['DB']
-when 'mysql'
-  gem 'mysql2'
-when 'postgresql'
-  gem 'pg'
+case ENV.fetch("DB", nil)
+when "mysql"
+  gem "mysql2"
+when "postgresql"
+  gem "pg"
 else
-  gem 'sqlite3'
+  gem "sqlite3", sqlite_version
 end
 
 gemspec
@@ -30,4 +51,4 @@ gemspec
 #
 # We use `send` instead of calling `eval_gemfile` to work around an issue with
 # how Dependabot parses projects: https://github.com/dependabot/dependabot-core/issues/1658.
-send(:eval_gemfile, 'Gemfile-local') if File.exist? 'Gemfile-local'
+send(:eval_gemfile, "Gemfile-local") if File.exist? "Gemfile-local"

data/Guardfile

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 guard "rspec", cmd: "bundle exec rspec" do
-  watch("spec/spec_helper.rb")                        { "spec" }
-  watch("config/routes.rb")                           { "spec/controllers" }
-  watch("app/controllers/application_controller.rb")  { "spec/controllers" }
-  watch(%r{^spec/(.+)_spec\.rb$})                     { |m| "spec/#{m[1]}_spec.rb"}
-  watch(%r{^app/(.+)_decorator\.rb$})                 { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^(app|lib)/(.+)(\.rb|\.erb)$})             { |m| "spec/#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb" }
+  watch("spec/spec_helper.rb") { "spec" }
+  watch("config/routes.rb") { "spec/controllers" }
+  watch("app/controllers/application_controller.rb") { "spec/controllers" }
+  watch(%r{^spec/(.+)_spec\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.+)_decorator\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^(app|lib)/(.+)(\.rb|\.erb)$}) { |m| "spec/#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb" }
 end

data/README.md

@@ -1,6 +1,6 @@
 # Solidus Static Content
 
-[![CircleCI](https://circleci.com/gh/solidusio-contrib/solidus_static_content.svg?style=svg)](https://circleci.com/gh/solidusio-contrib/solidus_static_content)
+[![Test](https://github.com/solidusio-contrib/solidus_static_content/actions/workflows/test.yml/badge.svg)](https://github.com/solidusio-contrib/solidus_static_content/actions/workflows/test.yml)
 
 A fork of the [Spree extension](https://github.com/spree-contrib/spree_static_content) for
 compatibility with [Solidus](https://solidus.io).
@@ -15,15 +15,27 @@ Good, clean content management of pages for Solidus. You can use it to:
 
 Add solidus_static_content to your Gemfile:
 
-```ruby
-gem 'solidus_static_content'
-```
+### Starter Frontend
 
 Bundle your dependencies and run the installation generator:
 
 ```shell
 bundle
-bundle exec rails g solidus_static_content:install
+bin/rails generate solidus_static_content:install --frontend=starter
+```
+
+Please, be aware that the installation only works with the default
+implementation of the starter frontend. Any customization to the files that
+will be modified by the installer might break the installation procedure.
+If that happens, try to adapt the installed code on top of the customizations
+of the store.
+
+### Legacy Frontend
+
+If you are using the legacy `solidus_frontend` gem, please run this command instead:
+
+```shell
+bin/rails generate solidus_static_content:install
 ```
 
 ## Usage
@@ -74,17 +86,17 @@ bundle
 bin/rake
 ```
 
-To run [Rubocop](https://github.com/bbatsov/rubocop) static code analysis run
+To run [Standard](https://github.com/standardrb/standard) static code analysis run
 
 ```shell
-bundle exec rubocop
+bundle exec standardrb
 ```
 
 When testing your application's integration with this extension you may use its factories.
 Simply add this require statement to your spec_helper:
 
 ```ruby
-require 'solidus_static_content/factories'
+require 'solidus_static_content/testing_support/factories'
 ```
 
 ### Running the sandbox

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'solidus_dev_support/rake_tasks'
+require "solidus_dev_support/rake_tasks"
 SolidusDevSupport::RakeTasks.install
 
-task default: 'extension:specs'
+task default: "extension:specs"

data/app/helpers/spree/pages_helper.rb

@@ -1,6 +1,10 @@
-module Spree::PagesHelper
-  def render_snippet(slug)
-    page = Spree::Page.find_by_slug(slug)
-    raw page.body if page
+# frozen_string_literal: true
+
+module Spree
+  module PagesHelper
+    def render_snippet(slug)
+      page = Spree::Page.find_by(slug: slug)
+      raw page.body if page
+    end
   end
-end
+end

data/app/models/solidus_static_content/permission_sets/page_display.rb

@@ -3,6 +3,16 @@
 module SolidusStaticContent
   module PermissionSets
     class PageDisplay < Spree::PermissionSets::Base
+      class << self
+        def privilege
+          :display
+        end
+
+        def category
+          :page
+        end
+      end
+
       def activate!
         can [:display, :admin], Spree::Page
       end

data/app/models/solidus_static_content/permission_sets/page_management.rb

@@ -3,6 +3,16 @@
 module SolidusStaticContent
   module PermissionSets
     class PageManagement < Spree::PermissionSets::Base
+      class << self
+        def privilege
+          :management
+        end
+
+        def category
+          :page
+        end
+      end
+
       def activate!
         can :manage, Spree::Page
       end

data/app/models/spree/page.rb

@@ -1,49 +1,53 @@
-class Spree::Page < ActiveRecord::Base
-  acts_as_list
-  default_scope -> { order("position ASC") }
+# frozen_string_literal: true
 
-  has_and_belongs_to_many :stores, join_table: 'spree_pages_stores'
+module Spree
+  class Page < ApplicationRecord
+    acts_as_list
+    default_scope -> { order("position ASC") }
 
-  validates_presence_of :title
-  validates_presence_of [:slug, :body], :if => :not_using_foreign_link?
-  validates_presence_of :layout, :if => :render_layout_as_partial?
-  validates_presence_of :stores
+    has_and_belongs_to_many :stores, join_table: "spree_pages_stores"
 
-  validates :slug, :uniqueness => true, :if => :not_using_foreign_link?
-  validates :foreign_link, :uniqueness => true, :allow_blank => true
+    validates :title, presence: true
+    validates :slug, :body, presence: true, if: :not_using_foreign_link?
+    validates :layout, presence: {if: :render_layout_as_partial?}
+    validates :stores, presence: true
 
-  before_validation :generate_slug, if: :title?
+    validates :slug, uniqueness: true, if: :not_using_foreign_link?
+    validates :foreign_link, uniqueness: true, allow_blank: true
 
-  scope :visible, -> { where(:visible => true) }
-  scope :header_links, -> { where(:show_in_header => true).visible }
-  scope :footer_links, -> { where(:show_in_footer => true).visible }
-  scope :sidebar_links, -> { where(:show_in_sidebar => true).visible }
-  scope :ordered_by_position, -> { order(:position) }
+    before_validation :generate_slug, if: :title?
 
-  scope :by_store, lambda { |store| joins(:stores).where("spree_pages_stores.store_id = ?", store) }
+    scope :visible, -> { where(visible: true) }
+    scope :header_links, -> { where(show_in_header: true).visible }
+    scope :footer_links, -> { where(show_in_footer: true).visible }
+    scope :sidebar_links, -> { where(show_in_sidebar: true).visible }
+    scope :ordered_by_position, -> { order(:position) }
 
-  before_save :normalize_slug
+    scope :by_store, lambda { |store| joins(:stores).where("spree_pages_stores.store_id = ?", store) }
 
-  def link
-    foreign_link.blank? ? slug : foreign_link
-  end
+    before_save :normalize_slug
 
-  def meta_title
-    super.presence || title
-  end
+    def link
+      foreign_link.presence || slug
+    end
 
-private
+    def meta_title
+      super.presence || title
+    end
 
-  def normalize_slug
-    # ensure that all slugs start with a slash
-    slug.prepend('/') if not_using_foreign_link? and not slug.start_with? '/'
-  end
+    private
 
-  def not_using_foreign_link?
-    foreign_link.blank?
-  end
+    def normalize_slug
+      # ensure that all slugs start with a slash
+      slug.prepend("/") if not_using_foreign_link? && (!slug.start_with? "/")
+    end
+
+    def not_using_foreign_link?
+      foreign_link.blank?
+    end
 
-  def generate_slug
-    self.slug ||= title.parameterize
+    def generate_slug
+      self.slug ||= title.parameterize
+    end
   end
 end

data/app/overrides/solidus_static_content/pages_in_footer.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PagesInFooter
+    Deface::Override.new(virtual_path: "spree/shared/_footer",
+      name: "pages_in_footer",
+      insert_bottom: "#footer-right",
+      partial: "spree/static_content/static_content_footer",
+      disabled: false)
+  end
+end

data/app/overrides/solidus_static_content/pages_in_header.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PagesInHeader
+    Deface::Override.new(virtual_path: "spree/shared/_main_nav_bar",
+      name: "pages_in_header",
+      insert_bottom: "#main-nav-bar",
+      partial: "spree/static_content/static_content_header",
+      disabled: false)
+  end
+end

data/app/overrides/solidus_static_content/pages_in_sidebar.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusStaticContent
+  module PagesInSidebar
+    Deface::Override.new(virtual_path: "spree/shared/_sidebar",
+      name: "pages_in_sidebar",
+      insert_bottom: "#sidebar",
+      partial: "spree/static_content/static_content_sidebar",
+      disabled: false)
+  end
+end

data/bin/r

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 warn %{
 DEPRECATION: bin/r has been replaced by bin/rails-engine, please use that

data/bin/rails

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 if %w[g generate].include? ARGV.first
   exec "#{__dir__}/rails-engine", *ARGV

data/bin/rails-engine

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 

data/bin/rails-sandbox

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 app_root = 'sandbox'
 
 unless File.exist? "#{app_root}/bin/rails"
   warn 'Creating the sandbox app...'
   Dir.chdir "#{__dir__}/.." do
-    system "#{__dir__}/sandbox" or begin # rubocop:disable Style/AndOr
+    system "#{__dir__}/sandbox" or begin
       warn 'Automatic creation of the sandbox app failed'
       exit 1
     end

data/bin/sandbox

@@ -22,19 +22,19 @@ if [ ! -z $SOLIDUS_BRANCH ]
 then
   BRANCH=$SOLIDUS_BRANCH
 else
-  BRANCH="master"
+  BRANCH="main"
 fi
 
 extension_name="solidus_static_content"
 
 # Stay away from the bundler env of the containing extension.
 function unbundled {
-  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- $@
+  ruby -rbundler -e'b = proc {system *ARGV}; Bundler.respond_to?(:with_unbundled_env) ? Bundler.with_unbundled_env(&b) : Bundler.with_clean_env(&b)' -- "$@"
 }
 
 rm -rf ./sandbox
-unbundled bundle exec rails new sandbox --database="$RAILSDB" \
-  --skip-bundle \
+rails new sandbox \
+  --database="$RAILSDB" \
   --skip-git \
   --skip-keeps \
   --skip-rc \
@@ -47,37 +47,30 @@ if [ ! -d "sandbox" ]; then
   exit 1
 fi
 
+# 🔥 Fix for Sprockets error: Ensure the manifest.js file exists
+mkdir -p sandbox/app/assets/config
+cat <<EOF > sandbox/app/assets/config/manifest.js
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+EOF
+
 cd ./sandbox
 cat <<RUBY >> Gemfile
-gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
-gem 'solidus_auth_devise', '>= 2.1.0'
-gem 'rails-i18n'
-gem 'solidus_i18n'
-
-gem '$extension_name', path: '..'
-
 group :test, :development do
   platforms :mri do
-    gem 'pry-byebug'
+    gem 'pry'
   end
 end
 RUBY
-
-unbundled bundle install --gemfile Gemfile
-
+unbundled bundle add solidus --github solidusio/solidus --branch "${BRANCH:-main}" --version '> 0.a'
 unbundled bundle exec rake db:drop db:create
-
-unbundled bundle exec rails generate spree:install \
-  --auto-accept \
-  --user_class=Spree::User \
-  --enforce_available_locales=true \
-  --with-authentication=false \
-  $@
-
-unbundled bundle exec rails generate solidus:auth:install
+unbundled bundle exec rails generate solidus:install --payment-method=none --auto-accept "$@"
+unbundled bundle add ${extension_name} --path '../'
+unbundled bundle exec rails generate $extension_name:install --frontend=starter --auto-run-migrations
 
 echo
-echo "🚀 Sandbox app successfully created for $extension_name!"
+echo "🚀 Sandbox app successfully created for ${extension_name}!"
 echo "🚀 Using $RAILSDB and Solidus $BRANCH"
 echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
 echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"

data/bin/sandbox_rails

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 warn %{
 DEPRECATION: bin/sandbox_rails has been replaced by bin/rails-sandbox, please

data/config/locales/en.yml

@@ -24,11 +24,10 @@ en:
         one: Page
         other: Pages
   spree:
-    stores: Stores
     admin:
       tab:
         pages: Pages
-    back_to_pages: "Back to static pages list"
+    back_to_static_pages_list: "Back to static pages list"
     page: Page
     pages: Pages
     stores: Stores

data/config/routes.rb

@@ -9,7 +9,10 @@ Spree::Core::Engine.routes.draw do
     end
   end
 
-  constraints(SolidusStaticContent::RouteMatcher) do
-    get '/(*path)', :to => 'static_content#show', :as => 'static'
+  # Check if the layout is not the default layout to avoid conflicts with the starter_frontend routes
+  if Spree::Config.layout != "layouts/storefront"
+    constraints(SolidusStaticContent::RouteMatcher) do
+      get "/(*path)", to: "static_content#show", as: "static"
+    end
   end
 end

data/db/migrate/20081216193152_create_pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreatePages < SolidusSupport::Migration[4.2]
   def self.up
     create_table :spree_pages do |t|