From 611585025b16ff9cae2195ef8b07c6b7712bc817 Mon Sep 17 00:00:00 2001
From: Template Bot <template-bot@users.noreply.github.com>
Date: Thu, 12 Feb 2026 23:27:22 +0000
Subject: [PATCH] Apply template update: fix autogen scripts (conflicts)

Source: https://github.com/mockdeep/Rails-Template/pull/1337

This cherry-pick had conflicts that need manual resolution.
Search for <<<<<<< in the changed files.
---
 .circleci/config.yml | 43 +++++++++++++++++++++++++++++++++++++++++++
 .stylelint_todo.yml  |  4 ++++
 exe/eslint_autogen   |  4 ++++
 3 files changed, 51 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11711957d..023e69b74 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -79,6 +79,49 @@ commands:
 
       - run:
           name: Database setup
+<<<<<<< HEAD
+=======
+          command: bin/rails db:setup --trace
+
+      - run:
+          name: Typescript
+          command: pnpm tscheck
+
+      - run:
+          name: Find Unused ESLint Rules
+          command: pnpm eslint_find_unused_rules
+
+      - run:
+          name: ESLint
+          command: pnpm eslint
+
+      - run:
+          name: Verify ESLint Autogen
+          command: bundle exec exe/eslint_autogen
+
+      - run:
+          name: Vitest
+          command: pnpm vitest run --coverage
+
+      - run:
+          name: Brakeman
+          command: bundle exec brakeman
+
+      - run:
+          name: Stylelint
+          command: pnpm stylelint
+
+      - run:
+          name: Verify Stylelint Autogen
+          command: bundle exec exe/stylelint_autogen
+
+      - run:
+          name: Rubocop
+          command: bundle exec rubocop
+
+      - run:
+          name: ✨ 🌈 ✨ Run Unit Tests ✨ 🌈 ✨
+>>>>>>> a78f4bae (fix autogen scripts (#1337))
           command: |
             bin/rails db:create
             bin/rails db:schema:load
diff --git a/.stylelint_todo.yml b/.stylelint_todo.yml
index 5160f4036..300764b02 100644
--- a/.stylelint_todo.yml
+++ b/.stylelint_todo.yml
@@ -1,5 +1,9 @@
 # This configuration was generated by `exe/stylelint_autogen`
+<<<<<<< HEAD
 # on 2025-05-20 00:12:11 UTC.
+=======
+# on 2026-02-12 23:23:33 UTC.
+>>>>>>> a78f4bae (fix autogen scripts (#1337))
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 
diff --git a/exe/eslint_autogen b/exe/eslint_autogen
index e8a85d650..93f5e463c 100755
--- a/exe/eslint_autogen
+++ b/exe/eslint_autogen
@@ -13,7 +13,11 @@ HEADING = <<~COMMENTS.freeze
 COMMENTS
 MAX_FILES_FOR_OVERRIDES = 4_000_000
 
+<<<<<<< HEAD
 File.write(TODO_FILE_PATH, "export default [];\n")
+=======
+File.write(TODO_FILE_PATH, "export default []")
+>>>>>>> a78f4bae (fix autogen scripts (#1337))
 json = `pnpm --silent eslint --format json`
 results = JSON.parse(json)