Merge remote branch 'origin/master' into edge

Author: automatic-merge

Makefile

@@ -122,7 +122,13 @@ clean:
 	-rm -rf integration/vscode/ada/$(PLATFORM)
 
 vscode:
-	cd integration/vscode/ada; LD_LIBRARY_PATH= npm install --no-audit && npm run compile
+ifneq ($(npm_config_offline),true)
+# These commands may try to contact remote servers so if npm is configured to
+# run in offline mode, don't bother running them
+	cd integration/vscode/ada; LD_LIBRARY_PATH= npm install --no-audit
+	cd integration/vscode/ada; LD_LIBRARY_PATH= npm run check-licenses
+endif
+	cd integration/vscode/ada; LD_LIBRARY_PATH= npm run compile
 	@echo Now run:
 	@echo code --extensionDevelopmentPath=`pwd`/integration/vscode/ada/ `pwd`
 

integration/vscode/ada/package-lock.json

@@ -575,12 +575,12 @@
         "eslint-plugin-tsdoc": "0.2.17",
         "glob": "9.3.0",
         "mocha": "10.2.0",
-        "mocha-junit-reporter": "^2.2.0",
         "prettier": "2.8.4",
         "typescript": "4.9.5",
         "vscode-tmgrammar-test": "0.1.1"
     },
     "scripts": {
+        "check-licenses": "npx license-checker-rseidelsohn --summary --onlyAllow '0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;BlueOak-1.0.0;CC0-1.0;GPL-3.0;GPL-3.0-or-later;ISC;MIT;Python-2.0;Zlib'",
         "vscode:prepublish": "npm run esbuild-base -- --minify",
         "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/src/extension.js --external:vscode --format=cjs --platform=node",
         "compile": "node ./node_modules/typescript/bin/tsc",