Merge branch 'develop' into feat/promotion-dml

medusajs · Dec 9, 2024 · a931beb · a931beb
2 parents 882c6a5 + 0ae98c5
commit a931beb
Show file tree

Hide file tree

Showing 252 changed files with 8,334 additions and 3,537 deletions.
diff --git a/.changeset/dry-cheetahs-wait.md b/.changeset/dry-cheetahs-wait.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/dashboard": patch
+"@medusajs/types": patch
+---
+
+feat(dashboard,types): Add UI to manage conditional SO prices
diff --git a/.changeset/empty-snails-admire.md b/.changeset/empty-snails-admire.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): add query type argument to RequestWithContext
diff --git a/.changeset/empty-trees-walk.md b/.changeset/empty-trees-walk.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/promotion": patch
+"@medusajs/core-flows": patch
+---
+
+fix(promotion, core-flows): updating cart with removed promotion removes adjustments
diff --git a/.changeset/stale-eyes-float.md b/.changeset/stale-eyes-float.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/dashboard": patch
+"@medusajs/types": patch
+---
+
+fix(dashboard,types): Fix TS errors
diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml
@@ -41,9 +41,9 @@ jobs:
           NEXT_PUBLIC_BASE_URL: "http://localhost:3000"
           NEXT_PUBLIC_BASE_PATH: /api
           NEXT_PUBLIC_DOCS_URL: "https://medusa-docs.vercel.app"
-          NEXT_PUBLIC_UI_URL: "https://docs-ui.vercel.app"
+          NODE_ENV: production
+          NEXT_PUBLIC_RESOURCES_URL: "http://medusa-types-nine.vercel.app"
           # TODO change once we have actual URLs
-          NEXT_PUBLIC_RESOURCES_URL: "http://example.com"
           NEXT_PUBLIC_USER_GUIDE_URL: "http://example.com"
 
   vale-book: