Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mixmaxhq/prettier-config
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: mixmaxhq/prettier-config
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.2
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 25, 2021

  1. chore(deps): update lockfile

    Garret Meier committed Jun 25, 2021
    Copy the full SHA
    f2de50e View commit details

  2. Merge pull request #14 from mixmaxhq/npm-7 

    chore(deps): update lockfile
    Garret Meier authored Jun 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4474397 View commit details

Commits on Sep 9, 2021

  1. fix: use supported option 

    The jsxBracketSameLine option was deprecated in 2.4.0 this allows us to
support it.
    Garret Meier committed Sep 9, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4fbe56f View commit details

  2. Merge pull request #15 from mixmaxhq/ghmeier/same-line 

    fix: use supported option
    Garret Meier authored Sep 9, 2021
    Copy the full SHA
    6ec35d7 View commit details

  3. chore(release): 1.0.2 [skip ci] 

    ### [1.0.2](v1.0.1...v1.0.2) (2021-09-09)

### Bug Fixes

* use supported option ([4fbe56f](4fbe56f))
    @semantic-release-bot
    semantic-release-bot committed Sep 9, 2021
    Copy the full SHA
    2e6594f View commit details
Showing with 16,232 additions and 59 deletions.
  1. +7 −0 CHANGELOG.md
  2. +1 −1 config.json
  3. +16,220 −57 package-lock.json
  4. +4 −1 package.json
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### [1.0.2](https://github.com/mixmaxhq/prettier-config/compare/v1.0.1...v1.0.2) (2021-09-09)


### Bug Fixes

* use supported option ([4fbe56f](https://github.com/mixmaxhq/prettier-config/commit/4fbe56f8f0f61def94f869765e3fc56b8e25a789))

### [1.0.1](https://github.com/mixmaxhq/prettier-config/compare/v1.0.0...v1.0.1) (2021-06-16)


2 changes: 1 addition & 1 deletion config.json
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"jsxSingleQuote": true,
"trailingComma": "es5",
"bracketSpacing": true,
"jsxBracketSameLine": true,
"bracketSameLine": true,
"arrowParens": "always",
"endOfLine": "lf",
"overrides": [
16,277 changes: 16,220 additions & 57 deletions package-lock.json
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mixmaxhq/prettier-config",
"version": "1.0.1",
"version": "1.0.2",
"description": "The prettier config that Mixmax uses",
"main": "config.json",
"scripts": {
@@ -26,6 +26,9 @@
"url": "https://github.com/mixmaxhq/prettier-config/issues"
},
"homepage": "https://github.com/mixmaxhq/prettier-config#readme",
"peerDependency": {
"prettier": "^2.4.0"
},
"devDependencies": {
"@commitlint/config-conventional": "^8.3.4",
"@mixmaxhq/commitlint-jenkins": "^1.4.2",