orionplace-react 0.7.0 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orionplace-react",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Next.js 16 storefront for your Orionplace marketplace: setup CLI, server API gateway, typed store and ready-made catalog, cart, checkout and account components in English and Russian, plus an Android app build.",
   "type": "module",
   "license": "MIT",

package/src/project-readme.mjs

@@ -413,11 +413,10 @@ out; the journal and other pages stay indexable. Leave it empty on a live shop.
 
 Every product page carries schema.org product data for Google and Yandex: the
 price, the crossed-out old price, stock, photos, brand, seller, rating and the
-return terms the page shows. To include the return terms, set
-\`ORIONPLACE_SHIPPING_COUNTRIES\` in \`.env\` to the countries you ship to, as
-ISO codes separated by spaces, for example
-\`ORIONPLACE_SHIPPING_COUNTRIES="RU BY"\`; without it the return terms are left
-out. The delivery cost is not included: it depends on the buyer's address.
+return terms the page shows. The return terms name the shop's shipping
+countries, which Application Load sends in \`init.shipping_countries\`; without
+a shipping country they are left out. The delivery cost is not included: it
+depends on the buyer's address.
 
 This setup does not add analytics.
 

package/templates/app/_storefront/ProductPage.tsx

@@ -17,11 +17,10 @@ import styles from '@/app/storefront.module.css';
 
 export function ProductPage({
   productId,
-  previewKey        = '',
+  previewKey   = '',
   initialProduct,
-  initialError      = '',
-  origin            = '',
-  shippingCountries = '',
+  initialError = '',
+  origin       = '',
 }: {
   productId: number;
   previewKey?: string;
@@ -29,8 +28,6 @@ export function ProductPage({
   initialError?: string;
   /** The visitor's origin from the server render. */
   origin?: string;
-  /** ORIONPLACE_SHIPPING_COUNTRIES from the server's .env. */
-  shippingCountries?: string;
 }) {
   const api                                   = useOrionplaceApi();
   const init                                  = useOrionplace(selectInit);
@@ -63,7 +60,6 @@ export function ProductPage({
       <StorefrontProductStructuredData
         product={metadataProduct}
         origin={origin}
-        shippingCountries={shippingCountries}
       />
       <StorefrontProduct
         productId={productId}

package/templates/app/_storefront/StorefrontProductStructuredData.tsx

@@ -30,13 +30,10 @@ import {
 export function StorefrontProductStructuredData({
   product,
   origin,
-  shippingCountries,
 }: {
   product?: IProduct;
   /** The visitor's origin from the server render (storefrontPublicOrigin). */
   origin: string;
-  /** ORIONPLACE_SHIPPING_COUNTRIES from the server's .env. */
-  shippingCountries: string;
 }) {
   const pathname   = usePathname();
   const search     = useSearchParams().toString();
@@ -62,7 +59,8 @@ export function StorefrontProductStructuredData({
           ).slice(0, 160),
           currencyId,
           currencyCode: init?.currencies?.[currencyId]?.currency_code,
-          shippingCountries: shippingCountryCodes(shippingCountries),
+          // The backend's shipping countries, for the return terms.
+          shippingCountries: shippingCountryCodes(init?.shipping_countries),
           showSeller: !init?.visual_settings?.single_seller_mode,
           absoluteUrl: (value) => storefrontAbsoluteUrl(value, origin),
         })

package/templates/app/_storefront/storefrontRoutes.tsx

@@ -99,8 +99,6 @@ export interface StorefrontRouteContext {
   address: string;
   /** The visitor's origin (storefrontPublicOrigin), for complete addresses. */
   origin?: string;
-  /** ORIONPLACE_SHIPPING_COUNTRIES from the server's .env. */
-  shippingCountries?: string;
   appLoad: { result: AppLoadResult | null; failure: AppLoadFailure | null };
   /** The storefront language of this request. */
   locale: () => Promise<string>;
@@ -466,7 +464,6 @@ const routes: Record<string, Loader> = {
           initialProduct={initialProduct}
           initialError={initialError}
           origin={context.origin ?? ''}
-          shippingCountries={context.shippingCountries ?? ''}
         />
       ),
     };

package/templates/components/orionplace/contact/EmailUnsubscribe.module.css

@@ -53,7 +53,8 @@
 .root button {
   display: inline-flex;
   box-sizing: border-box;
-  width: fit-content;
+  /* Full panel width, as the Nuxt and Svelte panels stretch it. */
+  width: 100%;
   min-height: 2.75rem;
   align-items: center;
   justify-content: center;

package/templates/components/orionplace/shared/OrionplaceImage.tsx

@@ -62,7 +62,8 @@ export function OrionplaceImage({
         className={`${styles.image} ${className}`.trim()}
         data-logo-type={dataLogoType}
         onError={() => setFailed(true)}
-        onLoad={onLoad}
+        // The callback has no payload (the element's load event stays inside).
+        onLoad={onLoad ? () => onLoad() : undefined}
       />
     );
   }

package/templates/interfaces/orionplace/appBase/IAppLoadCommon.ts

@@ -24,6 +24,8 @@ export interface IAppLoadCommon {
 	weights: Record<string, IAppLoadCommonUnit>;
 	lengths: Record<string, IAppLoadCommonUnit>;
 	geo_location_enabled: boolean;
+	/** ISO codes of the shop's shipping countries, sorted. */
+	shipping_countries?: string[];
 	is_authenticated: boolean;
 	wallet?: Record<string, IAppLoadCommonWalletValue>;
 	logos: IAppLoadCommonLogos;

package/templates/lib/orionplace/productStructuredData.ts

@@ -45,7 +45,7 @@ export interface StorefrontProductDataOptions {
   /** The currency the page shows prices in (its ID and code). */
   currencyId: string;
   currencyCode: string | undefined;
-  /** ORIONPLACE_SHIPPING_COUNTRIES, parsed by shippingCountryCodes(). */
+  /** App Load `init.shipping_countries`, parsed by shippingCountryCodes(). */
   shippingCountries: string[];
   /** False when the page hides the seller (single-seller storefront). */
   showSeller: boolean;
@@ -54,11 +54,12 @@ export interface StorefrontProductDataOptions {
 }
 
 /**
- * The countries the shop ships to, from ORIONPLACE_SHIPPING_COUNTRIES:
- * ISO 3166-1 alpha-2 codes separated by spaces or commas, e.g. "RU BY".
+ * The countries the shop ships to: App Load `init.shipping_countries` (the
+ * backend's countries marked as shipping countries), as valid ISO 3166-1
+ * alpha-2 codes.
  */
 export function shippingCountryCodes(value: unknown): string[] {
-  const codes = String(value ?? '')
+  const codes = (Array.isArray(value) ? value.join(' ') : String(value ?? ''))
     .split(/[\s,;]+/)
     .map((code) => code.trim().toUpperCase())
     .filter((code) => /^[A-Z]{2}$/.test(code));

package/templates/lib/orionplace/serverRoute.tsx

@@ -38,7 +38,6 @@ export async function renderStorefrontRoute(
     origin: storefrontPublicOrigin(
       incoming.get('x-forwarded-host') ?? incoming.get('host'),
     ),
-    shippingCountries: process.env.ORIONPLACE_SHIPPING_COUNTRIES ?? '',
     appLoad: await getOrionplaceAppLoad(),
     locale: getOrionplaceServerLocale,
     api: getOrionplaceServerApi,