From 64c283fb767acf198646b5202f630cf6be26fba7 Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Tue, 12 Mar 2024 12:51:47 -0700 Subject: [PATCH 1/5] Revert PR #23 Although this works for the vscode build, it doesn't work when running the server normally as is being done with Neovim. --- language-server/src/jsonc-instance.js | 2 +- vscode/src/extension.js | 32 ++++++++++++++++----------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/language-server/src/jsonc-instance.js b/language-server/src/jsonc-instance.js index dd05292..cf506bb 100644 --- a/language-server/src/jsonc-instance.js +++ b/language-server/src/jsonc-instance.js @@ -1,4 +1,4 @@ -import { parseTree } from "jsonc-parser/lib/esm/main.js"; +import { parseTree } from "jsonc-parser"; import * as JsonPointer from "@hyperjump/json-pointer"; import { getKeywordId } from "@hyperjump/json-schema/experimental"; import { drop, find, head, some } from "@hyperjump/pact"; diff --git a/vscode/src/extension.js b/vscode/src/extension.js index bc22951..ade1c82 100644 --- a/vscode/src/extension.js +++ b/vscode/src/extension.js @@ -1,24 +1,30 @@ "use strict"; const path = require("node:path"); -const { LanguageClient, TransportKind } = require("vscode-languageclient/node.js"); +const { LanguageClient } = require("vscode-languageclient/node.js"); let client; const activate = (context) => { - const serverModule = context.asAbsolutePath(path.join("out", "server.js")); + // const serverModule = context.asAbsolutePath(path.join("out", "server.js")); + // const serverOptions = { + // run: { + // module: serverModule, + // transport: TransportKind.ipc + // }, + // debug: { + // module: serverModule, + // transport: TransportKind.ipc, + // options: { + // execArgc: ["--nolazy", "--inspect=6009"] + // } + // } + // }; + + // Temporary Hack. Get the above code working. const serverOptions = { - run: { - module: serverModule, - transport: TransportKind.ipc - }, - debug: { - module: serverModule, - transport: TransportKind.ipc, - options: { - execArgc: ["--nolazy", "--inspect=6009"] - } - } + command: "node", + args: [context.asAbsolutePath(path.join("..", "language-server", "src", "server.js")), "--stdio"] }; const clientOptions = { From 20ee596b688061ae46f4e8a44d92913e765a2942 Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Tue, 12 Mar 2024 13:04:52 -0700 Subject: [PATCH 2/5] Fix vscode build --- vscode/package.json | 2 +- vscode/src/extension.js | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/vscode/package.json b/vscode/package.json index 528cbf8..9994357 100644 --- a/vscode/package.json +++ b/vscode/package.json @@ -8,7 +8,7 @@ "vscode:prepublish": "npm run build-client -- --minify && npm run build-server -- --minify", "build": "npm run build-client -- --sourcemap && npm run build-server -- --sourcemap", "build-client": "esbuild ./src/extension.js --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node", - "build-server": "esbuild ../language-server/src/server.js --bundle --outfile=out/server.js --external:vscode --format=cjs --platform=node", + "build-server": "esbuild ../language-server/src/server.js --bundle --main-fields=module,main --outfile=out/server.js --external:vscode --format=cjs --platform=node", "package": "vsce package --out=dist", "publish": "vsce publish" }, diff --git a/vscode/src/extension.js b/vscode/src/extension.js index ade1c82..bc22951 100644 --- a/vscode/src/extension.js +++ b/vscode/src/extension.js @@ -1,30 +1,24 @@ "use strict"; const path = require("node:path"); -const { LanguageClient } = require("vscode-languageclient/node.js"); +const { LanguageClient, TransportKind } = require("vscode-languageclient/node.js"); let client; const activate = (context) => { - // const serverModule = context.asAbsolutePath(path.join("out", "server.js")); - // const serverOptions = { - // run: { - // module: serverModule, - // transport: TransportKind.ipc - // }, - // debug: { - // module: serverModule, - // transport: TransportKind.ipc, - // options: { - // execArgc: ["--nolazy", "--inspect=6009"] - // } - // } - // }; - - // Temporary Hack. Get the above code working. + const serverModule = context.asAbsolutePath(path.join("out", "server.js")); const serverOptions = { - command: "node", - args: [context.asAbsolutePath(path.join("..", "language-server", "src", "server.js")), "--stdio"] + run: { + module: serverModule, + transport: TransportKind.ipc + }, + debug: { + module: serverModule, + transport: TransportKind.ipc, + options: { + execArgc: ["--nolazy", "--inspect=6009"] + } + } }; const clientOptions = { From 7616691bbecb08ae1c65f42d40b96d9300877f74 Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Tue, 12 Mar 2024 13:08:49 -0700 Subject: [PATCH 3/5] Bugfixes for instances that represent undefined values --- language-server/src/jsonc-instance.js | 4 +++- language-server/src/server.js | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/language-server/src/jsonc-instance.js b/language-server/src/jsonc-instance.js index cf506bb..07e14a6 100644 --- a/language-server/src/jsonc-instance.js +++ b/language-server/src/jsonc-instance.js @@ -29,7 +29,9 @@ export class JsoncInstance { } value() { - if (this.node.value === undefined) { + if (this.node === undefined) { + return undefined; + } else if (this.node.value === undefined) { const json = this.textDocument.getText().slice(this.node.offset, this.node.offset + this.node.length); return JSON.parse(json); } else { diff --git a/language-server/src/server.js b/language-server/src/server.js index 092f8c5..2ff7357 100644 --- a/language-server/src/server.js +++ b/language-server/src/server.js @@ -149,12 +149,12 @@ const validateSchema = async (document) => { const instance = JsoncInstance.fromTextDocument(document); const $schema = instance.get("#/$schema"); - const contextDialectUri = $schema?.value(); + const contextDialectUri = $schema.value(); const schemaResources = decomposeSchemaDocument(instance, contextDialectUri); for (const { dialectUri, schemaInstance } of schemaResources) { if (!hasDialect(dialectUri)) { const $schema = schemaInstance.get("#/$schema"); - if ($schema) { + if ($schema.typeOf() === "string") { diagnostics.push(buildDiagnostic($schema, "Unknown dialect")); } else { diagnostics.push(buildDiagnostic(schemaInstance, "No dialect")); @@ -255,7 +255,7 @@ const getTokenBuilder = (uri) => { const buildTokens = (builder, document) => { const instance = JsoncInstance.fromTextDocument(document); - const dialectUri = instance.get("#/$schema")?.value(); + const dialectUri = instance.get("#/$schema").value(); const schemaResources = decomposeSchemaDocument(instance, dialectUri); for (const { keywordInstance, tokenType, tokenModifier } of getSemanticTokens(schemaResources)) { const startPosition = keywordInstance.startPosition(); From e397145c8a3891fb6146fc4caf4396191ffe9ef4 Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Tue, 12 Mar 2024 13:13:43 -0700 Subject: [PATCH 4/5] Bugfix for revalidating workspace --- language-server/src/server.js | 8 +++++--- language-server/src/workspace.js | 4 ---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/language-server/src/server.js b/language-server/src/server.js index 2ff7357..2ff17ef 100644 --- a/language-server/src/server.js +++ b/language-server/src/server.js @@ -117,9 +117,11 @@ const validateWorkspace = async () => { // Re/validate all schemas for await (const uri of workspaceSchemas()) { - const textDocument = documents.get(uri); - if (textDocument) { - await validateSchema(textDocument); + if (isSchema(uri)) { + const textDocument = documents.get(uri); + if (textDocument) { + await validateSchema(textDocument); + } } } diff --git a/language-server/src/workspace.js b/language-server/src/workspace.js index 71c22d6..d4ea33e 100644 --- a/language-server/src/workspace.js +++ b/language-server/src/workspace.js @@ -43,10 +43,6 @@ export const workspaceSchemas = async function* () { const path = fileURLToPath(uri); for (const filename of await readdir(path, { recursive: true })) { - if (!filename.endsWith(".schema.json")) { - continue; - } - const schemaPath = resolve(path, filename); yield pathToFileURL(schemaPath).toString(); From a9f4c1af64bc129ab9c84f5370c7eb54f32666af Mon Sep 17 00:00:00 2001 From: Jason Desrosiers Date: Tue, 12 Mar 2024 13:16:41 -0700 Subject: [PATCH 5/5] Update dependencies --- package-lock.json | 128 +++++++++++++++++++-------------------- vscode/package-lock.json | 24 ++++---- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f14a49..737fcbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -730,9 +730,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.1.tgz", - "integrity": "sha512-iU2Sya8hNn1LhsYyf0N+L4Gf9Qc+9eBTJJJsaOGUp+7x4n2M9dxTt8UvhJl3oeftSjblSlpCfvjA/IfP3g5VjQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", + "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", "cpu": [ "arm" ], @@ -743,9 +743,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.1.tgz", - "integrity": "sha512-wlzcWiH2Ir7rdMELxFE5vuM7D6TsOcJ2Yw0c3vaBR3VOsJFVTx9xvwnAvhgU5Ii8Gd6+I11qNHwndDscIm0HXg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", + "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", "cpu": [ "arm64" ], @@ -756,9 +756,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.1.tgz", - "integrity": "sha512-YRXa1+aZIFN5BaImK+84B3uNK8C6+ynKLPgvn29X9s0LTVCByp54TB7tdSMHDR7GTV39bz1lOmlLDuedgTwwHg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", + "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", "cpu": [ "arm64" ], @@ -769,9 +769,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.1.tgz", - "integrity": "sha512-opjWJ4MevxeA8FhlngQWPBOvVWYNPFkq6/25rGgG+KOy0r8clYwL1CFd+PGwRqqMFVQ4/Qd3sQu5t7ucP7C/Uw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", + "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", "cpu": [ "x64" ], @@ -782,9 +782,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.1.tgz", - "integrity": "sha512-uBkwaI+gBUlIe+EfbNnY5xNyXuhZbDSx2nzzW8tRMjUmpScd6lCQYKY2V9BATHtv5Ef2OBq6SChEP8h+/cxifQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", + "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", "cpu": [ "arm" ], @@ -795,9 +795,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.1.tgz", - "integrity": "sha512-0bK9aG1kIg0Su7OcFTlexkVeNZ5IzEsnz1ept87a0TUgZ6HplSgkJAnFpEVRW7GRcikT4GlPV0pbtVedOaXHQQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", + "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", "cpu": [ "arm64" ], @@ -808,9 +808,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.1.tgz", - "integrity": "sha512-qB6AFRXuP8bdkBI4D7UPUbE7OQf7u5OL+R94JE42Z2Qjmyj74FtDdLGeriRyBDhm4rQSvqAGCGC01b8Fu2LthQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", + "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", "cpu": [ "arm64" ], @@ -821,9 +821,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.1.tgz", - "integrity": "sha512-sHig3LaGlpNgDj5o8uPEoGs98RII8HpNIqFtAI8/pYABO8i0nb1QzT0JDoXF/pxzqO+FkxvwkHZo9k0NJYDedg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", + "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", "cpu": [ "riscv64" ], @@ -834,9 +834,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.1.tgz", - "integrity": "sha512-nD3YcUv6jBJbBNFvSbp0IV66+ba/1teuBcu+fBBPZ33sidxitc6ErhON3JNavaH8HlswhWMC3s5rgZpM4MtPqQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", + "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", "cpu": [ "x64" ], @@ -847,9 +847,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.1.tgz", - "integrity": "sha512-7/XVZqgBby2qp/cO0TQ8uJK+9xnSdJ9ct6gSDdEr4MfABrjTyrW6Bau7HQ73a2a5tPB7hno49A0y1jhWGDN9OQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", + "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", "cpu": [ "x64" ], @@ -860,9 +860,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.1.tgz", - "integrity": "sha512-CYc64bnICG42UPL7TrhIwsJW4QcKkIt9gGlj21gq3VV0LL6XNb1yAdHVp1pIi9gkts9gGcT3OfUYHjGP7ETAiw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", + "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", "cpu": [ "arm64" ], @@ -873,9 +873,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.1.tgz", - "integrity": "sha512-LN+vnlZ9g0qlHGlS920GR4zFCqAwbv2lULrR29yGaWP9u7wF5L7GqWu9Ah6/kFZPXPUkpdZwd//TNR+9XC9hvA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", + "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", "cpu": [ "ia32" ], @@ -886,9 +886,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.1.tgz", - "integrity": "sha512-n+vkrSyphvmU0qkQ6QBNXCGr2mKjhP08mPRM/Xp5Ck2FV4NrHU+y6axzDeixUrCBHVUS51TZhjqrKBBsHLKb2Q==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", + "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", "cpu": [ "x64" ], @@ -3447,9 +3447,9 @@ } }, "node_modules/rollup": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.1.tgz", - "integrity": "sha512-ggqQKvx/PsB0FaWXhIvVkSWh7a/PCLQAsMjBc+nA2M8Rv2/HG0X6zvixAB7KyZBRtifBUhy5k8voQX/mRnABPg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", + "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -3462,19 +3462,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.12.1", - "@rollup/rollup-android-arm64": "4.12.1", - "@rollup/rollup-darwin-arm64": "4.12.1", - "@rollup/rollup-darwin-x64": "4.12.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.12.1", - "@rollup/rollup-linux-arm64-gnu": "4.12.1", - "@rollup/rollup-linux-arm64-musl": "4.12.1", - "@rollup/rollup-linux-riscv64-gnu": "4.12.1", - "@rollup/rollup-linux-x64-gnu": "4.12.1", - "@rollup/rollup-linux-x64-musl": "4.12.1", - "@rollup/rollup-win32-arm64-msvc": "4.12.1", - "@rollup/rollup-win32-ia32-msvc": "4.12.1", - "@rollup/rollup-win32-x64-msvc": "4.12.1", + "@rollup/rollup-android-arm-eabi": "4.13.0", + "@rollup/rollup-android-arm64": "4.13.0", + "@rollup/rollup-darwin-arm64": "4.13.0", + "@rollup/rollup-darwin-x64": "4.13.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", + "@rollup/rollup-linux-arm64-gnu": "4.13.0", + "@rollup/rollup-linux-arm64-musl": "4.13.0", + "@rollup/rollup-linux-riscv64-gnu": "4.13.0", + "@rollup/rollup-linux-x64-gnu": "4.13.0", + "@rollup/rollup-linux-x64-musl": "4.13.0", + "@rollup/rollup-win32-arm64-msvc": "4.13.0", + "@rollup/rollup-win32-ia32-msvc": "4.13.0", + "@rollup/rollup-win32-x64-msvc": "4.13.0", "fsevents": "~2.3.2" } }, @@ -4018,9 +4018,9 @@ } }, "node_modules/vite": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.5.tgz", - "integrity": "sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz", + "integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==", "dev": true, "dependencies": { "esbuild": "^0.19.3", @@ -4191,16 +4191,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", - "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.6", - "call-bind": "^1.0.5", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.1" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" diff --git a/vscode/package-lock.json b/vscode/package-lock.json index 02fcf98..04de9a3 100644 --- a/vscode/package-lock.json +++ b/vscode/package-lock.json @@ -2066,9 +2066,9 @@ } }, "node_modules/hasown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", - "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, "dependencies": { "function-bind": "^1.1.2" @@ -3192,9 +3192,9 @@ } }, "node_modules/safe-array-concat": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.1.tgz", - "integrity": "sha512-a4i5sUH9QtYYwK3n+9LEumSTV3VMZwlH2xkf/MdMd1dGtFr7wjCbJi9RoKEgfNpX3utiIsNEhadCCqBTKOtaGQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, "dependencies": { "call-bind": "^1.0.7", @@ -3819,16 +3819,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", - "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.6", - "call-bind": "^1.0.5", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.1" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4"