Merge main into vs - #14786
Merged
Sean McManus (sean-mcmanus) merged 8 commits intoSep 18, 2026
Merged
Merge main into vs#14786Sean McManus (sean-mcmanus) merged 8 commits into
Sean McManus (sean-mcmanus) merged 8 commits into
Conversation
Use ESLint 10-compatible import and JSDoc plugins while preserving the existing lint rules. Declare @eslint/js directly and refresh the Yarn lockfile. Limit automatic ambient types to the Node and Mocha environments used by the projects, avoiding the legacy Webpack scope-type conflict without disabling library checks.
* Update to vsce 4.0.0.
Sean McManus (sean-mcmanus)
force-pushed
the
seanmcm/devbox2-wsl/agent227/merge-main-into-vs-20260917
branch
from
September 18, 2026 01:30
92369b0 to
19ef177
Compare
Sean McManus (sean-mcmanus)
marked this pull request as ready for review
September 18, 2026 02:48
Colen Garoutte-Carson (Colengms)
approved these changes
Sep 18, 2026
Sean McManus (sean-mcmanus)
deleted the
seanmcm/devbox2-wsl/agent227/merge-main-into-vs-20260917
branch
September 18, 2026 04:15
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merge
mainintovsthrough #14775, immediately before #14777. The merge is conflict-free and its tree matches that selectedmainrevision.#14777 and subsequent
maincommits are deferred, not merged and reverted. Neither the telemetry migration nor its revert is in this branch's ancestry, so a later ordinary merge can bring the migration in when its paired server update is available.Validation
mainapplies the telemetry migration normally, without a revert-of-revert.vs.