From b806534db87002674dcf56141876b0953e52b350 Mon Sep 17 00:00:00 2001 From: dpiercey Date: Fri, 13 Dec 2024 19:33:07 -0700 Subject: [PATCH] chore: upgrade deps --- .changeset/plenty-games-impress.md | 8 + package-lock.json | 161 ++++++++---------- package.json | 4 +- packages/language-server/package.json | 9 +- .../src/utils/project-defaults.ts | 2 +- packages/language-tools/package.json | 7 +- 6 files changed, 92 insertions(+), 99 deletions(-) create mode 100644 .changeset/plenty-games-impress.md diff --git a/.changeset/plenty-games-impress.md b/.changeset/plenty-games-impress.md new file mode 100644 index 00000000..85274360 --- /dev/null +++ b/.changeset/plenty-games-impress.md @@ -0,0 +1,8 @@ +--- +"@marko/language-server": patch +"@marko/language-tools": patch +"@marko/type-check": patch +"marko-vscode": patch +--- + +Upgrade all deps. diff --git a/package-lock.json b/package-lock.json index 9c12c542..4e3955ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,11 +11,11 @@ "devDependencies": { "@changesets/changelog-github": "^0.5.0", "@changesets/cli": "^2.27.10", - "@eslint/js": "^9.16.0", + "@eslint/js": "^9.17.0", "@types/mocha": "^10.0.10", "@types/node": "^22.10.2", "esbuild": "^0.24.0", - "eslint": "^9.16.0", + "eslint": "^9.17.0", "eslint-formatter-unix": "^8.40.0", "eslint-plugin-simple-import-sort": "^12.1.1", "fast-glob": "^3.3.2", @@ -176,9 +176,9 @@ } }, "node_modules/@azure/msal-browser": { - "version": "3.27.0", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.27.0.tgz", - "integrity": "sha512-+b4ZKSD8+vslCtVRVetkegEhOFMLP3rxDWJY212ct+2r6jVg6OSQKc1Qz3kCoXo0FgwaXkb+76TMZfpHp8QtgA==", + "version": "3.28.0", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.28.0.tgz", + "integrity": "sha512-1c1qUF6vB52mWlyoMem4xR1gdwiQWYEQB2uhDkbAL4wVJr8WmAcXybc1Qs33y19N4BdPI8/DHI7rPE8L5jMtWw==", "dev": true, "license": "MIT", "dependencies": { @@ -1453,9 +1453,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.16.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz", - "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==", + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz", + "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==", "dev": true, "license": "MIT", "engines": { @@ -1784,42 +1784,43 @@ } }, "node_modules/@marko/babel-utils": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-6.6.2.tgz", - "integrity": "sha512-jzqIRZxViVVV1NmpLSfi5mfnz9ZLPjTUo1CronpAgR7p14Eo3Gspj1Me2YmOS09evFUdqgZQyoeW1loDH1zHWg==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-6.6.3.tgz", + "integrity": "sha512-EuH7uzskOfBFV5+EyJPuwMEkG7kHgejX9r+1FulUqsf294hj+BVTBfIfKkKgvzLDbkl8aJULjJOyLKCAP64fcA==", "license": "MIT", "dependencies": { + "@babel/parser": "^7.26.3", "@babel/runtime": "^7.26.0", - "jsesc": "^3.0.2", + "jsesc": "^3.1.0", "relative-import-path": "^1.0.0" } }, "node_modules/@marko/compiler": { - "version": "5.38.4", - "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.38.4.tgz", - "integrity": "sha512-MA2SbNgBu0VAkUnecnx1pw37KgIIhPzwNJ3KMpeIJdkNGYoJfqoOZmjSLAOJtVYnn6uC+s1TtvRZIeDZ9Wu4Ew==", + "version": "5.39.4", + "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.39.4.tgz", + "integrity": "sha512-F/AfA7dHCTtZ6rGrBJGSv94STt0RBnwI/n76ilLDiX0xwMXpe0ptW2brR5d4KQVLeQvdMqdA0Rb7CBx/iQdZvw==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", "@babel/core": "^7.26.0", - "@babel/generator": "^7.26.2", - "@babel/parser": "^7.26.2", + "@babel/generator": "^7.26.3", + "@babel/parser": "^7.26.3", "@babel/plugin-syntax-typescript": "^7.25.9", - "@babel/plugin-transform-modules-commonjs": "^7.25.9", - "@babel/plugin-transform-typescript": "^7.25.9", + "@babel/plugin-transform-modules-commonjs": "^7.26.3", + "@babel/plugin-transform-typescript": "^7.26.3", "@babel/runtime": "^7.26.0", - "@babel/traverse": "^7.25.9", - "@babel/types": "^7.26.0", + "@babel/traverse": "^7.26.4", + "@babel/types": "^7.26.3", "@luxass/strip-json-comments": "^1.3.2", - "@marko/babel-utils": "^6.6.2", "complain": "^1.6.1", "he": "^1.2.0", - "htmljs-parser": "^5.5.2", - "jsesc": "^3.0.2", + "htmljs-parser": "^5.5.3", + "jsesc": "^3.1.0", "kleur": "^4.1.5", "lasso-package-root": "^1.0.1", "raptor-regexp": "^1.0.1", "raptor-util": "^3.2.0", + "relative-import-path": "^1.0.0", "resolve-from": "^5.0.0", "self-closing-tags": "^1.0.1", "source-map-support": "^0.5.21" @@ -1833,22 +1834,6 @@ "resolved": "packages/language-tools", "link": true }, - "node_modules/@marko/translator-default": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-6.1.2.tgz", - "integrity": "sha512-4h7TgiiPtl8R4WuOwWznYl3+F97n9XsJusOEzAEn/yKHjsxAyAIWPNk0TlsnNcx37p4841Ypf7T1vtR0wAOiHw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@marko/babel-utils": "^6.6.0", - "magic-string": "^0.30.12", - "self-closing-tags": "^1.0.1" - }, - "peerDependencies": { - "@marko/compiler": "^5.16.1", - "marko": "^5.17.2" - } - }, "node_modules/@marko/type-check": { "resolved": "packages/type-check", "link": true @@ -1960,9 +1945,9 @@ "license": "MIT" }, "node_modules/@types/vscode": { - "version": "1.95.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.95.0.tgz", - "integrity": "sha512-0LBD8TEiNbet3NvWsmn59zLzOFu/txSlGxnv5yAFHCrhG9WvAnR3IvfHzMOs2aeWqgvNjq9pO99IUw8d3n+unw==", + "version": "1.96.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.96.0.tgz", + "integrity": "sha512-qvZbSZo+K4ZYmmDuaodMbAa67Pl6VDQzLKFka6rq+3WUTY4Kro7Bwoi0CuZLO/wema0ygcmpwow7zZfPJTs5jg==", "dev": true, "license": "MIT" }, @@ -2899,9 +2884,9 @@ "license": "ISC" }, "node_modules/browserslist": { - "version": "4.24.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", - "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", + "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", "funding": [ { "type": "opencollective", @@ -2918,9 +2903,9 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001669", - "electron-to-chromium": "^1.5.41", - "node-releases": "^2.0.18", + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { @@ -3052,9 +3037,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001687", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz", - "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==", + "version": "1.0.30001688", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz", + "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==", "funding": [ { "type": "opencollective", @@ -3803,9 +3788,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.72", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz", - "integrity": "sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==", + "version": "1.5.73", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz", + "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -3997,9 +3982,9 @@ } }, "node_modules/eslint": { - "version": "9.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.16.0.tgz", - "integrity": "sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==", + "version": "9.17.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz", + "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==", "dev": true, "license": "MIT", "dependencies": { @@ -4008,7 +3993,7 @@ "@eslint/config-array": "^0.19.0", "@eslint/core": "^0.9.0", "@eslint/eslintrc": "^3.2.0", - "@eslint/js": "9.16.0", + "@eslint/js": "9.17.0", "@eslint/plugin-kit": "^0.2.3", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -4017,7 +4002,7 @@ "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.5", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.2.0", @@ -5933,13 +5918,13 @@ "license": "Python-2.0" }, "node_modules/marko": { - "version": "5.36.3", - "resolved": "https://registry.npmjs.org/marko/-/marko-5.36.3.tgz", - "integrity": "sha512-Y4gDUPRkZkquhVNIxgDRzqY7/R2tTblla5OoQAhOywCCnE5682PbAz0H9xwdaku6/Junn1erJ/VF/GySTGEh/Q==", + "version": "5.37.4", + "resolved": "https://registry.npmjs.org/marko/-/marko-5.37.4.tgz", + "integrity": "sha512-F56nmODiMEl+mhwuNKPq1GU1aUtvp553D+ZUoVzDMKABvG7qHc3GQNzqfZYGJFKosuw0Jz8RuqvhtHOYelf/Aw==", "license": "MIT", "dependencies": { - "@marko/compiler": "^5.38.3", - "@marko/translator-default": "^6.1.2", + "@babel/runtime": "^7.26.0", + "@marko/compiler": "^5.39.4", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -5947,6 +5932,7 @@ "csstype": "^3.1.3", "events-light": "^1.0.5", "listener-tracker": "^2.0.0", + "magic-string": "^0.30.15", "minimatch": "^9.0.5", "raptor-util": "^3.2.0", "resolve-from": "^5.0.0", @@ -6142,9 +6128,9 @@ } }, "node_modules/mitata": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/mitata/-/mitata-1.0.20.tgz", - "integrity": "sha512-oHWYGX5bi4wGT/1zrhiZAEzqTV14Vq6/PUTW8WK0b3YHBBQcZz2QFm+InHhjnD0I7B6CMtwdGt2K0938r7YTdQ==", + "version": "1.0.21", + "resolved": "https://registry.npmjs.org/mitata/-/mitata-1.0.21.tgz", + "integrity": "sha512-5HnbQJpz0Ub/7x7lxaxPhd3U3zXr7rD+24FIgEp/hjVE5wz6ye/pQRBrgH3MUK8KLy/FfPy/yfZbpi0sbmsNFg==", "dev": true, "license": "MIT" }, @@ -7106,9 +7092,9 @@ } }, "node_modules/prettier-plugin-marko": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-marko/-/prettier-plugin-marko-3.1.10.tgz", - "integrity": "sha512-lRp3FyyHqJI58SZcRYYubtFL4BrH9Jx0PTQR9xAWH1oUvAiHy5o1UgRls8ZFAhbZQv8TdhMo/uu4pylO4L/uCg==", + "version": "3.1.12", + "resolved": "https://registry.npmjs.org/prettier-plugin-marko/-/prettier-plugin-marko-3.1.12.tgz", + "integrity": "sha512-hTC8s+mzvR91TmtAIUe94LkIwcyjCxyoNNN7PzHHLpFOG3zo2zbN2U6KgkI3/BaUEliH/vCRnwK1BKwuNpDmpg==", "license": "MIT", "peerDependencies": { "@marko/compiler": "^5", @@ -8097,21 +8083,21 @@ } }, "node_modules/tldts": { - "version": "6.1.66", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.66.tgz", - "integrity": "sha512-l3ciXsYFel/jSRfESbyKYud1nOw7WfhrBEF9I3UiarYk/qEaOOwu3qXNECHw4fHGHGTEOuhf/VdKgoDX5M/dhQ==", + "version": "6.1.67", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.67.tgz", + "integrity": "sha512-714VbegxoZ9WF5/IsVCy9rWXKUpPkJq87ebWLXQzNawce96l5oRrRf2eHzB4pT2g/4HQU1dYbu+sdXClYxlDKQ==", "license": "MIT", "dependencies": { - "tldts-core": "^6.1.66" + "tldts-core": "^6.1.67" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.66", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.66.tgz", - "integrity": "sha512-s07jJruSwndD2X8bVjwioPfqpIc1pDTzszPe9pL1Skbh4bjytL85KNQ3tolqLbCvpQHawIsGfFi9dgerWjqW4g==", + "version": "6.1.67", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.67.tgz", + "integrity": "sha512-12K5O4m3uUW6YM5v45Z7wc6NTSmAYj4Tq3de7eXghZkp879IlfPJrUWeWFwu1FS94U5t2vwETgJ1asu8UGNKVQ==", "license": "MIT" }, "node_modules/tmp": { @@ -9372,16 +9358,15 @@ "license": "MIT", "dependencies": { "@luxass/strip-json-comments": "^1.3.2", - "@marko/babel-utils": "^6.6.2", - "@marko/compiler": "^5.38.4", + "@marko/babel-utils": "^6.6.3", + "@marko/compiler": "^5.39.4", "@marko/language-tools": "^2.5.3", - "@marko/translator-default": "^6.1.2", "axe-core": "^4.10.2", "htmljs-parser": "^5.5.3", "jsdom": "^25.0.1", - "marko": "^5.36.3", + "marko": "^5.37.4", "prettier": "^3.4.2", - "prettier-plugin-marko": "^3.1.10", + "prettier-plugin-marko": "^3.1.12", "relative-import-path": "^1.0.0", "typescript": "^5.7.2", "vscode-css-languageservice": "^6.3.2", @@ -9409,12 +9394,11 @@ }, "devDependencies": { "@babel/code-frame": "^7.26.2", - "@marko/compiler": "^5.38.4", - "@marko/translator-default": "^6.1.2", + "@marko/compiler": "^5.39.4", "@types/babel__code-frame": "^7.0.6", "@typescript/vfs": "^1.6.0", - "marko": "^5.36.3", - "mitata": "^1.0.20", + "marko": "^5.37.4", + "mitata": "^1.0.21", "tsx": "^4.19.2" }, "peerDependencies": { @@ -9457,6 +9441,9 @@ "engines": { "vscode": "^1.80.0" } + }, + "packages/vscode/node_modules/marko-ts-plugin": { + "extraneous": true } } } diff --git a/package.json b/package.json index de0226d1..9016a908 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,11 @@ "devDependencies": { "@changesets/changelog-github": "^0.5.0", "@changesets/cli": "^2.27.10", - "@eslint/js": "^9.16.0", + "@eslint/js": "^9.17.0", "@types/mocha": "^10.0.10", "@types/node": "^22.10.2", "esbuild": "^0.24.0", - "eslint": "^9.16.0", + "eslint": "^9.17.0", "eslint-formatter-unix": "^8.40.0", "eslint-plugin-simple-import-sort": "^12.1.1", "fast-glob": "^3.3.2", diff --git a/packages/language-server/package.json b/packages/language-server/package.json index 2ae8e273..b1cc1965 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -9,13 +9,12 @@ "dependencies": { "@luxass/strip-json-comments": "^1.3.2", "@marko/language-tools": "^2.5.3", - "@marko/babel-utils": "^6.6.2", - "@marko/compiler": "^5.38.4", - "@marko/translator-default": "^6.1.2", + "@marko/babel-utils": "^6.6.3", + "@marko/compiler": "^5.39.4", "htmljs-parser": "^5.5.3", - "marko": "^5.36.3", + "marko": "^5.37.4", "prettier": "^3.4.2", - "prettier-plugin-marko": "^3.1.10", + "prettier-plugin-marko": "^3.1.12", "relative-import-path": "^1.0.0", "typescript": "^5.7.2", "vscode-css-languageservice": "^6.3.2", diff --git a/packages/language-server/src/utils/project-defaults.ts b/packages/language-server/src/utils/project-defaults.ts index e4352f1f..5b7b0a40 100644 --- a/packages/language-server/src/utils/project-defaults.ts +++ b/packages/language-server/src/utils/project-defaults.ts @@ -1,7 +1,7 @@ import * as defaultCompiler from "@marko/compiler"; import defaultConfig from "@marko/compiler/config"; import { Project } from "@marko/language-tools"; -import * as defaultTranslator from "@marko/translator-default"; +import * as defaultTranslator from "marko/translator"; import path from "path"; Project.setDefaultTypePaths({ diff --git a/packages/language-tools/package.json b/packages/language-tools/package.json index c6abf19d..52e199f8 100644 --- a/packages/language-tools/package.json +++ b/packages/language-tools/package.json @@ -14,12 +14,11 @@ }, "devDependencies": { "@babel/code-frame": "^7.26.2", - "@marko/compiler": "^5.38.4", - "@marko/translator-default": "^6.1.2", + "@marko/compiler": "^5.39.4", "@types/babel__code-frame": "^7.0.6", "@typescript/vfs": "^1.6.0", - "marko": "^5.36.3", - "mitata": "^1.0.20", + "marko": "^5.37.4", + "mitata": "^1.0.21", "tsx": "^4.19.2" }, "exports": {