sync integrations/makeswift branch w/ canary

.github/workflows/basic.yml

@@ -85,88 +85,3 @@ jobs:
 
       - name: Run Tests
         run: pnpm run test
-
-  e2e-tests:
-    name: E2E Functional Tests (${{ matrix.name }})
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        include:
-          - name: default
-            browsers: chromium webkit
-            test-filter: tests/ui/e2e
-            trailing-slash: true
-            locale-var: TESTS_LOCALE
-            artifact-name: playwright-report
-          - name: TRAILING_SLASH=false
-            browsers: chromium
-            test-filter: tests/ui/e2e --grep @no-trailing-slash
-            trailing-slash: false
-            locale-var: TESTS_LOCALE
-            artifact-name: playwright-report-no-trailing
-          - name: alternate locale
-            browsers: chromium
-            test-filter: tests/ui/e2e --grep @alternate-locale
-            trailing-slash: true
-            locale-var: TESTS_ALTERNATE_LOCALE
-            artifact-name: playwright-report-alternate-locale
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - uses: pnpm/action-setup@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Install Playwright browsers
-        run: pnpm exec playwright install --with-deps ${{ matrix.browsers }}
-        working-directory: ./core
-
-      # - name: Build catalyst-client
-      #   run: pnpm --filter @bigcommerce/catalyst-client build
-
-      # - name: Build catalyst-core
-      #   run: pnpm --filter @bigcommerce/catalyst-core build
-
-      - name: Build catalyst
-        run: pnpm build
-
-      - name: Start server
-        run: |
-          pnpm start &
-          npx wait-on http://localhost:3000 --timeout 60000
-        working-directory: ./core
-        env:
-          PORT: 3000
-          AUTH_SECRET: ${{ secrets.TESTS_AUTH_SECRET }}
-          AUTH_TRUST_HOST: ${{ vars.TESTS_AUTH_TRUST_HOST }}
-          BIGCOMMERCE_TRUSTED_PROXY_SECRET: ${{ secrets.BIGCOMMERCE_TRUSTED_PROXY_SECRET }}
-          TESTS_LOCALE: ${{ vars[matrix.locale-var] }}
-          TRAILING_SLASH: ${{ matrix.trailing-slash }}
-          DEFAULT_REVALIDATE_TARGET: ${{ matrix.name == 'default' && '1' || '' }}
-
-      - name: Run E2E tests
-        run: pnpm exec playwright test ${{ matrix.test-filter }}
-        working-directory: ./core
-        env:
-          PLAYWRIGHT_TEST_BASE_URL: http://localhost:3000
-
-      - name: Upload test results
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.artifact-name }}
-          path: ./core/.tests/reports/
-          retention-days: 3

.github/workflows/deploy.yml

@@ -70,12 +70,12 @@ jobs:
                     DEPLOY_ARGS+=(--env BIGCOMMERCE_ACCESS_TOKEN="$BIGCOMMERCE_ACCESS_TOKEN")
                   fi
 
-                  DEPLOYMENT_URL=$(vercel deploy "${DEPLOY_ARGS[@]}")
+                  DEPLOYMENT_URL=$(vercel deploy --scope="${{ vars.VERCEL_TEAM_SLUG }}" "${DEPLOY_ARGS[@]}")
                   echo "deployment_url=$DEPLOYMENT_URL" >> $GITHUB_OUTPUT
 
             - name: Set Vercel Domain Alias
               timeout-minutes: 5
               env:
                   VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
               run: |
-                  vercel alias ${{ steps.deploy.outputs.deployment_url }} $DOMAIN --token="$VERCEL_TOKEN"
+                  vercel alias ${{ steps.deploy.outputs.deployment_url }} $DOMAIN --scope="${{ vars.VERCEL_TEAM_SLUG }}" --token="$VERCEL_TOKEN"

.github/workflows/e2e.yml

@@ -0,0 +1,105 @@
+name: E2E Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    branches: [canary, integrations/makeswift, integrations/b2b-makeswift]
+
+env:
+  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+  TURBO_REMOTE_CACHE_SIGNATURE_KEY: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
+  BIGCOMMERCE_STORE_HASH: ${{ vars.BIGCOMMERCE_STORE_HASH }}
+  BIGCOMMERCE_CHANNEL_ID: ${{ vars.BIGCOMMERCE_CHANNEL_ID }}
+  BIGCOMMERCE_CLIENT_ID: ${{ secrets.BIGCOMMERCE_CLIENT_ID }}
+  BIGCOMMERCE_CLIENT_SECRET: ${{ secrets.BIGCOMMERCE_CLIENT_SECRET }}
+  BIGCOMMERCE_STOREFRONT_TOKEN: ${{ secrets.BIGCOMMERCE_STOREFRONT_TOKEN }}
+  BIGCOMMERCE_ACCESS_TOKEN: ${{ secrets.BIGCOMMERCE_ACCESS_TOKEN }}
+  TEST_CUSTOMER_ID: ${{ vars.TEST_CUSTOMER_ID }}
+  TEST_CUSTOMER_EMAIL: ${{ vars.TEST_CUSTOMER_EMAIL }}
+  TEST_CUSTOMER_PASSWORD: ${{ secrets.TEST_CUSTOMER_PASSWORD }}
+  TESTS_FALLBACK_LOCALE: ${{ vars.TESTS_FALLBACK_LOCALE }}
+  TESTS_READ_ONLY: ${{ vars.TESTS_READ_ONLY }}
+  DEFAULT_PRODUCT_ID: ${{ vars.DEFAULT_PRODUCT_ID }}
+  DEFAULT_COMPLEX_PRODUCT_ID: ${{ vars.DEFAULT_COMPLEX_PRODUCT_ID }}
+
+jobs:
+  e2e-tests:
+    name: E2E Functional Tests (${{ matrix.name }})
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        include:
+          - name: default
+            browsers: chromium webkit
+            test-filter: tests/ui/e2e
+            trailing-slash: true
+            locale-var: TESTS_LOCALE
+            artifact-name: playwright-report
+          - name: TRAILING_SLASH=false
+            browsers: chromium
+            test-filter: tests/ui/e2e --grep @no-trailing-slash
+            trailing-slash: false
+            locale-var: TESTS_LOCALE
+            artifact-name: playwright-report-no-trailing
+          - name: alternate locale
+            browsers: chromium
+            test-filter: tests/ui/e2e --grep @alternate-locale
+            trailing-slash: true
+            locale-var: TESTS_ALTERNATE_LOCALE
+            artifact-name: playwright-report-alternate-locale
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - uses: pnpm/action-setup@v3
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Install Playwright browsers
+        run: pnpm exec playwright install --with-deps ${{ matrix.browsers }}
+        working-directory: ./core
+
+      - name: Build catalyst
+        run: pnpm build
+
+      - name: Start server
+        run: |
+          mkdir -p ./.tests/reports/
+          pnpm start > ./.tests/reports/nextjs.app.log 2>&1 &
+          npx wait-on http://localhost:3000 --timeout 60000
+        working-directory: ./core
+        env:
+          PORT: 3000
+          AUTH_SECRET: ${{ secrets.TESTS_AUTH_SECRET }}
+          AUTH_TRUST_HOST: ${{ vars.TESTS_AUTH_TRUST_HOST }}
+          BIGCOMMERCE_TRUSTED_PROXY_SECRET: ${{ secrets.BIGCOMMERCE_TRUSTED_PROXY_SECRET }}
+          TESTS_LOCALE: ${{ vars[matrix.locale-var] }}
+          TRAILING_SLASH: ${{ matrix.trailing-slash }}
+          DEFAULT_REVALIDATE_TARGET: ${{ matrix.name == 'default' && '1' || '' }}
+
+      - name: Run E2E tests
+        run: pnpm exec playwright test ${{ matrix.test-filter }}
+        working-directory: ./core
+        env:
+          PLAYWRIGHT_TEST_BASE_URL: http://localhost:3000
+
+      - name: Upload test results
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.artifact-name }}
+          path: ./core/.tests/reports/
+          retention-days: 3

.github/workflows/regression-tests.yml

@@ -38,6 +38,6 @@ jobs:
         if: failure() || success()
         uses: actions/upload-artifact@v4
         with:
-          name: unlighthouse-${{ matrix.device }}-report
+          name: unlighthouse-vercel-${{ matrix.device }}-report
           path: './.unlighthouse/'
           include-hidden-files: 'true'

CONTRIBUTING.md

@@ -12,6 +12,12 @@ The default branch for this repository is called `canary`. This is the primary d
 
 To contribute to the `canary` branch, you can create a new branch off of `canary` and submit a PR against that branch.
 
+## API Scope
+
+Catalyst is intended to work with the [BigCommerce Storefront GraphQL API](https://developer.bigcommerce.com/docs/storefront/graphql) and not directly integrate out of the box with the [REST Management API](https://developer.bigcommerce.com/docs/rest-management).
+
+You're welcome to integrate the REST Management API in your own fork, but we will not accept pull requests that incorporate or depend on the REST Management API. If your contribution requires Management API functionality, it is out of scope for this project.
+
 ## Makeswift Integration
 
 In addition to `canary`, we also maintain the `integrations/makeswift` branch, which contains additional code required to integrate with [Makeswift](https://www.makeswift.com).
@@ -60,6 +66,7 @@ In order to complete the following steps, you will need to have met the followin
 >
 > - The `name` field in `core/package.json` should remain `@bigcommerce/catalyst-makeswift`
 > - The `version` field in `core/package.json` should remain whatever the latest published `@bigcommerce/catalyst-makeswift` version was
+> - The latest release in `core/CHANGELOG.md` should remain whatever the latest published `@bigcommerce/catalyst-makeswift` version was
 
 4. After resolving any merge conflicts, open a new PR in GitHub to merge your `sync-integrations-makeswift` into `integrations/makeswift`. This PR should be code reviewed and approved before the next steps.
 
@@ -104,14 +111,35 @@ This ensures `integrations/makeswift` remains a faithful mirror of `canary` whil
    - From this new `bump-version` branch, run `pnpm changeset`
    - Select `@bigcommerce/catalyst-makeswift`
    - For choosing between a `patch/minor/major` bump, you should copy the bump from Stage 1. (e.g., if `@bigcommerce/catalyst-core` went from `1.1.0` to `1.2.0`, choose `minor`)
+     - Example changeset:
+
+     ```
+     ---
+     "@bigcommerce/catalyst-makeswift": patch
+     ---
+
+     Pulls in changes from the `@bigcommerce/catalyst-core@1.4.1` patch.
+     ```
+
    - Commit the generated changeset file and open a PR to merge this branch into `integrations/makeswift`
    - Once merged, you can proceed to the next step
 
 4. Merge the **Version Packages (`integrations/makeswift`)** PR: Changesets will open another PR (similar to Stage 1) bumping `@bigcommerce/catalyst-makeswift`. Merge it following the same process. This cuts a new release of the Makeswift variant.
 
+5. **Tags and Releases:** Confirm tags exist for both `@bigcommerce/catalyst-core` and `@bigcommerce/catalyst-makeswift`. If needed, update `latest` tags in GitHub manually.
+
+- Push manually:
+  ```
+  git checkout canary
+  # Make sure you have the latest code
+  git fetch origin
+  git pull
+  git tag @bigcommerce/catalyst-core@latest -f
+  git push origin @bigcommerce/catalyst-core@latest -f
+  ```
+
 ### Additional Notes
 
-- **Tags and Releases:** Confirm tags exist for both `@bigcommerce/catalyst-core` and `@bigcommerce/catalyst-makeswift`. If needed, update `latest` tags in GitHub manually.
 - **Release cadence:** Teams typically review on Wednesdays whether to cut a release, but you may cut releases more frequently as needed.
 
 ## Other Ways to Contribute

core/app/[locale]/(default)/(auth)/change-password/_actions/change-password.ts

@@ -4,8 +4,8 @@ import { BigCommerceGQLError } from '@bigcommerce/catalyst-client';
 import { SubmissionResult } from '@conform-to/react';
 import { parseWithZod } from '@conform-to/zod';
 import { getTranslations } from 'next-intl/server';
+import { z } from 'zod';
 
-import { schema } from '@/vibes/soul/sections/reset-password-section/schema';
 import { client } from '~/client';
 import { graphql } from '~/client/graphql';
 
@@ -25,6 +25,10 @@ const ChangePasswordMutation = graphql(`
   }
 `);
 
+const schema = z.object({
+  password: z.string(),
+});
+
 export async function changePassword(
   { token, customerEntityId }: { token: string; customerEntityId: string },
   _prevState: { lastResult: SubmissionResult | null; successMessage?: string },

core/app/[locale]/(default)/(auth)/change-password/page-data.ts

@@ -0,0 +1,39 @@
+import { cache } from 'react';
+
+import { client } from '~/client';
+import { graphql } from '~/client/graphql';
+import { revalidate } from '~/client/revalidate-target';
+
+const ChangePasswordQuery = graphql(`
+  query ChangePasswordQuery {
+    site {
+      settings {
+        customers {
+          passwordComplexitySettings {
+            minimumNumbers
+            minimumPasswordLength
+            minimumSpecialCharacters
+            requireLowerCase
+            requireNumbers
+            requireSpecialCharacters
+            requireUpperCase
+          }
+        }
+      }
+    }
+  }
+`);
+
+export const getChangePasswordQuery = cache(async () => {
+  const response = await client.fetch({
+    document: ChangePasswordQuery,
+    fetchOptions: { next: { revalidate } },
+  });
+
+  const passwordComplexitySettings =
+    response.data.site.settings?.customers?.passwordComplexitySettings;
+
+  return {
+    passwordComplexitySettings,
+  };
+});

core/app/[locale]/(default)/(auth)/change-password/page.tsx

@@ -3,6 +3,7 @@ import { Metadata } from 'next';
 import { getTranslations, setRequestLocale } from 'next-intl/server';
 
 import { ResetPasswordSection } from '@/vibes/soul/sections/reset-password-section';
+import { getChangePasswordQuery } from '~/app/[locale]/(default)/(auth)/change-password/page-data';
 import { redirect } from '~/i18n/routing';
 
 import { changePassword } from './_actions/change-password';
@@ -37,11 +38,14 @@ export default async function ChangePassword({ params, searchParams }: Props) {
     return redirect({ href: '/login', locale });
   }
 
+  const { passwordComplexitySettings } = await getChangePasswordQuery();
+
   return (
     <ResetPasswordSection
       action={changePassword.bind(null, { customerEntityId, token })}
       confirmPasswordLabel={t('confirmPassword')}
       newPasswordLabel={t('newPassword')}
+      passwordComplexitySettings={passwordComplexitySettings}
       title={t('title')}
     />
   );