Skip to content

Merge v14.0.4 (+ readme updates) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 28 commits into from
May 24, 2024
Merged

Merge v14.0.4 (+ readme updates) #3

merged 28 commits into from
May 24, 2024

Conversation

mdmower-csnw
Copy link

  • Merge the latest upstream, see procedure below.
  • This v14.0.4 with two additional commits because they are only readme updates.
git checkout csnw
git checkout -b csnw-dev
git fetch upstream
git merge upstream/master
# Merge conflict, choose upstream test snapshots
git checkout upstream/master test/__snapshots__/test/test.ts.snap
npm ci
npm run test
git add .
git merge --continue

bcherny and others added 28 commits January 14, 2024 11:46
@bcherny
rm yarn.lock (fix bcherny#569)
bf63b97
@bcherny
[Bugfix] Fix comment emmission for closing comments in patternPropert…
569f492 
…ies keys (fix bcherny#546)
@bcherny
v13.1.2
6adcad9
@bcherny
Require Node v16+
7321597
@bcherny
Target ES6
5369633
@bcherny
Switch to @apidevtools/json-schema-ref-parser
d92b06e
@bcherny
[Chore] Update dependencies
4f47952
@bcherny
[Chore] Update dev dependencies (fix bcherny#587)
7c9ecd7
@bcherny
Optimize array output (fix bcherny#583)
9cbe26e
@bcherny
[Docs] Add badge for node version
e39ed18
@bcherny
[Docs] Update author URL in package.json
11879fa
@antfu
feat: support customName options (bcherny#585)
2f29f19 
* feat: support `customName` options

* feat: support nullish name for `customName`
[Chore] Downgrade ESLint -> 8.56.0
5f3039a 
Doing this to avoid warnings when running `npm i`, since @typescript-eslint still requires 8.56.
[Docs] Document customName option in readme
f97ec06
14.0.1
d97768e
@alexanderkrum @bcherny
feat: [577] Add yml support (bcherny#588)
9ec0c70 
* feat: [577] Add yml support

* Update README.md

Co-authored-by: Boris Cherny <[email protected]>

* feat: [577] Add yml support

* feat: [577] Rebase - master

---------

Co-authored-by: Boris Cherny <[email protected]>
@pcorpet
[Chore] Drop @types/prettier dependency. (bcherny#594)
13806bd 
It is now deprecated as the types are now part of the prettier lib.

Fixes bcherny#593

Co-authored-by: Pascal Corpet <[email protected]>
@bcherny
[Chore] Clean up yaml parsing
872a057
@bcherny
[Chore] Clean up legacy style imports
e53bb80
@bcherny
[CI] Modernize Github workflow
add8ee1
@bcherny
[CI] Add package-lock.json
2b61748
@bcherny
v14.0.2
39dd574
@bcherny
v14.0.3
107c338
@bcherny
[Docs] Clean up readme
c9680db
@bcherny
v14.0.4
e8291d7
@bcherny
Improve CLI docs
6c69141
@bcherny
"JSONSchema" -> "JSON Schema"
49fb14d
@mdmower-csnw
Merge remote-tracking branch 'upstream/master' into csnw
fede3b4
speck14
speck14 approved these changes May 24, 2024
View reviewed changes
Copy link

@speck14 speck14 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mdmower-csnw Review + (used BeyondCompare to diff these changes against the upstream)

@mdmower-csnw mdmower-csnw merged commit fede3b4 into csnw May 24, 2024
54 checks passed
@mdmower-csnw mdmower-csnw deleted the csnw-dev branch May 24, 2024 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@speck14 speck14 speck14 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mdmower-csnw @speck14 @bcherny @antfu @alexanderkrum @pcorpet