Merge branch 'develop' into gbockus/update-docs-for-local-logging

.git2gus/config.json

@@ -19,8 +19,7 @@
     "area:apex": "a1aB0000000JglYIAS",
     "area:aura": "a1aB0000000MRAzIAO",
     "area:lwc": "a1aB0000000Bn8tIAC",
-    "area:slds": "a1aB000000005G3IAI",
-    "area:soql": "a1aB0000000YKFSIA4",
+    "area:soql": "a1aB000000005G3IAI",
     "area:visualforce": "a1aB0000000BPyKIAW",
     "area:xml": "a1aB0000000BPyKIAW"
   },

.github/CODEOWNERS

@@ -11,7 +11,4 @@
 
 #ECCN:Open Source
 #GUSINFO: Platform Dev Tools Scrum Team, IDE Experience Team
-*       @forcedotcom/ide-experience
-
-# If the change occurs within the docs directory, add the doc maintainers.
-/docs/ @forcedotcom/doc-maintainers
+*       @forcedotcom/ide-experience

.github/workflows/e2e.yml

@@ -38,7 +38,7 @@ on:
       lwcE2ETests:
         description: 'LWC E2E Tests'
         required: false
-        default: false
+        default: true
         type: boolean
       vscodeVersion:
         description: 'VSCode Version for ESM branches'
@@ -133,7 +133,7 @@ jobs:
       runId: ${{ github.event.workflow_run.id }}
 
   LWC_E2E_tests_min_vscode_version:
-    if: ${{ inputs.lwcE2ETests || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
+    if: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/lwcE2E.yml
     secrets: inherit
     with:

.vscode/settings.json

@@ -35,4 +35,4 @@
     "./packages/salesforcedx-sobjects-faux-generator"
   ],
   "files.insertFinalNewline": true
-}
+}

CONTRIBUTING.md

@@ -1,7 +1,6 @@
 ## Contributing
 
-1. Familiarize yourself with the codebase by reading the [docs](docs), in
-   particular the [development](contributing/developing.md) doc.
+1. Familiarize yourself with the codebase by reading the [docs](https://developer.salesforce.com/tools/vscode) and the [development](contributing/developing.md) doc.
 1. Create a new discussion before starting your project so that we are aware of what you are trying to add/fix. On that discussion, we will give you the approval to proceed if your suggestion fits in our roadmap, offer suggestions, or let you know if there is already an effort in progress.
 1. Fork this repository.
 1. The [README](README.md) has details on how to set up your environment.

contributing/commit-guidelines.md

@@ -12,7 +12,7 @@ Here's a summary:
 - Separate subject from body with a blank line
 - Limit the subject line to 50 characters (this is a guide but not strictly
   enforced)
-- Capitalize the subject line
+- Begin the subject line with the type of fix (build, chore, ci, docs, feat, fix, perf, refactor, revert, style, test)
 - Do not end the subject line with a period
 - Use the imperative mood in the subject line
 - <strike>Wrap the body at 72 characters</strike> (this is not strictly
@@ -33,32 +33,20 @@ Here's an example of a good and easy to read commit log showing only the subject
 (slightly modified from our git log output)
 
 ```
-* 8d6a286 - (HEAD -> develop) Fix capitalization of package display name (#466) (3 weeks ago) <Ruth Sears-Blazej>
-* 96cb255 - Added feature request template (#462) (3 weeks ago) <Nathan Totten>
-* 8da30f8 - Introduce salesforcedx-webview-ui package (#451) (3 weeks ago) <Nick Chen>
-* 57abc05 - Add an event listener for changes to the sfdx-config file (#457) (3 weeks ago) <Allison Leong>
-* 5d5d7dc - Mark apex replay debugger as preview (#458) (3 weeks ago) <Nick Chen>
-* 8ace1d7 - Bump lwc-language-server to 1.5.1 (#456) (3 weeks ago) <Nick Chen>
-* fb7dda1 - Remove note about limitations of Live Share (#455) (3 weeks ago) <Nick Chen>
-* d07a21b - Send initialized event when logcontext is ready (#454) (4 weeks ago) <Jonathan Widjaja>
-* 42aaddd - Turn off logging will delete the traceflag (#437) (4 weeks ago) <James Sweetman>
-* 9adfcbb - Update UI Text (#453) (4 weeks ago) <JimSuplizio>
-* e0a0b7d - Bump vscode dependency to 1.23 (#452) (4 weeks ago) <Nick Chen>
-* 27c4bec - Make lwc-next the current version of lwc (#450) (4 weeks ago) <Nick Chen>
-* cc0afd8 - Add ISV debugger docs (#414) (4 weeks ago) <Ruth Sears-Blazej>
-*   8dc4b75 - Merge branch 'release/v42.18.0' into develop (4 weeks ago) <Nick Chen>
+2e2552f07 chore: generated CHANGELOG for release/v61.6.0
+287f9bfde chore: update to version 61.6.0
+4d1ecce18 chore: collapse all tests commands only show up within open project (#5694)
+2f88e4357 feat: Collapse All Apex Tests functionality @W-16273375@ (#5684)
+1a9229595 build: pin ovsx to 0.8.0 (#5693)
+ca78a0417 feat: new section in apex test results for test setup methods (#5691)
 ...
 ```
 
 Here's an example of a good and easy to read commit message (after everything has been squashed)
 
 ```
-Ignore warnings and CLI update messages when using --json (#406)
-
-* Ignore warnings and CLI update messages when using --json
-* Remove integration tests for setting eslint
-* Clean up npm lint
-* Remove test from vscode-lwc as well
-
-@W-4485495@
+ chore: make apexE2E.yml and coreE2E.yml run against testesm branch (#5688)
+    * chore: mirgate apexe2e and core e2e fully to esm
+    * chore: move lsp tests to esm
+    * Revert "chore: move lsp tests to esm"
 ```