Skip to content

Commit

Permalink
Merge branch 'master' into docs/js-client
Browse files Browse the repository at this point in the history
  • Loading branch information
shahednasser authored Jul 5, 2022
2 parents c7a0a65 + 915359d commit 2c1fd39
Show file tree
Hide file tree
Showing 427 changed files with 17,848 additions and 15,621 deletions.
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
11 changes: 11 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/config@2.0.0/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "medusajs/medusa" }],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "master",
"updateInternalDependencies": "patch",
"ignore": []
}
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
files: [`*.ts`],
parser: `@typescript-eslint/parser`,
plugins: [`@typescript-eslint/eslint-plugin`],
extends: [`plugin:@typescript-eslint/recommended`],
extends: [`plugin:@typescript-eslint/recommended`, "prettier"],
rules: {
"valid-jsdoc": [
"error",
Expand Down
20 changes: 20 additions & 0 deletions .github/.kodiak.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#.kodiak.toml
version = 1

[merge]
automerge_label = "automerge"
require_automerge_label = true
blocking_labels = ["on hold", "wip", "blocked"]
method = "squash"
delete_branch_on_merge = true
optimistic_updates = false
prioritize_ready_to_merge = true
notify_on_conflict = true

[merge.message]
title = "pull_request_title"
body = "pull_request_body"
include_coauthors= true
include_pr_number = true
body_type = "markdown"
strip_html_comments = true
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Ask a question
url: https://discord.gg/medusajs
about: Join our community to ask questions and participate in discussions
- name: Want to work with us?
url: mailto:hello@medusajs.com?subject=[GitHub]%20Working%20with%20Medusa
about: Interested in working with Medusa? Get in touch!
42 changes: 42 additions & 0 deletions .github/actions/setup-server/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: "Setup test env"
description: "Setup test environment for actions"

inputs:
node-version:
description: "Node version"
required: false
default: "14"
cache-extension:
description: "Extension for fetching cached dependencies"
required: true

runs:
using: "composite"
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
with:
node-version: ${{ inputs.node-version }}
cache: "yarn"

- name: Bootstrap packages
uses: ./.github/actions/cache-bootstrap
with:
extension: ${{ inputs.cache-extension }}

- name: Build Packages
shell: "bash"
run: yarn build

- name: Install dev cli
shell: "bash"
run: sudo npm i -g medusa-dev-cli

- name: Set path to medusa repo
shell: "bash"
run: medusa-dev --set-path-to-repo $(pwd)
33 changes: 33 additions & 0 deletions .github/actions/test-server/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: "Test server"
description: "Test the currently running medusa server to see if a user has been created and that the server is seeded"

inputs:
email:
description: "email of user to log in"
required: false
default: "test@test.com"
password:
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"

runs:
using: "composite"
steps:
- name: Wait for live server response
shell: "bash"
run: ./integration-tests/scripts/cli/wait-for-server-live.sh
- 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: Kill server
shell: "bash"
run: kill -9 $(lsof -t -i :9000)
15 changes: 12 additions & 3 deletions .github/workflows/action.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Medusa Pipeline
on:
on:
pull_request:
paths-ignore:
- 'docs/**'
- 'www/**'
- "docs/**"
- "www/**"

jobs:
unit-tests:
Expand Down Expand Up @@ -43,6 +43,15 @@ jobs:
runs-on: ubuntu-latest

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:
Expand Down
133 changes: 133 additions & 0 deletions .github/workflows/snapshot-this.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# Inspired from https://github.com/Shopify/quilt/blob/main/.github/workflows/snapit.yml
name: Snapshot This

on:
issue_comment:
types:
- created

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

jobs:
snapshot:
name: Snapshot Release
if: |
github.event.issue.pull_request &&
github.event.comment.body == '/snapshot-this'
runs-on: ubuntu-latest
steps:
- name: Validate pull request
uses: actions/github-script@v6
with:
script: |
try {
// Add a rocket reaction to the comment
await github.rest.reactions.createForIssueComment({
...context.repo,
comment_id: context.payload.comment.id,
content: 'rocket',
})
// Only allow comment creators who have "write" permissions to repo
const actorPermission = (await github.rest.repos.getCollaboratorPermissionLevel({
...context.repo,
username: context.actor
})).data.permission
const isPermitted = ['write', 'admin'].includes(actorPermission)
if (!isPermitted) {
const errorMessage = 'Only users with write permission to the respository can run /snapshot-this'
await github.rest.issues.createComment({
...context.repo,
issue_number: context.issue.number,
body: errorMessage,
})
core.setFailed(errorMessage)
return;
}
const pullRequest = await github.rest.pulls.get({
...context.repo,
pull_number: context.issue.number,
})
// Pull request from fork
if (context.payload.repository.full_name !== pullRequest.data.head.repo.full_name) {
const errorMessage = '`/snapshot-this` is not supported on pull requests from forked repositories.'
await github.rest.issues.createComment({
...context.repo,
issue_number: context.issue.number,
body: errorMessage,
})
core.setFailed(errorMessage)
}
} catch (err) {
core.setFailed(`Request failed with error ${err}`)
}
- name: Checkout pull request branch
uses: actions/checkout@v2
with:
ref: ${{ format('refs/pull/{0}/merge', github.event.issue.number) }}

# Because changeset entries are consumed and removed on the
# 'changeset-release/main' branch, we need to reset the files
# so the following 'changeset version --snapshot' command will
# regenerate the package version bumps with the snapshot releases
- name: Reset changeset entries on changeset-release/main branch
run: |
if [[ $(git branch --show-current) == 'changeset-release/main' ]]; then
git checkout origin/main -- .changeset
fi
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: 16.x
cache: "yarn"

- name: Bootstrap packages
uses: ./.github/actions/cache-bootstrap
with:
extension: snapshot-this

- name: Create an .npmrc
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
cat << EOF > "$HOME/.npmrc"
//registry.npmjs.org/:_authToken=$NPM_TOKEN
EOF
- name: Create and publish snapshot release
uses: actions/github-script@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
script: |
await exec.exec('yarn run changeset version --snapshot snapshot')
const {stdout} = await exec.getExecOutput('yarn run release:snapshot')
const newTags = Array
.from(stdout.matchAll(/New tag:\s+([^\s\n]+)/g))
.map(([_, tag]) => tag)
if (newTags.length) {
const multiple = newTags.length > 1
const body = (
`#### :rocket: A snapshot release has been made for this PR\n\n` +
`Test the snapshot${multiple ? 's' : ''} by updating your \`package.json\` ` +
`with the newly published version${multiple ? 's' : ''}:\n` +
newTags.map(tag => (
'```sh\n' +
`yarn add ${tag}\n` +
'```'
)).join('\n') +
`\n\n> Latest commit: ${context.sha}`
)
await github.rest.issues.createComment({
...context.repo,
issue_number: context.issue.number,
body,
})
await github.rest.reactions.createForIssueComment({
...context.repo,
comment_id: context.payload.comment.id,
content: 'hooray',
})
}
Loading

0 comments on commit 2c1fd39

Please sign in to comment.