From e7f159fb44b86ad918716bd661c368f45bfcc997 Mon Sep 17 00:00:00 2001 From: senkenn Date: Mon, 5 Aug 2024 22:07:44 +0900 Subject: [PATCH 1/2] chore: Update Prettier configuration and VS Code settings --- .prettierignore | 1 + .vscode/extensions.json | 3 ++ .vscode/settings.json | 24 +++++++++++ package.json | 2 + packages/zenn-cli/.prettierignore | 1 + packages/zenn-cli/package.json | 1 - packages/zenn-content-css/package.json | 4 +- packages/zenn-embed-elements/package.json | 2 + packages/zenn-markdown-html/package.json | 2 + packages/zenn-model/package.json | 2 + pnpm-lock.yaml | 49 +++++------------------ turbo.json | 3 ++ 12 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 .prettierignore create mode 100644 .vscode/extensions.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..bd5535a6 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +pnpm-lock.yaml diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 00000000..d7df89c9 --- /dev/null +++ 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 index 124dc6d4..775c01cf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,29 @@ "editor.formatOnSave": true, "editor.codeActionsOnSave": { "source.fixAll.eslint": true + }, + "[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 index 1eb1ae8a..7e1c9016 100644 --- 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 index 9b1c8b13..7fcd8656 100644 --- 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 index 1b234e28..8c4d933b 100644 --- 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-content-css/package.json b/packages/zenn-content-css/package.json index 44528623..add5956a 100644 --- 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 index 5cc08c5a..0795086e 100644 --- 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/package.json b/packages/zenn-markdown-html/package.json index fdfb57b5..b847b37b 100644 --- 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-model/package.json b/packages/zenn-model/package.json index 4e52ddfc..b4f1e0ce 100644 --- 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" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4224ee55..d46a053b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: npm-run-all: specifier: ^4.1.5 version: 4.1.5 + prettier: + specifier: ^3.3.3 + version: 3.3.3 turbo: specifier: ^1.7.4 version: 1.7.4 @@ -149,9 +152,6 @@ importers: path: specifier: ^0.12.7 version: 0.12.7 - prettier: - specifier: ^2.8.4 - version: 2.8.4 react: specifier: ^18.2.0 version: 18.2.0 @@ -503,7 +503,7 @@ packages: '@babel/core': 7.20.12 '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12) '@babel/helper-plugin-utils': 7.20.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) lodash.debounce: 4.0.8 resolve: 1.22.2 semver: 6.3.0 @@ -603,7 +603,7 @@ packages: '@babel/helper-member-expression-to-functions': 7.20.7 '@babel/helper-optimise-call-expression': 7.18.6 '@babel/template': 7.20.7 - '@babel/traverse': 7.20.13 + '@babel/traverse': 7.20.13(supports-color@5.5.0) '@babel/types': 7.20.7 transitivePeerDependencies: - supports-color @@ -651,7 +651,7 @@ packages: dependencies: '@babel/helper-function-name': 7.19.0 '@babel/template': 7.20.7 - '@babel/traverse': 7.20.13 + '@babel/traverse': 7.20.13(supports-color@5.5.0) '@babel/types': 7.20.7 transitivePeerDependencies: - supports-color @@ -1568,24 +1568,6 @@ packages: '@babel/types': 7.20.7 dev: true - /@babel/traverse@7.20.13: - resolution: {integrity: sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/code-frame': 7.18.6 - '@babel/generator': 7.20.14 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.19.0 - '@babel/helper-hoist-variables': 7.18.6 - '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.20.15 - '@babel/types': 7.20.7 - debug: 4.3.4(supports-color@5.5.0) - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/traverse@7.20.13(supports-color@5.5.0): resolution: {integrity: sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==} engines: {node: '>=6.9.0'} @@ -4051,18 +4033,6 @@ packages: supports-color: 5.5.0 dev: true - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: true - /debug@4.3.4(supports-color@5.5.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -5286,6 +5256,7 @@ packages: /iconv-lite@0.6.3: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} + requiresBuild: true dependencies: safer-buffer: 2.1.2 dev: true @@ -6972,9 +6943,9 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier@2.8.4: - resolution: {integrity: sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==} - engines: {node: '>=10.13.0'} + /prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + engines: {node: '>=14'} hasBin: true dev: true diff --git a/turbo.json b/turbo.json index a6990608..4b373026 100644 --- a/turbo.json +++ b/turbo.json @@ -16,6 +16,9 @@ }, "fix": { "outputs": ["src/**"] + }, + "fix:prettier": { + "outputs": ["*/**"] } } } From f15a55abd31185208baff0cb269ea9502b7a7034 Mon Sep 17 00:00:00 2001 From: senkenn Date: Mon, 5 Aug 2024 22:08:02 +0900 Subject: [PATCH 2/2] style: formatted --- packages/zenn-cli/src/client/components/Loading.tsx | 4 +++- .../src/client/components/books/show/BookHeader.tsx | 3 ++- packages/zenn-cli/src/client/index.html | 2 +- packages/zenn-cli/src/server/commands/init.ts | 6 +++++- .../__tests__/matchers/isCodesandboxUrl.test.ts | 3 +-- packages/zenn-markdown-html/src/utils/md-link-attributes.ts | 4 +++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/zenn-cli/src/client/components/Loading.tsx b/packages/zenn-cli/src/client/components/Loading.tsx index 4f4f745e..18b04a52 100644 --- 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 index 86b29501..5b3b2ea3 100644 --- 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 index a7a4987c..9a4a112b 100644 --- a/packages/zenn-cli/src/client/index.html +++ b/packages/zenn-cli/src/client/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/zenn-cli/src/server/commands/init.ts b/packages/zenn-cli/src/server/commands/init.ts index ca08d2db..548874fc 100644 --- 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-markdown-html/__tests__/matchers/isCodesandboxUrl.test.ts b/packages/zenn-markdown-html/__tests__/matchers/isCodesandboxUrl.test.ts index c7ea6708..cbb87fbc 100644 --- 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/src/utils/md-link-attributes.ts b/packages/zenn-markdown-html/src/utils/md-link-attributes.ts index 9a51341b..b0db26cd 100644 --- 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',