Skip to content

MLE-12345 Merging master into develop #303

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.

Sign up for GitHub

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

Merged
rjrudin merged 41 commits into from
Oct 28, 2025
Merged

MLE-12345 Merging master into develop #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c25b40e
Merge pull request #273 from marklogic/develop
BillFarber Mar 14, 2024
2853214
docs bug fixes
BillFarber Mar 14, 2024
271a212
Merge pull request #274 from BillFarber/master
BillFarber Mar 14, 2024
908713b
Bump nokogiri from 1.16.2 to 1.16.5 in /docs
dependabot[bot] May 13, 2024
ab71156
Merge pull request #275 from marklogic/dependabot/bundler/docs/nokogi…
rjrudin May 14, 2024
bba3607
Bump rexml from 3.2.6 to 3.2.8 in /docs
dependabot[bot] May 16, 2024
9fe813f
Bump braces from 3.0.2 to 3.0.3 in /server
dependabot[bot] Jun 16, 2024
22e1a65
Merge pull request #277 from marklogic/dependabot/npm_and_yarn/server…
BillFarber Jun 17, 2024
9ed273a
Bump braces from 3.0.2 to 3.0.3
dependabot[bot] Jun 17, 2024
cc8825f
Merge pull request #278 from marklogic/dependabot/npm_and_yarn/braces…
BillFarber Jun 17, 2024
a3ac90d
Merge pull request #276 from marklogic/dependabot/bundler/docs/rexml-…
BillFarber Jun 17, 2024
420ff2e
Bump fast-xml-parser from 4.3.5 to 4.4.1
dependabot[bot] Jul 29, 2024
8405374
Bump rexml from 3.2.8 to 3.3.6 in /docs
dependabot[bot] Aug 22, 2024
1127a9a
Merge pull request #281 from marklogic/dependabot/bundler/docs/rexml-…
rjrudin Aug 27, 2024
922ad77
Bump micromatch from 4.0.5 to 4.0.8
dependabot[bot] Aug 27, 2024
d3533ff
Merge pull request #282 from marklogic/dependabot/npm_and_yarn/microm…
BillFarber Oct 21, 2024
c92a10b
Merge pull request #279 from marklogic/dependabot/npm_and_yarn/fast-x…
BillFarber Oct 21, 2024
1b2e4c6
Bump webrick from 1.8.1 to 1.8.2 in /docs
dependabot[bot] Oct 21, 2024
a8c9449
Bump webpack from 5.76.1 to 5.95.0
dependabot[bot] Oct 21, 2024
491e33c
Merge pull request #284 from marklogic/dependabot/bundler/docs/webric…
BillFarber Oct 21, 2024
5e4b5ed
Fixes a high vulnerability.
BillFarber Oct 21, 2024
312f9ac
Merge pull request #286 from BillFarber/task/fixCVE
BillFarber Oct 21, 2024
e6c1f4d
Merge pull request #285 from marklogic/dependabot/npm_and_yarn/webpac…
BillFarber Oct 21, 2024
e192eb8
Bump the version to 3.9.1 and update the changelog.
BillFarber Oct 21, 2024
58a9ac7
Merge pull request #287 from BillFarber/task/prepPatchVersion
BillFarber Oct 21, 2024
199655b
Revert one of the upgrades.
BillFarber Oct 22, 2024
a508bcf
Merge pull request #288 from BillFarber/task/release
BillFarber Oct 22, 2024
b02a2a1
Bump rexml from 3.3.6 to 3.3.9 in /docs
dependabot[bot] Oct 28, 2024
4dfb2aa
Merge pull request #289 from marklogic/dependabot/bundler/docs/rexml-…
rjrudin Oct 28, 2024
b20055a
Bump nokogiri from 1.16.5 to 1.18.4 in /docs
dependabot[bot] Mar 21, 2025
62a6e1d
Merge pull request #293 from marklogic/dependabot/bundler/docs/nokogi…
BillFarber Mar 21, 2025
37c906d
Bump uri from 0.13.0 to 0.13.2 in /docs
dependabot[bot] Mar 21, 2025
eb3ee12
Merge pull request #292 from marklogic/dependabot/bundler/docs/uri-0.…
BillFarber Mar 21, 2025
0ba6661
Bump nokogiri from 1.18.4 to 1.18.8 in /docs
dependabot[bot] Apr 22, 2025
a001155
Merge pull request #295 from marklogic/dependabot/bundler/docs/nokogi…
BillFarber Apr 22, 2025
b8b921c
Bump tar-fs from 2.1.1 to 2.1.3
dependabot[bot] Jun 3, 2025
2be5e05
Merge pull request #296 from marklogic/dependabot/npm_and_yarn/tar-fs…
BillFarber Jun 3, 2025
21abda0
Bump form-data from 4.0.0 to 4.0.4
dependabot[bot] Jul 21, 2025
137664f
Merge pull request #298 from marklogic/dependabot/npm_and_yarn/form-d…
BillFarber Jul 21, 2025
056111f
Bump tar-fs from 2.1.3 to 2.1.4
dependabot[bot] Sep 26, 2025
4638864
Merge pull request #302 from marklogic/dependabot/npm_and_yarn/tar-fs…
BillFarber Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [3.9.1](https://github.com/marklogic/mlxprs/releases/tag/v3.9.1)

- Addressed a set of dependency updates and vulnerabilities.
- [Improved user guide.](https://marklogic.github.io/mlxprs/)

## [3.9.0](https://github.com/marklogic/mlxprs/releases/tag/v3.9.0)

- New MarkLogic icon in the Activity Bar that can be used to open an explorer view with high-level information about the currently connected MarkLogic server.
Expand Down
13 changes: 8 additions & 5 deletions docs/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,19 +222,21 @@ GEM
mutex_m (0.2.0)
net-http (0.4.1)
uri
nokogiri (1.16.2-arm64-darwin)
nokogiri (1.18.8-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.8-x86_64-linux-gnu)
racc (~> 1.4)
octokit (4.25.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.7)
racc (1.7.3)
racc (1.8.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.6)
rexml (3.3.9)
rouge (3.26.0)
rubyzip (2.3.2)
safe_yaml (1.0.5)
Expand All @@ -258,13 +260,14 @@ GEM
unf_ext
unf_ext (0.0.9.1)
unicode-display_width (1.8.0)
uri (0.13.0)
webrick (1.8.1)
uri (0.13.2)
webrick (1.8.2)

PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-linux

DEPENDENCIES
github-pages (~> 228)
Expand Down
0 docs/debuging-support/debugging-support.md → docs/debugging-support/debugging-support.md
View file
Open in desktop
File renamed without changes.
0 docs/debuging-support/localModules.md → docs/debugging-support/localModules.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/debuging-support/remoteRequests.md → docs/debugging-support/remoteRequests.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Once you start debugging, a dropdown menu will pop up listing all paused request

**Note: Only requests that are launched after a server is connected/made debug server can be attached.**

![Attach screenshot](/assets/attach_screenshot.png "attach screenshot")
![Attach screenshot](../assets/attach_screenshot.png "attach screenshot")

Use the optional parameter `rid` to specify a request ID in advance and avoid being prompted for it.

Expand Down
6 changes: 3 additions & 3 deletions docs/serverStatusView.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ nav_order: 3
### Server Status View

MLXPRS includes an icon (
<img src="/assets/Progress_PrimarySymbol.svg" width="15" height="15" style="filter: grayscale(1);"/>
<img src="./assets/Progress_PrimarySymbol.svg" width="15" height="15" style="filter: grayscale(1);"/>
) in the VSCode activity bar, which VSCode displays by default on the left side of the
VSCode window. When selected, an explorer view is shown, which can provide information
about the currently configured MarkLogic server.

The first time the Server Status View is displayed, the MarkLogic server is queried for
a list of configured databases and app servers, as well as a list of app servers that
are currently in "connected" mode - see
[Attach - Attach & step through remote requests](remoteRequests.md) for more
information. Then, the view and lists are updated anytime there is a change to
[Attach - Attach & step through remote requests](debugging-support/remoteRequests.html)
Copy link

Copilot AI Oct 28, 2025

Choose a reason for hiding this comment

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

The link uses '.html' extension but Markdown files typically use '.md' extension in source repositories. If this documentation is processed by a static site generator that converts .md to .html, this is correct. Otherwise, it should be 'debugging-support/remoteRequests.md'.

Suggested change
[Attach - Attach & step through remote requests](debugging-support/remoteRequests.html)
[Attach - Attach & step through remote requests](debugging-support/remoteRequests.md)

Copilot uses AI. Check for mistakes.
for more information. Then, the view and lists are updated anytime there is a change to
'marklogic' configuration values. Finally, you can also request a refresh of a specific
list by clicking on the list header (Databases, App-Servers, Debug App Servers).

Expand Down
488 changes: 364 additions & 124 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "mlxprs",
"displayName": "MLXPRS: MarkLogic Extension for VS Code",
"description": "Simplifies and automates common development tasks for creating applications on MarkLogic.",
"version": "3.9.0",
"version": "3.9.1",
"publisher": "mlxprs",
"engines": {
"vscode": "^1.78.0"
Expand Down Expand Up @@ -157,7 +157,7 @@
"runtime": "node",
"configurationAttributes": {
"launch": {
"required": [],
"required": [ ],
"properties": {
"path": {
"type": "string",
Expand Down Expand Up @@ -248,7 +248,7 @@
}
}
],
"variables": {}
"variables": { }
},
{
"type": "xquery-ml",
Expand Down Expand Up @@ -607,7 +607,9 @@
"coverageAll": "c8 npm run test && c8 npm run testServer && c8 npm run testIntegration"
},
"dependenciesComments": {
"webpack": "Something with version 5.80.0 is breaking the integration tests (and other things?).",
"webpackProblem": "Something with version 5.95.0 is breaking the integration tests (and other things?).",
"webpackFix": "I believe this will require upgrading the @types/node and will not be trivial.",
"@types/vscode": "This needs to match the value at the top of this file in 'engines.vscode`",
Copy link

Copilot AI Oct 28, 2025

Choose a reason for hiding this comment

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

Corrected typo: 'engines.vscode`' should be 'engines.vscode'.

Suggested change
"@types/vscode": "This needs to match the value at the top of this file in 'engines.vscode`",
"@types/vscode": "This needs to match the value at the top of this file in 'engines.vscode'",

Copilot uses AI. Check for mistakes.
"possiblyUnused": {
"comment": "I'm not sure about these four packages. Without them, there seem to be problems when you attempt to 'attach' or 'launch'.",
"@types/estree": "1.0.5",
Expand Down Expand Up @@ -646,9 +648,10 @@
"@vscode/debugadapter": "1.65.0",
"await-notify": "1.0.1",
"esprima": "4.0.1",
"fast-xml-parser": "4.3.5",
"fast-xml-parser": "4.4.1",
"marklogic": "3.3.1",
"merge-options": "3.0.4",
"path-to-regexp": "6.3.0",
"ts-loader": "9.5.1",
"vscode-languageclient": "7.0.0",
"xml2js": "0.6.2"
Expand Down
28 changes: 14 additions & 14 deletions server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test-app/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: mlxprs
services:

marklogic:
image: "marklogicdb/marklogic-db:11.1.0-centos-1.1.0"
image: "progressofficial/marklogic-db:latest"
Copy link

Copilot AI Oct 28, 2025

Choose a reason for hiding this comment

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

Using the 'latest' tag in Docker images is not recommended for production or reproducible builds. Consider pinning to a specific version tag (e.g., '11.1.0-centos-1.1.0' or a newer specific version) to ensure consistency across deployments and avoid unexpected breaking changes.

Suggested change
image: "progressofficial/marklogic-db:latest"
image: "progressofficial/marklogic-db:11.1.0-centos-1.1.0"

Copilot uses AI. Check for mistakes.
platform: linux/amd64
environment:
- INSTALL_CONVERTERS=true
Expand Down
Loading