Merge branch 'main' into return_value_breakpoint_settings

Author: zobo

.github/workflows/build.yml

@@ -13,13 +13,13 @@ jobs:
       matrix:
         include:
           # Latest versions
-          - xdebug: xdebug-3.3.2 # renovate:keep-up-to-date
+          - xdebug: xdebug-3.4.2 # renovate:keep-up-to-date
             php: '8.2' # renovate:keep-up-to-date
             os: ubuntu-22.04
-          - xdebug: xdebug-3.3.2 # renovate:keep-up-to-date
+          - xdebug: xdebug-3.4.2 # renovate:keep-up-to-date
             php: '8.1' # renovate:keep-up-to-date
             os: windows-2022
-          - xdebug: xdebug-3.3.2 # renovate:keep-up-to-date
+          - xdebug: xdebug-3.4.2 # renovate:keep-up-to-date
             php: '8.2' # renovate:keep-up-to-date
             os: macos-14
           # Old versions
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20.18.2' # renovate:keep-up-to-date
       - name: Install npm dependencies
@@ -68,7 +68,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '20.18.2' # renovate:keep-up-to-date
       - name: Install npm dependencies

package-lock.json

@@ -55,8 +55,6 @@
     "relateurl": "^0.2.7",
     "semver": "^7.5.2",
     "string-replace-async": "^2.0.0",
-    "url-relative": "^1.0.0",
-    "urlencode": "^1.1.0",
     "which": "^2.0.2"
   },
   "devDependencies": {
@@ -70,18 +68,17 @@
     "@types/node": "^16.11.27",
     "@types/relateurl": "^0.2.33",
     "@types/semver": "^7.3.13",
-    "@types/urlencode": "^1.1.3",
     "@types/vscode": "^1.66.0",
     "@types/which": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "^5.44.0",
     "@typescript-eslint/parser": "^5.44.0",
-    "@vscode/debugadapter-testsupport": "^1.64.0",
+    "@vscode/debugadapter-testsupport": "^1.68.0",
     "@vscode/vsce": "^3.2.2",
     "chai": "^4.3.10",
-    "chai-as-promised": "^7.1.1",
+    "chai-as-promised": "^7.1.2",
     "copyfiles": "^2.4.1",
     "eslint": "^8.28.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-jsdoc": "^39.6.4",
     "husky": "^8.0.3",
     "mocha": "^10.1.0",

package.json

@@ -1,58 +1,61 @@
 {
-  "extends": ["config:base"],
+  "extends": ["config:recommended"],
   "timezone": "Europe/Berlin",
   "rangeStrategy": "bump",
-  "semanticCommits": true,
-  "masterIssue": true,
+  "semanticCommits": "enabled",
+  "dependencyDashboard": true,
   "prHourlyLimit": 0,
-  "node": {
-    "supportPolicy": ["current"],
-    "major": {
-      "enabled": true
-    }
-  },
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "fileMatch": ["^.github/workflows/.+\\.ya?ml$"],
       "matchStrings": ["xdebug: xdebug-(?<currentValue>\\S+).*# renovate:keep-up-to-date"],
       "depNameTemplate": "xdebug",
-      "lookupNameTemplate": "xdebug/xdebug",
+      "packageNameTemplate": "xdebug/xdebug",
       "datasourceTemplate": "github-tags",
       "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?<prerelease>\\w+)?$"
     },
     {
+      "customType": "regex",
       "fileMatch": ["^.github/workflows/.+\\.ya?ml$"],
       "matchStrings": ["php: '(?<currentValue>[^']+)'.*# renovate:keep-up-to-date"],
       "depNameTemplate": "php",
-      "lookupNameTemplate": "php/php-src",
+      "packageNameTemplate": "php/php-src",
       "datasourceTemplate": "github-tags",
-      "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?<prerelease>\\w+)?$"
+      "versioningTemplate": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.?(?<patch>\\d+)?(?<prerelease>\\w+)?$"
     },
     {
+      "customType": "regex",
       "fileMatch": ["^.github/workflows/.+\\.ya?ml$"],
       "matchStrings": ["node-version: '(?<currentValue>[^']+)'.*# renovate:keep-up-to-date"],
       "depNameTemplate": "node",
-      "lookupNameTemplate": "nodejs/node",
+      "packageNameTemplate": "nodejs/node",
       "datasourceTemplate": "github-tags",
       "versioningTemplate": "node"
     }
   ],
   "packageRules": [
     {
-      "packageNames": ["php"],
+      "matchCategories": ["node"],
+      "major": {
+        "enabled": true
+      }
+    },
+    {
+      "matchPackageNames": ["php"],
       "extractVersion": "^php-(?<version>.*)$"
     },
     {
-      "packageNames": ["node"],
+      "matchPackageNames": ["node"],
       "extractVersion": "^v(?<version>.*)$",
       "commitMessageTopic": "Node.js",
       "major": {
         "enabled": true
       }
     },
     {
-      "packagePatterns": ["^vscode-debug"],
-      "groupName": "vscode-debug"
+      "groupName": "vscode-debug",
+      "matchPackageNames": ["/^vscode-debug/"]
     },
     {
       "matchPackageNames": ["vscode"],

renovate.json

@@ -18,6 +18,16 @@ describe('ProxyConnect', () => {
     let testSocket: Socket
     let msgs: ProxyMessages
 
+    function doneOnce(done: Mocha.Done): Mocha.Done {
+        let fired = false
+        return (err?: any) => {
+            if (!fired) {
+                fired = true
+                done(err)
+            }
+        }
+    }
+
     beforeEach(() => {
         testSocket = new Socket()
         testSocket.connect = (...param): Socket => {
@@ -57,6 +67,7 @@ describe('ProxyConnect', () => {
     })
 
     it('should request registration', (done: Mocha.Done) => {
+        done = doneOnce(done)
         conn.on('log_request', (str: string) => {
             assert.equal(str, msgs.registerInfo)
             done()
@@ -81,6 +92,7 @@ describe('ProxyConnect', () => {
     })
 
     it('should request deregistration', (done: Mocha.Done) => {
+        done = doneOnce(done)
         conn.on('log_request', (str: string) => {
             assert.equal(str, msgs.deregisterInfo)
             done()