Skip to content

[9.2] chore: migrate to neostandard #2920 (#3201)#3260

Merged
margaretjgu merged 4 commits into9.2from
backport-3201-to-9.2
Apr 21, 2026
Merged

[9.2] chore: migrate to neostandard #2920 (#3201)#3260
margaretjgu merged 4 commits into9.2from
backport-3201-to-9.2

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Backport #3201 to branch 9.2.

AI-resolved conflicts

This backport had merge conflicts that were automatically resolved using AI (Claude). The following files had conflicts that were resolved:

  • package.json
  • scripts/fix-esm-require.js
  • scripts/generate-version.js
  • src/helpers.ts
  • test/bundlers/repro/repro.mjs
  • test/ingest/base64.mjs
  • test/unit/client.test.ts

Please review the conflict resolutions carefully before merging.

Co-authored-by: Josh Mock <[email protected]>
Co-authored-by: Josh Mock <[email protected]>
(cherry picked from commit 567b9e6)
@github-actions github-actions Bot requested a review from JoshMock as a code owner April 21, 2026 17:00
@github-actions github-actions Bot added the ai-resolved-backport autogenerated prs to resolve merge conflicts and backporting issues label Apr 21, 2026
@prodsecmachine
Copy link
Copy Markdown

prodsecmachine commented Apr 21, 2026

Snyk checks have passed. No issues have been found so far.

Status Scan Engine Critical High Medium Low Total (0)
Open Source Security 0 0 0 0 0 issues
Licenses 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

margaretjgu
margaretjgu previously approved these changes Apr 21, 2026
@margaretjgu margaretjgu enabled auto-merge (squash) April 21, 2026 17:46
- Remove unused loadArrow function from helpers.ts (TS6133)
- Remove unused eslint-disable-line comment from client.ts
- Add eslint-disable-next-line no-new in test-import.mjs

Made-with: Cursor
margaretjgu
margaretjgu previously approved these changes Apr 21, 2026
The cherry-pick lost the alternative runtime detection lines that
append bn= and dn= to the x-elastic-client-meta header, causing
the Bun and Deno meta header unit tests to fail.

Made-with: Cursor
@margaretjgu margaretjgu disabled auto-merge April 21, 2026 18:13
@margaretjgu margaretjgu enabled auto-merge (squash) April 21, 2026 18:13
@margaretjgu margaretjgu disabled auto-merge April 21, 2026 18:13
@margaretjgu margaretjgu merged commit 2d27d7d into 9.2 Apr 21, 2026
18 of 19 checks passed
@margaretjgu margaretjgu deleted the backport-3201-to-9.2 branch April 21, 2026 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-resolved-backport autogenerated prs to resolve merge conflicts and backporting issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants