Merge branch 'main' into docs-prettier

microsoft · Jun 7, 2023 · 3784ee6 · 3784ee6
2 parents 93cc0d8 + f4c18be
commit 3784ee6
Show file tree

Hide file tree

Showing 308 changed files with 3,828 additions and 21,615 deletions.
diff --git a/.changeset/big-insects-nail.md b/.changeset/big-insects-nail.md
diff --git a/.changeset/chilly-seas-act.md b/.changeset/chilly-seas-act.md
diff --git a/.changeset/fuzzy-hats-cough.md b/.changeset/fuzzy-hats-cough.md
diff --git a/.changeset/heavy-dodos-suffer.md b/.changeset/heavy-dodos-suffer.md
diff --git a/.changeset/itchy-pets-tap.md b/.changeset/itchy-pets-tap.md
diff --git a/.changeset/light-months-hope.md b/.changeset/light-months-hope.md
diff --git a/.changeset/lovely-seas-end.md b/.changeset/lovely-seas-end.md
diff --git a/.changeset/lucky-numbers-happen.md b/.changeset/lucky-numbers-happen.md
diff --git a/.changeset/lucky-tomatoes-breathe.md b/.changeset/lucky-tomatoes-breathe.md
diff --git a/.changeset/polite-countries-roll.md b/.changeset/polite-countries-roll.md
diff --git a/.changeset/silly-glasses-wonder.md b/.changeset/silly-glasses-wonder.md
diff --git a/.changeset/slimy-games-deny.md b/.changeset/slimy-games-deny.md
diff --git a/.changeset/tiny-pans-fly.md b/.changeset/tiny-pans-fly.md
diff --git a/.changeset/unlucky-falcons-breathe.md b/.changeset/unlucky-falcons-breathe.md
diff --git a/.changeset/unlucky-knives-applaud.md b/.changeset/unlucky-knives-applaud.md
diff --git a/.changeset/wise-hats-grin.md b/.changeset/wise-hats-grin.md
diff --git a/.npmpackagejsonlintrc.json b/.npmpackagejsonlintrc.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -47,4 +47,16 @@
 	// Enable prettier as default formatter, and disable rules that disagree with it
 	"editor.defaultFormatter": "esbenp.prettier-vscode",
 	"editor.insertSpaces": false,
+	// Also configure the formatter on a per-language basis for some common languages/file-types, to make sure it is applied
+	// even if someone's User Settings specify a different formatter at this level (which overrides the root-level
+	// 'editor.defaultFormatter').
+	"[json]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+	},
+	"[javascript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+	},
+	"[typescript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+	},
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -34,9 +34,9 @@
 				"--root",
 				"${workspaceRoot}",
 				"--vscode",
-				"-s",
+				"-t",
 				"tsc",
-				"-s",
+				"-t",
 				"build:test",
 				"${fileDirname}",
 			],

diff --git a/README.md b/README.md
@@ -231,7 +231,7 @@ Right now, this is implemented on a per-package basis, with a [shared base confi
     `npm run format:changed` from the root of the repo to format only files changed since the main branch.
     If your change is for the next branch instead, you can run `npm run format:changed:next`.
 -   To run `prettier` with [fluid-build](./build-tools/packages/build-tools/README.md), you can specify "format" via the
-    script argument: `fluid-build -s format` or `npm run build:fast -- -s format`
+    script argument: `fluid-build -t format` or `npm run build:fast -- -t format`
 
 To ensure our formatting remains consistent, we run a formatting check as a part of each package's `lint` script.