Merge pull request #503 from senkenn/senkenn/issue#501

Prettier v3 の全面的な導入と VSCode の設定
zenn-dev · Aug 13, 2024 · 3d8acd1 · 3d8acd1
2 parents cb0d03b + 756eeca
commit 3d8acd1
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 107 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+pnpm-lock.yaml
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,3 @@
+{
+  "recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,5 +2,29 @@
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[yaml]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[css]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[scss]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "devDependencies": {
     "@lerna-lite/cli": "^1.15.1",
     "npm-run-all": "^4.1.5",
+    "prettier": "^3.3.3",
     "turbo": "^1.7.4"
   },
   "scripts": {
@@ -12,6 +13,7 @@
     "lint:lockfile": "npx lockfile-lint --path pnpm-lock.yaml --allowed-hosts npm yarn --validate-https",
     "strict:lint": "turbo strict:lint",
     "fix": "turbo fix",
+    "fix:prettier": "turbo fix:prettier",
     "publish:all": "pnpm test && pnpm build && lerna publish",
     "publish:canary": "pnpm build && lerna publish --pre-dist-tag canary",
     "test": "turbo test"

diff --git a/packages/zenn-cli/.prettierignore b/packages/zenn-cli/.prettierignore
@@ -1 +1,2 @@
 /dist
+*.md
diff --git a/packages/zenn-cli/package.json b/packages/zenn-cli/package.json
@@ -78,7 +78,6 @@
     "npm-run-all": "^4.1.5",
     "open": "^8.4.1",
     "path": "^0.12.7",
-    "prettier": "^2.8.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^4.7.1",

diff --git a/packages/zenn-cli/src/client/components/Loading.tsx b/packages/zenn-cli/src/client/components/Loading.tsx
@@ -29,5 +29,7 @@ const StyledLoading = styled.div`
   border: 4px solid var(--c-primary);
   border-radius: 50%;
   border-top-color: var(--c-primary-bg);
-  animation: ${rotate} 0.8s linear infinite, ${fadein} 0.7s;
+  animation:
+    ${rotate} 0.8s linear infinite,
+    ${fadein} 0.7s;
 `;
diff --git a/packages/zenn-cli/src/client/components/books/show/BookHeader.tsx b/packages/zenn-cli/src/client/components/books/show/BookHeader.tsx
@@ -81,7 +81,8 @@ const StyledBookHeader = styled.header`
   .book-header__cover-img {
     background: #fff;
     object-fit: cover;
-    box-shadow: 0 9px 20px -9px rgba(0, 27, 68, 0.52),
+    box-shadow:
+      0 9px 20px -9px rgba(0, 27, 68, 0.52),
       0 0 3px rgba(0, 21, 60, 0.1);
     border-radius: 5px;
   }

diff --git a/packages/zenn-cli/src/client/index.html b/packages/zenn-cli/src/client/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="ja">
   <head>
     <meta charset="utf-8" />

diff --git a/packages/zenn-cli/src/server/commands/init.ts b/packages/zenn-cli/src/server/commands/init.ts
@@ -1,6 +1,10 @@
 import { CliExecFn } from '../types';
 import * as Log from '../lib/log';
-import { detectPackageExecutor, getWorkingPath, generateFileIfNotExist } from '../lib/helper';
+import {
+  detectPackageExecutor,
+  getWorkingPath,
+  generateFileIfNotExist,
+} from '../lib/helper';
 import { initHelpText, invalidOptionText } from '../lib/messages';
 import arg from 'arg';
 

diff --git a/packages/zenn-content-css/package.json b/packages/zenn-content-css/package.json
@@ -15,7 +15,9 @@
   "scripts": {
     "dev": "sass ./src/index.scss ./lib/index.css --watch --no-source-map",
     "build": "sass ./src/index.scss ./lib/index.css --style compressed --no-source-map",
-    "test": "echo 'no test yet'"
+    "test": "echo 'no test yet'",
+    "lint:prettier": "prettier ./src",
+    "fix:prettier": "prettier -w ./src"
   },
   "devDependencies": {
     "sass": "^1.58.1"

diff --git a/packages/zenn-embed-elements/package.json b/packages/zenn-embed-elements/package.json
@@ -17,7 +17,9 @@
     "build": "pnpm clean && run-p build:*",
     "build:tsc": "tsc -p .",
     "lint": "eslint . --ext .ts,.tsx",
+    "lint:prettier": "prettier .",
     "fix": "eslint . --ext .ts,.tsx --fix",
+    "fix:prettier": "prettier -w .",
     "strict:lint": "eslint . --ext .ts,.tsx --max-warnings 0",
     "test": "echo 'no test yet'"
   },

diff --git a/packages/zenn-markdown-html/__tests__/matchers/isCodesandboxUrl.test.ts b/packages/zenn-markdown-html/__tests__/matchers/isCodesandboxUrl.test.ts
@@ -4,8 +4,7 @@ import { isCodesandboxUrl } from '../../src/utils/url-matcher';
 describe('isCodesandboxUrlのテスト', () => {
   describe('Trueを返す場合', () => {
     test('Codesandboxの埋め込みURL', () => {
-      const url =
-        'https://codesandbox.io/embed/new?view=Editor+%2B+Preview';
+      const url = 'https://codesandbox.io/embed/new?view=Editor+%2B+Preview';
 
       expect(isCodesandboxUrl(url)).toBe(true);
     });

diff --git a/packages/zenn-markdown-html/package.json b/packages/zenn-markdown-html/package.json
@@ -22,7 +22,9 @@
     "build:src": "babel ./src --extensions '.ts,.tsx' --ignore '**/*.d.ts' --out-dir ./lib",
     "build:types": "tsc --project ./tsconfig.build.json",
     "lint": "eslint . --ext .ts,.tsx",
+    "lint:prettier": "prettier .",
     "fix": "eslint . --ext .ts,.tsx --fix",
+    "fix:prettier": "prettier -w .",
     "strict:lint": "eslint . --ext .ts,.tsx --max-warnings 0",
     "test": "vitest run"
   },

diff --git a/packages/zenn-markdown-html/src/utils/md-link-attributes.ts b/packages/zenn-markdown-html/src/utils/md-link-attributes.ts
@@ -9,7 +9,9 @@ export function mdLinkAttributes(md: MarkdownIt) {
     // 内部リンク
     {
       matcher(href: string) {
-        return href.match(/^(?:https:\/\/zenn\.dev$)|(?:https:\/\/zenn\.dev\/.*$)/);
+        return href.match(
+          /^(?:https:\/\/zenn\.dev$)|(?:https:\/\/zenn\.dev\/.*$)/
+        );
       },
       attrs: {
         target: '_blank',

diff --git a/packages/zenn-model/package.json b/packages/zenn-model/package.json
@@ -18,7 +18,9 @@
     "build:src": "esbuild ./src/*.ts --format=cjs --outdir=lib",
     "build:types": "tsc --project ./tsconfig.build.json",
     "lint": "eslint . --ext .ts,.tsx",
+    "lint:prettier": "prettier .",
     "fix": "eslint . --ext .ts,.tsx --fix",
+    "fix:prettier": "prettier -w .",
     "strict:lint": "eslint . --ext .ts,.tsx --max-warnings 0",
     "test": "vitest run"
   },