Skip to content

Commit

Permalink
Merge branch 'medusajs:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
docloulou authored Nov 11, 2024
2 parents a0a89e5 + 82fd93d commit 61b5c82
Show file tree
Hide file tree
Showing 941 changed files with 235,959 additions and 213,861 deletions.
5 changes: 5 additions & 0 deletions .changeset/silly-spiders-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/types": patch
---

breaking: pluralize type helper to account for uncountable nouns and special rules
5 changes: 5 additions & 0 deletions .changeset/wet-cows-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@medusajs/dashboard": patch
---

feat(dashboard): Add Polish translation of admin dashboard
53 changes: 0 additions & 53 deletions .github/ISSUE_TEMPLATE/bug_report_v2.md

This file was deleted.

77 changes: 77 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report_v2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Bug report for v2.0
description: File a bug report.
title: "[Bug]: "
labels: ["status: needs triaging", "version: 2.0"]
body:
- type: markdown
attributes:
value: "## System information"
- type: markdown
attributes:
value: |
The system information will help us reproduce the issue in the same environment
- type: textarea
attributes:
label: Package.json file
description: Copy/paste the contents of the `package.json` file. No need to use backticks
placeholder: No need to use markdown backticks. Just copy/paste the contents of the file
render: JSON
validations:
required: true
- type: input
attributes:
label: Node.js version
description: Copy/paste the output of `node -v` command.
placeholder: v21.0.0
validations:
required: true
- type: input
attributes:
label: Database and its version
placeholder: PostgreSQL 16.2
validations:
required: true
- type: input
attributes:
label: Operating system name and version
validations:
required: true
- type: input
attributes:
label: Browser name
- type: markdown
attributes:
value: "## Describe the issue"
- type: markdown
attributes:
value: |
Please explain your issue in-depth along with the relevant screenshots and code snippets
- type: textarea
attributes:
label: What happended?
placeholder: A clear and concise description of what the bug is
validations:
required: true
- type: textarea
attributes:
label: Expected behavior
validations:
required: true
- type: textarea
attributes:
label: Actual behavior
validations:
required: true
- type: markdown
attributes:
value: "## Reproduction"
- type: markdown
attributes:
value: |
Providing a reproduction repo allows us to quickly validate the issue and get back to you.
- type: input
attributes:
label: Link to reproduction repo
description: Please reproduce the issue in isolation and share it as a Github repo with us
validations:
required: true
47 changes: 47 additions & 0 deletions .github/workflows/admin-i18n-validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: i18n Validation

on:
pull_request:
paths:
- packages/admin/dashboard/src/i18n/translations/**


jobs:
i18n-validation-admin-dashboard:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '20'
cache: 'yarn'

- name: Install dependencies
working-directory: packages/admin/dashboard
run: yarn install

- name: Validate i18n translations
working-directory: packages/admin/dashboard
run: |
git diff --name-only --diff-filter=A origin/develop HEAD -- src/i18n/translations > i18n_added_files.txt
cat i18n_added_files.txt
while read -r file; do
# Get the base name of the file
filename=$(basename "$file")
# Skip those items
if [ "$filename" = "\$schema.json" ] || [ "$filename" = "index.ts" ] || [ -d "$file" ]; then
continue
fi
# Run validation on the file
yarn i18n:validate "$filename"
done < i18n_added_files.txt
20 changes: 20 additions & 0 deletions .github/workflows/create-linear-issue-on-discussion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Create Linear Issue on Discussions

on:
discussion:
types: [created]

jobs:
create-linear-issue-on-discussion:
runs-on: ubuntu-latest
steps:
- name: Create the Linear Issue
id: createIssue
uses: ctriolo/[email protected]
with:
linear-api-key: ${{secrets.LINEAR_API_KEY}}
linear-team-key: "TRI"
linear-issue-title: ${{github.event.discussion.title}}
linear-issue-description: ${{github.event.discussion.body}}
linear-attachment-url: ${{github.event.discussion.html_url}}
linear-attachment-title: ${{github.event.discussion.title}}
36 changes: 36 additions & 0 deletions .github/workflows/create-linear-issue-on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Create Linear Issue on Pull Request

on:
pull_request:
branches:
- develop
types: [opened]

jobs:
create-linear-issue-on-pull-request:
runs-on: ubuntu-latest
steps:
- name: Check if PR Author is in Team
id: check_author
env:
GITHUB_TOKEN: ${{ secrets.READ_ORG_PAT }}
run: |
response=$(curl -s -o /dev/null -w "%{http_code}" \
-H "Authorization: Bearer $GITHUB_TOKEN" \
https://api.github.com/orgs/medusajs/teams/engineering/memberships/${{ github.event.pull_request.user.login }})
if [[ "$response" -eq 200 ]]; then
echo "author_is_team_member=true\n" >> $GITHUB_OUTPUT
else
echo "author_is_team_member=false\n" >> $GITHUB_OUTPUT
fi
- name: Create the Linear Issue
if: ${{ steps.check_author.outputs.author_is_team_member == 'false' }}
id: create_issue
uses: ctriolo/[email protected]
with:
linear-api-key: ${{secrets.LINEAR_API_KEY}}
linear-team-key: "SUP"
linear-issue-title: ${{github.event.pull_request.title}}
linear-issue-description: ${{github.event.pull_request.body}}
linear-attachment-url: ${{github.event.pull_request.html_url}}
linear-attachment-title: ${{github.event.pull_request.title}}
4 changes: 0 additions & 4 deletions .husky/pre-commit

This file was deleted.

12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,21 @@

## Getting Started

Visit the [Quickstart Guide](https://docs.medusajs.com/create-medusa-app) to set up a server.

Visit the [Docs](https://docs.medusajs.com/development/backend/prepare-environment) to learn more about our system requirements.
Visit the [Documentation](https://docs.medusajs.com/learn) to set up a Medusa application.

## What is Medusa

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.

Learn more about [Medusa’s architecture](https://docs.medusajs.com/development/fundamentals/architecture-overview) and [commerce modules](https://docs.medusajs.com/modules/overview) in the Docs.
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.

## Roadmap, Upgrades & Plugins
## Roadmap, Upgrades & Integrations

You can view the planned, started and completed features in the [Roadmap discussion](https://github.com/medusajs/medusa/discussions/categories/roadmap).

Follow the [Upgrade Guides](https://docs.medusajs.com/upgrade-guides/) to keep your Medusa project up-to-date.
Follow the [Release Notes](https://github.com/medusajs/medusa/releases) to keep your Medusa project up-to-date.

Check out all [available Medusa plugins](https://medusajs.com/plugins/).
Check out all [available Medusa integrations](https://docs.medusajs.com/resources/integrations).

## Community & Contributions

Expand Down
Loading

0 comments on commit 61b5c82

Please sign in to comment.