From 06d17894f358c7f84979a4b9f51d922cbd239293 Mon Sep 17 00:00:00 2001 From: David Schach Date: Fri, 2 Jun 2023 21:52:25 -0700 Subject: [PATCH 1/2] ci(pmd): update to PMD v7 filenames --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bba7a4..fa2a211 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,10 +52,10 @@ jobs: - name: "Install PMD" run: | PMD_VERSION=$(curl -s https://api.github.com/repos/pmd/pmd/releases/latest | grep '.tag_name' | sed 's:.*/::' | sed 's:",::') - wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F$PMD_VERSION/pmd-bin-$PMD_VERSION.zip - unzip pmd-bin-$PMD_VERSION.zip -d ~ + wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F$PMD_VERSION/pmd-dist-$PMD_VERSION-bin.zip + unzip pmd-dist-$PMD_VERSION-bin.zip -d ~ mv ~/pmd-bin-$PMD_VERSION ~/pmd - ~/pmd/bin/run.sh pmd --version + ~/pmd/bin/pmd --version # Run PMD scan - name: "Run PMD scan" - run: ~/pmd/bin/run.sh pmd -d force-app -R pmd/apexQuickStart.xml -f text --cache pmd/cache --minimum-priority 2 + run: ~/pmd/bin/pmd check --dir force-app --rulesets pmd/apexQuickStart.xml --format text --cache pmd/cache --minimum-priority "Medium Low" From db6c73c0138cf862f90cfffe7428dda8f79980a7 Mon Sep 17 00:00:00 2001 From: David Schach Date: Fri, 2 Jun 2023 21:54:56 -0700 Subject: [PATCH 2/2] fix: prettier scripts --- .prettierrc | 2 +- package.json | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.prettierrc b/.prettierrc index 14a12bf..0b9dd8c 100755 --- a/.prettierrc +++ b/.prettierrc @@ -16,7 +16,7 @@ "options": { "parser": "html" } }, { - "files": "*.json", + "files": "sfdx-project.json", "options": { "useTabs": false, "tabWidth": 2 } } ] diff --git a/package.json b/package.json index ea0f592..9ff6001 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,8 @@ "prettier": "prettier --write \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"", "prettier:docs": "prettier --write \"docs/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"", "prettier:verify": "prettier --list-different \"force-app/**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"", - "prettier:apex:local": "prettier --apex-standalone-parser built-in --write \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"", - "prettier:verify:apex:local": "prettier --apex-standalone-parser built-in --check \"**/*.{cls,cmp,component,page,trigger}\"", - "apex:local:start": "node node_modules/prettier-plugin-apex/dist/bin/start-apex-server.js", - "apex:local:stop": "node node_modules/prettier-plugin-apex/dist/bin/stop-apex-server.js", + "prettier:apex": "prettier --write \"**/*.{cls,cmp,component,css,html,js,json,md,page,trigger,xml,yaml,yml}\"", + "prettier:verify:apex": "prettier --check \"**/*.{cls,cmp,component,page,trigger}\"", "scratchorg": ". scripts/orginit.sh", "prepare": "husky install" },