Merge main into enterprise demo - #530
Merged
Merged
Conversation
* Revert "add experimental WebMCP storefront tools (#498)" This reverts commit 600e9ff. Removes the hand-rolled WebMCP implementation, its README/AGENTS-adjacent docs, env token, i18n strings, and cart-client support code. A follow-up PR will implement Hydrogen's WebMCP behind a config flag instead. * feat(template): add Hydrogen WebMCP behind webmcp.isEnabled config flag Replaces the reverted hand-rolled WebMCP implementation with Hydrogen's own. Setting webmcp.isEnabled in lib/config.ts makes the existing ShopifyScripts component load Shopify's storefront webmcp.js on browsers that expose document.modelContext. The Shopify analytics script is now gated independently (shopifyAnalytics) so WebMCP works without enabling analytics, and the shared ShopifyScripts mount turns on when either feature needs it. * Drop README note; rename ShopifyAnalyticsTracker to ShopifyScriptsTracker The README bullet doesn't fit the repo's docs style. The component now mounts ShopifyScripts for WebMCP too, so name it after what it renders. * TEMP: enable webmcp by default for preview deployment * docs: document experimental WebMCP feature Adds an anatomy page for WebMCP with an explicit experimental designation (in-progress browser API, Chrome-flag-only, disabled by default), testing instructions, and a webmcp section in the shop-config reference alongside the other isEnabled flags. * Revert "TEMP: enable webmcp by default for preview deployment" This reverts commit c40f6d1.
* fix(template): allow blocking product routes * fix(template): allow blocking content routes
* chore(docs): update Geistdocs to 1.20.4 * chore(docs): allow agent readability releases
* fix(template): proxy Shopify consent requests locally * chore(template): mount Hydrogen scripts by default * fix(template): provide consent banner access token * refactor(template): render consent token as script content * fix(template): proxy versioned Storefront API routes * chore(template): update Hydrogen preview * experiment(template): use Hydrogen cart proxy handler * refactor(template): delegate Shopify routes in proxy * fix(template): scope Shopify proxy routes * chore: bump dependencies * chore: enforce release age for Hydrogen
* feat(template): attribute carts to customer sessions * fix(template): settle concurrent cart totals * fix(template): update pending cart lines * feat(template): attribute carts to storefronts * fix(template): avoid duplicate page views * fix(template): preserve cart line attributes * fix(template): omit invalid storefront ID
* fix(template): use Hydrogen discount forms * fix(template): submit discount updates * fix(template): preserve cart mutation errors * feat(template): show line item discounts * fix(template): refine cart discount display
* Use Hydrogen predictive search * Use Hydrogen collection browse state * Fix taxonomy collection filters * Remove legacy collection filter URLs * Add Hydrogen storefront analytics events * Preserve predictive search loading state * Adopt Hydrogen cart form primitives * Adopt Hydrogen storefront logging * Start 2026-08-23 Hydrogen release * Format integrated Hydrogen docs * Scope client translation messages * Rewrite docs around essential user outcomes * Restore next-step guidance in feature docs * Codify reader-focused docs endings * Provide search client translations
* Improve template agent readability * Remove template test scaffolding
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
mainintodemo/enterprisethrough a dedicated integration branch based ondemo/enterpriseVerification
pnpm lintinapps/template— passed with 0 errors and 21 React Compiler warningsCUSTOMER_ACCOUNT_SESSION_SECRET=… SHOPIFY_CUSTOMER_ACCOUNT_API_CLIENT_ID=… pnpm buildinapps/template— passed; Next.js 16.3.2 compiled, TypeScript passed, and 165 static pages generatedgit diff --cached --checkbefore commit — passedNotes
The build uses command-scoped placeholder Customer Account values because authentication is intentionally enabled in the enterprise demo configuration.