Merge pull request #6468 from SuperGoodSoft/all-together-now

Merge solidus_starter_frontend in as "storefront"

Author: tvdeyen

.github/workflows/prepare_post_release.yml

@@ -44,11 +44,6 @@ jobs:
         run: |
           bin/release/bump-docker-image-version \
             ${{ steps.pipeline_context.outputs.next_candidate_dev_version }}
-      - name: "Bump installer starter frontend version"
-        if: github.ref_name == 'main'
-        run: |
-          bin/release/bump-starter-frontend-version \
-            main
       - name: "Publish release draft & tag last commit"
         run: |
           bin/release/publish-release \

.github/workflows/prepare_release.yml

@@ -29,9 +29,6 @@ jobs:
       - name: "Bump docker image version"
         if: github.ref_name == 'main'
         run: bin/release/bump-docker-image-version ${{ steps.pipeline_context.outputs.candidate_version }}
-      - name: "Bump installer starter frontend version"
-        if: github.ref_name == 'main'
-        run: bin/release/bump-starter-frontend-version ${{ steps.pipeline_context.outputs.candidate_patch_branch }}
       - name: "Update Changelog"
         run: bin/release/update-changelog ${{ steps.pipeline_context.outputs.candidate_tag }}
       - name: "Compute labels for the PR"

.github/workflows/solidus_installer.yml

@@ -19,6 +19,9 @@ jobs:
     env:
       DB: sqlite
       RUBY_VERSION: "3.2"
+      SOLIDUS_STOREFRONT_TEMPLATE: ${{ github.workspace }}/storefront/template.rb
+      COVERAGE: true
+      COVERAGE_DIR: ${{ github.workspace }}/storefront/coverage
     steps:
       - uses: actions/checkout@v6
       - name: Install libvips
@@ -37,3 +40,23 @@ jobs:
         run: |
           cd $RUNNER_TEMP/my_app
           bundle list | grep 'solidus_paypal_commerce_platform (1.'
+      - name: Setup code coverage
+        # SimpleCov must start before the app is loaded (Ruby's Coverage only
+        # tracks files required after Coverage.start), so we load it from the top
+        # of the generated spec_helper.rb rather than from spec/support, which is
+        # required after rails_helper has already (eager-)loaded the app.
+        run: |
+          cd $RUNNER_TEMP/my_app
+          cp $GITHUB_WORKSPACE/storefront/lib/testing_support/coverage.rb spec/simplecov_setup.rb
+          printf 'require_relative "simplecov_setup"\n%s\n' "$(cat spec/spec_helper.rb)" > spec/spec_helper.rb
+      - name: Run starter frontend specs
+        run: |
+          cd $RUNNER_TEMP/my_app
+          bundle exec rspec spec
+      - name: Upload coverage report to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: solidusio/solidus
+          disable_search: true
+          files: ${{ env.COVERAGE_DIR }}/coverage.xml

.standard.yml

@@ -3,4 +3,4 @@ format: progress
 ruby_version: 3.1
 ignore:
   - "*/spec/dummy/**/*"
-  - "sandbox/**/*"
+  - "**/sandbox/**/*"

bin/release/bump-starter-frontend-version

@@ -107,6 +107,7 @@ unbundled bin/rails db:drop db:create
 
 echo "~~~> Running the solidus:install generator"
 export SOLIDUS_ADMIN_LOOKBOOK=true
+export SOLIDUS_STOREFRONT_TEMPLATE="$PWD/../storefront/template.rb"
 unbundled bin/rails generate solidus:install --admin-preview --auto-accept $@
 
 echo "

bin/sandbox

@@ -1 +1,19 @@
-apply "https://github.com/solidusio/solidus_starter_frontend/raw/main/template.rb"
+# frozen_string_literal: true
+
+template =
+  ENV["SOLIDUS_STOREFRONT_TEMPLATE"] ||
+  begin
+    version = Spree.solidus_version if defined?(Spree) && Spree.respond_to?(:solidus_version)
+    gem_version = version ? Gem::Version.new(version) : nil
+
+    ref =
+      if gem_version && !gem_version.prerelease?
+        "v#{gem_version.segments[0, 2].join(".")}"
+      else
+        "main"
+      end
+
+    "https://github.com/solidusio/solidus/raw/#{ref}/storefront/template.rb"
+  end
+
+apply template

core/lib/generators/solidus/install/app_templates/frontend/starter.rb

@@ -0,0 +1 @@
+\set HISTFILE ~/history/psql_history

storefront/.dockerdev/.psqlrc

@@ -0,0 +1,55 @@
+ARG RUBY_VERSION
+FROM ruby:$RUBY_VERSION-slim-buster
+
+ARG PG_VERSION
+ARG MYSQL_VERSION
+ARG NODE_VERSION
+ARG BUNDLER_VERSION
+
+RUN apt-get update -qq \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
+    build-essential \
+    gnupg2 \
+    curl \
+    git \
+    imagemagick \
+    libmariadb-dev \
+    sqlite3 \
+    libsqlite3-dev \
+    chromium \
+    libvips \
+    chromium-driver \
+  && rm -rf /var/cache/apt/lists/*
+
+RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' $PG_VERSION > /etc/apt/sources.list.d/pgdg.list
+
+RUN curl -sSL https://deb.nodesource.com/setup_$NODE_VERSION.x | bash -
+
+RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get -yq dist-upgrade && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
+    libpq-dev \
+    postgresql-client-$PG_VERSION \
+    default-mysql-client \
+    nodejs \
+  && rm -rf /var/lib/apt/lists/*
+
+ENV APP_USER=solidus_storefront_user \
+    LANG=C.UTF-8 \
+    BUNDLE_JOBS=4 \
+    BUNDLE_RETRY=3
+ENV GEM_HOME=/home/$APP_USER/gems
+ENV APP_HOME=/home/$APP_USER/app
+ENV PATH=$PATH:$GEM_HOME/bin
+
+RUN useradd -ms /bin/bash $APP_USER
+
+RUN gem update --system \
+  && gem install bundler:$BUNDLER_VERSION \
+  && chown -R $APP_USER:$(id -g $APP_USER) /home/$APP_USER/gems
+
+USER $APP_USER
+
+RUN mkdir -p /home/$APP_USER/history
+
+WORKDIR /home/$APP_USER/app

storefront/.dockerdev/Dockerfile

@@ -0,0 +1,22 @@
+linters:
+  Rubocop:
+    enabled: true
+    rubocop_config:
+      inherit_from:
+        - .rubocop.yml
+      Layout/InitialIndentation:
+        Enabled: false
+      Layout/TrailingBlankLines:
+        Enabled: false
+      Layout/TrailingWhitespace:
+        Enabled: false
+      Naming/FileName:
+        Enabled: false
+      Style/FrozenStringLiteralComment:
+        Enabled: false
+      Metrics/LineLength:
+        Enabled: false
+      Lint/UselessAssignment:
+        Enabled: false
+      Rails/OutputSafety:
+        Enabled: false