Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge develop to apex-oas #5984

Closed
wants to merge 16 commits into from

Conversation

peternhale
Copy link
Contributor

Merge develop to aos
@W-0@

daphne-sfdc and others added 15 commits November 25, 2024 12:03
* Update README.md

* Update README.md

* Update developing.md
…orcedx-utils-vscode (#5949)

* chore(deps): bump cross-spawn in /packages/salesforcedx-utils-vscode

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.5.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.5)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: bump cross-spawn to v7.0.6 and @types/cross-spawn to v6.0.6

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Daphne Yang <[email protected]>
Co-authored-by: Daphne Yang <[email protected]>
* feat: add missing labels for org browser

* chore: labels missing in japanese file
* feat: add an user setting to disable error to telemetry by default

* chore: fix linting

* chore: updated jar
# Conflicts:
#	lerna.json
#	package-lock.json
#	packages/salesforcedx-apex-debugger/package.json
#	packages/salesforcedx-apex-replay-debugger/package.json
#	packages/salesforcedx-sobjects-faux-generator/package.json
#	packages/salesforcedx-test-utils-vscode/package.json
#	packages/salesforcedx-utils-vscode/package.json
#	packages/salesforcedx-utils/package.json
#	packages/salesforcedx-visualforce-language-server/package.json
#	packages/salesforcedx-visualforce-markup-language-server/package.json
#	packages/salesforcedx-vscode-apex-debugger/package.json
#	packages/salesforcedx-vscode-apex-replay-debugger/package.json
#	packages/salesforcedx-vscode-apex/out/apex-jorje-lsp.jar
#	packages/salesforcedx-vscode-apex/package.json
#	packages/salesforcedx-vscode-apex/package.nls.ja.json
#	packages/salesforcedx-vscode-apex/package.nls.json
#	packages/salesforcedx-vscode-apex/src/languageServer.ts
#	packages/salesforcedx-vscode-apex/src/settings.ts
#	packages/salesforcedx-vscode-core/package.json
#	packages/salesforcedx-vscode-expanded/package.json
#	packages/salesforcedx-vscode-lightning/package.json
#	packages/salesforcedx-vscode-lwc/package.json
#	packages/salesforcedx-vscode-soql/package.json
#	packages/salesforcedx-vscode-visualforce/package.json
#	packages/salesforcedx-vscode/package.json
#	packages/system-tests/package.json
@peternhale peternhale requested a review from a team as a code owner December 17, 2024 19:41
Copy link
Member

@mingxuanzhangsfdx mingxuanzhangsfdx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching up!

packages/salesforcedx-utils-vscode/package.json Outdated Show resolved Hide resolved
packages/salesforcedx-vscode-apex/package.json Outdated Show resolved Hide resolved
packages/salesforcedx-vscode-apex/package.nls.ja.json Outdated Show resolved Hide resolved
@daphne-sfdc daphne-sfdc closed this Jan 7, 2025
@daphne-sfdc
Copy link
Contributor

Superseded by #5995.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants