Skip to content

Commit

Permalink
Merge branch 'develop' into fix/todo-use-product-variant-method-to-ge…
Browse files Browse the repository at this point in the history
…t-sc-availability
  • Loading branch information
olivermrbl authored Feb 16, 2023
2 parents 3851af0 + 12d3043 commit 49274d1
Show file tree
Hide file tree
Showing 1,873 changed files with 33,351 additions and 95,349 deletions.
16 changes: 16 additions & 0 deletions .changeset/brave-guests-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
"@medusajs/medusa": minor
"medusa-plugin-sendgrid": patch
"medusa-payment-stripe": patch
"medusa-plugin-algolia": patch
"medusa-source-shopify": patch
"medusa-core-utils": patch
"medusa-file-minio": patch
"medusa-interfaces": patch
"medusa-test-utils": patch
"@medusajs/stock-location": patch
"@medusajs/inventory": patch
"@medusajs/medusa-js": patch
---

chore(medusa): upgrade typeorm from 0.2.51 to 0.3.11
5 changes: 0 additions & 5 deletions .changeset/clean-dancers-relax.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/clean-rockets-grow.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/dull-forks-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa-oas-cli": patch
---

feat(oas): medusa-oas-cli as OAS build tool
5 changes: 0 additions & 5 deletions .changeset/four-eggs-give.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/good-rabbits-pay.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lazy-frogs-teach.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/mean-rings-decide.md

This file was deleted.

7 changes: 7 additions & 0 deletions .changeset/new-cherries-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@medusajs/medusa": patch
"@medusajs/medusa-js": patch
"medusa-react": patch
---

feat(medusa,medusa-js,medusa-react): Add inventory module endpoints
5 changes: 0 additions & 5 deletions .changeset/orange-donuts-roll.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/rare-trees-sin.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/selfish-pianos-wonder.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/spicy-singers-applaud.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/three-peaches-move.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tidy-students-kiss.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/twelve-onions-tap.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/wise-lemons-sneeze.md

This file was deleted.

6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Bug report
about: Create a report to help us improve
about: Create a report to help us improve Medusa
title: ''
labels: 'type: bug'
assignees: ''
labels: 'status: needs triaging, type: bug'
assignees: olivermrbl

---

Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/oas-test.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: OAS Comments Format Validation
on:
on:
pull_request:
paths:
- packages/medusa/src/api/routes/**
- packages/medusa/src/api/**
- packages/medusa/src/models/**
- packages/medusa/src/types/**

jobs:
docs-test:
runs-on: ubuntu-latest
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
Expand All @@ -29,6 +34,9 @@ jobs:
with:
extension: oas

- name: Build Packages
run: yarn build

- name: Build OAS
run: |
yarn openapi:generate --dry-run
3 changes: 2 additions & 1 deletion .github/workflows/test-cli-with-database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@ jobs:
run: npm i -g @medusajs/medusa-cli

- name: Create Medusa project
# TODO: Remove the branch when typeorm is no longer a dependency for starter
run: |
medusa new cli-test
medusa new cli-test 'https://github.com/medusajs/medusa-starter-default/tree/typeorm-upgrade'
working-directory: ..

- name: Install postgres config
Expand Down
546 changes: 546 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.1.cjs
156 changes: 156 additions & 0 deletions docs-util/redocly/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
plugins:
- "./plugins/plugin.js"

# Allows to replace a $ref with `type: object` in order to avoid infinite loops
# when Redocly attempts to render circular references.
decorators:
plugin/circular-patch:
verbose: false
schemas:
Address:
- Customer
Cart:
- Customer
- Order
- Payment
- PaymentSession
ClaimImage:
- ClaimItem
ClaimItem:
- ClaimOrder
ClaimOrder:
- Fulfillment
- Order
- Return
Country:
- Region
Customer:
- Order
CustomerGroup:
- Customer
- PriceList
Discount:
- Discount
DiscountRule:
- DiscountCondition
DraftOrder:
- Cart
- Order
Fulfillment:
- ClaimOrder
- Order
- Swap
FulfillmentItem:
- Fulfillment
GiftCard:
- Order
GiftCardTransaction:
- GiftCard
- Order
LineItem:
- Cart
- ClaimOrder
- Order
- OrderEdit
- Swap
LineItemAdjustment:
- LineItem
LineItemTaxLine:
- LineItem
MoneyAmount:
- PriceList
- ProductVariant
- Region
Notification:
- Notification
Order:
- Cart
- ClaimOrder
- Customer
- DraftOrder
- Fulfillment
- OrderEdit
- Payment
- Refund
- Return
- Swap
OrderEdit:
- Order
OrderItemChange:
- OrderEdit
Payment:
- Cart
- Order
- Swap
ProductCategory:
- ProductCategory
- Product
ProductCollection:
- Product
ProductOption:
- Product
ProductOptionValue:
- ProductOption
- ProductVariant
ProductVariant:
- Product
ProductVariantInventoryItem:
- ProductVariant
Refund:
- Order
- Payment
Return:
- ClaimOrder
- Order
- Swap
ReturnItem:
- Return
ReturnReason:
- ReturnReason
SalesChannelLocation:
- SalesChannel
ShippingMethod:
- Cart
- ClaimOrder
- Order
- Payment
- Return
- Swap
ShippingMethodTaxLine:
- ShippingMethod
ShippingOption:
- Region
ShippingOptionRequirement:
- ShippingOption
ShippingProfile:
- Product
- ShippingOption
Swap:
- Cart
- Fulfillment
- Order
- Payment
- Return
TaxRate:
- Region
TrackingLink:
- Fulfillment

# Similar config to /www/docs/docusaurus.config.js > redocusaurus
# Allows to emulate rendering of API public documentation when using `yarn redocly preview-docs openapi.yaml`
theme.openapi:
theme:
colors:
primary:
dart: "#242526"
sidebar:
width: "250px"
disableSearch: true
expandResponses: "200,204"
generatedPayloadSamplesMaxDepth: 4
hideDownloadButton: true
hideRequestPayloadSample: true
nativeScrollbars: true
requiredPropsFirst: true
showObjectSchemaExamples: true
sortTagsAlphabetically: true
Loading

0 comments on commit 49274d1

Please sign in to comment.