Merge pull request #198 from forcedotcom/release-1.5.0

RELEASE @W-17915084@ Conducting 1.5.0 release

Author: stephen-carter-at-sf

.editorconfig

@@ -1,7 +1,7 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
 indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true

.eslintrc.json

@@ -60,7 +60,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*' # Always use Node LTS for building dependencies.
-      - run: yarn install --frozen-lockfile
+      - run: npm ci
       # Increment the version as desired locally, without actually committing anything.
       - name: Locally increment version
         run: |
@@ -85,7 +85,7 @@ jobs:
           # Immediately push the interim branch with no changes, so GraphQL can push to it later.
           git push --set-upstream origin $INTERIM_BRANCH_NAME
       # Update our dependencies
-      - run: yarn upgrade
+      - run: npm update
       # Use the GraphQL API to create a signed commmit with our changes.
       - run: |
           # GraphQL needs to know what branch to push to.
@@ -95,11 +95,11 @@ jobs:
           MESSAGE="Preparing for v$NEW_VERSION release."
           # GraphQL needs the latest versions of the files we changed, as Base64 encoded strings.
           NEW_PACKAGE="$(cat package.json | base64)"
-          NEW_YARN_LOCK="$(cat yarn.lock | base64)"
+          NEW_LOCKFILE="$(cat package-lock.json | base64)"
           gh api graphql -F message="$MESSAGE" -F oldOid=`git rev-parse HEAD` -F branch="$BRANCH" \
-          -F newPackage="$NEW_PACKAGE" -F newYarnLock="$NEW_YARN_LOCK" \
+          -F newPackage="$NEW_PACKAGE" -F newLockfile="$NEW_LOCKFILE" \
           -f query='
-            mutation ($message: String!, $oldOid: GitObjectID!, $branch: String!, $newPackage: Base64String!, $newYarnLock: Base64String!) {
+            mutation ($message: String!, $oldOid: GitObjectID!, $branch: String!, $newPackage: Base64String!, $newLockfile: Base64String!) {
               createCommitOnBranch(input: {
                 branch: {
                   repositoryNameWithOwner: "forcedotcom/sfdx-code-analyzer-vscode",
@@ -114,8 +114,8 @@ jobs:
                       path: "package.json",
                       contents: $newPackage
                     }, {
-                      path: "yarn.lock",
-                      contents: $newYarnLock
+                      path: "package-lock.json",
+                      contents: $newLockfile
                     }
                   ]
                 },

.github/workflows/create-release-branch.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           node-version: 'lts/*' # Node LTS should always be fine.
       - name: 'Install node dependencies'
-        run: yarn install --frozen-lockfile
+        run: npm ci
       - name: 'Create VSIX'
         run: npx vsce package
       - name: 'Upload artifact'

.github/workflows/create-vsix-artifact.yml

@@ -81,7 +81,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-      - run: yarn install --frozen-lockfile
+      - run: npm ci
       # Download the .vsix attached to the release.
       - name: Download Extension From Release
         run: |
@@ -114,7 +114,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '11'
-      - run: yarn install --frozen-lockfile
+      - run: npm ci
       # Download the .vsix attached to the release.
       - name: Download Extension From Release
         run: |

.github/workflows/publish.yml

@@ -48,7 +48,7 @@ jobs:
         with:
           python-version: 3.12
       - name: 'Install node module dependencies'
-        run: yarn install --frozen-lockfile
+        run: npm ci
       # We'll need to install the CLI tool, since some of the tests
       # are integration tests.
       - name: Install SF CLI
@@ -115,14 +115,14 @@ jobs:
         run: sf plugins install code-analyzer
       # Run the tests. (Linux and non-Linux need slightly different commands.)
       - name: 'Run Tests (Linux)'
-        run: xvfb-run -a yarn test
+        run: xvfb-run -a npm run test
         if: runner.os == 'Linux'
       - name: 'Run Tests (non-Linux)'
-        run: yarn test
+        run: npm run test
         if: runner.os != 'Linux'
       # Lint, to make sure we're following best practices.
       - name: 'Lint'
-        run: yarn lint
+        run: npm run lint
       # Upload the code coverage from the test as an artifact with
       # the name 'code-coverage-[whatever the OS is]'.
       - name: Upload coverage artifact

.github/workflows/run-tests.yml

@@ -13,8 +13,32 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Verify PR Title
-        uses: ./github-actions/verify-pr-title
-        id: verify_pr_title
+        run: |
+          title="${{ github.event.pull_request.title }}"
+          title_upper=$(echo "$title" | tr '[:lower:]' '[:upper:]')
+          base_ref="${{ github.base_ref }}"
+
+          # Define regex patterns for different types of PR titles
+          MAIN2DEV_REGEX="^MAIN2DEV[[:space:]]*:?[[:space:]]*@W-[[:digit:]]{8,9}@.*MERGING.+[[:digit:]]{1,2}\.[[:digit:]]{1,2}\.[[:digit:]]{1,2}.*"
+          RELEASE2MAIN_REGEX="^RELEASE[[:space:]]*:?[[:space:]]*@W-[[:digit:]]{8,9}@.+"
+          PR_INTO_DEV_OR_RELEASE_REGEX="^(FIX|CHANGE|NEW)([[:space:]]*\([^)]+\))?[[:space:]]*:?[[:space:]]*@W-[[:digit:]]{8,9}@.+"
+
+          # Validate PR title based on base_ref and head_ref
+          if [[ "$base_ref" == "dev" && "${{ startsWith(github.head_ref, 'm2d/') }}" == "true" && ! "$title_upper" =~ $MAIN2DEV_REGEX ]]; then
+            echo "::error::Invalid PR title: '$title'. Please follow the format: Main2Dev (__) @W-XXXXXXXX@ Merging.*\d+\.\d+\.\d+"
+            exit 1
+          elif [[ "$base_ref" == "main" && ! "$title_upper" =~ $RELEASE2MAIN_REGEX ]]; then
+            echo "::error::Invalid PR title: '$title'. Please follow the format: RELEASE @W-XXXXXXXX@ Summary"
+            exit 1
+          elif [[ ("$base_ref" == "dev" || "${{ startsWith(github.base_ref, 'release-') }}" == "true") && ! "$title_upper" =~ $PR_INTO_DEV_OR_RELEASE_REGEX ]]; then
+            echo "::error::Invalid PR title: '$title'. Please follow the format: FIX|CHANGE|NEW (__) @W-XXXXXXXX@ Summary"
+            exit 1
+          else
+            echo "PR title '$title' automatically accepted for $base_ref branch."
+          fi
+
+          # If no errors, print success
+          echo "Valid PR title: '$title'"
   # RUN TESTS
   # Step 1: Build the scanner tarball so it can be installed locally.
   build_v4_scanner_tarball:

.github/workflows/validate-pr.yml

@@ -8,3 +8,4 @@ node_modules
 **/.DS_Store
 coverage
 typescript-test-results
+.nyc_output/

.gitignore

@@ -0,0 +1,17 @@
+import { defineConfig } from '@vscode/test-cli';
+import { fileURLToPath } from "url";
+import { dirname } from "path";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+export default defineConfig({
+	tests: [{
+		files: `./out/test/legacy/**/*.test.js`,
+		installExtensions: ['salesforce.salesforcedx-vscode']
+	}],
+	coverage: {
+		includeAll: true,
+		reporter: ["text", "lcov"]
+	}
+});

.vscode-test.mjs

@@ -23,7 +23,7 @@
 			"request": "launch",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+				"--extensionTestsPath=${workspaceFolder}/out/test/legacy/index"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"