Merge pull request #77 from lambda-curry/codex/medusa-2-13-1-upgrade

Author: dwene

.github/workflows/pr-checks.yaml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   lint:
-    runs-on: warp-ubuntu-2404-x64-2x
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -25,24 +25,23 @@ jobs:
         run: biome ci .
 
   typecheck:
-    runs-on: warp-ubuntu-2404-x64-2x
+    runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Cache turbo build setup
-        if: env.skip == 'false'
-        uses: WarpBuilds/cache@v1
+        uses: actions/cache@v4
         with:
           path: .turbo
           key: ${{ runner.os }}-turbo-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-turbo-
 
       - name: Setup Node.js environment
-        uses: WarpBuilds/setup-node@v4
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -51,9 +50,7 @@ jobs:
         run: yarn install --immutable
 
       - name: Type-check
-        if: ${{ needs.detect-changes.outputs.e2e == 'true' }}
         run: yarn typecheck
 
       - name: Build
         run: yarn build
-      

.yarn/releases/yarn-4.5.0.cjs

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.0.cjs
+yarnPath: .yarn/releases/yarn-4.9.1.cjs

.yarn/releases/yarn-4.9.1.cjs

@@ -32,34 +32,29 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@lambdacurry/medusa-product-reviews": "1.2.0",
-    "@medusajs/admin-sdk": "2.7.0",
-    "@medusajs/cli": "2.7.0",
-    "@medusajs/framework": "2.7.0",
-    "@medusajs/js-sdk": "2.7.0",
-    "@medusajs/medusa": "2.7.0",
-    "@medusajs/types": "2.7.0",
-    "@mikro-orm/core": "6.4.3",
-    "@mikro-orm/knex": "6.4.3",
-    "@mikro-orm/migrations": "6.4.3",
-    "@mikro-orm/postgresql": "6.4.3",
-    "awilix": "^8.0.1",
-    "pg": "^8.13.0"
+    "@lambdacurry/medusa-product-reviews": "1.3.1",
+    "@medusajs/admin-sdk": "2.13.1",
+    "@medusajs/cli": "2.13.1",
+    "@medusajs/framework": "2.13.1",
+    "@medusajs/icons": "2.13.1",
+    "@medusajs/js-sdk": "2.13.1",
+    "@medusajs/medusa": "2.13.1",
+    "@medusajs/types": "2.13.1",
+    "@medusajs/ui": "4.1.1",
+    "posthog-node": "5.11.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "devDependencies": {
-    "@medusajs/test-utils": "2.7.0",
-    "@mikro-orm/cli": "6.4.3",
-    "@mikro-orm/core": "6.4.3",
-    "@mikro-orm/migrations": "6.4.3",
-    "@mikro-orm/postgresql": "6.4.3",
-    "@stdlib/number-float64-base-normalize": "0.0.8",
-    "@swc/core": "1.5.7",
+    "@medusajs/test-utils": "2.13.1",
+    "@swc/core": "^1.7.28",
     "@swc/jest": "^0.2.36",
     "@types/express": "^4.17.13",
     "@types/jest": "^29.5.12",
     "@types/mime": "1.3.5",
     "@types/node": "^17.0.8",
     "@types/react": "^18.3.2",
+    "@types/react-dom": "^18",
     "jest": "^29.7.0",
     "prop-types": "^15.8.1",
     "ts-node": "^10.9.2",

.yarnrc.yml

@@ -23,7 +23,7 @@ export const Footer = () => {
   const { region } = useRegion();
 
   const regionOptions = useMemo(() => {
-    return regions.map((region) => ({
+    return (regions ?? []).map((region) => ({
       label: `${region.name} (${region.currency_code})`,
       value: region.id,
     }));

apps/medusa/package.json

@@ -1,7 +1,8 @@
+import type { SiteDetailsRootData } from '@libs/types';
 import { useRootLoaderData } from './useRootLoaderData';
 
 export const useSiteDetails = () => {
   const data = useRootLoaderData();
 
-  return data.siteDetails || {};
+  return data?.siteDetails ?? ({} as SiteDetailsRootData);
 };

apps/storefront/app/components/layout/footer/Footer.tsx

@@ -284,6 +284,7 @@ export const getProductMeta: MetaFunction = ({ data, matches }) => {
   const ogDescription = description;
   const ogImage = product.thumbnail || product.images?.[0]?.url;
   const ogImageAlt = !!ogImage ? `${title} product thumbnail` : undefined;
+  const currencyCode = region?.currency_code ?? 'usd';
 
   return [
     { title },
@@ -293,11 +294,11 @@ export const getProductMeta: MetaFunction = ({ data, matches }) => {
     { property: 'og:image', content: ogImage },
     { property: 'og:image:alt', content: ogImageAlt },
     { property: 'og:type', content: 'product' },
-    { property: 'product:price:currency', content: region.currency_code },
+    { property: 'product:price:currency', content: currencyCode },
     {
       property: 'product:price:amount',
       content: formatPrice(getVariantFinalPrice(defaultVariant), {
-        currency: region.currency_code,
+        currency: currencyCode,
       }),
     },
   ];

apps/storefront/app/hooks/useSiteDetails.ts

@@ -144,7 +144,7 @@ export const deleteLineItem = withAuthHeaders(async (request, authHeaders, lineI
     throw new Error('Missing cart ID when deleting line item');
   }
 
-  return await sdk.store.cart.deleteLineItem(cartId, lineId, authHeaders).catch(medusaError);
+  return await sdk.store.cart.deleteLineItem(cartId, lineId, {}, authHeaders).catch(medusaError);
 });
 
 export async function enrichLineItems(

apps/storefront/libs/util/products.ts

@@ -58,7 +58,7 @@ export const reviewsFileUploadHandler = async (fileUpload: FileUpload) => {
 
     // FileUpload objects are not meant to stick around for very long (they are
     // streaming data from the request.body); store them as soon as possible.
-    await memoryStorage.set(storageKey, fileUpload);
+    await memoryStorage.set(storageKey, fileUpload as unknown as File);
 
     // Return a File for the FormData object. This is a LazyFile that knows how
     // to access the file's content if needed (using e.g. file.stream()) but