Merge branch 'develop' into feat/order-fulfillment-ui

.changeset/early-badgers-complain.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): Fix request type in upload route

.changeset/flat-timers-report.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+chore(medusa): cleanup admin function

.changeset/gorgeous-fireants-share.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): import and use `RequestQueryFields` from types package

.changeset/happy-mirrors-decide.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+chore(medusa): strict zod versions in workspace

.changeset/healthy-shirts-lick.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/promotion": patch
+"@medusajs/types": patch
+"@medusajs/medusa": patch
+---
+
+feat(dashboard,core,medusa,promotion): add campaigns UI

.changeset/itchy-forks-relate.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix(medusa): Missing middlewares export

.changeset/moody-days-drive.md

@@ -0,0 +1,8 @@
+---
+"@medusajs/modules-sdk": minor
+"@medusajs/types": minor
+"@medusajs/utils": minor
+"@medusajs/notification": patch
+---
+
+Add basic implementation of a notification module

.changeset/old-candles-cough.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/utils": patch
+---
+
+chore(utils): Provide a mikro orm base entity

.changeset/perfect-fishes-listen.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/notification-sendgrid": patch
+"@medusajs/notification-logger": patch
+"@medusajs/types": patch
+---
+
+Add sendgrid and logger notification providers

.changeset/silver-lemons-fly.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/core-flows": patch
+"@medusajs/types": patch
+"@medusajs/medusa": patch
+---
+
+feat(core-flows,types,medusa): API to add promotions to campaign

.github/actions/test-server/action.yml

@@ -1,5 +1,5 @@
 name: "Test server"
-description: "Test the currently running medusa server to see if a user has been created and that the server is seeded"
+description: "Test the currently running medusa server to see if a user has been created"
 
 inputs:
   email:
@@ -10,10 +10,11 @@ inputs:
     description: "password of user to log in"
     required: false
     default: "password"
-  pathToSeedData:
-    description: "path to seed data"
-    required: false
-    default: "../cli-test/data/seed.json"
+  # TODO: Add back seed test
+  # pathToSeedData:
+  #   description: "path to seed data"
+  #   required: false
+  #   default: "../cli-test/data/seed.json"
 
 runs:
   using: "composite"
@@ -24,9 +25,9 @@ runs:
     - name: Log in with user
       shell: "bash"
       run: ./integration-tests/scripts/cli/login.sh ${{ inputs.email }} ${{ inputs.password }}
-    - name: GetProducts
-      shell: "bash"
-      run: ./integration-tests/scripts/cli/get-products.sh ${{ inputs.pathToSeedData }}
+    # - name: GetProducts
+    #   shell: "bash"
+    #   run: ./integration-tests/scripts/cli/get-products.sh ${{ inputs.pathToSeedData }}
 
     - name: Kill server
       shell: "bash"

.github/labeler.yml

@@ -0,0 +1,3 @@
+'type: docs':
+- changed-files:
+  - any-glob-to-any-file: www/**

.github/workflows/docs-pr-label.yml

@@ -0,0 +1,13 @@
+name: "Add Docs PR Label"
+on:
+  pull_request:
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - id: label-the-PR
+      uses: actions/labeler@v5

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

@@ -1,90 +1,82 @@
-#name: CLI Pipeline
-#on:
-#  pull_request:
-#
-#jobs:
-#  test-cli-with-database:
-#    env:
-#      NODE_ENV: CI
-#      REDIS_URL: redis://localhost:6379
-#      DATABASE_URL: "postgres://postgres:postgres@localhost/cli-test"
-#    services:
-#      redis:
-#        image: redis
-#         Set health checks to wait until redis has started
-#        options: >-
-#          --health-cmd "redis-cli ping"
-#          --health-interval 10s
-#          --health-timeout 5s
-#          --health-retries 5
-#        ports:
-#          - 6379:6379
-#
-#      postgres:
-#        image: postgres
-#        env:
-#          POSTGRES_PASSWORD: postgres
-#          POSTGRES_USER: postgres
-#          POSTGRES_DB: cli-test
-#        options: >-
-#          --health-cmd pg_isready
-#          --health-interval 10s
-#          --health-timeout 5s
-#          --health-retries 5
-#        ports:
-#          - 5432:5432
-#
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v3
-#        with:
-#          fetch-depth: 0
-#
-#      - name: Setup development server
-#        uses: ./.github/actions/setup-server
-#        with:
-#          cache-extension: "cli-test"
-#          node-version: "16.14"
-#
-#      - name: Install Medusa cli
-#        run: npm i -g @medusajs/medusa-cli
-#
-#      - name: Create Medusa project
-#        run: |
-#          medusa new cli-test --skip-db
-#        working-directory: ..
-#
-#      - name: run medusa dev
-#        run: medusa-dev --force-install
-#        working-directory: ../cli-test
-#
-#      - name: Run migrations
-#        run: medusa migrations run
-#        working-directory: ../cli-test
-#
-#      - name: Seed db
-#        run: yarn seed
-#        working-directory: ../cli-test
-#
-#      - name: Create admin user
-#        run: medusa user -e [email protected] -p password -i admin_123
-#        working-directory: ../cli-test
-#
-#        Test medusa develop
-#
-#      - name: Run development server
-#        run: medusa develop &
-#        working-directory: ../cli-test
-#
-#      - name: Testing development server
-#        uses: ./.github/actions/test-server
-#
-#        Test medusa start
-#
-#      - name: Starting medusa
-#        run: medusa start &
-#        working-directory: ../cli-test
-#
-#      - name: Testing server
-#        uses: ./.github/actions/test-server
+name: CLI Pipeline
+on:
+ pull_request:
+
+jobs:
+ test-cli-with-database:
+   env:
+     NODE_ENV: CI
+     REDIS_URL: redis://localhost:6379
+     DATABASE_URL: "postgres://postgres:postgres@localhost/cli-test"
+     POSTGRES_URL: "postgres://postgres:postgres@localhost/cli-test"
+   services:
+     redis:
+       image: redis
+       options: >-
+         --health-cmd "redis-cli ping"
+         --health-interval 10s
+         --health-timeout 5s
+         --health-retries 5
+       ports:
+         - 6379:6379
+
+     postgres:
+       image: postgres
+       env:
+         POSTGRES_PASSWORD: postgres
+         POSTGRES_USER: postgres
+         POSTGRES_DB: cli-test
+       options: >-
+         --health-cmd pg_isready
+         --health-interval 10s
+         --health-timeout 5s
+         --health-retries 5
+       ports:
+         - 5432:5432
+
+   runs-on: ubuntu-latest
+   steps:
+     - name: Checkout
+       uses: actions/checkout@v3
+       with:
+         fetch-depth: 0
+
+     - name: Setup development server
+       uses: ./.github/actions/setup-server
+       with:
+         cache-extension: "cli-test"
+         node-version: "16.14"
+
+     - name: Install Medusa cli
+       run: npm i -g @medusajs/medusa-cli@preview
+
+     - name: Create Medusa project
+       run: |
+         medusa new cli-test --skip-db --v2
+       working-directory: ..
+
+     - name: run medusa dev
+       run: medusa-dev --force-install
+       working-directory: ../cli-test
+
+     - name: Run migrations
+       run: medusa migrations run
+       working-directory: ../cli-test
+
+     - name: Create admin user
+       run: medusa user -e [email protected] -p password -i admin_123
+       working-directory: ../cli-test
+
+     - name: Run development server
+       run: medusa develop &
+       working-directory: ../cli-test
+
+     - name: Testing development server
+       uses: ./.github/actions/test-server
+
+     - name: Starting medusa
+       run: medusa start &
+       working-directory: ../cli-test
+
+     - name: Testing server
+       uses: ./.github/actions/test-server