Merge branch 'develop' into chore/small-cleanup-inspection

medusajs · Feb 9, 2024 · 7bc44eb · 7bc44eb
2 parents 8043c06 + dc88fd3
commit 7bc44eb
Show file tree

Hide file tree

Showing 20 changed files with 61 additions and 41 deletions.
diff --git a/.changeset/few-parrots-crash.md b/.changeset/few-parrots-crash.md
diff --git a/.changeset/happy-zoos-smile.md b/.changeset/happy-zoos-smile.md
diff --git a/.changeset/silent-wombats-beg.md b/.changeset/silent-wombats-beg.md
diff --git a/.changeset/spicy-pillows-drum.md b/.changeset/spicy-pillows-drum.md
diff --git a/packages/admin-next/admin-bundler/package.json b/packages/admin-next/admin-bundler/package.json
@@ -19,7 +19,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@medusajs/ui-preset": "^1.1.1",
+    "@medusajs/ui-preset": "^1.1.2",
     "@medusajs/vite-plugin-extension": "*",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.16",

diff --git a/packages/cart/package.json b/packages/cart/package.json
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@medusajs/modules-sdk": "^1.12.8",
-    "@medusajs/utils": "^1.11.5",
+    "@medusajs/utils": "^1.11.6",
     "@mikro-orm/core": "5.9.7",
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",

diff --git a/packages/customer/package.json b/packages/customer/package.json
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@medusajs/modules-sdk": "^1.12.8",
-    "@medusajs/utils": "^1.11.5",
+    "@medusajs/utils": "^1.11.6",
     "@mikro-orm/core": "5.9.7",
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",

diff --git a/packages/design-system/ui-preset/CHANGELOG.md b/packages/design-system/ui-preset/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @medusajs/ui-preset
 
+## 1.1.2
+
+### Patch Changes
+
+- [#6357](https://github.com/medusajs/medusa/pull/6357) [`85a44dfd0`](https://github.com/medusajs/medusa/commit/85a44dfd017ab53b539bcfca04a32f1a0786a23c) Thanks [@kasperkristensen](https://github.com/kasperkristensen)! - fix(ui,ui-preset): Fixes an issue where the color styles of two code components was broken
+
 ## 1.1.1
 
 ### Patch Changes

diff --git a/packages/design-system/ui-preset/package.json b/packages/design-system/ui-preset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/ui-preset",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Medusa UI preset",
   "license": "MIT",
   "repository": {

diff --git a/packages/design-system/ui/CHANGELOG.md b/packages/design-system/ui/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @medusajs/ui
 
+## 2.4.1
+
+### Patch Changes
+
+- [#6357](https://github.com/medusajs/medusa/pull/6357) [`85a44dfd0`](https://github.com/medusajs/medusa/commit/85a44dfd017ab53b539bcfca04a32f1a0786a23c) Thanks [@kasperkristensen](https://github.com/kasperkristensen)! - fix(ui,ui-preset): Fixes an issue where the color styles of two code components was broken
+
 ## 2.4.0
 
 ### Minor Changes

diff --git a/packages/design-system/ui/package.json b/packages/design-system/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/ui",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "author": "Kasper Kristensen <[email protected]>",
   "license": "MIT",
   "repository": {
@@ -42,7 +42,7 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@medusajs/ui-preset": "^1.1.1",
+    "@medusajs/ui-preset": "^1.1.2",
     "@storybook/addon-essentials": "^7.0.23",
     "@storybook/addon-interactions": "^7.0.23",
     "@storybook/addon-links": "^7.0.23",

diff --git a/packages/medusa-js/CHANGELOG.md b/packages/medusa-js/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 6.1.7
+
+### Patch Changes
+
+- [`20cefa033`](https://github.com/medusajs/medusa/commit/20cefa0335384e3c37f593c9698651895765234e) Thanks [@olivermrbl](https://github.com/olivermrbl)! - feat(medusa-js): add axios adapter to config
+
 ## 6.1.6
 
 ### Patch Changes

diff --git a/packages/medusa-js/package.json b/packages/medusa-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/medusa-js",
-  "version": "6.1.6",
+  "version": "6.1.7",
   "description": "Client for Medusa Commerce Rest API",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/packages/medusa-react/CHANGELOG.md b/packages/medusa-react/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 9.0.15
+
+### Patch Changes
+
+- [`ef64f3740`](https://github.com/medusajs/medusa/commit/ef64f3740d90a8b8565ed10d33e8e35a640cd1ae) Thanks [@olivermrbl](https://github.com/olivermrbl)! - chore: Add missing changeset for medusa-react
+
+- Updated dependencies [[`20cefa033`](https://github.com/medusajs/medusa/commit/20cefa0335384e3c37f593c9698651895765234e)]:
+  - @medusajs/medusa-js@6.1.7
+
 ## 9.0.14
 
 ### Patch Changes

diff --git a/packages/medusa-react/package.json b/packages/medusa-react/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "9.0.14",
+  "version": "9.0.15",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @medusajs/types
 
+## 1.11.13
+
+### Patch Changes
+
+- [#6328](https://github.com/medusajs/medusa/pull/6328) [`3fd68d197`](https://github.com/medusajs/medusa/commit/3fd68d1979828e3cde6e028e9e6ab0d0fadcb77b) Thanks [@adrien2p](https://github.com/adrien2p)! - feat(fulfillment): Initialize models work
+
 ## 1.11.12
 
 ### Patch Changes

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/types",
-  "version": "1.11.12",
+  "version": "1.11.13",
   "description": "Medusa Types definition",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @medusajs/utils
 
+## 1.11.6
+
+### Patch Changes
+
+- [#6328](https://github.com/medusajs/medusa/pull/6328) [`3fd68d197`](https://github.com/medusajs/medusa/commit/3fd68d1979828e3cde6e028e9e6ab0d0fadcb77b) Thanks [@adrien2p](https://github.com/adrien2p)! - feat(fulfillment): Initialize models work
+
+- Updated dependencies [[`3fd68d197`](https://github.com/medusajs/medusa/commit/3fd68d1979828e3cde6e028e9e6ab0d0fadcb77b)]:
+  - @medusajs/types@1.11.13
+
 ## 1.11.5
 
 ### Patch Changes

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/utils",
-  "version": "1.11.5",
+  "version": "1.11.6",
   "description": "Medusa utilities functions shared by Medusa core and Modules",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@medusajs/types": "^1.11.12",
+    "@medusajs/types": "^1.11.13",
     "@mikro-orm/core": "5.9.7",
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",

diff --git a/yarn.lock b/yarn.lock
@@ -7735,7 +7735,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@medusajs/admin-bundler@workspace:packages/admin-next/admin-bundler"
   dependencies:
-    "@medusajs/ui-preset": ^1.1.1
+    "@medusajs/ui-preset": ^1.1.2
     "@medusajs/vite-plugin-extension": "*"
     "@vitejs/plugin-react": ^4.2.1
     autoprefixer: ^10.4.16
@@ -7964,7 +7964,7 @@ __metadata:
   dependencies:
     "@medusajs/modules-sdk": ^1.12.8
     "@medusajs/types": "workspace:^"
-    "@medusajs/utils": ^1.11.5
+    "@medusajs/utils": ^1.11.6
     "@mikro-orm/cli": 5.9.7
     "@mikro-orm/core": 5.9.7
     "@mikro-orm/migrations": 5.9.7
@@ -8024,7 +8024,7 @@ __metadata:
   dependencies:
     "@medusajs/modules-sdk": ^1.12.8
     "@medusajs/types": "workspace:^"
-    "@medusajs/utils": ^1.11.5
+    "@medusajs/utils": ^1.11.6
     "@mikro-orm/cli": 5.9.7
     "@mikro-orm/core": 5.9.7
     "@mikro-orm/migrations": 5.9.7
@@ -8702,7 +8702,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/types@^1.10.0, @medusajs/types@^1.11.11, @medusajs/types@^1.11.12, @medusajs/types@^1.11.6, @medusajs/types@^1.11.8, @medusajs/types@^1.11.9, @medusajs/types@^1.8.10, @medusajs/types@workspace:^, @medusajs/types@workspace:packages/types":
+"@medusajs/types@^1.10.0, @medusajs/types@^1.11.11, @medusajs/types@^1.11.12, @medusajs/types@^1.11.13, @medusajs/types@^1.11.6, @medusajs/types@^1.11.8, @medusajs/types@^1.11.9, @medusajs/types@^1.8.10, @medusajs/types@workspace:^, @medusajs/types@workspace:packages/types":
   version: 0.0.0-use.local
   resolution: "@medusajs/types@workspace:packages/types"
   dependencies:
@@ -8716,7 +8716,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/ui-preset@^1.1.1, @medusajs/ui-preset@workspace:^, @medusajs/ui-preset@workspace:packages/design-system/ui-preset":
+"@medusajs/ui-preset@^1.1.1, @medusajs/ui-preset@^1.1.2, @medusajs/ui-preset@workspace:^, @medusajs/ui-preset@workspace:packages/design-system/ui-preset":
   version: 0.0.0-use.local
   resolution: "@medusajs/ui-preset@workspace:packages/design-system/ui-preset"
   dependencies:
@@ -8736,7 +8736,7 @@ __metadata:
   resolution: "@medusajs/ui@workspace:packages/design-system/ui"
   dependencies:
     "@medusajs/icons": ^1.2.0
-    "@medusajs/ui-preset": ^1.1.1
+    "@medusajs/ui-preset": ^1.1.2
     "@radix-ui/react-accordion": ^1.1.2
     "@radix-ui/react-alert-dialog": ^1.0.4
     "@radix-ui/react-avatar": ^1.0.3
@@ -8832,11 +8832,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@medusajs/utils@^1.1.41, @medusajs/utils@^1.10.5, @medusajs/utils@^1.11.1, @medusajs/utils@^1.11.2, @medusajs/utils@^1.11.3, @medusajs/utils@^1.11.4, @medusajs/utils@^1.11.5, @medusajs/utils@^1.9.4, @medusajs/utils@workspace:^, @medusajs/utils@workspace:packages/utils":
+"@medusajs/utils@^1.1.41, @medusajs/utils@^1.10.5, @medusajs/utils@^1.11.1, @medusajs/utils@^1.11.2, @medusajs/utils@^1.11.3, @medusajs/utils@^1.11.4, @medusajs/utils@^1.11.5, @medusajs/utils@^1.11.6, @medusajs/utils@^1.9.4, @medusajs/utils@workspace:^, @medusajs/utils@workspace:packages/utils":
   version: 0.0.0-use.local
   resolution: "@medusajs/utils@workspace:packages/utils"
   dependencies:
-    "@medusajs/types": ^1.11.12
+    "@medusajs/types": ^1.11.13
     "@mikro-orm/core": 5.9.7
     "@mikro-orm/migrations": 5.9.7
     "@mikro-orm/postgresql": 5.9.7