Merge pull request #31 from SaekiTominaga/prettier

Add `format` script
SaekiTominaga · Feb 28, 2024 · 7cdc628 · 7cdc628
2 parents 9c7527c + 2516102
commit 7cdc628
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 14 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -6,13 +6,11 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 160
 
 [*.{md,yml}]
 indent_style = space
 indent_size = 2
 
-[*.{js,ts}]
-max_line_length = 160
-
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+packages/markuplint/__tests__/invalid/rules.html
diff --git a/.prettierrc b/.prettierrc
@@ -1,9 +1,10 @@
 {
+	"singleQuote": true,
 	"overrides": [
 		{
-			"files": ["*.js", "*.ts"],
+			"files": ["*.css"],
 			"options": {
-				"singleQuote": true
+				"singleQuote": false
 			}
 		}
 	]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,9 +1,11 @@
 {
 	"name": "config",
 	"scripts": {
+		"format": "prettier -w 'packages/**/__tests__/**/*.{html,css,js,ts}'",
 		"github-actions-lint": "yamllint .github/workflows/*.yml"
 	},
 	"devDependencies": {
+		"prettier": "^3.2.5",
 		"yaml-lint": "^1.7.0"
 	},
 	"private": true,

diff --git a/packages/markuplint/__tests__/invalid/nodeRules.html b/packages/markuplint/__tests__/invalid/nodeRules.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- html:not([lang]) -->
 <html>
 	<head>

diff --git a/packages/markuplint/__tests__/invalid/rules.html b/packages/markuplint/__tests__/invalid/rules.html
@@ -27,7 +27,7 @@
 			<!-- disallowed-element -->
 
 			<noscript></noscript>
-			<embed src="path/to">
+			<embed src="path/to" />
 		</section>
 
 		<section>
@@ -98,7 +98,7 @@ <h4>heading4</h4>
 			<!-- 不正: 最初のoption要素の親がoptgroup要素 -->
 			<select required>
 				<optgroup label="グループ">
-				<option value="">プレースホルダー</option>
+					<option value="">プレースホルダー</option>
 				</optgroup>
 				<option value="option1">オプション1</option>
 				<option value="option2">オプション2</option>
@@ -146,7 +146,7 @@ <h4>heading4</h4>
 		<section>
 			<!-- no-consecutive-br -->
 
-			<p>text<br><br>text</p>
+			<p>text<br /><br />text</p>
 		</section>
 
 		<section>

diff --git a/packages/markuplint/__tests__/valid/nodeRules.html b/packages/markuplint/__tests__/valid/nodeRules.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- html[prefix] -->
 <html lang="en" prefix="">
 	<head>

diff --git a/packages/markuplint/__tests__/valid/rules.html b/packages/markuplint/__tests__/valid/rules.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
 	<head>
 		<title>`rules` valid test</title>
@@ -24,7 +24,8 @@ <h2>text</h2>
 		<section>
 			<!-- placeholder-label-option -->
 
-			<label>妥当: プレースホルダーラベルオプションを持っている
+			<label
+				>妥当: プレースホルダーラベルオプションを持っている
 				<select required>
 					<option value="">プレースホルダー</option>
 					<option value="option1">オプション1</option>

diff --git a/packages/stylelint/__tests__/invalid/oder.css b/packages/stylelint/__tests__/invalid/oder.css
@@ -2,5 +2,5 @@
 	padding: initial;
 	margin: initial;
 
-	--custom-properties: 'x';
+	--custom-properties: "x";
 }
diff --git a/...es/typescript/__tests__/valid/compilerOptions/typeChecking/11 noUncheckedIndexedAccess.ts b/...es/typescript/__tests__/valid/compilerOptions/typeChecking/11 noUncheckedIndexedAccess.ts
@@ -1,4 +1,3 @@
-
 {
 	// Declared as existing
 	const sysName = env.NAME;