@mercurjs/vendor 2.3.7-canary.0 → 2.3.7

package/dist/{chunk-UKFEMWID.js → chunk-CDJVJZGQ.js}

@@ -1,7 +1,7 @@
 import {
   FileUpload,
   formatFileSize
-} from "./chunk-S2VRZMKR.js";
+} from "./chunk-YMUXQFOC.js";
 import {
   Form
 } from "./chunk-3QSRE5LS.js";

package/dist/{chunk-T7CFO2NU.js → chunk-RLPH22S3.js}

@@ -22,13 +22,13 @@ import {
 } from "./chunk-OVPAOBZB.js";
 import {
   UploadMediaFormItem
-} from "./chunk-UKFEMWID.js";
+} from "./chunk-CDJVJZGQ.js";
 import {
   PRODUCT_CREATE_FORM_DEFAULTS,
   ProductCreateSchema,
-  generateVariantsFromAttributes,
-  normalizeProductFormValues
-} from "./chunk-S2VRZMKR.js";
+  normalizeProductFormValues,
+  subscribeVariantsToAttributes
+} from "./chunk-YMUXQFOC.js";
 import {
   ChipInput
 } from "./chunk-KDE4HKH2.js";
@@ -87,7 +87,7 @@ import { useTranslation as useTranslation9 } from "react-i18next";
 var import_types6 = __toESM(require_dist(), 1);
 import { Button as Button3, toast } from "@medusajs/ui";
 import { useEffect as useEffect3, useMemo as useMemo3, Children } from "react";
-import { useForm, useWatch as useWatch2 } from "react-hook-form";
+import { useForm } from "react-hook-form";
 import { useTranslation as useTranslation8 } from "react-i18next";
 import { zodResolver } from "@hookform/resolvers/zod";
 
@@ -111,7 +111,8 @@ import {
 import { useEffect as useEffect2 } from "react";
 import {
   Controller,
-  useFieldArray
+  useFieldArray,
+  useWatch
 } from "react-hook-form";
 import { useTranslation as useTranslation2 } from "react-i18next";
 
@@ -448,137 +449,16 @@ var Root = () => {
             {
               className: "flex flex-col gap-y-4",
               "data-testid": "product-create-attributes-list",
-              children: fields.map((field, index) => {
-                if (!field.is_custom) return null;
-                const useForVariants = form.watch(
-                  `attributes.${index}.use_for_variants`
-                );
-                return /* @__PURE__ */ jsxs2(
-                  "li",
+              children: fields.map(
+                (field, index) => field.is_custom ? /* @__PURE__ */ jsx2(
+                  CustomAttributeRow,
                   {
-                    className: "bg-ui-bg-component shadow-elevation-card-rest grid grid-cols-[1fr_28px] items-start gap-1.5 rounded-xl p-1.5",
-                    "data-testid": `product-create-attribute-row-${index}`,
-                    children: [
-                      /* @__PURE__ */ jsxs2("div", { className: "grid grid-cols-[min-content,1fr] items-center gap-1.5", children: [
-                        /* @__PURE__ */ jsx2("div", { className: "flex items-center px-2 py-1.5", children: /* @__PURE__ */ jsx2(
-                          Label,
-                          {
-                            size: "xsmall",
-                            weight: "plus",
-                            className: "text-ui-fg-subtle",
-                            htmlFor: `attributes.${index}.title`,
-                            children: t("fields.title")
-                          }
-                        ) }),
-                        /* @__PURE__ */ jsx2(
-                          Input,
-                          {
-                            className: "bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover",
-                            ...form.register(
-                              `attributes.${index}.title`
-                            ),
-                            placeholder: t(
-                              "products.create.attributes.titlePlaceholder"
-                            ),
-                            "data-testid": `product-create-attribute-title-${index}`
-                          }
-                        ),
-                        /* @__PURE__ */ jsx2("div", { className: "flex items-center px-2 py-1.5", children: /* @__PURE__ */ jsx2(
-                          Label,
-                          {
-                            size: "xsmall",
-                            weight: "plus",
-                            className: "text-ui-fg-subtle",
-                            htmlFor: `attributes.${index}.values`,
-                            children: t("fields.values")
-                          }
-                        ) }),
-                        /* @__PURE__ */ jsx2(
-                          Controller,
-                          {
-                            control: form.control,
-                            name: `attributes.${index}.values`,
-                            render: ({ field: { onChange, value, ...field2 } }) => useForVariants ? /* @__PURE__ */ jsx2(
-                              ChipInput,
-                              {
-                                ...field2,
-                                variant: "contrast",
-                                value: Array.isArray(value) ? value : [],
-                                onChange,
-                                placeholder: t(
-                                  "products.create.attributes.valuePlaceholder"
-                                ),
-                                "data-testid": `product-create-attribute-values-${index}`
-                              }
-                            ) : /* @__PURE__ */ jsx2(
-                              Textarea,
-                              {
-                                ...field2,
-                                className: "bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover",
-                                value: Array.isArray(value) ? value[0] ?? "" : value ?? "",
-                                onChange: (e) => onChange(e.target.value),
-                                placeholder: t(
-                                  "products.create.attributes.valuePlaceholder"
-                                ),
-                                "data-testid": `product-create-attribute-values-${index}`
-                              }
-                            )
-                          }
-                        ),
-                        /* @__PURE__ */ jsx2("div", {}),
-                        /* @__PURE__ */ jsx2(
-                          Form.Field,
-                          {
-                            control: form.control,
-                            name: `attributes.${index}.use_for_variants`,
-                            render: ({
-                              field: { value, onChange, ref }
-                            }) => /* @__PURE__ */ jsx2(Form.Item, { children: /* @__PURE__ */ jsxs2(
-                              "div",
-                              {
-                                className: "flex items-start gap-x-3 py-1.5",
-                                "data-testid": `product-create-attribute-use-for-variants-${index}`,
-                                children: [
-                                  /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
-                                    Switch,
-                                    {
-                                      ref,
-                                      className: "shrink-0 rtl:rotate-180",
-                                      checked: value,
-                                      onCheckedChange: onChange
-                                    }
-                                  ) }),
-                                  /* @__PURE__ */ jsxs2("div", { className: "flex flex-col", children: [
-                                    /* @__PURE__ */ jsx2(Label, { size: "xsmall", weight: "plus", children: t(
-                                      "products.create.attributes.useForVariants"
-                                    ) }),
-                                    /* @__PURE__ */ jsx2(Hint, { className: "!txt-small", children: t(
-                                      "products.create.attributes.useForVariantsDescription"
-                                    ) })
-                                  ] })
-                                ]
-                              }
-                            ) })
-                          }
-                        )
-                      ] }),
-                      /* @__PURE__ */ jsx2(
-                        IconButton,
-                        {
-                          type: "button",
-                          size: "small",
-                          variant: "transparent",
-                          className: "text-ui-fg-muted",
-                          onClick: () => remove(index),
-                          "data-testid": `product-create-attribute-remove-${index}`,
-                          children: /* @__PURE__ */ jsx2(XMarkMini, {})
-                        }
-                      )
-                    ]
+                    index,
+                    remove
                   },
                   field.id
-                );
-              })
+                ) : null
+              )
             }
           ),
           /* @__PURE__ */ jsx2(RequiredAttributes, {})
@@ -587,6 +467,141 @@ var Root = () => {
     }
   );
 };
+var CustomAttributeRow = ({
+  index,
+  remove
+}) => {
+  const { t } = useTranslation2();
+  const form = useTabbedForm();
+  const useForVariants = useWatch({
+    control: form.control,
+    name: `attributes.${index}.use_for_variants`
+  });
+  return /* @__PURE__ */ jsxs2(
+    "li",
+    {
+      className: "bg-ui-bg-component shadow-elevation-card-rest grid grid-cols-[1fr_28px] items-start gap-1.5 rounded-xl p-1.5",
+      "data-testid": `product-create-attribute-row-${index}`,
+      children: [
+        /* @__PURE__ */ jsxs2("div", { className: "grid grid-cols-[min-content,1fr] items-center gap-1.5", children: [
+          /* @__PURE__ */ jsx2("div", { className: "flex items-center px-2 py-1.5", children: /* @__PURE__ */ jsx2(
+            Label,
+            {
+              size: "xsmall",
+              weight: "plus",
+              className: "text-ui-fg-subtle",
+              htmlFor: `attributes.${index}.title`,
+              children: t("fields.title")
+            }
+          ) }),
+          /* @__PURE__ */ jsx2(
+            Input,
+            {
+              className: "bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover",
+              ...form.register(
+                `attributes.${index}.title`
+              ),
+              placeholder: t(
+                "products.create.attributes.titlePlaceholder"
+              ),
+              "data-testid": `product-create-attribute-title-${index}`
+            }
+          ),
+          /* @__PURE__ */ jsx2("div", { className: "flex items-center px-2 py-1.5", children: /* @__PURE__ */ jsx2(
+            Label,
+            {
+              size: "xsmall",
+              weight: "plus",
+              className: "text-ui-fg-subtle",
+              htmlFor: `attributes.${index}.values`,
+              children: t("fields.values")
+            }
+          ) }),
+          /* @__PURE__ */ jsx2(
+            Controller,
+            {
+              control: form.control,
+              name: `attributes.${index}.values`,
+              render: ({ field: { onChange, value, ...field } }) => useForVariants ? /* @__PURE__ */ jsx2(
+                ChipInput,
+                {
+                  ...field,
+                  variant: "contrast",
+                  value: Array.isArray(value) ? value : [],
+                  onChange,
+                  placeholder: t(
+                    "products.create.attributes.valuePlaceholder"
+                  ),
+                  "data-testid": `product-create-attribute-values-${index}`
+                }
+              ) : /* @__PURE__ */ jsx2(
+                Textarea,
+                {
+                  ...field,
+                  className: "bg-ui-bg-field-component hover:bg-ui-bg-field-component-hover",
+                  value: Array.isArray(value) ? value[0] ?? "" : value ?? "",
+                  onChange: (e) => onChange(e.target.value),
+                  placeholder: t(
+                    "products.create.attributes.valuePlaceholder"
+                  ),
+                  "data-testid": `product-create-attribute-values-${index}`
+                }
+              )
+            }
+          ),
+          /* @__PURE__ */ jsx2("div", {}),
+          /* @__PURE__ */ jsx2(
+            Form.Field,
+            {
+              control: form.control,
+              name: `attributes.${index}.use_for_variants`,
+              render: ({
+                field: { value, onChange, ref }
+              }) => /* @__PURE__ */ jsx2(Form.Item, { children: /* @__PURE__ */ jsxs2(
+                "div",
+                {
+                  className: "flex items-start gap-x-3 py-1.5",
+                  "data-testid": `product-create-attribute-use-for-variants-${index}`,
+                  children: [
+                    /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(
+                      Switch,
+                      {
+                        ref,
+                        className: "shrink-0 rtl:rotate-180",
+                        checked: value,
+                        onCheckedChange: onChange
+                      }
+                    ) }),
+                    /* @__PURE__ */ jsxs2("div", { className: "flex flex-col", children: [
+                      /* @__PURE__ */ jsx2(Label, { size: "xsmall", weight: "plus", children: t(
+                        "products.create.attributes.useForVariants"
+                      ) }),
+                      /* @__PURE__ */ jsx2(Hint, { className: "!txt-small", children: t(
+                        "products.create.attributes.useForVariantsDescription"
+                      ) })
+                    ] })
+                  ]
+                }
+              ) })
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsx2(
+          IconButton,
+          {
+            type: "button",
+            size: "small",
+            variant: "transparent",
+            className: "text-ui-fg-muted",
+            onClick: () => remove(index),
+            "data-testid": `product-create-attribute-remove-${index}`,
+            children: /* @__PURE__ */ jsx2(XMarkMini, {})
+          }
+        )
+      ]
+    }
+  );
+};
 var SelectedAttributes = ({
   fields,
   remove
@@ -1594,7 +1609,7 @@ var ProductCreateOrganizeForm = Root3;
 // src/pages/products/create/components/product-create-variants-form/product-create-variants-form.tsx
 import { Input as Input3 } from "@medusajs/ui";
 import { useMemo as useMemo2, useState as useState3 } from "react";
-import { useWatch } from "react-hook-form";
+import { useWatch as useWatch2 } from "react-hook-form";
 import { useTranslation as useTranslation7 } from "react-i18next";
 import { jsx as jsx8 } from "react/jsx-runtime";
 var Root4 = () => {
@@ -1602,12 +1617,12 @@ var Root4 = () => {
   const form = useTabbedForm();
   const { setCloseOnEscape } = useRouteModal();
   const [search, setSearch] = useState3("");
-  const variants = useWatch({
+  const variants = useWatch2({
     control: form.control,
     name: "variants",
     defaultValue: []
   });
-  const watchedAttributes = useWatch({
+  const watchedAttributes = useWatch2({
     control: form.control,
     name: "attributes",
     defaultValue: []
@@ -1745,20 +1760,7 @@ var ProductCreateForm = ({
   const { mutateAsync, isPending } = useCreateProduct();
   const { feature_flags } = useFeatureFlags();
   const productRequestEnabled = !!feature_flags?.[import_types6.MercurFeatureFlags.PRODUCT_REQUEST];
-  const watchedAttributes = useWatch2({
-    control: form.control,
-    name: "attributes"
-  });
-  useEffect3(() => {
-    const currentVariants = form.getValues("variants") ?? [];
-    const newVariants = generateVariantsFromAttributes(
-      watchedAttributes ?? [],
-      currentVariants
-    );
-    if (JSON.stringify(newVariants.map((v) => v.options)) !== JSON.stringify(currentVariants.map((v) => v.options))) {
-      form.setValue("variants", newVariants);
-    }
-  }, [watchedAttributes, form]);
+  useEffect3(() => subscribeVariantsToAttributes(form), [form]);
   const submitProduct = async (values, isDraftSubmission) => {
     const media = values.media || [];
     const payload = { ...values, media: void 0 };
@@ -1781,30 +1783,29 @@ var ProductCreateForm = ({
       }
     }
     const submittedStatus = isDraftSubmission ? "draft" : productRequestEnabled ? "proposed" : "published";
-    await mutateAsync(
-      normalizeProductFormValues({
-        ...payload,
-        media: uploadedMedia,
-        status: submittedStatus
-      }),
-      {
-        onSuccess: (data) => {
-          if (submittedStatus === "proposed") {
-            toast.success(t("products.create.requestSuccessToast"));
-          } else {
-            toast.success(
-              t("products.create.successToast", {
-                title: data.product.title
-              })
-            );
-          }
-          handleSuccess(`../${data.product.id}`);
-        },
-        onError: (error) => {
-          toast.error(error.message);
-        }
+    try {
+      const data = await mutateAsync(
+        normalizeProductFormValues({
+          ...payload,
+          media: uploadedMedia,
+          status: submittedStatus
+        })
+      );
+      if (submittedStatus === "proposed") {
+        toast.success(t("products.create.requestSuccessToast"));
+      } else {
+        toast.success(
+          t("products.create.successToast", {
+            title: data.product.title
+          })
+        );
       }
-    );
+      handleSuccess(`../${data.product.id}`);
+    } catch (error) {
+      if (error instanceof Error) {
+        toast.error(error.message);
+      }
+    }
   };
   const handleSubmit = form.handleSubmit(async (values) => {
     await submitProduct(values, false);

package/dist/{chunk-S2VRZMKR.js → chunk-YMUXQFOC.js}

@@ -189,6 +189,25 @@ var generateVariantsFromAttributes = (attributes, currentVariants) => {
   }
   return newVariants;
 };
+var syncVariantsWithAttributes = (form) => {
+  const currentVariants = form.getValues("variants") ?? [];
+  const nextVariants = generateVariantsFromAttributes(
+    form.getValues("attributes") ?? [],
+    currentVariants
+  );
+  const sameOptions = JSON.stringify(nextVariants.map((v) => v.options)) === JSON.stringify(currentVariants.map((v) => v.options));
+  if (!sameOptions) {
+    form.setValue("variants", nextVariants);
+  }
+};
+var subscribeVariantsToAttributes = (form) => {
+  syncVariantsWithAttributes(form);
+  return form.subscribe({
+    name: "attributes",
+    formState: { values: true },
+    callback: () => syncVariantsWithAttributes(form)
+  });
+};
 
 // src/pages/products/create/constants.ts
 var MediaSchema = z.object({
@@ -507,7 +526,7 @@ var FileUpload = ({
 
 export {
   normalizeProductFormValues,
-  generateVariantsFromAttributes,
+  subscribeVariantsToAttributes,
   MediaSchema,
   ProductCreateSchema,
   EditProductMediaSchema,

package/dist/{create-OSWM6H4X.js → create-MYLL6LX4.js}

@@ -1,7 +1,7 @@
 import {
   ProductCreate,
   ProductCreatePage
-} from "./chunk-T7CFO2NU.js";
+} from "./chunk-RLPH22S3.js";
 import "./chunk-LEWA4BPH.js";
 import "./chunk-YXJUIFQA.js";
 import "./chunk-HJ56YXBU.js";
@@ -10,13 +10,13 @@ import "./chunk-YXC5DS7W.js";
 import "./chunk-YVCBMOJG.js";
 import "./chunk-RFBXMG3F.js";
 import "./chunk-OVPAOBZB.js";
-import "./chunk-UKFEMWID.js";
+import "./chunk-CDJVJZGQ.js";
 import {
   EditProductMediaSchema,
   MediaSchema,
   PRODUCT_CREATE_FORM_DEFAULTS,
   ProductCreateSchema
-} from "./chunk-S2VRZMKR.js";
+} from "./chunk-YMUXQFOC.js";
 import "./chunk-UXD3VNBO.js";
 import "./chunk-SMQT3ZNO.js";
 import "./chunk-KDE4HKH2.js";

package/dist/{edit-N3MHDCAT.js → edit-VLKDSPFM.js}

@@ -7,7 +7,7 @@ import {
 import {
   FileUpload,
   MediaSchema
-} from "./chunk-S2VRZMKR.js";
+} from "./chunk-YMUXQFOC.js";
 import "./chunk-UXD3VNBO.js";
 import "./chunk-SMQT3ZNO.js";
 import "./chunk-U5U446UX.js";

package/dist/index.js

@@ -176,7 +176,7 @@ function getRouteMap({
                       {
                         path: "",
                         lazy: async () => {
-                          const { productListLoader, ProductListPage } = await import("./products-IX2HMY2A.js");
+                          const { productListLoader, ProductListPage } = await import("./products-2FUI5H5W.js");
                           return {
                             Component: ProductListPage,
                             loader: withPermission(productListLoader, "products:view")
@@ -187,7 +187,7 @@ function getRouteMap({
                             path: "create",
                             handle: { permissions: "products:edit" },
                             lazy: async () => {
-                              const { ProductCreatePage } = await import("./create-OSWM6H4X.js");
+                              const { ProductCreatePage } = await import("./create-MYLL6LX4.js");
                               return {
                                 Component: ProductCreatePage
                               };
@@ -241,7 +241,7 @@ function getRouteMap({
                               {
                                 path: "media",
                                 handle: { permissions: "products:edit" },
-                                lazy: () => import("./media-7KOJLOEP.js")
+                                lazy: () => import("./media-K6I5ZZBK.js")
                               },
                               {
                                 path: "attributes",
@@ -1242,7 +1242,7 @@ function getRouteMap({
                           {
                             path: "edit",
                             handle: { permissions: "store:edit" },
-                            lazy: () => import("./edit-N3MHDCAT.js")
+                            lazy: () => import("./edit-VLKDSPFM.js")
                           },
                           {
                             path: "address",

package/dist/{media-7KOJLOEP.js → media-K6I5ZZBK.js}

@@ -1,9 +1,9 @@
 import {
   UploadMediaFormItem
-} from "./chunk-UKFEMWID.js";
+} from "./chunk-CDJVJZGQ.js";
 import {
   EditProductMediaSchema
-} from "./chunk-S2VRZMKR.js";
+} from "./chunk-YMUXQFOC.js";
 import "./chunk-UXD3VNBO.js";
 import "./chunk-SMQT3ZNO.js";
 import "./chunk-U5U446UX.js";

package/dist/pages/index.js

@@ -116,7 +116,7 @@ import "../chunk-PHOCVOZ5.js";
 import {
   ProductCreate,
   ProductCreatePage
-} from "../chunk-T7CFO2NU.js";
+} from "../chunk-RLPH22S3.js";
 import "../chunk-LEWA4BPH.js";
 import "../chunk-YXJUIFQA.js";
 import "../chunk-HJ56YXBU.js";
@@ -125,13 +125,13 @@ import "../chunk-YXC5DS7W.js";
 import "../chunk-YVCBMOJG.js";
 import "../chunk-RFBXMG3F.js";
 import "../chunk-OVPAOBZB.js";
-import "../chunk-UKFEMWID.js";
+import "../chunk-CDJVJZGQ.js";
 import {
   EditProductMediaSchema,
   MediaSchema,
   PRODUCT_CREATE_FORM_DEFAULTS,
   ProductCreateSchema
-} from "../chunk-S2VRZMKR.js";
+} from "../chunk-YMUXQFOC.js";
 import "../chunk-UXD3VNBO.js";
 import "../chunk-SMQT3ZNO.js";
 import "../chunk-KDE4HKH2.js";

package/dist/{products-IX2HMY2A.js → products-2FUI5H5W.js}

@@ -13,7 +13,7 @@ import "./chunk-PHOCVOZ5.js";
 import {
   ProductCreate,
   ProductCreatePage
-} from "./chunk-T7CFO2NU.js";
+} from "./chunk-RLPH22S3.js";
 import "./chunk-LEWA4BPH.js";
 import "./chunk-YXJUIFQA.js";
 import "./chunk-HJ56YXBU.js";
@@ -22,13 +22,13 @@ import "./chunk-YXC5DS7W.js";
 import "./chunk-YVCBMOJG.js";
 import "./chunk-RFBXMG3F.js";
 import "./chunk-OVPAOBZB.js";
-import "./chunk-UKFEMWID.js";
+import "./chunk-CDJVJZGQ.js";
 import {
   EditProductMediaSchema,
   MediaSchema,
   PRODUCT_CREATE_FORM_DEFAULTS,
   ProductCreateSchema
-} from "./chunk-S2VRZMKR.js";
+} from "./chunk-YMUXQFOC.js";
 import "./chunk-UXD3VNBO.js";
 import "./chunk-SMQT3ZNO.js";
 import "./chunk-KDE4HKH2.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/vendor",
-  "version": "2.3.7-canary.0",
+  "version": "2.3.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",
@@ -37,8 +37,8 @@
     "lint": "oxlint --max-warnings 0"
   },
   "dependencies": {
-    "@mercurjs/dashboard-shared": "2.3.7-canary.0",
-    "@mercurjs/client": "2.3.7-canary.0",
+    "@mercurjs/dashboard-shared": "2.3.7",
+    "@mercurjs/client": "2.3.7",
     "@ariakit/react": "^0.4.15",
     "@babel/runtime": "^8.0.0",
     "@dnd-kit/core": "^6.1.0",
@@ -91,9 +91,9 @@
     "tsup": "^8.0.2",
     "typescript": "5.9.3",
     "@medusajs/types": "2.21.2",
-    "@mercurjs/core": "2.3.7-canary.0",
-    "@mercurjs/dashboard-sdk": "2.3.7-canary.0",
-    "@mercurjs/types": "2.3.7-canary.0",
+    "@mercurjs/core": "2.3.7",
+    "@mercurjs/dashboard-sdk": "2.3.7",
+    "@mercurjs/types": "2.3.7",
     "react-router-dom": "7.18.1"
   }
 }