Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix: Addressed review findings on the dependency updates

Claude16e41b6b1e15
diff --git a/package.json b/package.json
index 00b9cf0d83..2f4755e7c5 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
"node": ">=22"
},
"dependencies": {
- "@base-ui/react": "1.9.0",
+ "@base-ui/react": "1.8.0",
"@spree/cli": "workspace:*"
}
}
diff --git a/packages/admin-sdk/src/zod/generated/Category.ts b/packages/admin-sdk/src/zod/generated/Category.ts
index f1a6be2cb5..2ce95d68c3 100644
--- a/packages/admin-sdk/src/zod/generated/Category.ts
+++ b/packages/admin-sdk/src/zod/generated/Category.ts
@@ -34,6 +34,6 @@ export const CategorySchema = z.object({
products_count: z.number(),
created_at: z.string(),
updated_at: z.string(),
-}) as unknown as z.ZodType<Category>;
+}) as unknown as z.ZodObject<{ [K in keyof Category]-?: z.ZodType<Category[K]> }>;
export type { Category };
diff --git a/packages/admin-sdk/src/zod/generated/Claim.ts b/packages/admin-sdk/src/zod/generated/Claim.ts
index 0aa760ffe9..72ed378620 100644
--- a/packages/admin-sdk/src/zod/generated/Claim.ts
+++ b/packages/admin-sdk/src/zod/generated/Claim.ts
@@ -30,6 +30,6 @@ export const ClaimSchema = z.object({
created_by: ActorSchema.optional(),
get order() { return OrderSchema.optional(); },
get refunds() { return z.array(RefundSchema).optional(); },
-}) as unknown as z.ZodType<Claim>;
+}) as unknown as z.ZodObject<{ [K in keyof Claim]-?: z.ZodType<Claim[K]> }>;
export type { Claim };
diff --git a/packages/admin-sdk/src/zod/generated/Company.ts b/packages/admin-sdk/src/zod/generated/Company.ts
index 9bb8b5a2a5..a027a38251 100644
--- a/packages/admin-sdk/src/zod/generated/Company.ts
+++ b/packages/admin-sdk/src/zod/generated/Company.ts
@@ -20,6 +20,6 @@ export const CompanySchema = z.object({
get children() { return z.array(CompanySchema).optional(); },
addresses: z.array(AddressSchema).optional(),
memberships: z.array(CompanyMembershipSchema).optional(),
-}) as unknown as z.ZodType<Company>;
+}) as unknown as z.ZodObject<{ [K in keyof Company]-?: z.ZodType<Company[K]> }>;
export type { Company };
diff --git a/packages/admin-sdk/src/zod/generated/Country.ts b/packages/admin-sdk/src/zod/generated/Country.ts
index 1eb2537b4c..16dd1867ac 100644
--- a/packages/admin-sdk/src/zod/generated/Country.ts
+++ b/packages/admin-sdk/src/zod/generated/Country.ts
@@ -11,6 +11,6 @@ export const CountrySchema = z.object({
zipcode_required: z.boolean(),
states: z.array(StateSchema).optional(),
get market() { return MarketSchema.nullable().optional(); },
-}) as unknown as z.ZodType<Country>;
+}) as unknown as z.ZodObject<{ [K in keyof Country]-?: z.ZodType<Country[K]> }>;
export type { Country };
diff --git a/packages/admin-sdk/src/zod/generated/Customer.ts b/packages/admin-sdk/src/zod/generated/Customer.ts
index e35cac77bc..207dc6d039 100644
--- a/packages/admin-sdk/src/zod/generated/Customer.ts
+++ b/packages/admin-sdk/src/zod/generated/Customer.ts
@@ -42,6 +42,6 @@ export const CustomerSchema = z.object({
get store_credits() { return z.array(StoreCreditSchema).optional(); },
customer_group_ids: z.array(z.string()),
get companies() { return z.array(CompanySchema).optional(); },
-}) as unknown as z.ZodType<Customer>;
+}) as unknown as z.ZodObject<{ [K in keyof Customer]-?: z.ZodType<Customer[K]> }>;
export type { Customer };
diff --git a/packages/admin-sdk/src/zod/generated/CustomerGroup.ts b/packages/admin-sdk/src/zod/generated/CustomerGroup.ts
index 02b7e60c14..e4b8c6e69c 100644
--- a/packages/admin-sdk/src/zod/generated/CustomerGroup.ts
+++ b/packages/admin-sdk/src/zod/generated/CustomerGroup.ts
@@ -11,6 +11,6 @@ export const CustomerGroupSchema = z.object({
created_at: z.string(),
updated_at: z.string(),
get customers() { return z.array(CustomerSchema).optional(); },
-}) as unknown as z.ZodType<CustomerGroup>;
+}) as unknown as z.ZodObject<{ [K in keyof CustomerGroup]-?: z.ZodType<CustomerGroup[K]> }>;
export type { CustomerGroup };
diff --git a/packages/admin-sdk/src/zod/generated/Exchange.ts b/packages/admin-sdk/src/zod/generated/Exchange.ts
index 327dd4ea72..559927ecc6 100644
--- a/packages/admin-sdk/src/zod/generated/Exchange.ts
+++ b/packages/admin-sdk/src/zod/generated/Exchange.ts
@@ -32,6 +32,6 @@ export const ExchangeSchema = z.object({
get order() { return OrderSchema.optional(); },
stock_location: StockLocationSchema.optional(),
get refunds() { return z.array(RefundSchema).optional(); },
-}) as unknown as z.ZodType<Exchange>;
+}) as unknown as z.ZodObject<{ [K in keyof Exchange]-?: z.ZodType<Exchange[K]> }>;
export type { Exchange };
diff --git a/packages/admin-sdk/src/zod/generated/Fulfillment.ts b/packages/admin-sdk/src/zod/generated/Fulfillment.ts
index 174a25628d..a951270201 100644
--- a/packages/admin-sdk/src/zod/generated/Fulfillment.ts
+++ b/packages/admin-sdk/src/zod/generated/Fulfillment.ts
@@ -47,6 +47,6 @@ export const FulfillmentSchema = z.object({
provider_generates_labels: z.boolean(),
fulfillment_items: z.array(FulfillmentItemSchema).optional(),
get order() { return OrderSchema.optional(); },
-}) as unknown as z.ZodType<Fulfillment>;
+}) as unknown as z.ZodObject<{ [K in keyof Fulfillment]-?: z.ZodType<Fulfillment[K]> }>;
export type { Fulfillment };
diff --git a/packages/admin-sdk/src/zod/generated/GiftCard.ts b/packages/admin-sdk/src/zod/generated/GiftCard.ts
index 788a7f5254..0acf803785 100644
--- a/packages/admin-sdk/src/zod/generated/GiftCard.ts
+++ b/packages/admin-sdk/src/zod/generated/GiftCard.ts
@@ -27,6 +27,6 @@ export const GiftCardSchema = z.object({
created_by: AdminUserSchema.optional(),
gift_card_batch: GiftCardBatchSchema.optional(),
get orders() { return z.array(OrderSchema).optional(); },
-}) as unknown as z.ZodType<GiftCard>;
+}) as unknown as z.ZodObject<{ [K in keyof GiftCard]-?: z.ZodType<GiftCard[K]> }>;
export type { GiftCard };
diff --git a/packages/admin-sdk/src/zod/generated/Market.ts b/packages/admin-sdk/src/zod/generated/Market.ts
index c5ebe684e9..0157cf31f5 100644
--- a/packages/admin-sdk/src/zod/generated/Market.ts
+++ b/packages/admin-sdk/src/zod/generated/Market.ts
@@ -16,6 +16,6 @@ export const MarketSchema = z.object({
created_at: z.string(),
updated_at: z.string(),
tax_provider: z.string().nullable(),
-}) as unknown as z.ZodType<Market>;
+}) as unknown as z.ZodObject<{ [K in keyof Market]-?: z.ZodType<Market[K]> }>;
export type { Market };
diff --git a/packages/admin-sdk/src/zod/generated/OptionType.ts b/packages/admin-sdk/src/zod/generated/OptionType.ts
index 14c77a7701..24b87161e7 100644
--- a/packages/admin-sdk/src/zod/generated/OptionType.ts
+++ b/packages/admin-sdk/src/zod/generated/OptionType.ts
@@ -15,6 +15,6 @@ export const OptionTypeSchema = z.object({
created_at: z.string(),
updated_at: z.string(),
get option_values() { return z.array(OptionValueSchema).optional(); },
-}) as unknown as z.ZodType<OptionType>;
+}) as unknown as z.ZodObject<{ [K in keyof OptionType]-?: z.ZodType<OptionType[K]> }>;
export type { OptionType };
diff --git a/packages/admin-sdk/src/zod/generated/OptionValue.ts b/packages/admin-sdk/src/zod/generated/OptionValue.ts
index 3c92b3d029..1b67840d8a 100644
--- a/packages/admin-sdk/src/zod/generated/OptionValue.ts
+++ b/packages/admin-sdk/src/zod/generated/OptionValue.ts
@@ -17,6 +17,6 @@ export const OptionValueSchema = z.object({
created_at: z.string(),
updated_at: z.string(),
get option_type() { return OptionTypeSchema.optional(); },
-}) as unknown as z.ZodType<OptionValue>;
+}) as unknown as z.ZodObject<{ [K in keyof OptionValue]-?: z.ZodType<OptionValue[K]> }>;
export type { OptionValue };
diff --git a/packages/admin-sdk/src/zod/generated/Order.ts b/packages/admin-sdk/src/zod/generated/Order.ts
index 075e93e2eb..54c1869f42 100644
--- a/packages/admin-sdk/src/zod/generated/Order.ts
+++ b/packages/admin-sdk/src/zod/generated/Order.ts
@@ -112,6 +112,6 @@ export const OrderSchema = z.object({
get exchanges() { return z.array(ExchangeSchema).optional(); },
get claims() { return z.array(ClaimSchema).optional(); },
freight_summary: FreightSummarySchema.nullable(),
-}) as unknown as z.ZodType<Order>;
+}) as unknown as z.ZodObject<{ [K in keyof Order]-?: z.ZodType<Order[K]> }>;
export type { Order };
diff --git a/packages/admin-sdk/src/zod/generated/Payment.ts b/packages/admin-sdk/src/zod/generated/Payment.ts
index d9f9ec7534..1d20055019 100644
--- a/packages/admin-sdk/src/zod/generated/Payment.ts
+++ b/packages/admin-sdk/src/zod/generated/Payment.ts
@@ -36,6 +36,6 @@ export const PaymentSchema = z.object({
get order() { return OrderSchema.optional(); },
get refunds() { return z.array(RefundSchema).optional(); },
payment_splits: z.array(PaymentSplitSchema).optional(),
-}) as unknown as z.ZodType<Payment>;
+}) as unknown as z.ZodObject<{ [K in keyof Payment]-?: z.ZodType<Payment[K]> }>;
export type { Payment };
diff --git a/packages/admin-sdk/src/zod/generated/Price.ts b/packages/admin-sdk/src/zod/generated/Price.ts
index e3fb66301c..badb3cebc1 100644
--- a/packages/admin-sdk/src/zod/generated/Price.ts
+++ b/packages/admin-sdk/src/zod/generated/Price.ts
@@ -14,6 +14,6 @@ export const PriceSchema = z.object({
created_at: z.string(),
updated_at: z.string(),
get variant() { return VariantSchema.optional(); },
-}) as unknown as z.ZodType<Price>;
+}) as unknown as z.ZodObject<{ [K in keyof Price]-?: z.ZodType<Price[K]> }>;
export type { Price };
diff --git a/packages/admin-sdk/src/zod/generated/Refund.ts b/packages/admin-sdk/src/zod/generated/Refund.ts
index 6a9e0d1518..f7bfd037fb 100644
--- a/packages/admin-sdk/src/zod/generated/Refund.ts
+++ b/packages/admin-sdk/src/zod/generated/Refund.ts
@@ -20,6 +20,6 @@ export const RefundSchema = z.object({
refunder_type: z.string().nullable(),
refunder: ActorSchema.optional(),
get payment() { return PaymentSchema.optional(); },
-}) as unknown as z.ZodType<Refund>;
+}) as unknown as z.ZodObject<{ [K in keyof Refund]-?: z.ZodType<Refund[K]> }>;
export type { Refund };
diff --git a/packages/admin-sdk/src/zod/generated/Return.ts b/packages/admin-sdk/src/zod/generated/Return.ts
index 7ac01a6298..a8fda8c7db 100644
--- a/packages/admin-sdk/src/zod/generated/Return.ts
+++ b/packages/admin-sdk/src/zod/generated/Return.ts
@@ -41,6 +41,6 @@ export const ReturnSchema = z.object({
documents: z.array(z.object({ kind: z.string(), url: z.string() })),
labels: z.array(ShippingLabelSchema),
deliveries: z.array(DeliverySchema),
-}) as unknown as z.ZodType<Return>;
+}) as unknown as z.ZodObject<{ [K in keyof Return]-?: z.ZodType<Return[K]> }>;
export type { Return };
diff --git a/packages/admin-sdk/src/zod/generated/StockLevel.ts b/packages/admin-sdk/src/zod/generated/StockLevel.ts
index 1baf9f4c73..537ad8d968 100644
--- a/packages/admin-sdk/src/zod/generated/StockLevel.ts
+++ b/packages/admin-sdk/src/zod/generated/StockLevel.ts
@@ -27,6 +27,6 @@ export const StockLevelSchema = z.object({
available_count: z.number(),
stock_location: StockLocationSchema.optional(),
get variant() { return VariantSchema.optional(); },
-}) as unknown as z.ZodType<StockLevel>;
+}) as unknown as z.ZodObject<{ [K in keyof StockLevel]-?: z.ZodType<StockLevel[K]> }>;
export type { StockLevel };
diff --git a/packages/admin-sdk/src/zod/generated/StoreCredit.ts b/packages/admin-sdk/src/zod/generated/StoreCredit.ts
index 943ebbdba2..8aba17c9e8 100644
--- a/packages/admin-sdk/src/zod/generated/StoreCredit.ts
+++ b/packages/admin-sdk/src/zod/generated/StoreCredit.ts
@@ -22,6 +22,6 @@ export const StoreCreditSchema = z.object({
originator_id: z.string().nullable(),
get customer() { return CustomerSchema.optional(); },
created_by: AdminUserSchema.optional(),
-}) as unknown as z.ZodType<StoreCredit>;
+}) as unknown as z.ZodObject<{ [K in keyof StoreCredit]-?: z.ZodType<StoreCredit[K]> }>;
export type { StoreCredit };
diff --git a/packages/admin-sdk/src/zod/generated/Variant.ts b/packages/admin-sdk/src/zod/generated/Variant.ts
index d6701f9188..4abd71b1b3 100644
--- a/packages/admin-sdk/src/zod/generated/Variant.ts
+++ b/packages/admin-sdk/src/zod/generated/Variant.ts
@@ -67,6 +67,6 @@ export const VariantSchema = z.object({
delivery_profile_id: z.string().nullable(),
get prices() { return z.array(PriceSchema).optional(); },
get stock_levels() { return z.array(StockLevelSchema).optional(); },
-}) as unknown as z.ZodType<Variant>;
+}) as unknown as z.ZodObject<{ [K in keyof Variant]-?: z.ZodType<Variant[K]> }>;
export type { Variant };
diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
index 3b572b74d1..77ae9cb88f 100644
--- a/packages/cli/src/commands/init.ts
+++ b/packages/cli/src/commands/init.ts
@@ -400,10 +400,17 @@ function resolveAdminCredentials(flags: { adminEmail?: string; adminPassword?: s
export async function openBrowser(url: string): Promise<void> {
const os = platform()
- const cmd = os === 'darwin' ? 'open' : os === 'win32' ? 'start' : 'xdg-open'
+ // `start` is built into cmd.exe rather than a program of its own; its first
+ // quoted argument is a window title, hence the empty one.
+ const [cmd, args] =
+ os === 'darwin'
+ ? ['open', [url]]
+ : os === 'win32'
+ ? ['cmd', ['/c', 'start', '""', url]]
+ : ['xdg-open', [url]]
try {
- await execa(cmd, [url], { stdio: 'ignore' })
+ await execa(cmd, args, { stdio: 'ignore' })
} catch {
// best-effort
}
diff --git a/packages/cli/src/commands/open.ts b/packages/cli/src/commands/open.ts
index 0d8834cbe3..77da9144e1 100644
--- a/packages/cli/src/commands/open.ts
+++ b/packages/cli/src/commands/open.ts
@@ -1,9 +1,8 @@
-import { platform } from 'node:os'
import type { Command } from 'commander'
-import { execa } from 'execa'
import { DASHBOARD_PORT } from '../constants.js'
import { detectProject } from '../context.js'
import { hasDashboardApp } from '../dashboard-server.js'
+import { openBrowser } from './init.js'
export function registerOpenCommand(program: Command): void {
program
@@ -16,8 +15,6 @@ export function registerOpenCommand(program: Command): void {
const url = hasDashboardApp(ctx.projectDir)
? `http://localhost:${DASHBOARD_PORT}`
: `http://localhost:${ctx.port}/dashboard`
- const os = platform()
- const cmd = os === 'darwin' ? 'open' : os === 'win32' ? 'start' : 'xdg-open'
- await execa(cmd, [url])
+ await openBrowser(url)
})
}
diff --git a/packages/dashboard-ui/package.json b/packages/dashboard-ui/package.json
index bc4d9dfc4e..c728000b8b 100644
--- a/packages/dashboard-ui/package.json
+++ b/packages/dashboard-ui/package.json
@@ -52,7 +52,7 @@
"tailwindcss": "^4.2.4"
},
"dependencies": {
- "@base-ui/react": "1.9.0",
+ "@base-ui/react": "1.8.0",
"@codemirror/autocomplete": "6.20.3",
"@codemirror/commands": "6.11.1",
"@codemirror/lang-html": "6.4.12",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 5be8c02871..4605acf883 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -58,7 +58,7 @@
"prepublishOnly": "tsup"
},
"dependencies": {
- "@base-ui/react": "1.9.0",
+ "@base-ui/react": "1.8.0",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
diff --git a/packages/sdk-core/scripts/generate-zod.ts b/packages/sdk-core/scripts/generate-zod.ts
index 2722c00731..29135fc2b5 100644
--- a/packages/sdk-core/scripts/generate-zod.ts
+++ b/packages/sdk-core/scripts/generate-zod.ts
@@ -293,8 +293,9 @@ function generateZodFile(parsed: ParsedType, cyclicTypes: Set<string>, typesImpo
// Inferring a type through schemas that reference each other walks the
// whole reference cycle, which TypeScript 7 rejects as too deep. A schema in
- // a cycle is typed as the generated type it was built from instead, so
- // nothing reading it infers through the cycle. It is a cast because the
+ // a cycle is typed field by field from the generated type it was built
+ // from instead, so nothing reading it infers through the cycle, and it keeps
+ // the object schema API (shape, pick, extend). It is a cast because the
// schema accepts any string where that type lists an enum's values.
const cyclic = cyclicTypes.has(parsed.typeName)
const typeImport = cyclic
@@ -310,7 +311,9 @@ function generateZodFile(parsed: ParsedType, cyclicTypes: Set<string>, typesImpo
'',
schemaDecl,
...fieldLines,
- cyclic ? `}) as unknown as z.ZodType<${parsed.typeName}>;` : '});',
+ cyclic
+ ? `}) as unknown as z.ZodObject<{ [K in keyof ${parsed.typeName}]-?: z.ZodType<${parsed.typeName}[K]> }>;`
+ : '});',
'',
cyclic
? `export type { ${parsed.typeName} };`
@@ -427,7 +430,7 @@ function generateFolder(typesDir: string, zodDir: string): void {
for (const [, parsed] of parsedTypes) {
fs.writeFileSync(
path.join(zodDir, `${parsed.typeName}.ts`),
- generateZodFile(parsed, cyclicTypes, path.relative(zodDir, typesDir)),
+ generateZodFile(parsed, cyclicTypes, path.relative(zodDir, typesDir).split(path.sep).join('/')),
'utf-8',
)
generatedNames.push(parsed.typeName)
diff --git a/packages/sdk/src/zod/generated/Category.ts b/packages/sdk/src/zod/generated/Category.ts
index 6861ad1264..83a8c63a89 100644
--- a/packages/sdk/src/zod/generated/Category.ts
+++ b/packages/sdk/src/zod/generated/Category.ts
@@ -25,6 +25,6 @@ export const CategorySchema = z.object({
get children() { return z.array(CategorySchema).optional(); },
get ancestors() { return z.array(CategorySchema).optional(); },
custom_fields: z.array(CustomFieldSchema).optional(),
-}) as unknown as z.ZodType<Category>;
+}) as unknown as z.ZodObject<{ [K in keyof Category]-?: z.ZodType<Category[K]> }>;
export type { Category };
diff --git a/packages/sdk/src/zod/generated/Country.ts b/packages/sdk/src/zod/generated/Country.ts
index 4b371cd76c..f458b974eb 100644
--- a/packages/sdk/src/zod/generated/Country.ts
+++ b/packages/sdk/src/zod/generated/Country.ts
@@ -12,6 +12,6 @@ export const CountrySchema = z.object({
zipcode_required: z.boolean(),
states: z.array(StateSchema).optional(),
get market() { return MarketSchema.nullable().optional(); },
-}) as unknown as z.ZodType<Country>;
+}) as unknown as z.ZodObject<{ [K in keyof Country]-?: z.ZodType<Country[K]> }>;
export type { Country };
diff --git a/packages/sdk/src/zod/generated/Market.ts b/packages/sdk/src/zod/generated/Market.ts
index f9191cbb7f..613a527e10 100644
--- a/packages/sdk/src/zod/generated/Market.ts
+++ b/packages/sdk/src/zod/generated/Market.ts
@@ -14,6 +14,6 @@ export const MarketSchema = z.object({
country_isos: z.array(z.string()),
supported_locales: z.array(z.string()),
get countries() { return z.array(CountrySchema).optional(); },
-}) as unknown as z.ZodType<Market>;
+}) as unknown as z.ZodObject<{ [K in keyof Market]-?: z.ZodType<Market[K]> }>;
export type { Market };
diff --git a/packages/seller-sdk/src/zod/generated/Category.ts b/packages/seller-sdk/src/zod/generated/Category.ts
index 6861ad1264..83a8c63a89 100644
--- a/packages/seller-sdk/src/zod/generated/Category.ts
+++ b/packages/seller-sdk/src/zod/generated/Category.ts
@@ -25,6 +25,6 @@ export const CategorySchema = z.object({
get children() { return z.array(CategorySchema).optional(); },
get ancestors() { return z.array(CategorySchema).optional(); },
custom_fields: z.array(CustomFieldSchema).optional(),
-}) as unknown as z.ZodType<Category>;
+}) as unknown as z.ZodObject<{ [K in keyof Category]-?: z.ZodType<Category[K]> }>;
export type { Category };