Merge branch 'develop' into fix/ful-ikit-res

packages/admin/admin-bundler/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @medusajs/admin-bundler
 
+## 2.6.1
+
+### Patch Changes
+
+- [#11738](https://github.com/medusajs/medusa/pull/11738) [`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861) Thanks [@olivermrbl](https://github.com/olivermrbl)! - chore: Remove ranges on Medusa packages
+
+- Updated dependencies [[`4c28efaadc01fd0782721924c3c2eff0f6f9ba7a`](https://github.com/medusajs/medusa/commit/4c28efaadc01fd0782721924c3c2eff0f6f9ba7a), [`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861)]:
+  - @medusajs/dashboard@2.6.1
+  - @medusajs/admin-shared@2.6.1
+  - @medusajs/admin-vite-plugin@2.6.1
+
 ## 2.6.0
 
 ### Patch Changes

packages/admin/admin-bundler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/admin-bundler",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Bundler for the Medusa admin dashboard.",
   "author": "Kasper Kristensen <[email protected]>",
   "scripts": {
@@ -18,17 +18,17 @@
     "package.json"
   ],
   "devDependencies": {
-    "@medusajs/types": "2.6.0",
+    "@medusajs/types": "2.6.1",
     "@types/compression": "^1.7.5",
     "copyfiles": "^2.4.1",
     "express": "^4.21.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@medusajs/admin-shared": "2.6.0",
-    "@medusajs/admin-vite-plugin": "2.6.0",
-    "@medusajs/dashboard": "2.6.0",
+    "@medusajs/admin-shared": "2.6.1",
+    "@medusajs/admin-vite-plugin": "2.6.1",
+    "@medusajs/dashboard": "2.6.1",
     "@rollup/plugin-node-resolve": "^16.0.0",
     "@vitejs/plugin-react": "^4.2.1",
     "autoprefixer": "^10.4.16",

packages/admin/admin-sdk/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @medusajs/admin-sdk
 
+## 2.6.1
+
+### Patch Changes
+
+- [#11738](https://github.com/medusajs/medusa/pull/11738) [`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861) Thanks [@olivermrbl](https://github.com/olivermrbl)! - chore: Remove ranges on Medusa packages
+
+- Updated dependencies []:
+  - @medusajs/admin-shared@2.6.1
+
 ## 2.6.0
 
 ### Patch Changes

packages/admin/admin-sdk/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@medusajs/admin-sdk",
   "description": "SDK for building extension for the Medusa admin dashboard.",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "author": "Kasper Kristensen <[email protected]>",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
@@ -24,7 +24,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@medusajs/admin-shared": "2.6.0",
+    "@medusajs/admin-shared": "2.6.1",
     "zod": "3.22.4"
   },
   "packageManager": "[email protected]"

packages/admin/admin-shared/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @medusajs/admin-shared
 
+## 2.6.1
+
 ## 2.6.0
 
 ## 2.5.1

packages/admin/admin-shared/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@medusajs/admin-shared",
   "description": "Shared code for Medusa admin packages.",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "author": "Kasper Kristensen <[email protected]>",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",

packages/admin/admin-vite-plugin/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @medusajs/admin-vite-plugin
 
+## 2.6.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @medusajs/admin-shared@2.6.1
+
 ## 2.6.0
 
 ### Patch Changes

packages/admin/admin-vite-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/admin-vite-plugin",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -40,7 +40,7 @@
     "@babel/parser": "7.25.6",
     "@babel/traverse": "7.25.6",
     "@babel/types": "7.25.6",
-    "@medusajs/admin-shared": "2.6.0",
+    "@medusajs/admin-shared": "2.6.1",
     "chokidar": "3.5.3",
     "fdir": "6.1.1",
     "magic-string": "0.30.5",

packages/admin/dashboard/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @medusajs/dashboard
 
+## 2.6.1
+
+### Patch Changes
+
+- [#11731](https://github.com/medusajs/medusa/pull/11731) [`4c28efaadc01fd0782721924c3c2eff0f6f9ba7a`](https://github.com/medusajs/medusa/commit/4c28efaadc01fd0782721924c3c2eff0f6f9ba7a) Thanks [@fPolic](https://github.com/fPolic)! - fix(dashboard): correctly format date cell time
+
+- [#11738](https://github.com/medusajs/medusa/pull/11738) [`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861) Thanks [@olivermrbl](https://github.com/olivermrbl)! - chore: Remove ranges on Medusa packages
+
+- Updated dependencies [[`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861)]:
+  - @medusajs/icons@2.6.1
+  - @medusajs/ui@4.0.7
+  - @medusajs/js-sdk@2.6.1
+  - @medusajs/admin-shared@2.6.1
+
 ## 2.6.0
 
 ### Patch Changes

packages/admin/dashboard/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/dashboard",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "scripts": {
     "generate:static": "node ./scripts/generate-currencies.js && prettier --write ./src/lib/currencies.ts",
     "dev": "vite",
@@ -45,10 +45,10 @@
     "@dnd-kit/sortable": "^8.0.0",
     "@hookform/error-message": "^2.0.1",
     "@hookform/resolvers": "3.4.2",
-    "@medusajs/admin-shared": "2.6.0",
-    "@medusajs/icons": "2.6.0",
-    "@medusajs/js-sdk": "2.6.0",
-    "@medusajs/ui": "4.0.6",
+    "@medusajs/admin-shared": "2.6.1",
+    "@medusajs/icons": "2.6.1",
+    "@medusajs/js-sdk": "2.6.1",
+    "@medusajs/ui": "4.0.7",
     "@tanstack/react-query": "5.64.2",
     "@tanstack/react-table": "8.20.5",
     "@tanstack/react-virtual": "^3.8.3",
@@ -75,10 +75,10 @@
     "zod": "3.22.4"
   },
   "devDependencies": {
-    "@medusajs/admin-shared": "2.6.0",
-    "@medusajs/admin-vite-plugin": "2.6.0",
-    "@medusajs/types": "2.6.0",
-    "@medusajs/ui-preset": "2.6.0",
+    "@medusajs/admin-shared": "2.6.1",
+    "@medusajs/admin-vite-plugin": "2.6.1",
+    "@medusajs/types": "2.6.1",
+    "@medusajs/ui-preset": "2.6.1",
     "@types/node": "^20.11.15",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",

packages/admin/dashboard/src/components/table/table-cells/common/date-cell/date-cell.tsx

@@ -1,35 +1,33 @@
 import { Tooltip } from "@medusajs/ui"
-import { format } from "date-fns/format"
 import { useTranslation } from "react-i18next"
 import { PlaceholderCell } from "../placeholder-cell"
+import { useDate } from "../../../../../hooks/use-date"
 
 type DateCellProps = {
   date?: Date | string | null
 }
 
 export const DateCell = ({ date }: DateCellProps) => {
+  const { getFullDate } = useDate()
+
   if (!date) {
     return <PlaceholderCell />
   }
 
-  const value = new Date(date)
-  value.setMinutes(value.getMinutes() - value.getTimezoneOffset())
-
-  const hour12 = Intl.DateTimeFormat().resolvedOptions().hour12
-  const timestampFormat = hour12 ? "dd MMM yyyy hh:MM a" : "dd MMM yyyy HH:MM"
-
   return (
     <div className="flex h-full w-full items-center overflow-hidden">
       <Tooltip
         className="z-10"
         content={
-          <span className="text-pretty">{`${format(
-            value,
-            timestampFormat
-          )}`}</span>
+          <span className="text-pretty">{`${getFullDate({
+            date,
+            includeTime: true,
+          })}`}</span>
         }
       >
-        <span className="truncate">{format(value, "dd MMM yyyy")}</span>
+        <span className="truncate">
+          {getFullDate({ date, includeTime: false })}
+        </span>
       </Tooltip>
     </div>
   )

packages/cli/create-medusa-app/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.6.1
+
+### Patch Changes
+
+- [#11738](https://github.com/medusajs/medusa/pull/11738) [`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861) Thanks [@olivermrbl](https://github.com/olivermrbl)! - chore: Remove ranges on Medusa packages
+
+- Updated dependencies []:
+  - @medusajs/telemetry@2.6.1
+
 ## 2.6.0
 
 ### Patch Changes

packages/cli/create-medusa-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-medusa-app",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Create a Medusa project using a single command.",
   "type": "module",
   "exports": "./dist/index.js",
@@ -13,7 +13,7 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "@medusajs/telemetry": "2.6.0",
+    "@medusajs/telemetry": "2.6.1",
     "boxen": "^5",
     "chalk": "^5.2.0",
     "commander": "^10.0.1",

packages/cli/medusa-cli/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 2.6.1
+
+### Patch Changes
+
+- [#11738](https://github.com/medusajs/medusa/pull/11738) [`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861) Thanks [@olivermrbl](https://github.com/olivermrbl)! - chore: Remove ranges on Medusa packages
+
+- Updated dependencies [[`3b470f41427e487c68f89b8ee8155de716ffe861`](https://github.com/medusajs/medusa/commit/3b470f41427e487c68f89b8ee8155de716ffe861)]:
+  - @medusajs/utils@2.6.1
+  - @medusajs/telemetry@2.6.1
+
 ## 2.6.0
 
 ### Patch Changes