diff --git a/.eslintrc.json b/.eslintrc.json index 28a3ed529..2130f6b45 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -13,5 +13,8 @@ }, "plugins": [ "@typescript-eslint" - ] + ], + "rules": { + "sf-plugin/only-extend-SfCommand": "off" + } } diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml index b58e859a6..c61678367 100644 --- a/.github/workflows/create-release-branch.yml +++ b/.github/workflows/create-release-branch.yml @@ -144,7 +144,9 @@ jobs: NEW_VERSION=$(jq -r ".version" package.json) git checkout -b release-$NEW_VERSION git push --set-upstream origin release-$NEW_VERSION - # Output the branch name so we can use it in later jobs. + # Now that we're done with the interim branch, delete it. + git push -d origin ${NEW_VERSION}-interim + # Output the release branch name so we can use it in later jobs. echo "branch_name=release-$NEW_VERSION" >> "$GITHUB_OUTPUT" # Run all the various tests against the newly created branch. test-release-branch: diff --git a/cli-messaging/build.gradle.kts b/cli-messaging/build.gradle.kts index 8bca89439..f55a7011a 100644 --- a/cli-messaging/build.gradle.kts +++ b/cli-messaging/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { exclude("junit") } implementation("com.google.code.gson:gson:2.10.1") - implementation("com.google.guava:guava:31.1-jre") + implementation("com.google.guava:guava:33.2.1-jre") testImplementation("org.hamcrest:hamcrest:2.2") testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.2") diff --git a/html-templates/simple.mustache b/html-templates/simple.mustache index 9022485fa..92814600f 100644 --- a/html-templates/simple.mustache +++ b/html-templates/simple.mustache @@ -65,7 +65,7 @@ - + + Salesforce Code Analyzer Report

Salesforce Code Analyzer Report

-
+

@@ -319,7 +320,7 @@ End Column - +
diff --git a/messages/RetireJsEngine.md b/messages/RetireJsEngine.md new file mode 100644 index 000000000..e1c20a747 --- /dev/null +++ b/messages/RetireJsEngine.md @@ -0,0 +1,11 @@ +# error.couldNotGetZipEntries + +Failed to get entries from ZIP file %s. Reason: %s. + +# error.couldNotReadEntryData + +Failed to read contents of entry %s in ZIP file %s. Reason: %s. + +# error.couldNotExtractZip + +Failed to extract ZIP file %s. Reason: %s. diff --git a/messages/run-common.md b/messages/run-common.md index 0327a061d..8e421f217 100644 --- a/messages/run-common.md +++ b/messages/run-common.md @@ -74,10 +74,6 @@ The selected output format doesn't match the output file type. Output format: %s --projectdir must specify existing paths -# validations.noFilesFoundInTarget - -No files were found in the target. --target must contain at least one file. - # info.resolvedTarget The --target flag wasn't specified so the default target '.' will be used. diff --git a/package.json b/package.json index e564f52d7..ee68af8fc 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/sfdx-scanner", "description": "Static code scanner that applies quality and security rules to Apex code, and provides feedback.", - "version": "4.3.2", + "version": "4.4.0", "author": "Salesforce Code Analyzer Team", "bugs": "https://github.com/forcedotcom/sfdx-scanner/issues", "dependencies": { diff --git a/pmd-appexchange/docs/AvoidCreateElementScriptLinkTag.md b/pmd-appexchange/docs/AvoidCreateElementScriptLinkTag.md index 38dd0388f..0e07ad64a 100644 --- a/pmd-appexchange/docs/AvoidCreateElementScriptLinkTag.md +++ b/pmd-appexchange/docs/AvoidCreateElementScriptLinkTag.md @@ -10,7 +10,9 @@ AvoidCreateElementScriptLinkTag[](#avoidcreateelementscriptlinktag) **Description:** - Detects dynamic creation of script or link tags +Detects dynamic creation of script or link tags +Note: This rule identifies the `