Skip to content

Commit a2d5cec

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-8.48.1
2 parents be5cb5d + b256930 commit a2d5cec

File tree

2 files changed

+55
-23
lines changed

2 files changed

+55
-23
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"@vue/cli-plugin-unit-mocha": "~5.0.9",
4242
"@vue/cli-plugin-vuex": "~5.0.9",
4343
"@vue/cli-service": "~4.5.0",
44-
"@vue/compiler-sfc": "^3.5.22",
44+
"@vue/compiler-sfc": "^3.5.25",
4545
"@vue/eslint-config-prettier": "^10.2.0",
4646
"@vue/eslint-config-typescript": "^14.6.0",
4747
"@vue/test-utils": "^2.0.0-0",
48-
"chai": "^6.2.0",
48+
"chai": "^6.2.1",
4949
"eslint": "^9.39.1",
5050
"eslint-plugin-prettier": "^5.5.4",
5151
"eslint-plugin-vue": "^10.6.0",

yarn.lock

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -384,14 +384,7 @@
384384
chalk "^2.0.0"
385385
js-tokens "^4.0.0"
386386

387-
"@babel/parser@^7.15.4", "@babel/parser@^7.27.2", "@babel/parser@^7.28.0", "@babel/parser@^7.28.3":
388-
version "7.28.4"
389-
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8"
390-
integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
391-
dependencies:
392-
"@babel/types" "^7.28.4"
393-
394-
"@babel/parser@^7.28.5":
387+
"@babel/parser@^7.15.4", "@babel/parser@^7.27.2", "@babel/parser@^7.28.0", "@babel/parser@^7.28.3", "@babel/parser@^7.28.5":
395388
version "7.28.5"
396389
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
397390
integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
@@ -1086,14 +1079,6 @@
10861079
"@babel/helper-string-parser" "^7.27.1"
10871080
"@babel/helper-validator-identifier" "^7.27.1"
10881081

1089-
"@babel/types@^7.28.4":
1090-
version "7.28.4"
1091-
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.4.tgz#0a4e618f4c60a7cd6c11cb2d48060e4dbe38ac3a"
1092-
integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
1093-
dependencies:
1094-
"@babel/helper-string-parser" "^7.27.1"
1095-
"@babel/helper-validator-identifier" "^7.27.1"
1096-
10971082
"@babel/types@^7.28.5":
10981083
version "7.28.5"
10991084
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
@@ -2229,6 +2214,17 @@
22292214
estree-walker "^2.0.2"
22302215
source-map-js "^1.2.1"
22312216

2217+
2218+
version "3.5.25"
2219+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.25.tgz#7ffb658d7919348baad8c491eb5b948ee8e44108"
2220+
integrity sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==
2221+
dependencies:
2222+
"@babel/parser" "^7.28.5"
2223+
"@vue/shared" "3.5.25"
2224+
entities "^4.5.0"
2225+
estree-walker "^2.0.2"
2226+
source-map-js "^1.2.1"
2227+
22322228
22332229
version "3.5.24"
22342230
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz#b02e98749c377d6d2ba30dc2e94ce0f5b0af060c"
@@ -2237,7 +2233,15 @@
22372233
"@vue/compiler-core" "3.5.24"
22382234
"@vue/shared" "3.5.24"
22392235

2240-
"@vue/[email protected]", "@vue/compiler-sfc@^3.5.22":
2236+
2237+
version "3.5.25"
2238+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz#dd799ac2474cda54303039310b8994f0cfb40957"
2239+
integrity sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==
2240+
dependencies:
2241+
"@vue/compiler-core" "3.5.25"
2242+
"@vue/shared" "3.5.25"
2243+
2244+
22412245
version "3.5.24"
22422246
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz#7cc3329b672b7b75d04a71eabe81bc84209dfa9f"
22432247
integrity sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==
@@ -2252,6 +2256,21 @@
22522256
postcss "^8.5.6"
22532257
source-map-js "^1.2.1"
22542258

2259+
"@vue/compiler-sfc@^3.5.25":
2260+
version "3.5.25"
2261+
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz#30377920c3869c3bb32111aa4aefad53921831ad"
2262+
integrity sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==
2263+
dependencies:
2264+
"@babel/parser" "^7.28.5"
2265+
"@vue/compiler-core" "3.5.25"
2266+
"@vue/compiler-dom" "3.5.25"
2267+
"@vue/compiler-ssr" "3.5.25"
2268+
"@vue/shared" "3.5.25"
2269+
estree-walker "^2.0.2"
2270+
magic-string "^0.30.21"
2271+
postcss "^8.5.6"
2272+
source-map-js "^1.2.1"
2273+
22552274
22562275
version "3.5.24"
22572276
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz#3891f2479928751353b946e491e048f33d0249a8"
@@ -2260,6 +2279,14 @@
22602279
"@vue/compiler-dom" "3.5.24"
22612280
"@vue/shared" "3.5.24"
22622281

2282+
2283+
version "3.5.25"
2284+
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz#51dd89b88a1e044d1beab158c91a29963d28eb96"
2285+
integrity sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==
2286+
dependencies:
2287+
"@vue/compiler-dom" "3.5.25"
2288+
"@vue/shared" "3.5.25"
2289+
22632290
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
22642291
version "3.2.2"
22652292
resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz#2f7ed5feed82ff7f0284acc11d525ee7eff22460"
@@ -2342,6 +2369,11 @@
23422369
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.24.tgz#45ea9e6e037e53cfb8141ffa6bcad75b8be11e9c"
23432370
integrity sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==
23442371

2372+
2373+
version "3.5.25"
2374+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.25.tgz#21edcff133a5a04f72c4e4c6142260963fe5afbe"
2375+
integrity sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==
2376+
23452377
"@vue/test-utils@^2.0.0-0":
23462378
version "2.0.0-rc.14"
23472379
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.0-rc.14.tgz#9da1be7b0e365ff5f945677da17bf6c8a7a83abd"
@@ -3708,10 +3740,10 @@ caseless@~0.12.0:
37083740
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
37093741
integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
37103742

3711-
chai@^6.2.0:
3712-
version "6.2.0"
3713-
resolved "https://registry.yarnpkg.com/chai/-/chai-6.2.0.tgz#181bca6a219cddb99c3eeefb82483800ffa550ce"
3714-
integrity sha512-aUTnJc/JipRzJrNADXVvpVqi6CO0dn3nx4EVPxijri+fj3LUUDyZQOgVeW54Ob3Y1Xh9Iz8f+CgaCl8v0mn9bA==
3743+
chai@^6.2.1:
3744+
version "6.2.1"
3745+
resolved "https://registry.yarnpkg.com/chai/-/chai-6.2.1.tgz#d1e64bc42433fbee6175ad5346799682060b5b6a"
3746+
integrity sha512-p4Z49OGG5W/WBCPSS/dH3jQ73kD6tiMmUM+bckNK6Jr5JHMG3k9bg/BvKR8lKmtVBKmOiuVaV2ws8s9oSbwysg==
37153747

37163748
chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
37173749
version "2.4.2"

0 commit comments

Comments
 (0)