ci: include prettier in lint:*

Agoric · Jul 11, 2023 · 2e3810b · 2e3810b
1 parent 718e69b
commit 2e3810b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,5 +19,4 @@ jobs:
  cache: 'yarn'
  - run: yarn install --frozen-lockfile # optional, --immutable
  - run: cd wallet && yarn lint
- - run: cd wallet && yarn pretty-check
  - run: yarn test
diff --git a/package.json b/package.json
@@ -15,10 +15,10 @@
  "start": "web-dev-server --port=3000 packages/wallet/public/",
  "preview": "web-dev-server --port=3001 build/",
  "test": "yarn workspaces run test",
- "pretty-fix": "prettier --write '**/*.{js,html}'",
- "pretty-check": "prettier --check '**/*.{js,html}'",
+ "format": "prettier --write '**/*.{js,html}'",
+ "lint:format": "prettier --check '**/*.{js,html}'",
  "lint-fix": "yarn lint:eslint --fix && yarn lint:types",
- "lint-check": "yarn lint",
+ "lint:check": "yarn lint",
  "lint": "yarn lint:types && yarn lint:eslint",
  "lint:types": "tsc -p jsconfig.json",
  "lint:eslint": "eslint '**/*.js'"

diff --git a/wallet/package.json b/wallet/package.json
@@ -83,8 +83,8 @@
  "build": "yarn build:ses && yarn build:react",
  "build:ses": "cp node_modules/ses/dist/lockdown.umd.js public/",
  "build:react": "react-app-rewired build",
- "pretty-check": "yarn prettier --check '**/*.{js,jsx,ts,tsx}'",
- "pretty-fix": "yarn prettier --write '**/*.{js,jsx,ts,tsx}'",
+ "lint:format": "yarn prettier --check '**/*.{js,jsx,ts,tsx}'",
+ "format": "yarn prettier --write '**/*.{js,jsx,ts,tsx}'",
  "lint": "run-s --continue-on-error lint:*",
  "lint:eslint": "eslint '**/*.{js,jsx,ts,tsx}'",
  "lint:types": "yarn tsc",