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: prettier/prettier-eslint-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8c077bcf25b55c16a5177067f8d40bffa502b9c
Choose a base ref
...
head repository: prettier/prettier-eslint-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 637132451487776dc39aa95a40c61b8003f828e7
Choose a head ref

Commits on Mar 7, 2019

  1. Fix broken CI tests (#150)

    * Bump jest-cli
    
    * Add parser argument to specify which parser prettier should use for stdin input
    
    * Add bj00rn to contributors
    bj00rn authored and zimme committed Mar 7, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    44a8fc5 View commit details

Commits on Jun 17, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    ddf7cf5 View commit details
  2. chore: Don't use save-exact

    zimme committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    0ebc8b1 View commit details
  3. chore: Update travis config

    zimme committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    813f7fe View commit details
  4. chore: Update eslint and require node 8+

    BREAKING CHANGE: Update eslint to version 5 and require node 8+
    zimme committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    489a0b3 View commit details
  5. Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    4ef613e View commit details
  6. chore: Delete .babelrc

    zimme committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    d0b6eeb View commit details
  7. chore: Update version name

    zimme committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    0718efc View commit details
  8. chore: Update test snapshot

    zimme committed Jun 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    7225533 View commit details
  9. Verified

    This commit was signed with the committer’s verified signature.
    zimme Simon Fridlund
    Copy the full SHA
    29db6b5 View commit details

Commits on Mar 6, 2021

  1. fix(format-files): ensure paths passed to prettier-eslint are absol…

    …ute paths (#259)
    
    As of the 6.7.0 release of eslint, absolute paths are required when eslint is
    searching for ignore patterns (eslint/eslint@ca3b2a6).
    This causes prettier-eslint-cli to fail if called with a glob pattern using
    relative paths. This commit passes the file path through the `path.resolve` method
    to ensure they are always absolute paths.
    
    Addresses issues #205 & #208
    dpwilhelmsen authored Mar 6, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dd70720 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e7ff4a6 View commit details

Commits on May 6, 2021

  1. Delete stale.yml

    kylemh authored May 6, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5ebffc9 View commit details

Commits on Sep 6, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    afc22f5 View commit details

Commits on May 11, 2022

  1. feat: 📦 Support ESLint 8 (#431)

    BREAKING CHANGE:
    Requires ESLint 8. ESLint 8 API changes caused the format function to now be asynchronous.
    Requires minimum Node 12 as required by ESLint 8
    idahogurl authored May 11, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4e4077d View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f9debed View commit details
  3. fix: Don't specify any jsxBracketSameLine parameter if none is specif…

    …ied (#430)
    
    By removing the default value for jsx-bracket-same-line (which is just
      `undefined` anyway), no option value at all for jsxBracketSameLine will
      be generated if none is specified. Then if a recent version of prettier
      is in use for which that option is deprecated, it won't complain.
    
      Resolves #428.
    gwhitney authored May 11, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    04a8e04 View commit details

Commits on Aug 12, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    25fcce1 View commit details

Commits on Aug 13, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    32ca804 View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    58101c1 View commit details

Commits on Aug 14, 2022

  1. feat: make the cli work with/without prettier-eslint peer (#438)

    BREAKING CHANGE: bump all upgradable (dev)Dependencies except pure ESM
    JounQin authored Aug 14, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    39c38b5 View commit details

Commits on Aug 23, 2022

  1. fix(deps): migrate messageformat to @messageformat/core (#442)

    Co-authored-by: JounQin <admin@1stg.me>
    He Li and JounQin authored Aug 23, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3eef076 View commit details

Commits on Aug 24, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e4ad84f View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    JounQin JounQin
    Copy the full SHA
    d8fc957 View commit details

Commits on Aug 25, 2022

  1. fix(list-different): removed the message at the end of execution (#288)

    Co-authored-by: Dor Serero <dorserer@amazon.com>
    Co-authored-by: JounQin <admin@1stg.me>
    3 people authored Aug 25, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4093cb7 View commit details
  2. ci: build before committing

    JounQin authored Aug 25, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7801aa8 View commit details
  3. chore: release prettier-eslint-cli v7.0.2 (#444)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Aug 25, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    625a7fe View commit details
  4. feat: support matching dot files (#132)

    Co-authored-by: JounQin <admin@1stg.me>
    u3u and JounQin authored Aug 25, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4561a79 View commit details
  5. chore: release prettier-eslint-cli v7.1.0 (#445)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Aug 25, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    33b39e5 View commit details
  6. docs: cleanup CHANGELOG.md

    JounQin authored Aug 25, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c4b5aa1 View commit details

Commits on Oct 14, 2023

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5fd8eea View commit details
  2. chore: release prettier-eslint-cli v8.0.0 (#450)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Oct 14, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6371324 View commit details
Showing with 994 additions and 655 deletions.
  1. +88 −1 .all-contributorsrc
  2. +0 −23 .babelrc
  3. +8 −0 .changeset/README.md
  4. +16 −0 .changeset/config.json
  5. +4 −0 .codesandbox/ci.json
  6. +1 −1 .eslintignore
  7. +0 −15 .eslintrc
  8. +24 −0 .eslintrc.js
  9. +0 −4 .github/ISSUE_TEMPLATE.md
  10. +3 −1 .github/PULL_REQUEST_TEMPLATE.md
  11. +34 −0 .github/workflows/ci.yml
  12. +41 −0 .github/workflows/release.yml
  13. +1 −0 .gitignore
  14. +1 −2 .npmrc
  15. +1 −0 .nvmrc
  16. +1 −1 .prettierignore
  17. +0 −17 .travis.yml
  18. +17 −2 CHANGELOG.md
  19. +13 −13 CONTRIBUTING.md
  20. +57 −18 README.md
  21. +6 −6 __mocks__/fs.js
  22. +1 −1 __mocks__/get-stdin.js
  23. +87 −66 __mocks__/glob.js
  24. +8 −8 __mocks__/prettier-eslint.js
  25. +16 −0 babel.config.js
  26. +0 −6 cli-test/jest.config.json
  27. +0 −22 cli-test/tests/__snapshots__/index.js.snap
  28. +8 −3 jest.config.js
  29. +10 −10 other/CODE_OF_CONDUCT.md
  30. +22 −21 package-scripts.js
  31. +70 −46 package.json
  32. +2 −2 src/__snapshots__/uncaught-exception-handler.test.js.snap
  33. +2 −2 src/add-exception-handler.js
  34. +1 −1 src/argv.js
  35. +149 −122 src/format-files.js
  36. +79 −90 src/format-files.test.js
  37. +7 −7 src/index.js
  38. +13 −13 src/message.test.js
  39. +5 −5 src/messages.js
  40. +71 −65 src/parser.js
  41. +17 −0 src/prettier-eslint.js
  42. +5 −5 src/uncaught-exception-handler.js
  43. +12 −12 src/uncaught-exception-handler.test.js
  44. 0 {cli-test → test}/fixtures/stdout1.js
  45. 0 {cli-test → test}/fixtures/stdout2.js
  46. +5 −0 test/override-config.js
  47. +22 −0 test/tests/__snapshots__/cli.spec.js.snap
  48. +66 −44 cli-test/tests/index.js → test/tests/cli.spec.js
89 changes: 88 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -203,6 +203,93 @@
"doc",
"test"
]
},
{
"login": "bj00rn",
"name": "Björn Dalfors",
"avatar_url": "https://avatars0.githubusercontent.com/u/10961167?v=4",
"profile": "https://github.com/bj00rn",
"contributions": [
"infra"
]
},
{
"login": "sscaff1",
"name": "Steven Scaffidi",
"avatar_url": "https://avatars1.githubusercontent.com/u/1554424?v=4",
"profile": "https://github.com/sscaff1",
"contributions": [
"doc"
]
},
{
"login": "dpwilhelmsen",
"name": "Daniel Wilhelmsen",
"avatar_url": "https://avatars3.githubusercontent.com/u/1758049?v=4",
"profile": "http://danielwilhelmsen.com",
"contributions": [
"code",
"maintenance"
]
},
{
"login": "gwhitney",
"name": "Glen Whitney",
"avatar_url": "https://avatars.githubusercontent.com/u/3825429?v=4",
"profile": "https://github.com/gwhitney",
"contributions": [
"maintenance"
]
},
{
"login": "idahogurl",
"name": "Rebecca Vest",
"avatar_url": "https://avatars.githubusercontent.com/u/10620169?v=4",
"profile": "https://campcode.dev/",
"contributions": [
"code"
]
},
{
"login": "JounQin",
"name": "JounQin",
"avatar_url": "https://avatars.githubusercontent.com/u/8336744?v=4",
"profile": "https://www.1stg.me/",
"contributions": [
"question",
"code",
"design",
"doc",
"ideas",
"infra",
"maintenance",
"plugin",
"projectManagement",
"review",
"test",
"tool"
]
},
{
"login": "dorser",
"name": "dorser",
"avatar_url": "https://avatars2.githubusercontent.com/u/20969462?v=4",
"profile": "https://github.com/dorser",
"contributions": [
"code",
"maintenance"
]
},
{
"login": "u3u",
"name": "さくら",
"avatar_url": "https://avatars2.githubusercontent.com/u/20062482?v=4",
"profile": "https://qwq.cat",
"contributions": [
"code"
]
}
]
],
"repoType": "github",
"commitConvention": "none"
}
23 changes: 0 additions & 23 deletions .babelrc

This file was deleted.

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)
16 changes: 16 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "https://unpkg.com/@changesets/config/schema.json",
"changelog": [
"@changesets/changelog-github",
{
"repo": "prettier/prettier-eslint-cli"
}
],
"commit": false,
"fixed": [],
"linked": [],
"access": "public",
"baseBranch": "master",
"updateInternalDependencies": "patch",
"ignore": []
}
4 changes: 4 additions & 0 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"node": "16",
"sandboxes": []
}
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@ node_modules
.nyc_output
coverage
dist
cli-test/fixtures
test/fixtures
15 changes: 0 additions & 15 deletions .eslintrc

This file was deleted.

24 changes: 24 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
const config = {
extends: [
'kentcdodds',
'kentcdodds/jest',
'plugin:node-dependencies/recommended'
],
rules: {
quotes: ['error', 'single', { avoidEscape: true }],
'arrow-parens': ['error', 'as-needed'],
'import/max-dependencies': 'off',
'jest/prefer-snapshot-hint': 'off',
'max-len': 'off',
'space-before-function-paren': [
'error',
{
anonymous: 'never',
named: 'never',
asyncArrow: 'always'
}
]
}
};

module.exports = config;
4 changes: 0 additions & 4 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -23,8 +23,6 @@ Relevant code/config.

What you did:



What happened:

<!-- Please provide the full error message/screenshots/anything -->
@@ -41,6 +39,4 @@ with as minimal amount of code possible. Then paste a link below:

Problem description:



Suggested solution:
4 changes: 3 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -15,13 +15,15 @@ merge of your pull request!
-->

<!-- What changes are being made? (What feature/bug is being fixed here?) -->

**What**:

<!-- Why are these changes necessary? -->

**Why**:

<!-- How were these changes implemented? -->
**How**:

**How**:

<!-- feel free to add additional comments -->
34 changes: 34 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: CI

on:
- push
- pull_request

jobs:
ci:
runs-on: ubuntu-latest

strategy:
matrix:
node-version:
- 12
- 14
- 16
- 18

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Install dependencies
run: npm i

- name: Lint, test, and build
run: npm start validate

- name: Check test coverage
uses: codecov/codecov-action@v3
41 changes: 41 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Release

on:
push:
branches:
- master

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

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

- name: Install Dependencies
run: npm i

- name: Build
run: npm run build

- name: Create Release Pull Request or Publish to npm
uses: changesets/action@v1
with:
# This expects you to have a script called release which does a build for your packages and calls changeset publish
publish: npm run release
# this expects you to have a npm script called version that runs some logic and then calls `changeset version`.
version: npm run version
commit: 'chore: release prettier-eslint-cli'
title: 'chore: release prettier-eslint-cli'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ dist
.opt-out
.DS_Store
.eslintcache
*.log

# these cause more harm than good
# when working with contributors
3 changes: 1 addition & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
registry=http://registry.npmjs.org/
save-exact=true
registry=https://registry.npmjs.org/
package-lock=false
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.17.0
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@ node_modules
.nyc_output
coverage
dist
cli-test/fixtures
test/fixtures
17 changes: 0 additions & 17 deletions .travis.yml

This file was deleted.

19 changes: 17 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
# CHANGELOG

The changelog is automatically updated using [semantic-release](https://github.com/semantic-release/semantic-release).
You can see it on the [releases page](https://github.com/prettier/prettier-eslint-cli/releases).
## 8.0.0

### Major Changes

- [#449](https://github.com/prettier/prettier-eslint-cli/pull/449) [`5fd8eea`](https://github.com/prettier/prettier-eslint-cli/commit/5fd8eea1eb9f17fe0fab931aa8e59c8a2fc87529) Thanks [@JounQin](https://github.com/JounQin)! - feat!: bump all (dev)Dependencies, drop node < 16

## 7.1.0

### Minor Changes

- [#132](https://github.com/prettier/prettier-eslint-cli/pull/132) [`4561a79`](https://github.com/prettier/prettier-eslint-cli/commit/4561a799b90f0c0c2861a81426ced852b4468377) Thanks [@u3u](https://github.com/u3u)! - feat: support matching dot files

## 7.0.2

### Patch Changes

- [#288](https://github.com/prettier/prettier-eslint-cli/pull/288) [`4093cb7`](https://github.com/prettier/prettier-eslint-cli/commit/4093cb7830d49fd8cda23fe33008694dc61074a6) Thanks [@dorser](https://github.com/dorser)! - fix(list-different): removed the message at the end of execution
Loading