Skip to content

sync integrations/makeswift with canary#3120

Merged
jordanarldt merged 6 commits into
integrations/makeswiftfrom
sync-integrations-makeswift
Jul 17, 2026
Merged

sync integrations/makeswift with canary#3120
jordanarldt merged 6 commits into
integrations/makeswiftfrom
sync-integrations-makeswift

Conversation

@jordanarldt

Copy link
Copy Markdown
Contributor

Summary

Syncs integrations/makeswift with the latest canary (through the @bigcommerce/catalyst-core@1.10.0 release), and adds a changeset to release @bigcommerce/catalyst-makeswift@1.10.0.

Notable changes pulled in from canary:

Conflict resolutions

  • core/package.json: kept name as @bigcommerce/catalyst-makeswift and version at 1.9.0 (latest published makeswift version); updated catalyst.version/catalyst.ref to point at @bigcommerce/catalyst-core@1.10.0.
  • core/app/[locale]/(default)/page.tsx: kept the makeswift-specific homepage implementation (delegates to MakeswiftPage), discarding canary's native homepage changes since Makeswift owns homepage content on this branch.
  • core/CHANGELOG.md: removed the raw ## 1.10.0 section copied from canary's changelog — the new sync changeset will generate the correct combined entry when this release is versioned.

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.

Test plan

  • CI passes

bc-vivekaggarwal and others added 6 commits July 17, 2026 12:21
…age (#3108)

* feat(promotions): PROMO-1574 add featured promotions callout on homepage

* feat(promotions): PROMO-1574 resolve moreOffers label inline in productCard
…#3115)

The `Complete Linear release` step passed `version` to
linear-release-action`s `complete`, which looks up an existing release
with that exact version. The `catalyst-release` pipeline is a scheduled
pipeline whose started release is unversioned (the accumulating `sync`
steps run without a version), so the lookup never matched and the step
failed on every publish with `No release found with version "..."` — on
both canary (catalyst-core) and integrations/makeswift (catalyst-makeswift).

Drop the `version` input so `complete` finalizes the latest started
release, i.e. the one `sync` has been accumulating into. Release notes are
still fetched by tag and passed through.

Refs LTRAC-1265

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* TRAC-1250: Add additional scopes missing from CLI create command

* TRAC-1250: Add changeset
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…akeswift

# Conflicts:
#	core/app/[locale]/(default)/page.tsx
#	core/package.json
@jordanarldt
jordanarldt requested a review from a team as a code owner July 17, 2026 23:03
@changeset-bot

changeset-bot Bot commented Jul 17, 2026

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: aa55606

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@bigcommerce/catalyst-makeswift Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@vercel

vercel Bot commented Jul 17, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
catalyst Ready Ready Preview, Comment Jul 17, 2026 11:04pm

Request Review

@github-actions

Copy link
Copy Markdown
Contributor

Bundle Size Report

Comparing against baseline from dbdc5a6 (2026-07-17).

No bundle size changes detected.

@jordanarldt
jordanarldt merged commit aa55606 into integrations/makeswift Jul 17, 2026
22 of 25 checks passed
@jordanarldt
jordanarldt deleted the sync-integrations-makeswift branch July 17, 2026 23:29
@github-actions

Copy link
Copy Markdown
Contributor

Unlighthouse Performance Comparison — Vercel

Comparing PR preview deployment Unlighthouse scores vs production Unlighthouse scores.

Summary Score

Aggregate score across all categories as reported by Unlighthouse.

Prod Desktop Prod Mobile Preview Desktop Preview Mobile
Score 88 90 90 92

Category Scores

Category Prod Desktop Prod Mobile Preview Desktop Preview Mobile
Performance 70 77 67 78
Accessibility 91 91 91 92
Best Practices 100 100 100 100
SEO 89 89 100 100

Core Web Vitals

Metric Prod Desktop Prod Mobile Preview Desktop Preview Mobile
LCP 3.8 s 6.3 s 5.4 s 6.0 s
CLS 0 0 0 0
FCP 1.2 s 1.1 s 1.2 s 1.2 s
TBT 10 ms 40 ms 60 ms 30 ms
Max Potential FID 80 ms 90 ms 90 ms 100 ms
Time to Interactive 6.9 s 6.4 s 8.6 s 6.3 s

Full Unlighthouse report →

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants