Skip to content

Commit

Permalink
Merge branch 'main' into ts-packages-support
Browse files Browse the repository at this point in the history
  • Loading branch information
aduh95 authored Sep 27, 2023
2 parents 5cd4e9b + eef6b1e commit 9e3acf6
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,45 +183,51 @@ If you don’t have access to the transloadit.com source code ping @arturi or @g
#### Companion hotfix

First checkout the tag of the version you want to patch:

```bash
git checkout @uppy/[email protected]
```

Now create a branch for your hotfix:

```bash
git checkout -b x.y.z-hotfix
```

Run yarn to make sure all packages are consistent:

```bash
corepack yarn
```

Now navigate to the Companion workspace:

```bash
cd packages/@uppy/companion
```

**Now cherry pick your desired commits**
**Now cherry pick your desired commits**.

Next edit `CHANGELOG.md` and then commit it:

```bash
git add CHANGELOG.md
git commit -m 'Update changelog'
```

Now let's create the version & tag
Now let’s create the version & tag:

```bash
mkdir -p .git && npm version --workspaces-update=false --tag-version-prefix='@uppy/companion@' patch
```

Run a "dry-run" first:
Run a dry-run first:

```bash
corepack yarn pack
```

If the previous command succeeded, let's publish!
If the earlier command succeeded, lets publish!

```bash
corepack yarn npm publish --access public --tag=none
Expand All @@ -235,8 +241,8 @@ git push && git push --tags

#### Hotfix other packages

For other Uppy packages, the process should be similar to Companion,
but hasn't been documented yet. Make sure to remember to run `yarn` as well as building the package first, then you can release it.
For other Uppy packages, the process should be like Companion,
but hasnt been documented yet. Make sure to remember to run `yarn` as well as building the package first, then you can release it.
If you do release any other packages, please update this doc.

## CSS guidelines
Expand Down

0 comments on commit 9e3acf6

Please sign in to comment.