Merge branch 'canary' into sync-integrations-makeswift

Author: matthewvolk

.github/workflows/basic.yml

@@ -33,8 +33,8 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version-file: '.nvmrc'
-          cache: 'pnpm'
+          node-version-file: ".nvmrc"
+          cache: "pnpm"
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -48,10 +48,13 @@ jobs:
       - name: Typecheck
         run: pnpm run typecheck
 
-  unit-tests:
-    name: CLI Unit Tests
+  cli-tests:
+    name: CLI Tests
 
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -71,5 +74,4 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Run Tests
-        run: pnpm test
-        working-directory: packages/create-catalyst
+        run: pnpm run test

CONTRIBUTING.md

@@ -84,7 +84,9 @@ To pull the latest code from `canary` into `integrations/makeswift`, follow the
    ```
 
 > [!IMPORTANT]
-> It is very important that you do not use the merge button in the GitHub UI to merge your PR. The problem with the "Squash and merge" or "Rebase and merge" button in GitHub is that it **rewrites history and throws away your local merge commit**. Instead, locally rebasing your `integrations/makeswift` branch onto your `{new-branch-name}` branch preserves the merge commit from step 4, which will properly set the new merge base for future merges from `canary` into `integrations/makeswift`.
+> We have added a GitHub Ruleset to protect against this, but it's worth explicitly documenting here for posterity: It is very important that we do not "Squash and merge" or "Rebase and merge" our changes onto `integrations/makeswift`. Instead, we should either merge the PR with a traditional merge commit (the button in the GitHub PR UI should say "Merge pull request"), or locally rebase the `integrations/makeswift` branch onto the `{new-branch-name}` branch (as illustrated in the step above). Either of these options will correctly preserve the merge commit from step 4 in the history of the `integrations/makeswift` branch, which will then set the new merge base for future merges from `canary` into `integrations/makeswift`.
+>
+> If you are unsure whether or not you've done this correctly, you can run `git merge canary` from `integrations/makeswift` after rebasing in the step above; if you see "Already up to date.", you followed the steps correctly (with one caveat: in the case that new commits have been pushed to `canary` since the last time you merged, then you may see a new merge commit/potential conflicts for only those new commits).
 
 7. Push the changes up to GitHub, which will automatically close the open PR from step 5.
 

core/.env.test.example

@@ -3,6 +3,8 @@
 # For example, if BIGCOMMERCE_CHANNEL_ID=1 in .env.local, but BIGCOMMERCE_CHANNEL_ID=5 in this file, the test environment will use BIGCOMMERCE_CHANNEL_ID=5
 
 # Access token client ID and client secret are required for JWT login tests. If not provided, tests that require these will be skipped.
+# If provided, ensure the API account associated with this client ID/secret pair has the following scope:
+#   - Customers login: login
 BIGCOMMERCE_CLIENT_ID=
 BIGCOMMERCE_CLIENT_SECRET=
 
@@ -28,7 +30,23 @@ TEST_CUSTOMER_ID=1
 TEST_CUSTOMER_EMAIL=example@test.com
 TEST_CUSTOMER_PASSWORD=Password1
 
-# Used to create customer accounts for testing purposes if no existing customer account is provided
+# Used to create/update/delete store data for testing purposes
+# Some tests will not pass without a BIGCOMMERCE_ACCESS_TOKEN, even with TESTS_READ_ONLY set to true
+# This is due to the test API client sending GET (read-only) API requests
+# Create a token with the following scopes:
+#   - Content: read-only
+#   - Products: read-only
+#   - Channel listings: read-only
+#   - Channel settings: read-only
+#   - Information & settings: read-only
+#   - Customers: read-only
+#   - Orders: read-only
+# When TESTS_READ_ONLY is false, you'll need additional scopes:
+#   - Products: modify
+#   - Content: modify
+#   - Customers: modify
+#   - Marketing: modify
+#   - Orders: modify
 BIGCOMMERCE_ACCESS_TOKEN=
 
 # The default product ID to use for tests. This needs to be a product without variants (simple)

core/.eslintrc.cjs

@@ -2,7 +2,7 @@
 
 require('@bigcommerce/eslint-config/patch');
 
-/** @type {import('eslint').Linter.Config} */
+/** @type {import('eslint').Linter.LegacyConfig} */
 const config = {
   root: true,
   extends: [

core/CHANGELOG.md

@@ -189,7 +189,6 @@
 ### Minor Changes
 
 - [#1491](https://github.com/bigcommerce/catalyst/pull/1491) [`313a591`](https://github.com/bigcommerce/catalyst/commit/313a5913181a144b53cb12208132f4a9924e2256) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Bump `next-intl` which includes [some minor changes and updated APIs](<(https://next-intl-docs.vercel.app/blog/next-intl-3-22)>):
-
   - Use new `createNavigation` api.
   - Pass `locale` to redirects.
   - `setRequestLocale` is no longer unstable.
@@ -285,7 +284,6 @@
 - [#1362](https://github.com/bigcommerce/catalyst/pull/1362) [`0814afe`](https://github.com/bigcommerce/catalyst/commit/0814afefca00b2497dddb0622df45f4d50865882) Thanks [@deini](https://github.com/deini)! - If app is not running on Vercel's infra, `<Analytics />` and `<SpeedInsights />` are not rendered.
 
   Opt-out of vercel analytics and speed insights by setting the following env vars to `true`
-
   - `DISABLE_VERCEL_ANALYTICS`
   - `DISABLE_VERCEL_SPEED_INSIGHTS`
 
@@ -374,7 +372,6 @@
 - [#1278](https://github.com/bigcommerce/catalyst/pull/1278) [`f8553c6`](https://github.com/bigcommerce/catalyst/commit/f8553c6c9fb35ab7a143fabd60719c8156269448) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Fix wrapping author text in BlogPostCard.
 
 - [#1322](https://github.com/bigcommerce/catalyst/pull/1322) [`77ecb4b`](https://github.com/bigcommerce/catalyst/commit/77ecb4bb4f527e079788b0f9dff2468e92d0bc1a) Thanks [@jorgemoya](https://github.com/jorgemoya)! - Split auth forms to four different pages:
-
   - /login
   - /register
   - /reset
@@ -424,7 +421,6 @@
 - [#1194](https://github.com/bigcommerce/catalyst/pull/1194) [`b455b05`](https://github.com/bigcommerce/catalyst/commit/b455b05a6121b005bd5147a25c964b9554b1b350) Thanks [@BC-krasnoshapka](https://github.com/BC-krasnoshapka)! - Add basic support for Google Analytics via [Big Open Data Layer](https://developer.bigcommerce.com/docs/integrations/hosted-analytics). BODL and GA4 integration is encapsulated in `bodl` library which hides current complexity and limitations that will be improved in future. It can be extended with more events and integrations with other analytics providers later. Data transformation from Catalyst data models to BODL and firing events is done in client components, as only frontend events are supported by BODL for now.
 
   List of currently supported events:
-
   - View product category
   - View product page
   - Add product to cart

core/app/[locale]/(default)/(auth)/login/token/[token]/route.ts

@@ -33,5 +33,4 @@ export async function GET(_: Request, { params }: { params: Promise<{ token: str
   }
 }
 
-export const runtime = 'edge';
 export const dynamic = 'force-dynamic';

core/app/[locale]/(default)/product/[slug]/page-data.ts

@@ -242,6 +242,8 @@ const StreamableProductQuery = graphql(
               }
             }
           }
+          minPurchaseQuantity
+          maxPurchaseQuantity
           warranty
           inventory {
             isInStock

core/app/[locale]/(default)/product/[slug]/page.tsx

@@ -267,6 +267,18 @@ export default async function Product({ params, searchParams }: Props) {
     return productCardTransformer(relatedProducts, format);
   });
 
+  const streamableMinQuantity = Streamable.from(async () => {
+    const product = await streamableProduct;
+
+    return product.minPurchaseQuantity;
+  });
+
+  const streamableMaxQuantity = Streamable.from(async () => {
+    const product = await streamableProduct;
+
+    return product.maxPurchaseQuantity;
+  });
+
   const streamableAnalyticsData = Streamable.from(async () => {
     const [extendedProduct, pricingProduct] = await Streamable.all([
       streamableProduct,
@@ -313,6 +325,8 @@ export default async function Product({ params, searchParams }: Props) {
             subtitle: baseProduct.brand?.name,
             rating: baseProduct.reviewSummary.averageRating,
             accordions: streameableAccordions,
+            minQuantity: streamableMinQuantity,
+            maxQuantity: streamableMaxQuantity,
           }}
           productId={baseProduct.entityId}
           quantityLabel={t('ProductDetails.quantity')}

core/app/[locale]/layout.tsx

@@ -20,6 +20,7 @@ import { revalidate } from '~/client/revalidate-target';
 import { WebAnalyticsFragment } from '~/components/analytics/fragment';
 import { AnalyticsProvider } from '~/components/analytics/provider';
 import { ContainerQueryPolyfill } from '~/components/polyfills/container-query';
+import { ScriptManagerScripts, ScriptsFragment } from '~/components/scripts';
 import { routing } from '~/i18n/routing';
 import { SiteTheme } from '~/lib/makeswift/components/site-theme';
 import { MakeswiftProvider } from '~/lib/makeswift/provider';
@@ -41,13 +42,16 @@ const RootLayoutMetadataQuery = graphql(
           }
           ...WebAnalyticsFragment
         }
+        content {
+          ...ScriptsFragment
+        }
       }
       channel {
         entityId
       }
     }
   `,
-  [WebAnalyticsFragment],
+  [WebAnalyticsFragment, ScriptsFragment],
 );
 
 const fetchRootLayoutMetadata = cache(async () => {
@@ -118,6 +122,10 @@ export default async function RootLayout({ params, children }: Props) {
       <html className={clsx(fonts.map((f) => f.variable))} lang={locale}>
         <head>
           <SiteTheme />
+          <ScriptManagerScripts
+            scripts={data.site.content.headerScripts}
+            strategy="afterInteractive"
+          />
         </head>
         <body className="flex min-h-screen flex-col">
           <NextIntlClientProvider>
@@ -134,6 +142,7 @@ export default async function RootLayout({ params, children }: Props) {
           </NextIntlClientProvider>
           <VercelComponents />
           <ContainerQueryPolyfill />
+          <ScriptManagerScripts scripts={data.site.content.footerScripts} strategy="lazyOnload" />
         </body>
       </html>
     </MakeswiftProvider>

core/app/admin/route.ts

@@ -18,5 +18,3 @@ export const GET = () => {
     locale: defaultLocale,
   });
 };
-
-export const runtime = 'edge';