fixup! Merge branch 'main' into colin/pnpm

coder · coadler · Aug 2, 2023 · Jul 31, 2023 · Jul 31, 2023 · Jul 31, 2023
commit a5949ede96c93f1594bc1b10ea1b7191d83925c9
diff --git a/.prettierignore.include b/.prettierignore.include
@@ -11,3 +11,5 @@ scripts/apitypings/testdata/**/*.ts
 
 # Generated files shouldn't be formatted.
 site/e2e/provisionerGenerated.ts
+
+**/pnpm-lock.yaml
diff --git a/Makefile b/Makefile
@@ -466,7 +466,6 @@ gen: \
 	.prettierignore \
 	site/.prettierrc.yaml \
 	site/.prettierignore \
-	site/.eslintignore
 .PHONY: gen
 
 # Mark all generated files as fresh so make thinks they're up-to-date. This is

diff --git a/offlinedocs/.gitignore b/offlinedocs/.gitignore
@@ -23,7 +23,7 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-.pnpm-debug.log*
+pnpm-debug.log*
 
 # local env files
 .env*.local

diff --git a/offlinedocs/.prettierignore b/offlinedocs/.prettierignore
@@ -0,0 +1 @@
+**/pnpm-lock.yaml
diff --git a/scripts/apidocgen/.prettierignore b/scripts/apidocgen/.prettierignore
@@ -0,0 +1 @@
+**/pnpm-lock.yaml
diff --git a/site/.eslintignore b/site/.eslintignore
@@ -78,3 +78,5 @@ stats/
 
 # Generated files shouldn't be formatted.
 e2e/provisionerGenerated.ts
+
+**/pnpm-lock.yaml
diff --git a/site/.prettierignore b/site/.prettierignore
@@ -78,3 +78,5 @@ stats/
 
 # Generated files shouldn't be formatted.
 e2e/provisionerGenerated.ts
+
+**/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,5 @@ scripts/apitypings/testdata/*/.ts

		# Generated files shouldn't be formatted.
		site/e2e/provisionerGenerated.ts

		**/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,3 +78,5 @@ stats/

		# Generated files shouldn't be formatted.
		e2e/provisionerGenerated.ts

		**/pnpm-lock.yaml