diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f39152f8b..174966c0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,8 +80,8 @@ jobs: - name: Run type checking run: yarn tsc - prettier: - name: Prettier + format: + name: Formatting runs-on: ubuntu-latest steps: @@ -109,8 +109,8 @@ jobs: - name: Install dependencies run: yarn --immutable - - name: Prettier - run: yarn prettier + - name: Run formatting + run: yarn format unit: name: Unit tests diff --git a/.lintstagedrc.json b/.lintstagedrc.json index 383e54fbc..6cb3ca644 100644 --- a/.lintstagedrc.json +++ b/.lintstagedrc.json @@ -1,3 +1,3 @@ { - "*.{css,html,js,json,jsx,md,ts,tsx,yml}": "prettier --write" + "*.{css,html,js,json,jsx,md,ts,tsx,yml}": "yarn format --write" } diff --git a/package.json b/package.json index f50838e4b..a0c2df9be 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "scripts": { "build": "yarn workspace react-pdf build", "dev": "yarn workspace react-pdf watch & yarn workspace test dev", + "format": "yarn workspaces foreach --all run format", "lint": "yarn workspaces foreach --all run lint", "postinstall": "husky", - "prettier": "yarn workspaces foreach --all run prettier", "test": "yarn workspaces foreach --all run test", "tsc": "yarn workspaces foreach --all run tsc", "unit": "yarn workspaces foreach --all run unit" diff --git a/packages/react-pdf/package.json b/packages/react-pdf/package.json index 369dfd016..fd6296da0 100644 --- a/packages/react-pdf/package.json +++ b/packages/react-pdf/package.json @@ -36,10 +36,10 @@ "build-js-cjs-package": "echo '{\n \"type\": \"commonjs\"\n}' > dist/cjs/package.json", "clean": "rimraf dist", "copy-styles": "cpy 'src/**/*.css' dist/esm && cpy 'src/**/*.css' dist/cjs", + "formatter": "prettier --check . --cache", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "prepack": "yarn clean && yarn build", - "prettier": "prettier --check . --cache", - "test": "yarn lint && yarn tsc && yarn prettier && yarn unit", + "test": "yarn lint && yarn tsc && yarn formatter && yarn unit", "tsc": "tsc", "unit": "vitest", "watch": "yarn build-js-esm --watch & yarn build-js-cjs --watch & nodemon --watch src --ext css --exec \"yarn copy-styles\"" diff --git a/test/package.json b/test/package.json index f560b7f14..5adee9121 100644 --- a/test/package.json +++ b/test/package.json @@ -7,10 +7,10 @@ "scripts": { "build": "vite build", "dev": "vite", - "preview": "vite preview", + "formatter": "prettier --check . --cache", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", - "prettier": "prettier --check . --cache", - "test": "yarn lint && yarn tsc && yarn prettier", + "preview": "vite preview", + "test": "yarn lint && yarn tsc && yarn formatter", "tsc": "tsc" }, "author": {