Merge pull request #303 from marklogic/master

MLE-12345 Merging master into develop

Author: rjrudin

CHANGELOG.md

@@ -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.

docs/Gemfile.lock

@@ -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)
@@ -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)

…cs/debuging-support/debugging-support.md …s/debugging-support/debugging-support.mddocs/debuging-support/debugging-support.md renamed to docs/debugging-support/debugging-support.md docs/debuging-support/debugging-support.md renamed to docs/debugging-support/debugging-support.md

@@ -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.
 

docs/debuging-support/localModules.md docs/debugging-support/localModules.mddocs/debuging-support/localModules.md renamed to docs/debugging-support/localModules.md

@@ -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)
+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).
 

docs/debuging-support/remoteRequests.md docs/debugging-support/remoteRequests.mddocs/debuging-support/remoteRequests.md renamed to docs/debugging-support/remoteRequests.md

@@ -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"
@@ -157,7 +157,7 @@
                 "runtime": "node",
                 "configurationAttributes": {
                     "launch": {
-                        "required": [],
+                        "required": [ ],
                         "properties": {
                             "path": {
                                 "type": "string",
@@ -248,7 +248,7 @@
                         }
                     }
                 ],
-                "variables": {}
+                "variables": { }
             },
             {
                 "type": "xquery-ml",
@@ -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`",
         "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",
@@ -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"

docs/serverStatusView.md

@@ -4,7 +4,7 @@ name: mlxprs
 services:
 
   marklogic:
-    image: "marklogicdb/marklogic-db:11.1.0-centos-1.1.0"
+    image: "progressofficial/marklogic-db:latest"
     platform: linux/amd64
     environment:
       - INSTALL_CONVERTERS=true