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: atom-community/prettier-config-atomic
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.3
Choose a base ref
...
head repository: atom-community/prettier-config-atomic
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.4
Choose a head ref
  • 8 commits
  • 5 files changed
  • 4 contributors

Commits on Feb 26, 2022

  1. chore(deps): update actions/setup-node action to v3

    @renovate-bot
    renovate-bot committed Feb 26, 2022
    Copy the full SHA
    02d0bcd View commit details

  2. Merge pull request #16 from atom-community/renovate/actions-setup-nod… 

    …e-3.x

chore(deps): update actions/setup-node action to v3
    @UziTech
    UziTech authored Feb 26, 2022
    Copy the full SHA
    0b08637 View commit details

Commits on Mar 5, 2022

  1. chore(deps): update actions/checkout action to v3

    @renovate-bot
    renovate-bot committed Mar 5, 2022
    Copy the full SHA
    59a3e94 View commit details

  2. Merge pull request #17 from atom-community/renovate/actions-checkout-3.x

    @UziTech
    UziTech authored Mar 5, 2022
    Copy the full SHA
    16e61a3 View commit details

Commits on Mar 11, 2022

  1. fix: require prettier-plugin-jsdoc

    @aminya
    aminya committed Mar 11, 2022
    Copy the full SHA
    257495a View commit details

  2. fix: bump deps

    @aminya
    aminya committed Mar 11, 2022
    Copy the full SHA
    659ac08 View commit details

  3. Merge pull request #18 from atom-community/require

    @aminya
    aminya authored Mar 11, 2022
    Copy the full SHA
    4259e41 View commit details

  4. chore(release): 3.0.4 [skip ci]

    @semantic-release-bot
    semantic-release-bot committed Mar 11, 2022
    Copy the full SHA
    83eb65f View commit details
Showing with 610 additions and 512 deletions.
  1. +4 −4 .github/workflows/CI.yml
  2. +8 −0 CHANGELOG.md
  3. +4 −4 package.json
  4. +592 −502 pnpm-lock.yaml
  5. +2 −2 prettier.config.js
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
# - windows-latest
atom_channel: [stable, beta]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: UziTech/action-setup-atom@v1
with:
channel: ${{ matrix.atom_channel }}
@@ -37,7 +37,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Commit lint ✨
@@ -58,9 +58,9 @@ jobs:
github.event.repository.fork == false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: UziTech/action-setup-atom@v1
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: "14.x"
- name: NPM install
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [3.0.4](https://github.com/atom-community/prettier-config-atomic/compare/v3.0.3...v3.0.4) (2022-03-11)


### Bug Fixes

* bump deps ([659ac08](https://github.com/atom-community/prettier-config-atomic/commit/659ac086a9c36c13e0a41b104143206518f25e1f))
* require prettier-plugin-jsdoc ([257495a](https://github.com/atom-community/prettier-config-atomic/commit/257495a8d928cdca21dbfdda7cc044944cc00d15))

## [3.0.3](https://github.com/atom-community/prettier-config-atomic/compare/v3.0.2...v3.0.3) (2022-01-27)


8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier-config-atomic",
"version": "3.0.3",
"version": "3.0.4",
"description": "The Prettier configuration used in atom-community",
"repository": "https://github.com/atom-community/prettier-config-atomic",
"license": "MIT",
@@ -17,13 +17,13 @@
"test.lint": "eslint ."
},
"dependencies": {
"prettier": "^2.4.1",
"prettier": "2.4.1",
"prettier-plugin-jsdoc": "^0.3.30",
"prettier-plugin-packagejson": "^2.2.15",
"prettier-plugin-packagejson": "^2.2.16",
"sort-package-json": "github:aminya/sort-package-json"
},
"devDependencies": {
"eslint-config-atomic": "^1.16.6"
"eslint-config-atomic": "^1.17.0"
},
"keywords": [
"prettier",
1,094 changes: 592 additions & 502 deletions pnpm-lock.yaml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions prettier.config.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Modified from https://github.com/matzkoh/prettier-plugin-packagejson to use the custom sort-package.json package
function prettier_plugin_packagejson() {
// Modified from https://github.com/matzkoh/prettier-plugin-packagejson to use the custom sort-package.json package
function requireSafe(path) {
try {
return require(path)
@@ -30,7 +30,7 @@ function prettier_plugin_packagejson() {
}

module.exports = {
plugins: ["prettier-plugin-jsdoc", prettier_plugin_packagejson()],
plugins: [require("prettier-plugin-jsdoc"), prettier_plugin_packagejson()],
tabWidth: 2,
printWidth: 120,
semi: false,