sync integrations/makeswift with canary

.changeset/sync-canary.md

@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-makeswift": minor
+---
+
+Pulls in changes from the `@bigcommerce/catalyst-core@1.6.0` release. For more information about what was included in the `@bigcommerce/catalyst-core@1.6.0` release, see the [changelog entry](https://github.com/bigcommerce/catalyst/blob/a00b8647c59e81d69f73f10161ea5cf6f3d74c87/core/CHANGELOG.md#160).

.claude/skills/release-catalyst/SKILL.md

@@ -0,0 +1,120 @@
+---
+name: release-catalyst
+description: >
+  Cut a new release of Catalyst (`@bigcommerce/catalyst-core` and `@bigcommerce/catalyst-makeswift`).
+  Use when the user says "/release-catalyst", "cut a release", "release catalyst", or asks to
+  publish new versions of the Catalyst packages. This skill orchestrates the full two-stage release
+  process: merging the Version Packages PR on canary, syncing integrations/makeswift, and pushing
+  @latest tags.
+---
+
+# Release Catalyst
+
+Execute stages in order. Pause for user input where indicated.
+
+## Stage 1: Cut release from `canary`
+
+### 1a. Find and merge the Version Packages PR
+
+```bash
+gh pr list --search "Version Packages (canary)" --state open --json number,title,reviews,mergeable
+```
+
+- If **no open PR** exists, inform the user that there are no pending changesets on `canary` and stop.
+- If the PR is **approved and checks are passing**, merge it: `gh pr merge <number> --squash`
+- If the PR is **not approved or checks are not passing**, tell the user and wait.
+  - Bot-opened PRs often don't trigger CI. If checks aren't running, push an empty commit to trigger them:
+    ```bash
+    git checkout --track origin/changeset-release/canary
+    git commit --allow-empty -m "chore: trigger CI"
+    git push origin changeset-release/canary
+    git checkout canary && git branch -D changeset-release/canary
+    ```
+  - **Stop here.** Wait for the user to confirm checks pass and the PR is approved before merging.
+
+### 1b. Verify the release
+
+After the PR merges:
+
+```bash
+git fetch origin --tags
+```
+
+Determine the new `@bigcommerce/catalyst-core` version from the PR body (look for `## @bigcommerce/catalyst-core@X.Y.Z`). Then verify:
+
+```bash
+gh release view @bigcommerce/catalyst-core@<version> --json tagName,name,isDraft,isPrerelease
+```
+
+If the release and tag don't exist yet, wait briefly and retry — the Changesets action may still be running.
+
+Record the **version number** and **bump type** (patch/minor/major) for use in Stage 2.
+
+## Stage 2: Sync and release `integrations/makeswift`
+
+### 2a. Sync branches
+
+Invoke the `/sync-makeswift` skill, with one addition: during the sync (after merge, before pushing), also add a changeset for `@bigcommerce/catalyst-makeswift`:
+
+**Determine bump type**: Match the bump type from Stage 1 (e.g., if core went `1.4.2` → `1.5.0`, that's a `minor`).
+
+**Create changeset file** (`.changeset/sync-canary-<version>.md`):
+
+```markdown
+---
+"@bigcommerce/catalyst-makeswift": <patch|minor|major>
+---
+
+Pulls in changes from the `@bigcommerce/catalyst-core@<version>` release. For more information about what was included in the `@bigcommerce/catalyst-core@<version>` release, see the [changelog entry](https://github.com/bigcommerce/catalyst/blob/<canary-sha>/core/CHANGELOG.md#<version-anchor>).
+```
+
+Where:
+- `<canary-sha>` is the merge commit SHA on canary (from the Version Packages merge)
+- `<version-anchor>` is the version with dots removed (e.g., `1.5.0` → `150`)
+
+Include this changeset in the merge commit (amend if needed) alongside the normal sync work.
+
+### 2b. Merge the Version Packages (`integrations/makeswift`) PR
+
+After the sync lands, the Changesets action will open a "Version Packages (`integrations/makeswift`)" PR.
+
+```bash
+gh pr list --search "Version Packages (integrations/makeswift)" --state open --json number,title
+```
+
+Same flow as Stage 1a:
+- If checks aren't running (bot PR), push an empty commit to trigger CI, then **drop it before merging** by resetting to the parent and force-pushing.
+- Once approved and green, merge with `gh pr merge <number> --squash`.
+  - Note: squash merging is normally disallowed on `integrations/makeswift` to preserve merge bases for sync PRs. The user may need to temporarily enable squash merging in the branch protection rules for this step, then re-disable it after.
+
+### 2c. Verify the makeswift release
+
+```bash
+git fetch origin --tags
+gh release view @bigcommerce/catalyst-makeswift@<version> --json tagName,name,isDraft,isPrerelease
+```
+
+## Stage 3: Push `@latest` tags
+
+Update both `@latest` tags to point to the new releases:
+
+```bash
+git fetch origin --tags
+git tag @bigcommerce/catalyst-core@latest @bigcommerce/catalyst-core@<version> -f
+git tag @bigcommerce/catalyst-makeswift@latest @bigcommerce/catalyst-makeswift@<version> -f
+git push origin @bigcommerce/catalyst-core@latest -f
+git push origin @bigcommerce/catalyst-makeswift@latest -f
+```
+
+Confirm both tags were pushed successfully.
+
+## Stage 4: Cleanup
+
+```bash
+git checkout canary
+git pull
+```
+
+Delete any leftover local branches (`changeset-release/*`, `sync-integrations-makeswift`, `integrations/makeswift`).
+
+Report the final state: both package versions released, tags updated, branches cleaned up.

.claude/skills/sync-makeswift/SKILL.md

@@ -0,0 +1,82 @@
+---
+name: sync-makeswift
+description: >
+  Sync the `integrations/makeswift` branch with `canary` in the Catalyst monorepo.
+  Use when the user says "/sync-makeswift", "sync makeswift", "sync integrations/makeswift",
+  or asks to bring `integrations/makeswift` up to date with `canary`.
+---
+
+# Sync `integrations/makeswift` with `canary`
+
+Execute the following phases in order. Pause for user input where indicated.
+
+## Phase 1: Prepare and merge
+
+```bash
+git fetch origin
+git checkout -B sync-integrations-makeswift origin/integrations/makeswift
+git merge canary
+```
+
+If the merge completes cleanly, skip to changeset cleanup. Otherwise, resolve conflicts.
+
+### Conflict resolution rules
+
+- `core/package.json`: the `name` field MUST stay `@bigcommerce/catalyst-makeswift`. The `version` field MUST stay at the latest published `@bigcommerce/catalyst-makeswift` version (check what's on `origin/integrations/makeswift`, not `canary`).
+- `core/CHANGELOG.md`: the latest release entry MUST match the latest published `@bigcommerce/catalyst-makeswift` version.
+- `pnpm-lock.yaml`: accept canary's version (`git checkout --theirs pnpm-lock.yaml`), then regenerate with `pnpm install --no-frozen-lockfile`.
+- For all other conflicts, prefer canary's structure/patterns while preserving makeswift-specific additions (imports, components, config).
+
+After resolving all conflicts, stage everything and verify no unresolved conflicts remain:
+
+```bash
+git add <resolved files>
+git diff --name-only --diff-filter=U  # should return empty
+```
+
+### Changeset cleanup
+
+Remove any `.changeset/*.md` files that do NOT target `@bigcommerce/catalyst-makeswift`. Read each changeset file and delete any that reference `@bigcommerce/catalyst-core` or other packages. Amend the removals into the merge commit.
+
+### Commit the merge
+
+```bash
+git commit --no-edit
+```
+
+If changesets were removed after the initial commit, amend them in (`git commit --amend --no-edit`) rather than creating a separate commit.
+
+## Phase 2: Push and open PR
+
+```bash
+git push origin sync-integrations-makeswift
+```
+
+Open a PR into `integrations/makeswift` (not `canary`):
+
+- Title: `sync \`integrations/makeswift\` with \`canary\``
+- Body: summarize what came from canary, list conflict resolutions, and include this notice:
+
+> **Do not squash or rebase-and-merge this PR.** Use a true merge commit or rebase locally to preserve the merge base between `canary` and `integrations/makeswift`.
+
+**Stop here.** Tell the user the PR is ready for review and wait for them to confirm approval before continuing.
+
+## Phase 3: Rebase and push (after PR approval)
+
+```bash
+git fetch origin
+git checkout -B integrations/makeswift origin/integrations/makeswift
+git rebase sync-integrations-makeswift
+git push origin integrations/makeswift --force-with-lease
+```
+
+This closes the PR automatically. Confirm with the user that the push succeeded and the PR closed.
+
+## Phase 4: Cleanup
+
+Switch back to `canary` and delete the local branches that are no longer needed:
+
+```bash
+git checkout canary
+git branch -D sync-integrations-makeswift integrations/makeswift
+```

core/messages/da.json

@@ -98,6 +98,7 @@
             "heading": "Ny konto",
             "cta": "Opret konto",
             "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+            "recaptchaRequired": "Please complete the reCAPTCHA verification.",
             "FieldErrors": {
                 "firstNameRequired": "Fornavnet er påkrævet",
                 "lastNameRequired": "Efternavnet er påkrævet",
@@ -561,6 +562,7 @@
                 "emailLabel": "E-mail",
                 "successMessage": "Din anmeldelse er blevet indsendt!",
                 "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification.",
                 "FieldErrors": {
                     "titleRequired": "Titel er påkrævet",
                     "authorRequired": "Navn er påkrævet",
@@ -591,7 +593,8 @@
                 "email": "E-mail",
                 "comments": "Kommentarer/spørgsmål",
                 "cta": "Indsend formular",
-                "somethingWentWrong": "Noget gik galt. Prøv igen senere."
+                "somethingWentWrong": "Noget gik galt. Prøv igen senere.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification."
             }
         }
     },
@@ -761,6 +764,7 @@
     },
     "Form": {
         "optional": "Valgfrit",
+        "recaptchaRequired": "Please complete the reCAPTCHA verification.",
         "Errors": {
             "invalidInput": "Tjek din indtastning, og prøv igen",
             "invalidFormat": "Den indtastede værdi stemmer ikke overens med det krævede format"

core/messages/de.json

@@ -98,6 +98,7 @@
             "heading": "Neues Konto",
             "cta": "Konto erstellen",
             "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+            "recaptchaRequired": "Please complete the reCAPTCHA verification.",
             "FieldErrors": {
                 "firstNameRequired": "Es muss ein Vorname angegeben werden",
                 "lastNameRequired": "Es muss ein Nachname angegeben werden",
@@ -561,6 +562,7 @@
                 "emailLabel": "E-Mail",
                 "successMessage": "Ihre Bewertung wurde erfolgreich übermittelt!",
                 "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification.",
                 "FieldErrors": {
                     "titleRequired": "Titel ist erforderlich",
                     "authorRequired": "Es muss ein Name angegeben werden",
@@ -591,7 +593,8 @@
                 "email": "E-Mail",
                 "comments": "Kommentare/Fragen",
                 "cta": "Formular einreichen",
-                "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut."
+                "somethingWentWrong": "Es ist etwas schiefgegangen Bitte versuchen Sie es später erneut.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification."
             }
         }
     },
@@ -761,6 +764,7 @@
     },
     "Form": {
         "optional": "optional",
+        "recaptchaRequired": "Please complete the reCAPTCHA verification.",
         "Errors": {
             "invalidInput": "Bitte überprüfen Sie Ihre Eingabe und versuchen Sie es erneut",
             "invalidFormat": "Der eingegebene Wert entspricht nicht dem erforderlichen Format"

core/messages/es-419.json

@@ -98,6 +98,7 @@
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "recaptchaRequired": "Please complete the reCAPTCHA verification.",
             "FieldErrors": {
                 "firstNameRequired": "El campo Nombre es obligatorio.",
                 "lastNameRequired": "El campo Apellido es obligatorio.",
@@ -561,6 +562,7 @@
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification.",
                 "FieldErrors": {
                     "titleRequired": "Se requiere título",
                     "authorRequired": "El campo Nombre es obligatorio",
@@ -591,7 +593,8 @@
                 "email": "Correo electrónico",
                 "comments": "Comentarios/Preguntas",
                 "cta": "Enviar formulario",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification."
             }
         }
     },
@@ -761,6 +764,7 @@
     },
     "Form": {
         "optional": "Opcional",
+        "recaptchaRequired": "Please complete the reCAPTCHA verification.",
         "Errors": {
             "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
             "invalidFormat": "El valor introducido no coincide con el formato requerido"

core/messages/es-AR.json

@@ -98,6 +98,7 @@
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "recaptchaRequired": "Please complete the reCAPTCHA verification.",
             "FieldErrors": {
                 "firstNameRequired": "El campo Nombre es obligatorio.",
                 "lastNameRequired": "El campo Apellido es obligatorio.",
@@ -561,6 +562,7 @@
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification.",
                 "FieldErrors": {
                     "titleRequired": "Se requiere título",
                     "authorRequired": "El campo Nombre es obligatorio",
@@ -591,7 +593,8 @@
                 "email": "Correo electrónico",
                 "comments": "Comentarios/Preguntas",
                 "cta": "Enviar formulario",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification."
             }
         }
     },
@@ -761,6 +764,7 @@
     },
     "Form": {
         "optional": "Opcional",
+        "recaptchaRequired": "Please complete the reCAPTCHA verification.",
         "Errors": {
             "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
             "invalidFormat": "El valor introducido no coincide con el formato requerido"

core/messages/es-CL.json

@@ -98,6 +98,7 @@
             "heading": "Cuenta nueva",
             "cta": "Crear cuenta",
             "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+            "recaptchaRequired": "Please complete the reCAPTCHA verification.",
             "FieldErrors": {
                 "firstNameRequired": "El campo Nombre es obligatorio.",
                 "lastNameRequired": "El campo Apellido es obligatorio.",
@@ -561,6 +562,7 @@
                 "emailLabel": "Correo electrónico",
                 "successMessage": "¡Tu reseña fue enviada con éxito!",
                 "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification.",
                 "FieldErrors": {
                     "titleRequired": "Se requiere título",
                     "authorRequired": "El campo Nombre es obligatorio",
@@ -591,7 +593,8 @@
                 "email": "Correo electrónico",
                 "comments": "Comentarios/Preguntas",
                 "cta": "Enviar formulario",
-                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde."
+                "somethingWentWrong": "Algo salió mal. Vuelva a intentarlo más tarde.",
+                "recaptchaRequired": "Please complete the reCAPTCHA verification."
             }
         }
     },
@@ -761,6 +764,7 @@
     },
     "Form": {
         "optional": "Opcional",
+        "recaptchaRequired": "Please complete the reCAPTCHA verification.",
         "Errors": {
             "invalidInput": "Por favor, revisa tu opinión y vuelve a intentarlo",
             "invalidFormat": "El valor introducido no coincide con el formato requerido"