Merge pull request #2761 from bigcommerce/bump-main

bookernath · web-flow · commit 9423237a623b · 2025-12-11T17:45:30.000-06:00
Bump locked `main` branch to address CVE
diff --git a/core/app/[locale]/(default)/(auth)/change-password/page.tsx b/core/app/[locale]/(default)/(auth)/change-password/page.tsx
@@ -39,5 +39,3 @@ export default async function ChangePassword({ searchParams }: Props) {
 
   return null;
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/(auth)/login/forgot-password/page.tsx b/core/app/[locale]/(default)/(auth)/login/forgot-password/page.tsx
@@ -48,5 +48,3 @@ export default async function Reset() {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/(auth)/register/page.tsx b/core/app/[locale]/(default)/(auth)/register/page.tsx
@@ -40,5 +40,3 @@ export default async function Register() {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/brand/[slug]/page.tsx
@@ -124,5 +124,3 @@ export default async function Brand(props: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx b/core/app/[locale]/(default)/(faceted)/category/[slug]/page.tsx
@@ -140,5 +140,3 @@ export default async function Category(props: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/(faceted)/search/page.tsx b/core/app/[locale]/(default)/(faceted)/search/page.tsx
@@ -113,5 +113,3 @@ export default async function Search(props: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/addresses/add/page.tsx b/core/app/[locale]/(default)/account/addresses/add/page.tsx
@@ -96,5 +96,3 @@ export default async function AddPage() {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/addresses/edit/[slug]/page.tsx b/core/app/[locale]/(default)/account/addresses/edit/[slug]/page.tsx
@@ -138,5 +138,3 @@ export default async function Edit({ params }: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/addresses/page.tsx b/core/app/[locale]/(default)/account/addresses/page.tsx
@@ -54,5 +54,3 @@ export default async function Addresses({ searchParams }: Props) {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/order/[slug]/page.tsx b/core/app/[locale]/(default)/account/order/[slug]/page.tsx
@@ -67,5 +67,3 @@ export default async function Order(props: Props) {
 
   return <OrderDetails data={data} />;
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/orders/page.tsx b/core/app/[locale]/(default)/account/orders/page.tsx
@@ -52,5 +52,3 @@ export default async function Orders({ searchParams }: Props) {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/settings/change-password/page.tsx b/core/app/[locale]/(default)/account/settings/change-password/page.tsx
@@ -28,5 +28,3 @@ export default async function ChangePassword({ params }: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/account/settings/page.tsx b/core/app/[locale]/(default)/account/settings/page.tsx
@@ -30,5 +30,3 @@ export default async function Settings() {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/blog/[blogId]/page.tsx b/core/app/[locale]/(default)/blog/[blogId]/page.tsx
@@ -93,5 +93,3 @@ export default async function Blog({ params }: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/blog/page.tsx b/core/app/[locale]/(default)/blog/page.tsx
@@ -57,5 +57,3 @@ export default async function Blog(props: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/blog/tag/[tagId]/page.tsx b/core/app/[locale]/(default)/blog/tag/[tagId]/page.tsx
@@ -41,5 +41,3 @@ export default async function Tag(props: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/cart/page.tsx b/core/app/[locale]/(default)/cart/page.tsx
@@ -99,5 +99,3 @@ export default async function Cart() {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/compare/page.tsx b/core/app/[locale]/(default)/compare/page.tsx
@@ -372,5 +372,3 @@ export default async function Compare(props: Props) {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/page.tsx b/core/app/[locale]/(default)/page.tsx
@@ -75,5 +75,3 @@ export default async function Home({ params }: Props) {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/product/[slug]/page.tsx b/core/app/[locale]/(default)/product/[slug]/page.tsx
@@ -119,5 +119,3 @@ export default async function Product(props: Props) {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/webpages/contact/[id]/page.tsx b/core/app/[locale]/(default)/webpages/contact/[id]/page.tsx
@@ -52,5 +52,3 @@ export default async function WebPage({ params }: Props) {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/(default)/webpages/normal/[id]/page.tsx b/core/app/[locale]/(default)/webpages/normal/[id]/page.tsx
@@ -45,5 +45,3 @@ export default async function WebPage({ params }: Props) {
     </div>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/maintenance/page.tsx b/core/app/[locale]/maintenance/page.tsx
@@ -89,5 +89,3 @@ export default async function Maintenance({ params }: Props) {
     </Container>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/[locale]/not-found.tsx b/core/app/[locale]/not-found.tsx
@@ -73,5 +73,3 @@ export default async function NotFound() {
     </>
   );
 }
-
-export const runtime = 'edge';
diff --git a/core/app/admin/route.ts b/core/app/admin/route.ts
@@ -17,5 +17,3 @@ export const GET = () => {
     locale: defaultLocale,
   });
 };
-
-export const runtime = 'edge';
diff --git a/core/app/api/auth/[...nextauth]/route.ts b/core/app/api/auth/[...nextauth]/route.ts
@@ -1,4 +1,3 @@
 import { handlers } from '~/auth';
 
 export const { GET, POST } = handlers;
-export const runtime = 'edge';
diff --git a/core/app/api/cart-quantity/route.ts b/core/app/api/cart-quantity/route.ts
@@ -19,5 +19,3 @@ export const GET = async (request: NextRequest) => {
 
   return NextResponse.json({ count: 0 });
 };
-
-export const runtime = 'edge';
diff --git a/core/app/login/token/[token]/route.ts b/core/app/login/token/[token]/route.ts
@@ -39,5 +39,4 @@ export async function GET(request: Request, { params }: TokenParams) {
   }
 }
 
-export const runtime = 'edge';
 export const dynamic = 'force-dynamic';
diff --git a/core/app/sitemap.xml/route.ts b/core/app/sitemap.xml/route.ts
@@ -16,5 +16,3 @@ export const GET = async () => {
     },
   });
 };
-
-export const runtime = 'edge';
diff --git a/core/app/xmlsitemap.php/route.ts b/core/app/xmlsitemap.php/route.ts
@@ -11,5 +11,3 @@ import { defaultLocale, permanentRedirect } from '~/i18n/routing';
 export const GET = () => {
   permanentRedirect({ href: '/sitemap.xml', locale: defaultLocale });
 };
-
-export const runtime = 'edge';
diff --git a/core/package.json b/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bigcommerce/catalyst-core",
   "description": "BigCommerce Catalyst is a Next.js starter kit for building headless BigCommerce storefronts.",
-  "version": "0.24.2",
+  "version": "0.24.3",
   "private": true,
   "scripts": {
     "dev": "npm run generate && next dev",
@@ -44,12 +44,12 @@
     "lodash.debounce": "^4.0.8",
     "lru-cache": "^11.0.2",
     "lucide-react": "^0.468.0",
-    "next": "15.2.3",
+    "next": "15.5.8",
     "next-auth": "5.0.0-beta.25",
     "next-intl": "^3.26.1",
-    "react": "^19.0.0",
+    "react": "^19.1.3",
     "react-day-picker": "^8.10.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^19.1.3",
     "react-google-recaptcha": "^3.1.0",
     "react-hook-form": "^7.54.1",
     "react-hot-toast": "^2.4.1",
diff --git a/integrations/makeswift/integration.patch b/integrations/makeswift/integration.patch
@@ -59,10 +59,8 @@ index 71d40507..2d20fa4f 100644
 +    <MakeswiftProvider>
 +      <MakeswiftPage snapshot={snapshot} />
 +    </MakeswiftProvider>
-+  );
- }
-+
-+export const runtime = 'nodejs';
++    );
+}
 diff --git a/core/app/[locale]/layout.tsx b/core/app/[locale]/layout.tsx
 index faf15d53..a66fb02b 100644
 --- a/core/app/[locale]/layout.tsx
@@ -174,8 +172,6 @@ index 00000000..bea1b56f
 +
 +  return NextResponse.json(removeEdgesAndNodes(data.site.featuredProducts));
 +};
-+
-+export const runtime = 'edge';
 diff --git a/core/components/ui/accordions/accordion.makeswift.tsx b/core/components/ui/accordions/accordion.makeswift.tsx
 new file mode 100644
 index 00000000..a70a94e8
@@ -490,10 +486,9 @@ new file mode 100644
 index 00000000..e988b5cf
 --- /dev/null
 +++ b/core/lib/makeswift/runtime.ts
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,2 @@
 +import { ReactRuntime } from '@makeswift/runtime/react';
 +
-+export const runtime = new ReactRuntime();
 diff --git a/core/middleware.ts b/core/middleware.ts
 index c9928bdd..1724c1ea 100644
 --- a/core/middleware.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,3 @@ export default async function ChangePassword({ searchParams }: Props) {`
`39`	`39`
`40`	`40`	`return null;`
`41`	`41`	`}`
`42`		`-`
`43`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,3 @@ export default async function Reset() {`
`48`	`48`	`</div>`
`49`	`49`	`);`
`50`	`50`	`}`
`51`		`-`
`52`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,3 @@ export default async function Register() {`
`40`	`40`	`</div>`
`41`	`41`	`);`
`42`	`42`	`}`
`43`		`-`
`44`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -124,5 +124,3 @@ export default async function Brand(props: Props) {`
`124`	`124`	`</div>`
`125`	`125`	`);`
`126`	`126`	`}`
`127`		`-`
`128`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -140,5 +140,3 @@ export default async function Category(props: Props) {`
`140`	`140`	`</div>`
`141`	`141`	`);`
`142`	`142`	`}`
`143`		`-`
`144`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,3 @@ export default async function Search(props: Props) {`
`113`	`113`	`</div>`
`114`	`114`	`);`
`115`	`115`	`}`
`116`		`-`
`117`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -96,5 +96,3 @@ export default async function AddPage() {`
`96`	`96`	`</div>`
`97`	`97`	`);`
`98`	`98`	`}`
`99`		`-`
`100`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -138,5 +138,3 @@ export default async function Edit({ params }: Props) {`
`138`	`138`	`</div>`
`139`	`139`	`);`
`140`	`140`	`}`
`141`		`-`
`142`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,3 @@ export default async function Addresses({ searchParams }: Props) {`
`54`	`54`	`</>`
`55`	`55`	`);`
`56`	`56`	`}`
`57`		`-`
`58`		`-export const runtime = 'edge';`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,3 @@ export default async function Order(props: Props) {`
`67`	`67`
`68`	`68`	`return <OrderDetails data={data} />;`
`69`	`69`	`}`
`70`		`-`
`71`		`-export const runtime = 'edge';`