Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
shahednasser authored Apr 10, 2023
2 parents 93ab12c + 5280e1b commit 44a0d11
Show file tree
Hide file tree
Showing 165 changed files with 6,073 additions and 1,313 deletions.
6 changes: 5 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "master",
"baseBranch": "develop",
"updateInternalDependencies": "patch",
"ignore": ["integration-tests-api", "integration-tests-plugins", "integration-tests-repositories"],
"snapshot": {
"useCalculatedVersion": true
},
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
}

}
5 changes: 5 additions & 0 deletions .changeset/dry-kids-hear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

fix(medusa): Throw upon draft order creation if a variant does not have any prices
5 changes: 5 additions & 0 deletions .changeset/eight-monkeys-bathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chore(medusa): migrate SalesChannel / ProductCategory repository
5 changes: 5 additions & 0 deletions .changeset/eight-tips-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/openapi-typescript-codegen": patch
---

feat(codegen:test): coverage x-expanded-relation + x-codegen.queryParams
5 changes: 5 additions & 0 deletions .changeset/famous-rice-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chores(medusa): cleanup registrations life time
5 changes: 5 additions & 0 deletions .changeset/fresh-ties-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chore(medusa): Migrate payment repository api
5 changes: 5 additions & 0 deletions .changeset/fuzzy-cheetahs-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

feat(tests): harmonize and clean-up yarn test commands convention
5 changes: 5 additions & 0 deletions .changeset/gold-garlics-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

fix(medusa): invalidate price selection cache on update
5 changes: 5 additions & 0 deletions .changeset/grumpy-cars-tease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chore(medusa): Migrate price list repository
6 changes: 6 additions & 0 deletions .changeset/healthy-garlics-retire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/medusa": patch
"@medusajs/utils": patch
---

chore(medusa, utils): rename buildLegacyFieldsListFrom to objectToStringPath
5 changes: 5 additions & 0 deletions .changeset/healthy-lies-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chore(medusa): Migrate product tag repository
5 changes: 5 additions & 0 deletions .changeset/metal-cougars-punch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"medusa-react": patch
---

fix(medusa-react): update customer hook payload type
5 changes: 5 additions & 0 deletions .changeset/nine-chicken-cheat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

fix(medusa): align prices formating in the import & export strategies
5 changes: 5 additions & 0 deletions .changeset/old-spoons-bow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chore(medusa): Upgrade ioredis-mock
5 changes: 5 additions & 0 deletions .changeset/pink-socks-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/medusa": patch
---

chore(medusa): Migrate product type repository
10 changes: 10 additions & 0 deletions .changeset/polite-lamps-suffer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"medusa-plugin-discount-generator": patch
"medusa-plugin-economic": patch
"medusa-plugin-mailchimp": patch
"medusa-plugin-restock-notification": patch
"medusa-plugin-sendgrid": patch
"medusa-plugin-wishlist": patch
---

fix(plugin-discount-generator,plugin-economic,plugin-mailchimp,plugin-restock-notification,plugin-sendgrid,plugin-wishlist): Temporarily remove payload validation in some plugins
5 changes: 5 additions & 0 deletions .changeset/strange-files-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/admin-ui": patch
---

fix(admin-ui): correct notification text on fulfillment cancel
5 changes: 5 additions & 0 deletions .changeset/strong-points-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"medusa-react": patch
---

fix(react): Fix input type on useAdminUpdateReservation mutation hook
5 changes: 5 additions & 0 deletions .changeset/thirty-scissors-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/admin-ui": patch
---

fix(admin-ui): display SC update notification
6 changes: 6 additions & 0 deletions .changeset/wicked-adults-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/medusa": patch
"@medusajs/admin-ui": patch
---

feat(medusa, admin-ui): add description field to product categories
3 changes: 0 additions & 3 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Medusa Pipeline
on:
pull_request:
paths-ignore:
- "docs/**"
- "www/**"

jobs:
setup:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/oas-test.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: OAS Comments Format Validation
on:
pull_request:
paths-ignore:
- "docs/**"
- "www/**"

jobs:
docs-test:
Expand Down
46 changes: 46 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Release

on:
push:
branches:
- develop

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
name: Version packages PR
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Setup Node.js 16
uses: actions/setup-node@v3
with:
node-version: 16

- name: Creating .npmrc
run: |
cat << EOF > "$HOME/.npmrc"
//registry.npmjs.org/:_authToken=$NPM_TOKEN
EOF
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Install Dependencies
run: yarn

- name: Build packages
run: yarn build

- name: Create Release Pull Request
uses: changesets/action@v1
with:
version: yarn version
publish: yarn release
commit: "chore: Release"
title: "chore: Release"
createGithubReleases: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26 changes: 12 additions & 14 deletions .github/workflows/test-cli-with-database.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: CLI Pipeline
on:
pull_request:
paths-ignore:
- "docs/**"
- "www/**"

jobs:
test-cli-with-database:
Expand Down Expand Up @@ -58,38 +55,37 @@ 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 'https://github.com/medusajs/medusa-starter-default/tree/typeorm-upgrade'
medusa new cli-test
working-directory: ..

- name: Install postgres config
if: matrix.db == 'postgres'
run: |
curl \
https://raw.githubusercontent.com/medusajs/medusa-starter-default/feat/postgres-config/medusa-config.js \
--output medusa-config.js
working-directory: ../cli-test

- name: run medusa dev
run: medusa-dev --force-install
working-directory: ../cli-test

- name: Run migrations
env:
DATABASE_TYPE: ${{ matrix.db }}
run: medusa migrations run
working-directory: ../cli-test

- name: Seed db
env:
DATABASE_TYPE: ${{ matrix.db }}
run: yarn seed
working-directory: ../cli-test

- name: Create admin user
env:
DATABASE_TYPE: ${{ matrix.db }}
run: medusa user -e [email protected] -p password -i admin_123
working-directory: ../cli-test

########################## Test medusa develop ###############################

- name: Run development server
env:
DATABASE_TYPE: ${{ matrix.db }}
run: medusa develop &
working-directory: ../cli-test

Expand All @@ -99,8 +95,10 @@ jobs:
########################### Test medusa start ################################

- name: Starting medusa
env:
DATABASE_TYPE: ${{ matrix.db }}
run: medusa start &
working-directory: ../cli-test

- name: Testing server
uses: ./.github/actions/test-server
uses: ./.github/actions/test-server
13 changes: 6 additions & 7 deletions docs/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ module.exports = {
],
settings: {
react: {
version: "detect"
}
version: "detect",
},
},
rules: {
"no-undef": "off",
Expand All @@ -30,8 +30,6 @@ module.exports = {
curly: ["error", "all"],
"new-cap": "off",
"require-jsdoc": "off",
"no-unused-expressions": "off",
"no-unused-vars": "off",
camelcase: "off",
"no-invalid-this": "off",
"max-len": [
Expand Down Expand Up @@ -78,15 +76,15 @@ module.exports = {
"space-infix-ops": "off",
"eol-last": ["error", "always"],
"react/prop-types": "off",
"react/jsx-no-undef": "off"
"react/jsx-no-undef": "off",
},
env: {
es6: true,
node: true,
},
ignorePatterns: [
'docs/content/references/**',
'docs/content/**/events-list.md'
"docs/content/references/**",
"docs/content/**/events-list.md",
],
overrides: [
{
Expand Down Expand Up @@ -115,6 +113,7 @@ module.exports = {
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-non-null-assertion": "off",
},
},
],
Expand Down
4 changes: 3 additions & 1 deletion docs/content/admin/quickstart.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ As the admin dashboard is a plugin installed on the Medusa Backend, you must hav

### Node.js

The Admin uses [Vite v4.1.4](https://vitejs.dev/guide/#scaffolding-your-first-vite-project) which requires v14.8+ or v16+ of Node.js. You can check which version of Node you have by running the following command:
The Admin uses [Vite v4.1.4](https://vitejs.dev/guide/#scaffolding-your-first-vite-project) which requires v14.8+ or v16+ of Node.js, and as Medusa requires v16 or greater it's recommended you use v16+ of Node.js.

You can check which version of Node you have by running the following command:

```bash noReport
node -v
Expand Down
Loading

0 comments on commit 44a0d11

Please sign in to comment.