Skip to content

Commit af3d01e

Browse files
jimrarrasjimrarras
authored
Merge branch 'develop' into feat/translate-el
2 parents a796cd1 + cbcca21 commit af3d01e

File tree

3,974 files changed

+628011
-353507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,974 files changed

+628011
-353507
lines changed

‎.changeset/afraid-experts-walk.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/utils": patch
3+
---
4+
5+
feat: add default retry strategy for redis

‎.changeset/angry-jobs-prove.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/types": patch
3+
---
4+
5+
fix(types): add missing inventory_items to input of createProductsWorkflow

‎.changeset/calm-cameras-unite.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/framework": patch
4+
"@medusajs/cli": patch
5+
---
6+
7+
feat: add plugin build command

‎.changeset/chilled-schools-collect.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/orchestration": patch
3+
---
4+
5+
fix(orchestration): avoid retry when finished

‎.changeset/eight-nails-act.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@medusajs/admin-bundler": patch
3+
"@medusajs/cli": patch
4+
"@medusajs/framework": patch
5+
"@medusajs/medusa": patch
6+
---
7+
8+
feat(medusa,admin-bundler,cli,framework): Integrate admin extensions into plugin build

‎.changeset/eleven-rules-battle.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/dashboard": patch
3+
"@medusajs/core-flows": patch
4+
---
5+
6+
fix(dashboard, core-flows): improvements to order page on canceled orders

‎.changeset/five-candles-dress.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
"@medusajs/medusa": patch
4+
---
5+
6+
fix(core-flows,medusa): use deleteRefundReasonsWorkflow in delete /admin/refund-reasons/:id

‎.changeset/forty-lamps-fly.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/framework": patch
4+
"@medusajs/cli": patch
5+
---
6+
7+
Feat/plugin develop

‎.changeset/gorgeous-comics-compete.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
---
4+
5+
fix(core-flows): process payment capture condition

‎.changeset/grumpy-ladybugs-tickle.md

-6
This file was deleted.

‎.changeset/grumpy-papayas-call.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/cli": patch
4+
---
5+
6+
feat(cli): Add plugin:publish and plugin:add commands support

‎.changeset/itchy-walls-call.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/medusa": patch
3+
---
4+
5+
chore(medusa): Add handler path to the http tracing to be able to group by

‎.changeset/long-tigers-sparkle.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@medusajs/promotion": patch
3+
"@medusajs/dashboard": patch
4+
"@medusajs/types": patch
5+
"@medusajs/utils": patch
6+
"@medusajs/medusa": patch
7+
---
8+
9+
feat(promotion,dashboard,types,utils,medusa): Add statuses to promotions

‎.changeset/nasty-poets-pretend.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/pricing": patch
3+
---
4+
5+
fix(pricing): add null conditions for deleted at during price calculations

‎.changeset/neat-lamps-check.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/framework": patch
4+
"@medusajs/types": patch
5+
---
6+
7+
feat: add support for loading admin extensions from the source

‎.changeset/nice-tigers-visit.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/index": patch
3+
---
4+
5+
fix(index): cast order by

‎.changeset/quick-buttons-raise.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/pricing": patch
3+
---
4+
5+
fix(pricing): PriceLists of type Sale no longer override default prices when the price list price is higher than the default price.

‎.changeset/quiet-beers-compare.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
---
4+
5+
feat(core-flows): validation hook on cart mutations

‎.changeset/seven-gorillas-smile.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/cli": patch
4+
---
5+
6+
Feat(medusa, cli): plugin db generate

‎.changeset/silent-keys-sniff.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"create-medusa-app": patch
3+
---
4+
5+
Feat/plugin scaffolding

‎.changeset/six-bears-vanish.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/framework": patch
4+
"@medusajs/cli": patch
5+
---
6+
7+
feat(core, medusa, cli): Enable migration scripts

‎.changeset/sixty-peaches-hug.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
---
4+
5+
fix(core-flows): return refunded when all captured payments have been refunded

‎.changeset/stupid-plums-buy.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/admin-vite-plugin": patch
3+
"@medusajs/admin-bundler": patch
4+
"@medusajs/medusa": patch
5+
---
6+
7+
feat(admin-bundler,admin-vite-plugin): Support loading loading admin extensions from plugins.

‎.changeset/tall-gorillas-smash.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/framework": patch
3+
---
4+
5+
fix(framework): Exclude .d.ts files from the glob search and Properly generate the insert query string

‎.changeset/thick-books-walk.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/medusa": patch
3+
---
4+
5+
chore: lazy import admin-bundler and run scripts during publish

‎.changeset/thin-games-worry.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/types": patch
4+
"@medusajs/utils": patch
5+
---
6+
7+
Feat/merge plugin modules

‎.changeset/tiny-moles-build.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/test-utils": patch
4+
"@medusajs/types": patch
5+
"@medusajs/utils": patch
6+
---
7+
8+
feat: remove dead code and refactor the logic of resolving plugins

‎.changeset/violet-weeks-pretend.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"@medusajs/inventory": patch
3+
"@medusajs/dashboard": patch
4+
"@medusajs/core-flows": patch
5+
"@medusajs/js-sdk": patch
6+
"@medusajs/types": patch
7+
"@medusajs/medusa": patch
8+
---
9+
10+
feat(inventory,dashboard,core-flows,js-sdk,types,medusa): Improve inventory management UX

‎.changeset/weak-poems-run.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/icons": patch
3+
"@medusajs/dashboard": patch
4+
---
5+
6+
chore(icons,dashboard): Pull latest icons and update branch icon in category tree

‎.changeset/wild-parrots-lie.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/framework": patch
4+
---
5+
6+
chore: move build utilities to Compiler class

‎.github/workflows/test-cli-with-database.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
node-version: 20
4848

4949
- name: Install Medusa cli
50-
run: npm i -g @medusajs/cli@preview
50+
run: npm i -g @medusajs/cli@latest
5151

5252
- name: Create Medusa project
5353
run: |
@@ -59,22 +59,22 @@ jobs:
5959
working-directory: ../cli-test
6060

6161
- name: Run migrations
62-
run: medusa db:migrate
62+
run: npx medusa db:migrate
6363
working-directory: ../cli-test
6464

6565
- name: Create admin user
66-
run: medusa user -e [email protected] -p password -i admin_123
66+
run: npx medusa user -e [email protected] -p password -i admin_123
6767
working-directory: ../cli-test
6868

6969
- name: Run development server
70-
run: medusa develop &
70+
run: npx medusa develop &
7171
working-directory: ../cli-test
7272

7373
- name: Testing development server
7474
uses: ./.github/actions/test-server
7575

7676
- name: Starting medusa
77-
run: medusa start &
77+
run: npx medusa start &
7878
working-directory: ../cli-test
7979

8080
- name: Testing server

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@ dist/**
2727
.vscode
2828

2929
**/tsconfig.tsbuildinfo
30+
31+
# Cache File
32+
/packages/**/.cache

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thank you for considering contributing to Medusa! This document will outline how to submit changes to this repository and which conventions to follow. If you are ever in doubt about anything we encourage you to reach out either by submitting an issue here or reaching out [via Discord](https://discord.gg/xpCwq3Kfn8).
44

5-
If you're contributing to our documentation, make sure to also check out the [contribution guidelines on our documentation website](https://docs.medusajs.com/contribution-guidelines).
5+
If you're contributing to our documentation, make sure to also check out the [contribution guidelines on our documentation website](https://docs.medusajs.com/resources/contribution-guidelines/docs).
66

77
### Important
88
Our core maintainers prioritize pull requests (PRs) from within our organization. External contributions are regularly triaged, but not at any fixed cadence. It varies depending on how busy the maintainers are. This is applicable to all types of PRs, so we kindly ask for your patience.

‎README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,11 @@ Visit the [Documentation](https://docs.medusajs.com/learn) to set up a Medusa ap
4040

4141
## What is Medusa
4242

43-
Medusa is a set of commerce modules and tools that allow you to build rich, reliable, and performant commerce applications without reinventing core commerce logic. The modules can be customized and used to build advanced ecommerce stores, marketplaces, or any product that needs foundational commerce primitives. All modules are open-source and freely available on npm.
43+
Medusa is an ecommerce platform with a built-in framework for customization that allows you to build custom commerce applications without reinventing core commerce logic. The framework and modules can be used to build advanced B2B or DTC ecommerce stores, marketplaces, PoS systems, service businesses, or any product that needs foundational commerce primitives. All commerce modules are open-source and freely available on npm.
4444

4545
Learn more about [Medusa’s architecture](https://docs.medusajs.com/learn/advanced-development/architecture/overview) and [commerce modules](https://docs.medusajs.com/resources/commerce-modules) in the Docs.
4646

47-
## Roadmap, Upgrades & Integrations
48-
49-
You can view the planned, started and completed features in the [Roadmap discussion](https://github.com/medusajs/medusa/discussions/categories/roadmap).
47+
## Upgrades & Integrations
5048

5149
Follow the [Release Notes](https://github.com/medusajs/medusa/releases) to keep your Medusa project up-to-date.
5250

‎integration-tests/http/__tests__/campaigns/admin/campaigns.spec.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
import { CampaignBudgetType, PromotionType } from "@medusajs/utils"
21
import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
2+
import {
3+
CampaignBudgetType,
4+
PromotionStatus,
5+
PromotionType,
6+
} from "@medusajs/utils"
37
import { createAdminUser } from "../../../../helpers/create-admin-user"
48

59
jest.setTimeout(50000)
@@ -46,6 +50,7 @@ export const campaignsData = [
4650
const promotionData = {
4751
code: "TEST",
4852
type: PromotionType.STANDARD,
53+
status: PromotionStatus.ACTIVE,
4954
is_automatic: true,
5055
application_method: {
5156
target_type: "items",
@@ -108,6 +113,7 @@ medusaIntegrationTestRunner({
108113
return {
109114
code,
110115
type: PromotionType.STANDARD,
116+
status: PromotionStatus.ACTIVE,
111117
is_automatic: true,
112118
application_method: {
113119
target_type: "items",

0 commit comments

Comments
 (0)