Merge branch 'main' into next

# Conflicts:
#	package.json
#	scripts/build/bundler.mjs
#	scripts/build/config.mjs
#	scripts/vendors/vendor-meta.json
#	scripts/vendors/vendors.mjs
#	src/cli/format.js
#	src/cli/logger.js
#	src/cli/options/get-options-for-file.js
#	src/cli/options/parse-cli-arguments.js
#	src/main/core.js
#	tests/config/install-prettier.js
#	vendors/execa.js
#	vendors/mem.js
#	vendors/string-width.js
#	vendors/tempy.js
#	yarn.lock
This commit is contained in:
fisker Cheung committed 2022-03-17 09:44:08 +08:00
commit c95c899b6f
64 files changed
+2076 -1214

No files matched your search

+5
View File
@@ -23,10 +23,15 @@ function printOptions(options) {
filepath,
errors,
parser,
pluginSearchDirs,
...snapshotOptions
} = options;
if (pluginSearchDirs !== false) {
snapshotOptions.pluginSearchDirs = pluginSearchDirs;
}
const keys = Object.keys(snapshotOptions).sort();
return keys
.map((key) => `${key}: ${stringify(snapshotOptions[key])}`)