fisker Cheung 52c9a20e2c Merge branch 'main' into next ...

# Conflicts:
#	package.json
#	src/cli/index.js
#	tests/config/install-prettier.js
#	tests/format/yaml/block-literal/jsfmt.spec.js
#	tests/integration/__tests__/file-info.js
#	yarn.lock

2022-02-21 16:12:59 +08:00

..

__tests__

Merge branch 'main' into next

2022-02-21 16:12:59 +08:00

cli

Merge branch 'main' into next

2022-02-21 16:12:59 +08:00

custom-parsers

Refactor integration test files to use ES Module (part 2) (#11912)

2021-12-03 15:41:12 +08:00

plugins

Refactor integration test files to use ES Module (part 2) (#11912)

2021-12-03 15:41:12 +08:00

.prettierrc

Restructure test files (#10415)

2021-04-25 20:01:56 +08:00

env.js

Refactor integration test files to use ES Module (part 2) (#11912)

2021-12-03 15:41:12 +08:00

path-serializer.js

Refactor integration test files to use ES Module (part 2) (#11912)

2021-12-03 15:41:12 +08:00

print-doc.js

Merge branch 'main' into next

2022-02-10 10:52:10 +08:00

run-prettier.js

Migrate CLI to ES Module (#11903)

2022-02-11 09:56:58 +08:00