diff --git a/.github/update.log b/.github/update.log index 901447bc9b..b240d34e96 100644 --- a/.github/update.log +++ b/.github/update.log @@ -1166,3 +1166,4 @@ Update On Sun Oct 26 19:35:56 CET 2025 Update On Mon Oct 27 19:43:18 CET 2025 Update On Tue Oct 28 19:41:08 CET 2025 Update On Wed Oct 29 19:43:03 CET 2025 +Update On Thu Oct 30 19:42:18 CET 2025 diff --git a/clash-nyanpasu/backend/Cargo.lock b/clash-nyanpasu/backend/Cargo.lock index cef22bd405..b53c6d53ad 100644 --- a/clash-nyanpasu/backend/Cargo.lock +++ b/clash-nyanpasu/backend/Cargo.lock @@ -1459,9 +1459,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", "clap_derive", @@ -1469,9 +1469,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstream", "anstyle", diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json index a4ff8bf25a..2b71724cc0 100644 --- a/clash-nyanpasu/frontend/nyanpasu/package.json +++ b/clash-nyanpasu/frontend/nyanpasu/package.json @@ -72,7 +72,7 @@ "@tauri-apps/plugin-updater": "2.9.0", "@types/react": "19.2.2", "@types/react-dom": "19.2.2", - "@types/validator": "13.15.3", + "@types/validator": "13.15.4", "@vitejs/plugin-legacy": "7.2.1", "@vitejs/plugin-react": "5.0.4", "@vitejs/plugin-react-swc": "4.1.0", diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json index 9f8644be87..81cb2b7121 100644 --- a/clash-nyanpasu/package.json +++ b/clash-nyanpasu/package.json @@ -60,13 +60,13 @@ "devDependencies": { "@commitlint/cli": "20.1.0", "@commitlint/config-conventional": "20.0.0", - "@eslint/compat": "1.4.0", + "@eslint/compat": "1.4.1", "@eslint/eslintrc": "3.3.1", "@ianvs/prettier-plugin-sort-imports": "4.7.0", "@tauri-apps/cli": "2.8.4", "@types/fs-extra": "11.0.4", "@types/lodash-es": "4.17.12", - "@types/node": "24.8.1", + "@types/node": "24.9.2", "@typescript-eslint/eslint-plugin": "8.46.2", "@typescript-eslint/parser": "8.46.2", "autoprefixer": "10.4.21", @@ -110,7 +110,7 @@ "typescript": "5.9.3", "typescript-eslint": "8.46.2" }, - "packageManager": "pnpm@10.18.3", + "packageManager": "pnpm@10.20.0", "engines": { "node": "22.21.1" }, diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml index e3381a0429..e9390d30f0 100644 --- a/clash-nyanpasu/pnpm-lock.yaml +++ b/clash-nyanpasu/pnpm-lock.yaml @@ -24,13 +24,13 @@ importers: devDependencies: '@commitlint/cli': specifier: 20.1.0 - version: 20.1.0(@types/node@24.8.1)(typescript@5.9.3) + version: 20.1.0(@types/node@24.9.2)(typescript@5.9.3) '@commitlint/config-conventional': specifier: 20.0.0 version: 20.0.0 '@eslint/compat': - specifier: 1.4.0 - version: 1.4.0(eslint@9.38.0(jiti@2.6.1)) + specifier: 1.4.1 + version: 1.4.1(eslint@9.38.0(jiti@2.6.1)) '@eslint/eslintrc': specifier: 3.3.1 version: 3.3.1 @@ -47,8 +47,8 @@ importers: specifier: 4.17.12 version: 4.17.12 '@types/node': - specifier: 24.8.1 - version: 24.8.1 + specifier: 24.9.2 + version: 24.9.2 '@typescript-eslint/eslint-plugin': specifier: 8.46.2 version: 8.46.2(@typescript-eslint/parser@8.46.2(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3) @@ -105,7 +105,7 @@ importers: version: 16.4.0 knip: specifier: 5.66.4 - version: 5.66.4(@types/node@24.8.1)(typescript@5.9.3) + version: 5.66.4(@types/node@24.9.2)(typescript@5.9.3) lint-staged: specifier: 16.2.6 version: 16.2.6 @@ -359,10 +359,10 @@ importers: version: 1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0) '@tanstack/react-router-devtools': specifier: 1.133.36 - version: 1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.36)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) + version: 1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.36)(@types/node@24.9.2)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) '@tanstack/router-plugin': specifier: 1.133.36 - version: 1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) '@tauri-apps/plugin-clipboard-manager': specifier: 2.3.0 version: 2.3.0 @@ -394,17 +394,17 @@ importers: specifier: 19.2.2 version: 19.2.2(@types/react@19.2.2) '@types/validator': - specifier: 13.15.3 - version: 13.15.3 + specifier: 13.15.4 + version: 13.15.4 '@vitejs/plugin-legacy': specifier: 7.2.1 - version: 7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) '@vitejs/plugin-react': specifier: 5.0.4 - version: 5.0.4(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.0.4(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) '@vitejs/plugin-react-swc': specifier: 4.1.0 - version: 4.1.0(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 4.1.0(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) change-case: specifier: 5.4.4 version: 5.4.4 @@ -443,19 +443,19 @@ importers: version: 13.15.20 vite: specifier: 7.1.10 - version: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + version: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) vite-plugin-html: specifier: 3.2.2 - version: 3.2.2(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 3.2.2(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) vite-plugin-sass-dts: specifier: 1.3.34 - version: 1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) vite-plugin-svgr: specifier: 4.5.0 - version: 4.5.0(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 4.5.0(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) zod: specifier: 4.1.12 version: 4.1.12 @@ -491,7 +491,7 @@ importers: version: 19.2.2 '@vitejs/plugin-react': specifier: 5.0.4 - version: 5.0.4(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.0.4(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) ahooks: specifier: 3.9.6 version: 3.9.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0) @@ -521,10 +521,10 @@ importers: version: 4.1.16 vite: specifier: 7.1.10 - version: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + version: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) vite-tsconfig-paths: specifier: 5.1.4 - version: 5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) devDependencies: '@emotion/react': specifier: 11.14.0 @@ -549,7 +549,7 @@ importers: version: 5.2.0(typescript@5.9.3) vite-plugin-dts: specifier: 4.5.4 - version: 4.5.4(@types/node@24.8.1)(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) + version: 4.5.4(@types/node@24.9.2)(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)) scripts: dependencies: @@ -585,8 +585,8 @@ importers: specifier: 0.5.7 version: 0.5.7 '@types/yargs': - specifier: 17.0.33 - version: 17.0.33 + specifier: 17.0.34 + version: 17.0.34 adm-zip: specifier: 0.5.16 version: 0.5.16 @@ -1727,8 +1727,8 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/compat@1.4.0': - resolution: {integrity: sha512-DEzm5dKeDBPm3r08Ixli/0cmxr8LkRdwxMRUIJBlSCpAwSrvFEJpVBzV+66JhDxiaqKxnRzCXhtiMiczF7Hglg==} + '@eslint/compat@1.4.1': + resolution: {integrity: sha512-cfO82V9zxxGBxcQDr1lfaYB7wykTa0b00mGa36FrJl7iTFd0Z2cHfEYuxcBRP/iNijCsWsEkA+jzT8hGYmv33w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.40 || 9 @@ -1748,6 +1748,10 @@ packages: resolution: {integrity: sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/core@0.17.0': + resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/eslintrc@3.3.1': resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3503,8 +3507,8 @@ packages: '@types/node@16.18.108': resolution: {integrity: sha512-fj42LD82fSv6yN9C6Q4dzS+hujHj+pTv0IpRR3kI20fnYeS0ytBpjFO9OjmDowSPPt4lNKN46JLaKbCyP+BW2A==} - '@types/node@24.8.1': - resolution: {integrity: sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==} + '@types/node@24.9.2': + resolution: {integrity: sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==} '@types/parse-json@4.0.2': resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==} @@ -3543,14 +3547,14 @@ packages: '@types/unist@3.0.2': resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==} - '@types/validator@13.15.3': - resolution: {integrity: sha512-7bcUmDyS6PN3EuD9SlGGOxM77F8WLVsrwkxyWxKnxzmXoequ6c7741QBrANq6htVRGOITJ7z72mTP6Z4XyuG+Q==} + '@types/validator@13.15.4': + resolution: {integrity: sha512-LSFfpSnJJY9wbC0LQxgvfb+ynbHftFo0tMsFOl/J4wexLnYMmDSPaj2ZyDv3TkfL1UePxPrxOWJfbiRS8mQv7A==} '@types/yargs-parser@21.0.3': resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==} - '@types/yargs@17.0.33': - resolution: {integrity: sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==} + '@types/yargs@17.0.34': + resolution: {integrity: sha512-KExbHVa92aJpw9WDQvzBaGVE2/Pz+pLZQloT2hjL8IqsZnV62rlPOYvNnLmf/L2dyllfVUOVBj64M0z/46eR2A==} '@types/yauzl@2.10.3': resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} @@ -8245,8 +8249,8 @@ packages: resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==} engines: {node: '>= 0.4'} - undici-types@7.14.0: - resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==} + undici-types@7.16.0: + resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} undici@5.29.0: resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==} @@ -9808,11 +9812,11 @@ snapshots: '@bufbuild/protobuf@2.5.2': {} - '@commitlint/cli@20.1.0(@types/node@24.8.1)(typescript@5.9.3)': + '@commitlint/cli@20.1.0(@types/node@24.9.2)(typescript@5.9.3)': dependencies: '@commitlint/format': 20.0.0 '@commitlint/lint': 20.0.0 - '@commitlint/load': 20.1.0(@types/node@24.8.1)(typescript@5.9.3) + '@commitlint/load': 20.1.0(@types/node@24.9.2)(typescript@5.9.3) '@commitlint/read': 20.0.0 '@commitlint/types': 20.0.0 tinyexec: 1.0.1 @@ -9859,7 +9863,7 @@ snapshots: '@commitlint/rules': 20.0.0 '@commitlint/types': 20.0.0 - '@commitlint/load@20.1.0(@types/node@24.8.1)(typescript@5.9.3)': + '@commitlint/load@20.1.0(@types/node@24.9.2)(typescript@5.9.3)': dependencies: '@commitlint/config-validator': 20.0.0 '@commitlint/execute-rule': 20.0.0 @@ -9867,7 +9871,7 @@ snapshots: '@commitlint/types': 20.0.0 chalk: 5.4.1 cosmiconfig: 9.0.0(typescript@5.9.3) - cosmiconfig-typescript-loader: 6.1.0(@types/node@24.8.1)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3) + cosmiconfig-typescript-loader: 6.1.0(@types/node@24.9.2)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -10184,9 +10188,9 @@ snapshots: '@eslint-community/regexpp@4.12.1': {} - '@eslint/compat@1.4.0(eslint@9.38.0(jiti@2.6.1))': + '@eslint/compat@1.4.1(eslint@9.38.0(jiti@2.6.1))': dependencies: - '@eslint/core': 0.16.0 + '@eslint/core': 0.17.0 optionalDependencies: eslint: 9.38.0(jiti@2.6.1) @@ -10206,6 +10210,10 @@ snapshots: dependencies: '@types/json-schema': 7.0.15 + '@eslint/core@0.17.0': + dependencies: + '@types/json-schema': 7.0.15 + '@eslint/eslintrc@3.3.1': dependencies: ajv: 6.12.6 @@ -10331,23 +10339,23 @@ snapshots: '@material/material-color-utilities@0.3.0': {} - '@microsoft/api-extractor-model@7.30.3(@types/node@24.8.1)': + '@microsoft/api-extractor-model@7.30.3(@types/node@24.9.2)': dependencies: '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.11.0(@types/node@24.8.1) + '@rushstack/node-core-library': 5.11.0(@types/node@24.9.2) transitivePeerDependencies: - '@types/node' - '@microsoft/api-extractor@7.51.0(@types/node@24.8.1)': + '@microsoft/api-extractor@7.51.0(@types/node@24.9.2)': dependencies: - '@microsoft/api-extractor-model': 7.30.3(@types/node@24.8.1) + '@microsoft/api-extractor-model': 7.30.3(@types/node@24.9.2) '@microsoft/tsdoc': 0.15.1 '@microsoft/tsdoc-config': 0.17.1 - '@rushstack/node-core-library': 5.11.0(@types/node@24.8.1) + '@rushstack/node-core-library': 5.11.0(@types/node@24.9.2) '@rushstack/rig-package': 0.5.3 - '@rushstack/terminal': 0.15.0(@types/node@24.8.1) - '@rushstack/ts-command-line': 4.23.5(@types/node@24.8.1) + '@rushstack/terminal': 0.15.0(@types/node@24.9.2) + '@rushstack/ts-command-line': 4.23.5(@types/node@24.9.2) lodash: 4.17.21 minimatch: 3.0.8 resolve: 1.22.8 @@ -11152,7 +11160,7 @@ snapshots: '@rtsao/scc@1.1.0': {} - '@rushstack/node-core-library@5.11.0(@types/node@24.8.1)': + '@rushstack/node-core-library@5.11.0(@types/node@24.9.2)': dependencies: ajv: 8.13.0 ajv-draft-04: 1.0.0(ajv@8.13.0) @@ -11163,23 +11171,23 @@ snapshots: resolve: 1.22.8 semver: 7.5.4 optionalDependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@rushstack/rig-package@0.5.3': dependencies: resolve: 1.22.8 strip-json-comments: 3.1.1 - '@rushstack/terminal@0.15.0(@types/node@24.8.1)': + '@rushstack/terminal@0.15.0(@types/node@24.9.2)': dependencies: - '@rushstack/node-core-library': 5.11.0(@types/node@24.8.1) + '@rushstack/node-core-library': 5.11.0(@types/node@24.9.2) supports-color: 8.1.1 optionalDependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 - '@rushstack/ts-command-line@4.23.5(@types/node@24.8.1)': + '@rushstack/ts-command-line@4.23.5(@types/node@24.9.2)': dependencies: - '@rushstack/terminal': 0.15.0(@types/node@24.8.1) + '@rushstack/terminal': 0.15.0(@types/node@24.9.2) '@types/argparse': 1.0.38 argparse: 1.0.10 string-argv: 0.3.2 @@ -11443,13 +11451,13 @@ snapshots: '@tanstack/query-core': 5.90.5 react: 19.2.0 - '@tanstack/react-router-devtools@1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.36)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': + '@tanstack/react-router-devtools@1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(@tanstack/router-core@1.133.36)(@types/node@24.9.2)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': dependencies: '@tanstack/react-router': 1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - '@tanstack/router-devtools-core': 1.133.36(@tanstack/router-core@1.133.36)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) + '@tanstack/router-devtools-core': 1.133.36(@tanstack/router-core@1.133.36)(@types/node@24.9.2)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1) react: 19.2.0 react-dom: 19.2.0(react@19.2.0) - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - '@tanstack/router-core' - '@types/node' @@ -11507,14 +11515,14 @@ snapshots: tiny-invariant: 1.3.3 tiny-warning: 1.0.3 - '@tanstack/router-devtools-core@1.133.36(@tanstack/router-core@1.133.36)(@types/node@24.8.1)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': + '@tanstack/router-devtools-core@1.133.36(@tanstack/router-core@1.133.36)(@types/node@24.9.2)(csstype@3.1.3)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(solid-js@1.9.5)(stylus@0.62.0)(terser@5.36.0)(tiny-invariant@1.3.3)(tsx@4.20.6)(yaml@2.8.1)': dependencies: '@tanstack/router-core': 1.133.36 clsx: 2.1.1 goober: 2.1.16(csstype@3.1.3) solid-js: 1.9.5 tiny-invariant: 1.3.3 - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) optionalDependencies: csstype: 3.1.3 transitivePeerDependencies: @@ -11543,7 +11551,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@tanstack/router-plugin@1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@tanstack/router-plugin@1.133.36(@tanstack/react-router@1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@babel/core': 7.28.4 '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.28.4) @@ -11561,7 +11569,7 @@ snapshots: zod: 3.25.76 optionalDependencies: '@tanstack/react-router': 1.133.36(react-dom@19.2.0(react@19.2.0))(react@19.2.0) - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color @@ -11703,7 +11711,7 @@ snapshots: '@types/adm-zip@0.5.7': dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/argparse@1.0.38': {} @@ -11734,12 +11742,12 @@ snapshots: dependencies: '@types/http-cache-semantics': 4.0.4 '@types/keyv': 3.1.4 - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/responselike': 1.0.3 '@types/conventional-commits-parser@5.0.0': dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/d3-array@3.2.1': {} @@ -11875,7 +11883,7 @@ snapshots: '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.4 - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/geojson@7946.0.14': {} @@ -11895,11 +11903,11 @@ snapshots: '@types/jsonfile@6.1.4': dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/keyv@3.1.4': dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/lodash-es@4.17.12': dependencies: @@ -11915,9 +11923,9 @@ snapshots: '@types/node@16.18.108': {} - '@types/node@24.8.1': + '@types/node@24.9.2': dependencies: - undici-types: 7.14.0 + undici-types: 7.16.0 '@types/parse-json@4.0.2': {} @@ -11945,7 +11953,7 @@ snapshots: '@types/responselike@1.0.3': dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 '@types/semver@7.7.1': {} @@ -11953,17 +11961,17 @@ snapshots: '@types/unist@3.0.2': {} - '@types/validator@13.15.3': {} + '@types/validator@13.15.4': {} '@types/yargs-parser@21.0.3': {} - '@types/yargs@17.0.33': + '@types/yargs@17.0.34': dependencies: '@types/yargs-parser': 21.0.3 '@types/yauzl@2.10.3': dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 optional: true '@typescript-eslint/eslint-plugin@8.46.2(@typescript-eslint/parser@8.46.2(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3)': @@ -12174,7 +12182,7 @@ snapshots: '@unrs/resolver-binding-win32-x64-msvc@1.10.1': optional: true - '@vitejs/plugin-legacy@7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@vitejs/plugin-legacy@7.2.1(terser@5.36.0)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@babel/core': 7.28.0 '@babel/plugin-transform-dynamic-import': 7.27.1(@babel/core@7.28.0) @@ -12189,19 +12197,19 @@ snapshots: regenerator-runtime: 0.14.1 systemjs: 6.15.1 terser: 5.36.0 - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color - '@vitejs/plugin-react-swc@4.1.0(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@vitejs/plugin-react-swc@4.1.0(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@rolldown/pluginutils': 1.0.0-beta.35 '@swc/core': 1.13.5 - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - '@swc/helpers' - '@vitejs/plugin-react@5.0.4(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': + '@vitejs/plugin-react@5.0.4(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1))': dependencies: '@babel/core': 7.28.4 '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.28.4) @@ -12209,7 +12217,7 @@ snapshots: '@rolldown/pluginutils': 1.0.0-beta.38 '@types/babel__core': 7.20.5 react-refresh: 0.17.0 - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color @@ -12886,9 +12894,9 @@ snapshots: core-js@3.46.0: {} - cosmiconfig-typescript-loader@6.1.0(@types/node@24.8.1)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3): + cosmiconfig-typescript-loader@6.1.0(@types/node@24.9.2)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3): dependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 cosmiconfig: 9.0.0(typescript@5.9.3) jiti: 2.6.1 typescript: 5.9.3 @@ -14948,10 +14956,10 @@ snapshots: kind-of@6.0.3: {} - knip@5.66.4(@types/node@24.8.1)(typescript@5.9.3): + knip@5.66.4(@types/node@24.9.2)(typescript@5.9.3): dependencies: '@nodelib/fs.walk': 1.2.8 - '@types/node': 24.8.1 + '@types/node': 24.9.2 fast-glob: 3.3.3 formatly: 0.3.0 jiti: 2.6.1 @@ -17326,7 +17334,7 @@ snapshots: has-symbols: 1.1.0 which-boxed-primitive: 1.1.1 - undici-types@7.14.0: {} + undici-types@7.16.0: {} undici@5.29.0: dependencies: @@ -17559,9 +17567,9 @@ snapshots: - rollup - supports-color - vite-plugin-dts@4.5.4(@types/node@24.8.1)(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-dts@4.5.4(@types/node@24.9.2)(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: - '@microsoft/api-extractor': 7.51.0(@types/node@24.8.1) + '@microsoft/api-extractor': 7.51.0(@types/node@24.9.2) '@rollup/pluginutils': 5.1.4(rollup@4.46.2) '@volar/typescript': 2.4.11 '@vue/language-core': 2.2.0(typescript@5.9.3) @@ -17572,13 +17580,13 @@ snapshots: magic-string: 0.30.17 typescript: 5.9.3 optionalDependencies: - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - '@types/node' - rollup - supports-color - vite-plugin-html@3.2.2(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-html@3.2.2(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: '@rollup/pluginutils': 4.2.1 colorette: 2.0.20 @@ -17592,39 +17600,39 @@ snapshots: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) - vite-plugin-sass-dts@1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-sass-dts@1.3.34(postcss@8.5.6)(prettier@3.6.2)(sass-embedded@1.93.2)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: postcss: 8.5.6 postcss-js: 4.0.1(postcss@8.5.6) prettier: 3.6.2 sass-embedded: 1.93.2 - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) - vite-plugin-svgr@4.5.0(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-plugin-svgr@4.5.0(rollup@4.46.2)(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: '@rollup/pluginutils': 5.2.0(rollup@4.46.2) '@svgr/core': 8.1.0(typescript@5.9.3) '@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.9.3)) - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - rollup - supports-color - typescript - vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): + vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1)): dependencies: debug: 4.3.7 globrex: 0.1.2 tsconfck: 3.0.3(typescript@5.9.3) optionalDependencies: - vite: 7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) + vite: 7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1) transitivePeerDependencies: - supports-color - typescript - vite@7.1.10(@types/node@24.8.1)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1): + vite@7.1.10(@types/node@24.9.2)(jiti@2.6.1)(less@4.2.0)(lightningcss@1.30.2)(sass-embedded@1.93.2)(sass@1.93.2)(stylus@0.62.0)(terser@5.36.0)(tsx@4.20.6)(yaml@2.8.1): dependencies: esbuild: 0.25.0 fdir: 6.5.0(picomatch@4.0.3) @@ -17633,7 +17641,7 @@ snapshots: rollup: 4.46.2 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 24.8.1 + '@types/node': 24.9.2 fsevents: 2.3.3 jiti: 2.6.1 less: 4.2.0 diff --git a/clash-nyanpasu/scripts/package.json b/clash-nyanpasu/scripts/package.json index 767cb0d940..1c38ff8039 100644 --- a/clash-nyanpasu/scripts/package.json +++ b/clash-nyanpasu/scripts/package.json @@ -15,7 +15,7 @@ "devDependencies": { "@octokit/types": "14.1.0", "@types/adm-zip": "0.5.7", - "@types/yargs": "17.0.33", + "@types/yargs": "17.0.34", "adm-zip": "0.5.16", "colorize-template": "1.0.0", "consola": "3.4.2", diff --git a/lede/target/linux/generic/config-6.12 b/lede/target/linux/generic/config-6.12 index 46a4aac7ad..c013e17558 100644 --- a/lede/target/linux/generic/config-6.12 +++ b/lede/target/linux/generic/config-6.12 @@ -13,6 +13,7 @@ CONFIG_32BIT=y # CONFIG_ACENIC is not set # CONFIG_ACERHDF is not set # CONFIG_ACER_WIRELESS is not set +# CONFIG_ACER_WMI is not set # CONFIG_ACORN_PARTITION is not set # CONFIG_ACPI_AGDI is not set # CONFIG_ACPI_ALS is not set @@ -25,6 +26,7 @@ CONFIG_32BIT=y # CONFIG_ACPI_NFIT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set # CONFIG_ACPI_TABLE_UPGRADE is not set +# CONFIG_ACPI_TOSHIBA is not set # CONFIG_ACPI_VIDEO is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -440,8 +442,8 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_ARM_MHU is not set CONFIG_ARM_MODULE_PLTS=y # CONFIG_ARM_NI is not set -# CONFIG_ARM_PATCH_PHYS_VIRT is not set # CONFIG_ARM_PAN is not set +# CONFIG_ARM_PATCH_PHYS_VIRT is not set # CONFIG_ARM_PSCI is not set # CONFIG_ARM_PSCI_CHECKER is not set # CONFIG_ARM_PSCI_CPUIDLE is not set @@ -459,12 +461,15 @@ CONFIG_ARM_MODULE_PLTS=y # CONFIG_ARM_TIMER_SP804 is not set # CONFIG_ARM_UNWIND is not set # CONFIG_ARM_VIRT_EXT is not set +# CONFIG_AS21XXX_PHY is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set # CONFIG_ASM9260_TIMER is not set # CONFIG_ASN1 is not set # CONFIG_ASUS_LAPTOP is not set +# CONFIG_ASUS_TF103C_DOCK is not set # CONFIG_ASUS_WIRELESS is not set +# CONFIG_ASUS_WMI is not set # CONFIG_ASYMMETRIC_KEY_TYPE is not set # CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set # CONFIG_ASYNC_RAID6_TEST is not set @@ -935,6 +940,7 @@ CONFIG_CIFS_XATTR=y # CONFIG_CLK_ICST is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_SP810 is not set +# CONFIG_CLK_TWL is not set CONFIG_CLS_U32_MARK=y # CONFIG_CLS_U32_PERF is not set # CONFIG_CM32181 is not set @@ -1038,6 +1044,7 @@ CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_CRAMFS_BLOCKDEV=y # CONFIG_CRAMFS_MTD is not set # CONFIG_CRASH_DUMP is not set +# CONFIG_CRASH_HOTPLUG is not set # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_CRC32_BIT is not set @@ -1470,6 +1477,9 @@ CONFIG_DQL=y # CONFIG_DRAGONRISE_FF is not set # CONFIG_DRM is not set # CONFIG_DRM_ACCEL is not set +# CONFIG_DRM_ACCEL_HABANALABS is not set +# CONFIG_DRM_ACCEL_IVPU is not set +# CONFIG_DRM_ACCEL_QAIC is not set # CONFIG_DRM_AMDGPU is not set # CONFIG_DRM_AMDGPU_CIK is not set # CONFIG_DRM_AMDGPU_SI is not set @@ -1477,6 +1487,7 @@ CONFIG_DQL=y # CONFIG_DRM_AMDGPU_WERROR is not set # CONFIG_DRM_AMD_ACP is not set # CONFIG_DRM_AMD_DC_SI is not set +# CONFIG_DRM_AMD_ISP is not set # CONFIG_DRM_AMD_SECURE_DISPLAY is not set # CONFIG_DRM_ANALOGIX_ANX6345 is not set # CONFIG_DRM_ANALOGIX_ANX7625 is not set @@ -1515,6 +1526,9 @@ CONFIG_DQL=y # CONFIG_DRM_I2C_NXP_TDA998X is not set # CONFIG_DRM_I2C_SIL164 is not set # CONFIG_DRM_I915 is not set +# CONFIG_DRM_I915_DEBUG_WAKEREF is not set +# CONFIG_DRM_I915_GVT_KVMGT is not set +# CONFIG_DRM_I915_REPLAY_GPU_HANGS_API is not set # CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ITE_IT6505 is not set # CONFIG_DRM_ITE_IT66121 is not set @@ -1559,7 +1573,10 @@ CONFIG_DQL=y # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set @@ -1683,6 +1700,7 @@ CONFIG_DQL=y # CONFIG_DRM_VIRTIO_GPU is not set # CONFIG_DRM_VKMS is not set # CONFIG_DRM_VMWGFX is not set +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN is not set # CONFIG_DRM_XEN_FRONTEND is not set @@ -1896,17 +1914,17 @@ CONFIG_ELFCORE=y CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set # CONFIG_EROFS_FS is not set -# CONFIG_EROFS_FS_DEBUG is not set -# CONFIG_EROFS_FS_XATTR is not set -# CONFIG_EROFS_FS_POSIX_ACL is not set -# CONFIG_EROFS_FS_SECURITY is not set # CONFIG_EROFS_FS_BACKED_BY_FILE is not set -# CONFIG_EROFS_FS_ZIP is not set -# CONFIG_EROFS_FS_ZIP_DEFLATE is not set -# CONFIG_EROFS_FS_ZIP_ZSTD is not set +# CONFIG_EROFS_FS_DEBUG is not set # CONFIG_EROFS_FS_ONDEMAND is not set CONFIG_EROFS_FS_PCPU_KTHREAD=y CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI=y +# CONFIG_EROFS_FS_POSIX_ACL is not set +# CONFIG_EROFS_FS_SECURITY is not set +# CONFIG_EROFS_FS_XATTR is not set +# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set +# CONFIG_EROFS_FS_ZIP_ZSTD is not set # CONFIG_ET131X is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set @@ -1966,6 +1984,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_FAT_FS is not set # CONFIG_FAULT_INJECTION is not set # CONFIG_FB is not set +# CONFIG_FBNIC is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_ARC is not set # CONFIG_FB_ARK is not set @@ -2183,6 +2202,7 @@ CONFIG_GENERIC_VDSO_TIME_NS=y # CONFIG_GENEVE is not set # CONFIG_GENWQE is not set # CONFIG_GFS2_FS is not set +# CONFIG_GIGABYTE_WMI is not set # CONFIG_GLOB_SELFTEST is not set # CONFIG_GNSS is not set # CONFIG_GOLDFISH is not set @@ -2461,6 +2481,7 @@ CONFIG_HPET_MMAP_DEFAULT=y # CONFIG_HTE is not set # CONFIG_HTS221 is not set # CONFIG_HTU21 is not set +# CONFIG_HUAWEI_WMI is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set # CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set @@ -2783,6 +2804,7 @@ CONFIG_INPUT_MISC=y # CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_WISTRON_BTNS is not set # CONFIG_INPUT_YEALINK is not set +# CONFIG_INSPUR_PLATFORM_PROFILE is not set # CONFIG_INT340X_THERMAL is not set # CONFIG_INTEGRITY is not set # CONFIG_INTEGRITY_AUDIT is not set @@ -2811,6 +2833,8 @@ CONFIG_INPUT_MISC=y # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_TH is not set # CONFIG_INTEL_VBTN is not set +# CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set +# CONFIG_INTEL_WMI_THUNDERBOLT is not set # CONFIG_INTEL_XWAY_PHY is not set # CONFIG_INTERCONNECT is not set # CONFIG_INTERVAL_TREE_TEST is not set @@ -3079,7 +3103,12 @@ CONFIG_KUSER_HELPERS=y # CONFIG_KVM_AMD is not set # CONFIG_KVM_AMD_SEV is not set # CONFIG_KVM_GUEST is not set +# CONFIG_KVM_HYPERV is not set # CONFIG_KVM_INTEL is not set +# CONFIG_KVM_INTEL_PROVE_VE is not set +CONFIG_KVM_MAX_NR_VCPUS=1024 +# CONFIG_KVM_PROVE_MMU is not set +# CONFIG_KVM_SW_PROTECTED_VM is not set # CONFIG_KVM_WERROR is not set # CONFIG_KVM_XEN is not set # CONFIG_KXCJK1013 is not set @@ -3194,6 +3223,9 @@ CONFIG_LEDS_TRIGGER_TIMER=y # CONFIG_LED_TRIGGER_PHY is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_LEGACY_TIOCSTI is not set +# CONFIG_LENOVO_WMI_CAMERA is not set +# CONFIG_LENOVO_YMC is not set +# CONFIG_LG_LAPTOP is not set # CONFIG_LIB80211 is not set # CONFIG_LIB80211_CRYPT_CCMP is not set # CONFIG_LIB80211_CRYPT_TKIP is not set @@ -3717,6 +3749,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MOST is not set # CONFIG_MOTORCOMM_PHY is not set # CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set # CONFIG_MOUSE_ELAN_I2C is not set # CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_INPORT is not set @@ -3724,8 +3758,10 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MOUSE_PC110PAD is not set # CONFIG_MOUSE_PS2_FOCALTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOXTET is not set # CONFIG_MPL115 is not set # CONFIG_MPL115_I2C is not set @@ -3748,6 +3784,8 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_MSE102X is not set # CONFIG_MSI_BITMAP_SELFTEST is not set # CONFIG_MSI_LAPTOP is not set +# CONFIG_MSI_WMI is not set +# CONFIG_MSI_WMI_PLATFORM is not set # CONFIG_MSM_GCC_8953 is not set # CONFIG_MSM_MMCC_8994 is not set # CONFIG_MST_IRQ is not set @@ -3888,6 +3926,7 @@ CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware" # CONFIG_MTD_SPLIT_JIMAGE_FW is not set # CONFIG_MTD_SPLIT_LZMA_FW is not set # CONFIG_MTD_SPLIT_MINOR_FW is not set +# CONFIG_MTD_SPLIT_MSTC_BOOT is not set # CONFIG_MTD_SPLIT_SEAMA_FW is not set # CONFIG_MTD_SPLIT_SEIL_FW is not set CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y @@ -3923,6 +3962,7 @@ CONFIG_MULTIUSER=y # CONFIG_MWL8K is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set +# CONFIG_MXM_WMI is not set # CONFIG_MYRI10GE is not set # CONFIG_NAMESPACES is not set # CONFIG_NATIONAL_PHY is not set @@ -4035,6 +4075,7 @@ CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NETXEN_NIC is not set # CONFIG_NET_9P is not set # CONFIG_NET_9P_USBG is not set +# CONFIG_NET_9P_XEN is not set # CONFIG_NET_ACT_BPF is not set # CONFIG_NET_ACT_CSUM is not set # CONFIG_NET_ACT_CT is not set @@ -4070,6 +4111,7 @@ CONFIG_NET_CORE=y # CONFIG_NET_DSA is not set # CONFIG_NET_DSA_AR9331 is not set # CONFIG_NET_DSA_BCM_SF2 is not set +# CONFIG_NET_DSA_KS8995 is not set # CONFIG_NET_DSA_LANTIQ_GSWIP is not set # CONFIG_NET_DSA_LOOP is not set # CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON is not set @@ -4091,6 +4133,7 @@ CONFIG_NET_CORE=y # CONFIG_NET_DSA_TAG_AR9331 is not set # CONFIG_NET_DSA_TAG_BRCM is not set # CONFIG_NET_DSA_TAG_BRCM_LEGACY is not set +# CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS is not set # CONFIG_NET_DSA_TAG_BRCM_PREPEND is not set # CONFIG_NET_DSA_TAG_DSA is not set # CONFIG_NET_DSA_TAG_EDSA is not set @@ -4442,6 +4485,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NUMA is not set # CONFIG_NVGRACE_GPU_VFIO_PCI is not set # CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set +# CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set # CONFIG_NVMEM is not set # CONFIG_NVMEM_BCM_OCOTP is not set # CONFIG_NVMEM_BLOCK is not set @@ -5484,6 +5528,7 @@ CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_SENSORS_ASC7621 is not set # CONFIG_SENSORS_ASPEED is not set # CONFIG_SENSORS_ASUS_ROG_RYUJIN is not set +# CONFIG_SENSORS_ASUS_WMI is not set # CONFIG_SENSORS_ATK0110 is not set # CONFIG_SENSORS_ATXP1 is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set @@ -5524,6 +5569,7 @@ CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_SENSORS_HMC5843 is not set # CONFIG_SENSORS_HMC5843_I2C is not set # CONFIG_SENSORS_HMC5843_SPI is not set +# CONFIG_SENSORS_HP_WMI is not set # CONFIG_SENSORS_HS3001 is not set # CONFIG_SENSORS_I5500 is not set # CONFIG_SENSORS_I5K_AMB is not set @@ -5751,6 +5797,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_MAX3100 is not set # CONFIG_SERIAL_MAX310X is not set +# CONFIG_SERIAL_MULTI_INSTANTIATE is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_OF_PLATFORM is not set # CONFIG_SERIAL_PCH_UART is not set @@ -5780,6 +5827,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SERIO_RAW is not set # CONFIG_SERIO_SERPORT is not set # CONFIG_SERIO_SUN4I_PS2 is not set +# CONFIG_SERIO_XILINX_XPS_PS2 is not set # CONFIG_SFC is not set # CONFIG_SFC_FALCON is not set # CONFIG_SFC_SIENA is not set @@ -5920,10 +5968,17 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_GUSEXTREME is not set # CONFIG_SND_GUSMAX is not set # CONFIG_SND_HDA_CODEC_CS8409 is not set +# CONFIG_SND_HDA_CODEC_SENARYTECH is not set +# CONFIG_SND_HDA_CTL_DEV_ID is not set # CONFIG_SND_HDA_INTEL is not set # CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDA_PREALLOC_SIZE=64 +# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set +# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set +# CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set +# CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set +# CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set # CONFIG_SND_HDSP is not set # CONFIG_SND_HDSPM is not set # CONFIG_SND_HRTIMER is not set @@ -6027,7 +6082,11 @@ CONFIG_SND_PROC_FS=y # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP5x is not set +# CONFIG_SND_SOC_AMD_ACP6x is not set +# CONFIG_SND_SOC_AMD_ACP_COMMON is not set +# CONFIG_SND_SOC_AMD_PS is not set # CONFIG_SND_SOC_AMD_RENOIR is not set +# CONFIG_SND_SOC_AMD_RPL_ACP6x is not set # CONFIG_SND_SOC_AU1XAUDIO is not set # CONFIG_SND_SOC_AU1XPSC is not set # CONFIG_SND_SOC_AUDIO_IIO_AUX is not set @@ -6104,6 +6163,7 @@ CONFIG_SND_PROC_FS=y # CONFIG_SND_SOC_IMX_HDMI is not set # CONFIG_SND_SOC_IMX_RPMSG is not set # CONFIG_SND_SOC_INNO_RK3036 is not set +# CONFIG_SND_SOC_INTEL_AVS is not set # CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH is not set # CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH is not set # CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH is not set @@ -6162,6 +6222,7 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MT8188 is not set # CONFIG_SND_SOC_MT8192 is not set # CONFIG_SND_SOC_MT8195 is not set +# CONFIG_SND_SOC_MT8365 is not set # CONFIG_SND_SOC_MTK_BTCVSD is not set # CONFIG_SND_SOC_NAU8315 is not set # CONFIG_SND_SOC_NAU8540 is not set @@ -6352,6 +6413,11 @@ CONFIG_SND_X86=y # CONFIG_SPI_CH341 is not set # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_DW_BT1 is not set +# CONFIG_SPI_DW_BT1_DIRMAP is not set +# CONFIG_SPI_DW_DMA is not set +# CONFIG_SPI_DW_MMIO is not set +# CONFIG_SPI_DW_PCI is not set # CONFIG_SPI_FSL_DSPI is not set # CONFIG_SPI_FSL_ESPI is not set # CONFIG_SPI_FSL_SPI is not set @@ -6402,6 +6468,7 @@ CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y # CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_EMBEDDED=y # CONFIG_SQUASHFS_FILE_CACHE is not set CONFIG_SQUASHFS_FILE_DIRECT=y @@ -6423,6 +6490,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_SSB_SDIOHOST is not set # CONFIG_SSFDC is not set # CONFIG_SSIF_IPMI_BMC is not set +CONFIG_STACKDEPOT_MAX_FRAMES=64 # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_PER_TASK is not set # CONFIG_STACKPROTECTOR_STRONG is not set @@ -6615,6 +6683,7 @@ CONFIG_TEXTSEARCH=y # CONFIG_THERMAL_NETLINK is not set # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THINKPAD_ACPI is not set +# CONFIG_THINKPAD_LMI is not set # CONFIG_THRUSTMASTER_FF is not set # CONFIG_THUMB2_KERNEL is not set # CONFIG_THUNDER_NIC_BGX is not set @@ -6686,6 +6755,7 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TOPSTAR_LAPTOP is not set # CONFIG_TORTURE_TEST is not set # CONFIG_TOSHIBA_HAPS is not set +# CONFIG_TOSHIBA_WMI is not set # CONFIG_TOUCHSCREEN_88PM860X is not set # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set @@ -7289,6 +7359,7 @@ CONFIG_VDSO=y # CONFIG_VGA_CONSOLE is not set # CONFIG_VGA_SWITCHEROO is not set # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set +CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y CONFIG_VHOST_MENU=y # CONFIG_VHOST_NET is not set # CONFIG_VHOST_VSOCK is not set @@ -7375,6 +7446,8 @@ CONFIG_VHOST_MENU=y # CONFIG_VIDEO_IMX8_JPEG is not set # CONFIG_VIDEO_IMX_MIPI_CSIS is not set # CONFIG_VIDEO_IMX_PXP is not set +# CONFIG_VIDEO_INTEL_IPU6 is not set +# CONFIG_VIDEO_IPU3_CIO2 is not set # CONFIG_VIDEO_IR_I2C is not set # CONFIG_VIDEO_ISL7998X is not set # CONFIG_VIDEO_IVTV is not set @@ -7605,6 +7678,7 @@ CONFIG_WLAN=y # CONFIG_WLAN_VENDOR_TI is not set # CONFIG_WLAN_VENDOR_ZYDAS is not set # CONFIG_WLCORE is not set +# CONFIG_WMI_BMOF is not set # CONFIG_WPCM450_SOC is not set # CONFIG_WQ_CPU_INTENSIVE_REPORT is not set CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y @@ -7614,7 +7688,9 @@ CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y # CONFIG_WW_MUTEX_SELFTEST is not set # CONFIG_X25 is not set # CONFIG_X509_CERTIFICATE_PARSER is not set +# CONFIG_X86_KERNEL_IBT is not set # CONFIG_X86_PKG_TEMP_THERMAL is not set +# CONFIG_X86_USER_SHADOW_STACK is not set # CONFIG_X9250 is not set # CONFIG_XDP_SOCKETS is not set # CONFIG_XEN is not set @@ -7637,6 +7713,7 @@ CONFIG_XFRM=y # CONFIG_XFS_SUPPORT_ASCII_CI is not set # CONFIG_XFS_SUPPORT_V4 is not set # CONFIG_XFS_WARN is not set +# CONFIG_XIAOMI_WMI is not set # CONFIG_XILINX_AXI_EMAC is not set # CONFIG_XILINX_DMA is not set # CONFIG_XILINX_EMACLITE is not set @@ -7675,6 +7752,7 @@ CONFIG_XZ_DEC=y # CONFIG_YENTA_RICOH is not set # CONFIG_YENTA_TI is not set # CONFIG_YENTA_TOSHIBA is not set +# CONFIG_YOGABOOK is not set # CONFIG_ZBUD is not set # CONFIG_ZD1211RW is not set # CONFIG_ZD1211RW_DEBUG is not set diff --git a/lede/target/linux/generic/config-6.6 b/lede/target/linux/generic/config-6.6 index 0597242db5..1aac732840 100644 --- a/lede/target/linux/generic/config-6.6 +++ b/lede/target/linux/generic/config-6.6 @@ -440,6 +440,7 @@ CONFIG_ARM_MODULE_PLTS=y # CONFIG_ARM_TIMER_SP804 is not set # CONFIG_ARM_UNWIND is not set # CONFIG_ARM_VIRT_EXT is not set +# CONFIG_AS21XXX_PHY is not set # CONFIG_AS3935 is not set # CONFIG_AS73211 is not set # CONFIG_ASM9260_TIMER is not set @@ -1008,10 +1009,10 @@ CONFIG_CRAMFS_BLOCKDEV=y # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_CRC32_BIT is not set -CONFIG_CRC32_SARWATE=y +# CONFIG_CRC32_SARWATE is not set # CONFIG_CRC32_SELFTEST is not set # CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SLICEBY8 is not set +CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC4 is not set # CONFIG_CRC64 is not set # CONFIG_CRC64_ROCKSOFT is not set @@ -1841,14 +1842,14 @@ CONFIG_EPOLL=y # CONFIG_EQUALIZER is not set # CONFIG_EROFS_FS is not set # CONFIG_EROFS_FS_DEBUG is not set -# CONFIG_EROFS_FS_XATTR is not set -# CONFIG_EROFS_FS_POSIX_ACL is not set -# CONFIG_EROFS_FS_SECURITY is not set -# CONFIG_EROFS_FS_ZIP is not set -# CONFIG_EROFS_FS_ZIP_DEFLATE is not set # CONFIG_EROFS_FS_ONDEMAND is not set CONFIG_EROFS_FS_PCPU_KTHREAD=y CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI=y +# CONFIG_EROFS_FS_POSIX_ACL is not set +# CONFIG_EROFS_FS_SECURITY is not set +# CONFIG_EROFS_FS_XATTR is not set +# CONFIG_EROFS_FS_ZIP is not set +# CONFIG_EROFS_FS_ZIP_DEFLATE is not set # CONFIG_ET131X is not set CONFIG_ETHERNET=y # CONFIG_ETHOC is not set @@ -3063,6 +3064,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=y # CONFIG_LEDS_INTEL_SS4200 is not set # CONFIG_LEDS_IS31FL319X is not set # CONFIG_LEDS_IS31FL32XX is not set +# CONFIG_LEDS_KTD202X is not set # CONFIG_LEDS_LM3530 is not set # CONFIG_LEDS_LM3532 is not set # CONFIG_LEDS_LM355x is not set @@ -3092,6 +3094,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=y # CONFIG_LEDS_PWM_MULTICOLOR is not set # CONFIG_LEDS_REGULATOR is not set # CONFIG_LEDS_SPI_BYTE is not set +# CONFIG_LEDS_ST1202 is not set # CONFIG_LEDS_SYSCON is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TI_LMU_COMMON is not set @@ -3626,6 +3629,8 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MOST is not set # CONFIG_MOTORCOMM_PHY is not set # CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set # CONFIG_MOUSE_ELAN_I2C is not set # CONFIG_MOUSE_GPIO is not set # CONFIG_MOUSE_INPORT is not set @@ -3633,8 +3638,10 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_MOUSE_PC110PAD is not set # CONFIG_MOUSE_PS2_FOCALTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_MOUSE_SYNAPTICS_USB is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOXTET is not set # CONFIG_MPL115 is not set # CONFIG_MPL115_I2C is not set @@ -3799,6 +3806,7 @@ CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware" # CONFIG_MTD_SPLIT_JIMAGE_FW is not set # CONFIG_MTD_SPLIT_LZMA_FW is not set # CONFIG_MTD_SPLIT_MINOR_FW is not set +# CONFIG_MTD_SPLIT_MSTC_BOOT is not set # CONFIG_MTD_SPLIT_SEAMA_FW is not set # CONFIG_MTD_SPLIT_SEIL_FW is not set CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y @@ -3987,6 +3995,7 @@ CONFIG_NET_CORE=y # CONFIG_NET_DSA_MT7530 is not set # CONFIG_NET_DSA_MV88E6060 is not set # CONFIG_NET_DSA_MV88E6XXX is not set +# CONFIG_NET_DSA_MV88E6XXX_LEDS is not set # CONFIG_NET_DSA_MV88E6XXX_PTP is not set # CONFIG_NET_DSA_QCA8K is not set # CONFIG_NET_DSA_QCA8K_LEDS_SUPPORT is not set @@ -4351,6 +4360,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" # CONFIG_NVMEM_BCM_OCOTP is not set # CONFIG_NVMEM_BLOCK is not set # CONFIG_NVMEM_IMX_OCOTP is not set +# CONFIG_NVMEM_LAYOUT_ASCII_ENV is not set # CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set # CONFIG_NVMEM_LAYOUT_SL28_VPD is not set # CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set @@ -4768,6 +4778,7 @@ CONFIG_PROC_SYSCTL=y # CONFIG_PSB6970_PHY is not set # CONFIG_PSE_CONTROLLER is not set # CONFIG_PSI is not set +# CONFIG_PSI_DEFAULT_DISABLED is not set # CONFIG_PSTORE is not set # CONFIG_PSTORE_BLK is not set # CONFIG_PSTORE_COMPRESS is not set @@ -5647,6 +5658,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SERIO_RAW is not set # CONFIG_SERIO_SERPORT is not set # CONFIG_SERIO_SUN4I_PS2 is not set +# CONFIG_SERIO_XILINX_XPS_PS2 is not set # CONFIG_SFC is not set # CONFIG_SFC_FALCON is not set # CONFIG_SFC_SIENA is not set @@ -6226,6 +6238,11 @@ CONFIG_SND_X86=y # CONFIG_SPI_CADENCE_XSPI is not set # CONFIG_SPI_DEBUG is not set # CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_DW_BT1 is not set +# CONFIG_SPI_DW_BT1_DIRMAP is not set +# CONFIG_SPI_DW_DMA is not set +# CONFIG_SPI_DW_MMIO is not set +# CONFIG_SPI_DW_PCI is not set # CONFIG_SPI_FSL_DSPI is not set # CONFIG_SPI_FSL_ESPI is not set # CONFIG_SPI_FSL_SPI is not set @@ -6277,6 +6294,7 @@ CONFIG_SQUASHFS=y # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y # CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y CONFIG_SQUASHFS_EMBEDDED=y # CONFIG_SQUASHFS_FILE_CACHE is not set CONFIG_SQUASHFS_FILE_DIRECT=y @@ -7556,6 +7574,7 @@ CONFIG_ZONE_DMA=y # CONFIG_ZRAM_DEF_COMP_ZSTD is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set # CONFIG_ZRAM_MULTI_COMP is not set +# CONFIG_ZRAM_TRACK_ENTRY_ACTIME is not set # CONFIG_ZSMALLOC is not set CONFIG_ZSMALLOC_CHAIN_SIZE=8 # CONFIG_ZSWAP is not set diff --git a/lede/target/linux/rockchip/armv8/config-6.12 b/lede/target/linux/rockchip/armv8/config-6.12 index 1e4546f883..b2055e1a4f 100644 --- a/lede/target/linux/rockchip/armv8/config-6.12 +++ b/lede/target/linux/rockchip/armv8/config-6.12 @@ -1,7 +1,6 @@ CONFIG_64BIT=y CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y -CONFIG_ARCH_DEFAULT_CRASH_DUMP=y CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_FORCE_MAX_ORDER=10 @@ -63,7 +62,6 @@ CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_ARM64_VA_BITS=48 # CONFIG_ARM64_VA_BITS_39 is not set CONFIG_ARM64_VA_BITS_48=y -# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y @@ -127,8 +125,6 @@ CONFIG_BUFFER_HEAD=y CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y CONFIG_CC_HAVE_SHADOW_CALL_STACK=y CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y -CONFIG_CC_NO_ARRAY_BOUNDS=y -CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_CHARGER_GPIO=y # CONFIG_CHARGER_RK817 is not set CONFIG_CLKSRC_MMIO=y @@ -214,9 +210,7 @@ CONFIG_CRYPTO_LIB_GF128MUL=y CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LIB_UTILS=y -CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SM4=y CONFIG_CRYPTO_SM4_ARM64_CE_BLK=y CONFIG_CRYPTO_SM4_ARM64_CE_CCM=y @@ -234,7 +228,6 @@ CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DIMLIB=y CONFIG_DMADEVICES=y CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y CONFIG_DMA_CMA=y @@ -258,7 +251,6 @@ CONFIG_EEPROM_AT24=y CONFIG_EMAC_ROCKCHIP=y CONFIG_ENERGY_MODEL=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y -CONFIG_EXECMEM=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXTCON=y @@ -271,14 +263,11 @@ CONFIG_FRAME_POINTER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y -CONFIG_FS_STACK=y CONFIG_FUNCTION_ALIGNMENT=4 CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y -CONFIG_GCC10_NO_ARRAY_BOUNDS=y -CONFIG_GCC_NO_STRINGOP_OVERFLOW=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y @@ -315,7 +304,6 @@ CONFIG_GPIO_DWAPB=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_GPIO_ROCKCHIP=y -# CONFIG_GPIO_VIRTUSER is not set # CONFIG_HARDENED_USERCOPY is not set CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y @@ -346,7 +334,6 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_RK3X=y -# CONFIG_IDPF is not set CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_INDIRECT_PIO=y CONFIG_INPUT=y @@ -435,7 +422,6 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_OF_ARASAN=y CONFIG_MMC_SDHCI_OF_DWCMSHC=y -# CONFIG_MMC_SDHCI_PCI is not set CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMU_LAZY_TLB_REFCOUNT=y CONFIG_MODULES_USE_ELF_RELA=y @@ -451,7 +437,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_SG_DMA_FLAGS=y CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NEED_TASKS_RCU=y CONFIG_NET_DEVMEM=y CONFIG_NET_EGRESS=y CONFIG_NET_FLOW_LIMIT=y @@ -470,7 +455,6 @@ CONFIG_NVMEM_ROCKCHIP_EFUSE=y CONFIG_NVMEM_ROCKCHIP_OTP=y CONFIG_NVMEM_SYSFS=y CONFIG_NVME_CORE=y -# CONFIG_NVME_HOST_AUTH is not set # CONFIG_NVME_HWMON is not set # CONFIG_NVME_MULTIPATH is not set CONFIG_OF=y @@ -489,7 +473,6 @@ CONFIG_OLD_SIGSUSPEND3=y # CONFIG_OVERLAY_FS_XINO_AUTO is not set CONFIG_PADATA=y CONFIG_PAGE_POOL=y -CONFIG_PAGE_SHIFT=12 CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_PAGE_SIZE_LESS_THAN_64KB=y # CONFIG_PANIC_ON_OOPS is not set @@ -518,7 +501,6 @@ CONFIG_PCI_MSI=y CONFIG_PCI_STUB=y CONFIG_PCS_XPCS=y CONFIG_PER_VMA_LOCK=y -# CONFIG_PFCP is not set CONFIG_PGTABLE_HAS_HUGE_LEAVES=y CONFIG_PGTABLE_LEVELS=4 CONFIG_PHYLIB=y @@ -557,13 +539,13 @@ CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y CONFIG_POWER_RESET=y CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_HWMON=y -CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PRINTK_TIME=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_PROC_VMCORE=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_PWM=y CONFIG_PWM_ROCKCHIP=y +CONFIG_PWM_ROCKCHIP_V4=y # CONFIG_QFMT_V2 is not set CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_SPINLOCKS=y @@ -578,6 +560,7 @@ CONFIG_RATIONAL=y # CONFIG_RAVE_SP_CORE is not set CONFIG_RCU_TRACE=y CONFIG_REALTEK_PHY=y +CONFIG_REALTEK_PHY_HWMON=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_IRQ=y @@ -601,15 +584,16 @@ CONFIG_ROCKCHIP_GRF=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_ROCKCHIP_IOMMU=y CONFIG_ROCKCHIP_MBOX=y +CONFIG_ROCKCHIP_MFPWM=y CONFIG_ROCKCHIP_PHY=y CONFIG_ROCKCHIP_PM_DOMAINS=y CONFIG_ROCKCHIP_THERMAL=y CONFIG_ROCKCHIP_TIMER=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y -# CONFIG_RPMB is not set CONFIG_RPS=y CONFIG_RSEQ=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_HYM8563=y CONFIG_RTC_DRV_RK808=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTC_NVMEM=y @@ -646,7 +630,6 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIO=y CONFIG_SERIO_AMBAKMI=y CONFIG_SERIO_LIBPS2=y -CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SLUB_DEBUG=y CONFIG_SMP=y @@ -667,13 +650,11 @@ CONFIG_SPI_ROCKCHIP_SFC=y CONFIG_SPI_SPIDEV=y CONFIG_SPLIT_PMD_PTLOCKS=y CONFIG_SPLIT_PTE_PTLOCKS=y -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FILE_CACHE=y # CONFIG_SQUASHFS_FILE_DIRECT is not set CONFIG_SRAM=y CONFIG_STACKDEPOT=y -CONFIG_STACKDEPOT_MAX_FRAMES=64 CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_PER_TASK=y CONFIG_STACKPROTECTOR_STRONG=y diff --git a/lede/target/linux/rockchip/armv8/config-6.6 b/lede/target/linux/rockchip/armv8/config-6.6 index 18157b117a..a98dd70f21 100644 --- a/lede/target/linux/rockchip/armv8/config-6.6 +++ b/lede/target/linux/rockchip/armv8/config-6.6 @@ -86,6 +86,7 @@ CONFIG_ARM_PSCI_FW=y CONFIG_ARM_RK3328_DMC_DEVFREQ=y # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set # CONFIG_ARM_SCMI_CPUFREQ is not set +# CONFIG_ARM_SCMI_DEBUG_COUNTERS is not set CONFIG_ARM_SCMI_HAVE_SHMEM=y CONFIG_ARM_SCMI_HAVE_TRANSPORT=y CONFIG_ARM_SCMI_POWER_CONTROL=y @@ -127,7 +128,6 @@ CONFIG_BUFFER_HEAD=y CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y CONFIG_CC_HAVE_SHADOW_CALL_STACK=y CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y -CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CHARGER_GPIO=y # CONFIG_CHARGER_RK817 is not set CONFIG_CLKSRC_MMIO=y @@ -193,8 +193,6 @@ CONFIG_CPU_THERMAL=y CONFIG_CRASH_CORE=y CONFIG_CRASH_DUMP=y CONFIG_CRC16=y -# CONFIG_CRC32_SARWATE is not set -CONFIG_CRC32_SLICEBY8=y CONFIG_CRC64=y CONFIG_CRC64_ROCKSOFT=y CONFIG_CRC_T10DIF=y @@ -272,7 +270,6 @@ CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y -CONFIG_GCC10_NO_ARRAY_BOUNDS=y CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y @@ -560,6 +557,7 @@ CONFIG_RATIONAL=y # CONFIG_RAVE_SP_CORE is not set CONFIG_RCU_TRACE=y CONFIG_REALTEK_PHY=y +CONFIG_REALTEK_PHY_HWMON=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_IRQ=y @@ -590,6 +588,7 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y CONFIG_RPS=y CONFIG_RSEQ=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_HYM8563=y CONFIG_RTC_DRV_RK808=y CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTC_NVMEM=y @@ -644,7 +643,6 @@ CONFIG_SPI_MEM=y CONFIG_SPI_ROCKCHIP=y CONFIG_SPI_ROCKCHIP_SFC=y CONFIG_SPI_SPIDEV=y -CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FILE_CACHE=y # CONFIG_SQUASHFS_FILE_DIRECT is not set diff --git a/nekobox-android/buildScript/lib/core/get_source_env.sh b/nekobox-android/buildScript/lib/core/get_source_env.sh index 5c7bc0be94..d3851c00c6 100644 --- a/nekobox-android/buildScript/lib/core/get_source_env.sh +++ b/nekobox-android/buildScript/lib/core/get_source_env.sh @@ -1,2 +1,2 @@ -export COMMIT_SING_BOX="98c74d272a6b61abc120ff8163ab2ead0bb0ce96" +export COMMIT_SING_BOX="9beb42f553ebdf575f497c01c33ffa7b6df17efb" export COMMIT_LIBNEKO="1c47a3af71990a7b2192e03292b4d246c308ef0b" diff --git a/nekobox-android/libcore/go.mod b/nekobox-android/libcore/go.mod index daaf48eeed..12b9d82988 100644 --- a/nekobox-android/libcore/go.mod +++ b/nekobox-android/libcore/go.mod @@ -8,8 +8,8 @@ require ( github.com/matsuridayo/libneko v1.0.0 // replaced github.com/miekg/dns v1.1.67 github.com/oschwald/maxminddb-golang v1.13.1 - github.com/sagernet/quic-go v0.52.0-sing-box-mod.2 - github.com/sagernet/sing v0.7.12 + github.com/sagernet/quic-go v0.52.0-sing-box-mod.3 + github.com/sagernet/sing v0.7.13 github.com/sagernet/sing-box v1.0.0 // replaced github.com/sagernet/sing-tun v0.7.3 github.com/ulikunitz/xz v0.5.15 diff --git a/nekobox-android/libcore/go.sum b/nekobox-android/libcore/go.sum index b516d865b0..55e9d7d7ca 100644 --- a/nekobox-android/libcore/go.sum +++ b/nekobox-android/libcore/go.sum @@ -86,11 +86,11 @@ github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a h1:ObwtHN2VpqE0ZN github.com/sagernet/netlink v0.0.0-20240612041022-b9a21c07ac6a/go.mod h1:xLnfdiJbSp8rNqYEdIW/6eDO4mVoogml14Bh2hSiFpM= github.com/sagernet/nftables v0.3.0-beta.4 h1:kbULlAwAC3jvdGAC1P5Fa3GSxVwQJibNenDW2zaXr8I= github.com/sagernet/nftables v0.3.0-beta.4/go.mod h1:OQXAjvjNGGFxaTgVCSTRIhYB5/llyVDeapVoENYBDS8= -github.com/sagernet/quic-go v0.52.0-sing-box-mod.2 h1:QTPr/ptUPsgregVfFXReBFrhv/8U83deZG8urQ7pWYI= -github.com/sagernet/quic-go v0.52.0-sing-box-mod.2/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4= +github.com/sagernet/quic-go v0.52.0-sing-box-mod.3 h1:ySqffGm82rPqI1TUPqmtHIYd12pfEGScygnOxjTL56w= +github.com/sagernet/quic-go v0.52.0-sing-box-mod.3/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4= github.com/sagernet/sing v0.6.9/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= -github.com/sagernet/sing v0.7.12 h1:MpMbO56crPRZTbltoj1wGk4Xj9+GiwH1wTO4s3fz1EA= -github.com/sagernet/sing v0.7.12/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= +github.com/sagernet/sing v0.7.13 h1:XNYgd8e3cxMULs/LLJspdn/deHrnPWyrrglNHeCUAYM= +github.com/sagernet/sing v0.7.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing-mux v0.3.3 h1:YFgt9plMWzH994BMZLmyKL37PdIVaIilwP0Jg+EcLfw= github.com/sagernet/sing-mux v0.3.3/go.mod h1:pht8iFY4c9Xltj7rhVd208npkNaeCxzyXCgulDPLUDA= github.com/sagernet/sing-quic v0.5.2-0.20250909083218-00a55617c0fb h1:5Wx3XeTiKrrrcrAky7Hc1bO3CGxrvho2Vu5b/adlEIM= diff --git a/nekobox-android/nb4a.properties b/nekobox-android/nb4a.properties index c032774fdc..aab000694a 100644 --- a/nekobox-android/nb4a.properties +++ b/nekobox-android/nb4a.properties @@ -1,4 +1,4 @@ PACKAGE_NAME=moe.nb4a -VERSION_NAME=1.4.0 +VERSION_NAME=1.4.1 PRE_VERSION_NAME=pre-1.4.1-20251026-2 -VERSION_CODE=44 +VERSION_CODE=45 diff --git a/openwrt-packages/adguardhome/Makefile b/openwrt-packages/adguardhome/Makefile index b083b4ce0d..f335c17da9 100644 --- a/openwrt-packages/adguardhome/Makefile +++ b/openwrt-packages/adguardhome/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.68 +PKG_VERSION:=0.107.69 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=349eaf6d91d70d6769486abe9f4ce5b3703c10a9090d140a67fa2297c3abb757 +PKG_HASH:=65f95054bdb4efbfba446b708e7e2a1a36365ddbabcb7236daab1a44a83d06bc PKG_BUILD_DIR:=$(BUILD_DIR)/AdGuardHome-$(PKG_VERSION) PKG_LICENSE:=GPL-3.0-only @@ -58,7 +58,7 @@ define Download/adguardhome-frontend URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/ URL_FILE:=AdGuardHome_frontend.tar.gz FILE:=$(FRONTEND_FILE) - HASH:=978e6a2c8ab268a64006133d8082ab332bf42d5c4575125630410e4e7e03e98e + HASH:=8414ebbbba860f92d60d3ae3d591229e025f02bb0d2c5f87581df4b569ac3cce endef define Build/Prepare diff --git a/openwrt-packages/ddns-go/Makefile b/openwrt-packages/ddns-go/Makefile index ddda923fa2..1201df30ad 100644 --- a/openwrt-packages/ddns-go/Makefile +++ b/openwrt-packages/ddns-go/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-go -PKG_VERSION:=6.13.1 +PKG_VERSION:=6.13.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3f71e243d93b19b9e08d1205a4e0868bf41cf70a18a029d1175a076ff8408169 +PKG_HASH:=a729096b6d0d769223a21dfd82040b264d6f672d6018d08157f400de321d381e PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/Makefile b/openwrt-packages/luci-app-partexp/luci-app-partexp/Makefile index 4e167e8224..c9e4e73bdf 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/Makefile +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/Makefile @@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-partexp -PKG_VERSION:=1.3.1 -PKG_RELEASE:=20250326 +PKG_VERSION:=1.3.2 +PKG_RELEASE:=20250706 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Sirpdboy LUCI_TITLE:=LuCI Support for Automatic Partition Mount -LUCI_DEPENDS:=+fdisk +block-mount +bc +blkid +parted +btrfs-progs +LUCI_DEPENDS:=+fdisk +block-mount +bc +blkid +parted +btrfs-progs +losetup +resize2fs +e2fsprogs +f2fs-tools +kmod-loop LUCI_PKGARCH:=all diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/controller/partexp.lua b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/controller/partexp.lua index 922d71b575..7fb671da9f 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/controller/partexp.lua +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/controller/partexp.lua @@ -14,7 +14,7 @@ function index() local e = entry({"admin","system","partexp"},alias("admin", "system", "partexp", "global"),_("Partition Expansion"), 54) e.dependent = false e.acl_depends = { "luci-app-partexp" } - entry({"admin", "system", "partexp", "global"}, cbi('partexp/global', {hideapplybtn = true, hidesavebtn = true, hideresetbtn = true}), _('Partition Expansion'), 10).leaf = true + entry({"admin","system","partexp","global"}, cbi('partexp/global', {hideapplybtn = true, hidesavebtn = true, hideresetbtn = true}), _('Partition Expansion'), 10).leaf = true entry({"admin", "system", "partexp","partexprun"}, call("partexprun")) entry({"admin", "system", "partexp", "check"}, call("act_check")) end @@ -32,6 +32,7 @@ function act_check() end + function partexprun() local kconfig = http.formvalue('kconfig') local eformat = http.formvalue('eformat') diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/model/cbi/partexp/global.lua b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/model/cbi/partexp/global.lua index 79abd8db11..5d985cb1a3 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/model/cbi/partexp/global.lua +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/model/cbi/partexp/global.lua @@ -46,6 +46,9 @@ e:value("/dev", translate("Normal mount and use by device name(/mnt/x1)")) e.default="/opt" e=t:option(ListValue,"target_disk", translate("Destination hard disk"),translate("Select the hard disk device to operate")) +e:depends("target_function", "/overlay") +e:depends("target_function", "/opt") +e:depends("target_function", "/dev") for i, d in ipairs(devices) do if d.name and d.size then e:value(d.name, "%s (%s, %d MB)" %{ d.name, d.dev, d.size }) @@ -70,6 +73,7 @@ e.default="0" e=t:option(Button, "restart", translate("Perform operation")) e.inputtitle=translate("Click to execute") +e.rawhtml=true e.template ='partexp' return m diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexp.htm b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexp.htm index 7f6cf3b114..eb22476994 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexp.htm +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexp.htm @@ -3,9 +3,9 @@ Copyright (C) 2022-2024 sirpdboy https://github.com/si -%> <%+cbi/valueheader%> <%local fs=require"nixio.fs"%> - + <%+cbi/valuefooter%> diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexplogrun.htm b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexplogrun.htm new file mode 100644 index 0000000000..f42d6339f6 --- /dev/null +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/luasrc/view/partexplogrun.htm @@ -0,0 +1,54 @@ +<%+cbi/valueheader%> + +<%:Reverse%> + + + +<%+cbi/valuefooter%> \ No newline at end of file diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh-cn/partexp.po b/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh-cn/partexp.po index f30e09f7e1..48d259e93d 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh-cn/partexp.po +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh-cn/partexp.po @@ -89,3 +89,8 @@ msgstr "打勾选择表示格式化" msgid "Tick means to retain the settings" msgstr "打勾选择表示保留设置" + +msgid "reverse" +msgstr "逆序" + + diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh_Hans/partexp.po b/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh_Hans/partexp.po index f30e09f7e1..48d259e93d 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh_Hans/partexp.po +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/po/zh_Hans/partexp.po @@ -89,3 +89,8 @@ msgstr "打勾选择表示格式化" msgid "Tick means to retain the settings" msgstr "打勾选择表示保留设置" + +msgid "reverse" +msgstr "逆序" + + diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/root/etc/init.d/partexp b/openwrt-packages/luci-app-partexp/luci-app-partexp/root/etc/init.d/partexp index 88d093d245..806a19bf18 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/root/etc/init.d/partexp +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/root/etc/init.d/partexp @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # -# Copyright (C) 2021-2025 sirpdboy https://github.com/sirpdboy/partexp +# Copyright (C) 2021-2025 sirpdboy https://github.com/sirpdboy/luci-app-partexp # This is free software, licensed under the Apache License, Version 2.0 . # @@ -11,9 +11,13 @@ USE_PROCD=1 EXTRA_COMMANDS="autopart" -LOCK=/var/lock/partexp.lock -LOGD=/var/partexp -LOG=$LOGD/partexp.log +CONFIG="taskplan" +LOCK=/var/lock/$CONFIG.lock +LOGD=/var/$CONFIG +LOGDIR=/etc/$CONFIG +LOG=$LOGDIR/bk$CONFIG.log + +[ -d "$LOGDIR" ] || mkdir -p $LOGDIR [ -d "$LOGD" ] || mkdir -p $LOGD limit_log() { @@ -35,65 +39,11 @@ init_env() { gen_log()( - log "---------------自动分区扩展挂载开始执行------------------ " + log "--自动分区扩展挂载开始执行-- " | tee -a $LOG ) log(){ - echo -e " $(date +'%Y-%m-%d %H:%M:%S') $*" -} - -_uci_get() { - local ret=$(uci get partexp.global.$1 2>/dev/null) - echo ${ret:=$2} -} - -uci_get() { - case $# in - 2) - local ret=$(uci get $1.$2 2>/dev/null) - echo ${ret} - ;; - 3) - local ret=$(uci get $1.$2.$3 2>/dev/null) - echo ${ret} - ;; - 4) - local ret=$(uci get $1.$2.$3 2>/dev/null) - echo ${ret:=$4} - ;; - esac -} - -uci_set() { - case $# in - 3) - uci set $1.$2=$3 2>/dev/null - uci commit $1 - ;; - 4) - uci set $1.$2.$3=$4 2>/dev/null - uci commit $1 - ;; - esac -} - -uci_add(){ - uci add_list $1.$2.$3=$4 2>/dev/null - uci commit $1 -} - -uci_del() { - case $# in - 2) - uci delete "$1.$2" - ;; - 3) - uci delete "$1.$2.$3" - ;; - 4) - uci delete "$1.$2.$3.$4" - ;; - esac + echo -e " $(date +'%Y-%m-%d %H:%M:%S') $*" | tee -a $LOG } # 检查硬盘是否已挂载 @@ -206,11 +156,12 @@ s=$1 [ -e "/etc/config/$s" ] && { msum=$(grep -c "config sambashare" /etc/config/$s) for i in $(seq 0 $((msum)));do - pdev=`uci_get $s @sambashare[$i] path ` + pdev=`uci -q get $s.@sambashare[$i].path ` [ "$pdev" = "$2" ] && { - uci_del $s @sambashare[$i] - log "分区/dev/$b被挂载$MOUNT共享使用，删除$s共享成功！" - sleep 1 + uci delete $s.@sambashare[$i] + uci commit $s + log "分区/dev/$b被挂载$MOUNT共享使用，删除$s共享成功！" + sleep 5 } done } @@ -254,7 +205,7 @@ fdisksave(){ format_disk() { local DISK=$1 local TYPE=$2 - [ $TYPE == '0' ] && TYPE="ext4" + [[ $TYPE == '0' || $TYPE == '' ]] && TYPE="ext4" log "正在格式化 $DISK " mkfs.$TYPE -F "$DISK" >/dev/null 2>/dev/null if [ $? -eq 0 ]; then @@ -267,20 +218,19 @@ format_disk() { } fdiskB(){ - target_function=$( _uci_get target_function "/opt" ) - format_type=$( _uci_get format_type) - keep_config=$( _uci_get keep_config "1" ) - uci_set fstab @global[0] anon_mount '0' - uci_set fstab @global[0] auto_mount '0' - a=$( _uci_get target_disk "/sda3" ) - local b=$a$1 + + a=$1 + b=$1$2 log "开始检测目标$a信息" - log "检测/dev/$b是否需要分区和格式化$format_type" - - if [ $target_function = '/opt' ] ;then + log "检测/dev/$a是否需要分区和格式化$format_type" + block detect > /etc/config/fstab + uci -q set fstab.@global[0].anon_mount='0' + uci -q set fstab.@global[0].auto_mount='0' + uci commit fstab + if [ $target_function = '/opt' ] ;then /etc/init.d/dockerd stop >/dev/null 2> /dev/null amount=`mount |grep /opt | awk '{print $1}'` - if [ -n $amount ] ;then + if [ -n "$amount" ] ;then umount $amount >/dev/null 2> /dev/null log "取消/opt之前的挂载$amount成功！" fi @@ -289,31 +239,30 @@ fdiskB(){ log "取消/opt之前的挂载$OPT成功！" done fi - [ -e "/etc/config/fstab" ] || block detect > /etc/config/fstab [ -d "/mnt/$b" ] || mkdir -p /mnt/$b if is_disk_mounted "/dev/$b"; then - log "设备 /dev/$b 已挂载，尝试取消挂载..." - + log "设备 /dev/$b 已挂载，尝试取消挂载..." if check_shared_mount $b; then usamba samba4 $MOUNT usamba samba $MOUNT sleep 5 fi - umount_disk "/dev/$b" || umount_disk "/mnt/$b" + umount_disk "/dev/$b" + [ $? -ne 0 ] || umount_disk "/mnt/$b" else log "设备/dev/$b未挂载" isfdisk=0 isP=$(is_disk_partitioned $a $b) - if [ "$isP" == '0' ] ;then + if [ "$isP" = '0' ] ;then fdisksave $a fdisknew $a sleep 2 isfdisk=1 fi isP=$(is_disk_partitioned $a $b) - if [ $isP == '1' -a "$isfdisk" == 1 ] ;then + if [[ "$isP" = '1' && "$isfdisk" = 1 ]] ;then log "分区$b建立成功！" - elif [ $isP == '1' -a "$isfdisk" = 0 ] ;then + elif [[ "$isP" = '1' && "$isfdisk" = 0 ]] ;then log "检测目标分区$b已存在." else log "分区$b建立失败，请检查$b硬盘空间！" @@ -325,15 +274,14 @@ fdiskB(){ umount /dev/$b >/dev/null 2> /dev/null [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null fi - if [ "$target_function" = "/" -o "$target_function" = "/overlay" ] ; then + if [[ "$target_function" = "/" || "$target_function" = "/overlay" ]] ; then format_disk "/dev/$b" $format_type - elif [ "$format_type" != "0" -o "$isfdisk" = "1" ] ; then + elif [[ "$format_type" != "0" || "$isfdisk" = "1" ]] ; then format_disk "/dev/$b" $format_type else log "设备/dev/$b如果未格式化,可能无法正常使用." fi - TYPE='';eval $(blkid "/dev/$b" | grep -o -e "TYPE=\S*") log "检测设备/dev/$b分区$TYPE格式！" @@ -358,7 +306,6 @@ fdiskB(){ else log "获取/dev/$b设备UUID信息:$UUID成功" fi - case "$target_function" in "/overlay") @@ -370,7 +317,7 @@ fdiskB(){ [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null block detect > /etc/config/fstab OVERLAY=`uci -q get fstab.@mount[0].target ` - if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then + if [[ "$OVERLAY" = "/overlay" || "$OVERLAY" = "/dev/loop0" ]] ;then uci -q set fstab.@mount[0].uuid="${UUID}" uci -q set fstab.@mount[0].target='/overlay' uci -q set fstab.@mount[0].enabled='0' @@ -388,6 +335,8 @@ fdiskB(){ uci set fstab.@global[0].delay_root="15" uci commit fstab log "保留数据overlay扩展/dev/$b成功！" + eval $(block info /dev/$b | grep -o -e "MOUNT=\S*") + echo $MOUNT $a>> /etc/partexppath sleep 3 log "设备重启才能生效" expquit 2 @@ -397,7 +346,7 @@ fdiskB(){ [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null block detect > /etc/config/fstab OVERLAY=`uci -q get fstab.@mount[0].target ` - if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then + if [[ "$OVERLAY" = "/overlay" || "$OVERLAY" = "/dev/loop0" ]] ;then uci -q set fstab.@mount[0].uuid="${UUID}" uci -q set fstab.@mount[0].target='/overlay' uci -q set fstab.@mount[0].enabled='0' @@ -415,17 +364,17 @@ fdiskB(){ uci set fstab.@global[0].delay_root="15" uci commit fstab log "不保留数据overlay扩展/dev/$b成功！" + eval $(block info /dev/$b | grep -o -e "MOUNT=\S*") + echo $MOUNT $a>> /etc/partexppath sleep 3 log "设备重启才能生效" expquit 2 fi - ;; "/opt") umount /dev/$b >/dev/null 2> /dev/null [ $? -ne 0 ] && umount /mnt/$b >/dev/null 2> /dev/null [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null - block detect > /etc/config/fstab mkdir -p $target_function msum=$(grep -c "'mount'" /etc/config/fstab) @@ -442,55 +391,54 @@ fdiskB(){ uci commit fstab # ln -sf /mnt/$b /overlay if is_disk_mounted "/opt"; then - log "/dev/$b分区扩容和挂载到$target_function成功！" + log "/dev/$b分区扩容和挂载到$target_function成功！" + eval $(block info /dev/$b | grep -o -e "MOUNT=\S*") + echo $MOUNT $a>> /etc/partexppath log "如果没生效，请重启设备" expquit 2 else log "/dev/$b分区扩容和挂载到$target_function失败！" fi ;; - "/") - if [ "$keep_config" = "1" ] ; then - mkdir -p /tmp/introot - mount --bind / /tmp/introot - tar -C /tmp/introot -cvf - . | tar -C /mnt/$b -xf - - umount /tmp/introot || block umount /tmp/introot - umount /dev/$b >/dev/null 2> /dev/null - [ $? -ne 0 ] && umount /mnt/$b >/dev/null 2> /dev/null - [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null - - block detect > /etc/config/fstab - OVERLAY=`uci -q get fstab.@mount[0].target ` - if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then - uci -q set fstab.@mount[0].uuid="${UUID}" - uci -q set fstab.@mount[0].target='/' - uci -q set fstab.@mount[0].enabled='1' + "/") + + + ROOTBLK="$(readlink -f /sys/dev/block/"$(awk '$9="/dev/root"{print $3}' /proc/self/mountinfo)")" + [ -z "$ROOTBLK" ] && { log "错误：无法获取根分区块设备"; expquit 1; } + ROOTDISK="/dev/$(basename "${ROOTBLK%/}")" + FSTYPE=$(blkid -o value -s TYPE "$ROOTDISK" 2>/dev/null) + if [[ "$FSTYPE" != "squashfs" && -n "$FSTYPE" ]] ; then + if [ $target_function = '/' ] ;then + FREE_SPACE=$(check_free_space $(basename $DISK)) + log "目标盘 $ROOT_PART $FSTYPE有剩余空间: $FREE_SPACE Gb" + if [[ "$FREE_SPACE" -gt 2 ]]; then + rootpt_resize + expquit 2 + else + log "目标盘 $SYSTEM_DISK $FSTYPE没有足够的剩余空间！" + expquit 1 + fi fi - log "保留数据根目录扩展/dev/$b成功！" + if [ $target_function = '/overlay' ] ;then + FREE_SPACE=$(check_free_space $(basename $DISK)) + log "目标盘 $ROOT_PART $FSTYPE有剩余空间: $FREE_SPACE Gb" + if [[ "$FREE_SPACE" -gt 2 ]]; then + rootfs_resize + eval $(block info /dev/$b | grep -o -e "MOUNT=\S*") + echo $MOUNT $a>> /etc/partexppath + expquit 2 + else + log "目标盘 $SYSTEM_DISK $FSTYPE没有足够的剩余空间！" + expquit 1 + fi + fi + else + log "目标硬盘不支持/根分区扩展！请换EXT4固件！" + fi sleep 3 - log "设备重启才能生效" expquit 2 - else - mkdir -p /tmp/introot - mount --bind / /tmp/introot - umount /tmp/introot || block umount /tmp/introot - umount /dev/$b >/dev/null 2> /dev/null - [ $? -ne 0 ] && umount /mnt/$b >/dev/null 2> /dev/null - [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null - block detect > /etc/config/fstab - OVERLAY=`uci -q get fstab.@mount[0].target ` - if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then - uci -q set fstab.@mount[0].uuid="${UUID}" - uci -q set fstab.@mount[0].target='/' - uci -q set fstab.@mount[0].enabled='1' - fi - log "保留数据根目录扩展/dev/$b成功！" - sleep 3 - log "设备重启才能生效" - expquit 2 - fi ;; - *) + *) umount /dev/$b >/dev/null 2> /dev/null [ $? -ne 0 ] && umount /mnt/$b >/dev/null 2> /dev/null [ $? -ne 0 ] && block umount /dev/$b >/dev/null 2> /dev/null @@ -510,21 +458,23 @@ fdiskB(){ uci commit fstab if is_disk_mounted /mnt/$b ; then log "/dev/$b分区扩容和挂载到/mnt/$b成功！" + eval $(block info /dev/$b | grep -o -e "MOUNT=\S*") + echo $MOUNT $a>> /etc/partexppath log "如果没生效，请重启设备" expquit 2 else - log "/dev/$b分区扩容和挂载到/mnt/$b失败！" fi ;; esac - } get_system_disk() { - SYSTEM_DISK=$( df -h | grep boot |awk -F ' ' '{print $1}' |head -1) - [ -z ${SYSTEM_DISK} ] && SYSTEM_DISK=$(mount | grep 'on /overlay' | awk '{print $1}' | sed 's/[0-9]*$//' |head -1) + SYSTEM_DISK=$(df -h | grep boot | awk '{print $1}' | head -1 | sed -E 's/(p?[0-9]+)$//') + [ -z ${SYSTEM_DISK} ] && SYSTEM_DISK=$(mount | grep 'on /overlay' | awk '{print $1}' | sed -E 's/(p?[0-9]+)$//' |head -1) echo "$SYSTEM_DISK" + ROOT_DISK="/dev/$(basename "${ROOTBLK%/*}")" + echo "$ROOT_DISK" } get_all_disks() { @@ -532,15 +482,59 @@ get_all_disks() { echo "$DISKS" } +check_part_space() { + DISK=$1 + info=$(lsblk -no SIZE,FSTYPE,MOUNTPOINT "$DISK" | awk '{print $1}') + if [ -z "$info" ]; then + echo "物理大小: 未知（可能是未格式化的裸分区）" + else + echo $info |awk -F '.' '{print $1}' | sed 's/[A-Za-z]//g' + fi +} + check_free_space() { DISK=$1 - PARTED_OUTPUT=$(echo i | parted /dev/$DISK unit GB print free 2>/dev/null) + PARTED_OUTPUT=$(parted -s /dev/$DISK unit GB print free 2>/dev/null) FREE_SPACE=$(echo "$PARTED_OUTPUT" | grep "Free Space" | awk '{print $3}' ) echo $FREE_SPACE |awk -F '.' '{print $1}' | sed 's/[A-Za-z]//g' } -# 获取下一个新的可用的分区号 +show_partition_info() { + local partition="$1" + if [ ! -e "$partition" ]; then + echo "错误：分区 $partition 不存在！" + return 1 + fi + echo -e "\n=== 分区信息 [$partition] ===" + local lsblk_info=$(lsblk -no SIZE,FSTYPE,MOUNTPOINT "$partition" 2>/dev/null) + if [ -z "$lsblk_info" ]; then + echo "物理大小: 未知（可能是未格式化的裸分区）" + else + local size=$(echo "$lsblk_info" | awk '{print $1}') + local fstype=$(echo "$lsblk_info" | awk '{print $2}') + local mountpoint=$(echo "$lsblk_info" | awk '{print $3}') + echo "物理大小: $size" + echo "文件系统: ${fstype:-未知}" + echo "挂载点: ${mountpoint:-未挂载}" + fi + if df "$partition" &>/dev/null; then + local df_info=$(df -h "$partition" | awk 'NR=2 {print $2,$3,$4,$5}') + echo -e "\n[已挂载] 空间使用情况:" + echo "总容量: $(echo "$df_info" | awk '{print $1}')" + echo "已用: $(echo "$df_info" | awk '{print $2}')" + echo "剩余: $(echo "$df_info" | awk '{print $3}')" + echo "使用率: $(echo "$df_info" | awk '{print $4}')" + else + echo -e "\n[未挂载] 无法查询使用情况（需先挂载）" + fi + + local disk="${partition%[0-9]*}" + local part_num="${partition##*[!0-9]}" + echo -e "\n分区表信息:" + parted -s "$disk" unit MiB print | grep -w "^ $part_num" | awk '{print "起始: " $2 " MiB | 结束: " $3 " MiB | 类型: " $6}' +} + get_next_partition_number() { DISK=$1 PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g' | awk -F '[^0-9]+' '{print $NF}') @@ -550,7 +544,7 @@ get_next_partition_number() { echo "$NEXT_PARTITION" } -# 获取最后一个可用的分区号 + get_last_partition_number() { DISK=$1 PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g' | awk -F '[^0-9]+' '{print $NF}') @@ -558,14 +552,94 @@ get_last_partition_number() { echo "$MAX_PARTITION" } - -# 获取硬盘分区数 get_partition_number() { DISK=$1 PARTITIONS=$(fdisk -l /dev/$DISK 2>/dev/null | grep -v boot | grep -E "^/dev/$DISK" | awk '{print $1}' | sed 's/\/dev\/[a-z]*//g' | wc -l) echo "$PARTITIONS" } +rootpt_resize() +{ +if [ ! -e /etc/rootpt-resize ] ;then + log "--->请稍侯，系统根分区扩展中<---" + ROOTBLK="$(readlink -f /sys/dev/block/"$(awk -e '$9="/dev/root"{print $3}' /proc/self/mountinfo)")" + ROOTDISK="/dev/$(basename "${ROOTBLK%/}")" + ROOTPART="${ROOTBLK##*[^0-9]}" + partplace=$(fdisk -l 2>/dev/null | grep "$ROOTDISK" | awk '{print $5}' ) + log "--->根分区$ROOTDISK：$partplace <---" + sleep 3 + parted -f -s "${ROOTDISK}" resizepart "${ROOTPART}" 100% + mount_root done + touch /etc/rootpt-resize + sleep 3 + log "--->系统根分区扩展成功！<---" + partplace=$(fdisk -l 2>/dev/null | grep "$ROOTDISK" | awk '{print $5}' ) + log "--->根分区$ROOTDISK扩展后容量：$partplace <---" + log "--->如果没生效，请重启设备<---" + expquit 2 +else + log "已经扩展过或者挂载分区过，请删除分区或者重置重新操作或者联系作者sirpdboy！" + expquit 1 +fi +} + +rootfs_resize() +{ +if [ ! -e /etc/rootfs-resize ] && [ -e /etc/rootpt-resize ] ;then + log "--->请稍侯，系统根分区扩展中<---" + ROOTBLK="$(readlink -f /sys/dev/block/"$(awk -e '$9="/dev/root"{print $3}' /proc/self/mountinfo)")" + ROOTPART="${ROOTBLK##*[^0-9]}" + ROOTDISK="/dev/$(basename "${ROOTBLK%/}")" + partplace=$(fdisk -l 2>/dev/null | grep "$ROOTDISK" | awk '{print $5}' ) + log "--->根分区$ROOTDISK：$partplace <---" + sleep 3 + parted -f -s "${ROOTDISK}" resizepart "${ROOTPART}" 100% + mount_root done + touch /etc/rootpt-resize + sleep 3 + log "--->系统根分区扩展成功！<---" + partplace=$(fdisk -l 2>/dev/null | grep "$ROOTDISK" | awk '{print $5}' ) + log "--->根分区$ROOTDISK扩展后容量：$partplace <---" + log "--->请稍侯，系统overlay扩展中<---" + df -h /overlay | awk 'NR=2 {printf " overlay扩展前: 总容量: %s 已用: %s 剩余: %s 使用率: %s", $2, $3, $4, $5}' + LOOPDEV="$(awk -e '$5="/overlay"{print $9}' /proc/self/mountinfo)" + if [ -z "${LOOPDEV}" ] ; then + LOOP_DEV="$(losetup -f)" + losetup "${LOOPDEV}" "${ROOTDEV}" + fi + # eval $(blkid "$LOOPDEV" | grep -o -e "TYPE=\S*") + FSTYPE=$(blkid -o value -s TYPE "$LOOPDEV" 2>/dev/null) + umount -l /overlay + mount -t tmpfs -o size=128M tmpfs /overlay + losetup -d /dev/loop0 + losetup -fP ${ROOTDISK} + case "$FSTYPE" in + f2fs) + umount /overlay || { log "错误：无法卸载 /overlay"; expquit 1; } + fsck.f2fs -f "$LOOPDEV" + resize.f2fs -f "$LOOPDEV" || { log "错误：f2fs 调整大小失败"; expquit 1; } + ;; + ext4) + resize2fs -f "$LOOPDEV" || { log "错误：ext4 调整大小失败"; expquit 1; } + ;; + *) + log "--->分区格式 $FSTYPE 不识别，overlay 扩展失败！<---" + expquit 1 + ;; + esac + mount_root done + touch /etc/rootfs-resize + sleep 3 + log "--->系统overlay扩展成功！<---" + df -h /overlay | awk 'NR=2 {printf " overlay扩展后: 总容量: %s 已用: %s 剩余: %s 使用率: %s", $2, $3, $4, $5}' + log "--->如果没生效，请重启设备<---" + expquit 2 +else + log "已经扩展过或者挂载分区过，请删除分区或者重置重新操作或者联系作者sirpdboy！" + expquit 1 +fi +} + get_config() { config_get target_function $1 target_function 1 config_get target_disk $1 target_disk 1 @@ -574,28 +648,32 @@ get_config() { } autopart() { - #config_load partexp - #config_foreach get_config global + config_load partexp + config_foreach get_config global touch $LOCK init_env gen_log - target_function=$( _uci_get target_function "/opt" ) - format_type=$( _uci_get format_type) - DISK=$( _uci_get target_disk "/sda3" ) - keep_config=$( _uci_get keep_config "1" ) - NEXTPART=1 #目标分区 - DISKSALL=$(get_all_disks) #硬盘名列表 - DISK_COUNT=$(echo "$DISKSALL" | wc -l) #所有硬盘数量 + uci -q set fstab.@global[0].anon_mount='0' + uci -q set fstab.@global[0].auto_mount='0' + uci commit fstab + [ -e "/etc/config/dockerd" ] && /etc/init.d/dockerd stop >/dev/null 2> /dev/null + DISK=$target_disk + NEXTPART=1 + DISKSALL=$(get_all_disks) + DISK_COUNT=$(echo "$DISKSALL" | wc -l) log "系统中检测到的硬盘数量: $DISK_COUNT" log "硬盘信息列表:" $DISKSALL SYSTEM_DISK=$(get_system_disk) log "系统盘: "$SYSTEM_DISK - if [[ $SYSTEM_DISK =~ ^/dev/$DISK ]] ;then + case "$SYSTEM_DISK" in + /dev/$DISK*) + fdisksave /dev/$DISK log "此次执行操作功能：$target_function ，目标盘是系统盘：/dev/$DISK" + PARTITIONSUM=$(get_partition_number $DISK) log "目标盘 $DISK 一共有分区数: $PARTITIONSUM个" - if [[ "$PARTITIONSUM" -gt 3 ]];then + if [[ "$PARTITIONSUM" -gt 2 ]];then FREE_SPACE=$(check_free_space $(basename $DISK)) log "目标盘 $DISK 有剩余空间: $FREE_SPACE Gb" if [[ "$FREE_SPACE" -gt 2 ]]; then @@ -614,8 +692,10 @@ autopart() { expquit 1 fi fi - else - log "此次执行操作功能：$target_function ，目标盘是：/dev/$DISK" + ;; + *) + + log "此次执行操作功能：$target_function ，目标盘(非系统盘)是：/dev/$DISK" PARTITIONSUM=$(get_partition_number $DISK) log "目标盘 $DISK 一共有分区数: $PARTITIONSUM个" if [[ "$PARTITIONSUM" -gt 1 ]];then @@ -626,18 +706,18 @@ autopart() { else NEXTPART=1 fi - fi + ;; + esac log "定位到操作目标设备分区:/dev/$DISK$NEXTPART" case "$DISK" in - vd*) fdiskB $NEXTPART;; - sd*) fdiskB $NEXTPART;; - nvme*) fdiskB p$NEXTPART;; - mmc*) fdiskB p$NEXTPART;; + vd*) fdiskB $DISK $NEXTPART;; + sd*) fdiskB $DISK $NEXTPART;; + nvme*) fdiskB $DISK p$NEXTPART;; + mmc*) fdiskB $DISK p$NEXTPART;; *) log "目标设备/dev/$DISK暂不支持！请联系作者sirpdboy！" ;; esac - expquit 1 } @@ -646,20 +726,26 @@ start() { [ -f $LOCK ] && exit [ x$xBOOT = x1 ] || autopart rm -f $LOCK 2>/dev/null +} + +stop () { + + rm -f $LOCK 2>/dev/null } boot() { -xBOOT=1 +xBOOT=1 start } expquit() { rm -f $LOCK - uci_set fstab @global[0] anon_mount '1' - uci_set fstab @global[0] auto_mount '1' + uci -q set fstab.@global[0].anon_mount='1' + uci -q set fstab.@global[0].auto_mount='1' + uci commit fstab [ -e "/etc/config/dockerd" ] && /etc/init.d/dockerd restart >/dev/null 2> /dev/null sleep 2 - [ $1 == 2 ] && log "重启中...\n" &&reboot + [ $1 = 3 ] && log "重启中...\n" &&reboot exit $1 } diff --git a/openwrt-packages/luci-app-partexp/luci-app-partexp/root/usr/share/rpcd/acl.d/luci-app-partexp.json b/openwrt-packages/luci-app-partexp/luci-app-partexp/root/usr/share/rpcd/acl.d/luci-app-partexp.json index da249bf5a0..9003434018 100644 --- a/openwrt-packages/luci-app-partexp/luci-app-partexp/root/usr/share/rpcd/acl.d/luci-app-partexp.json +++ b/openwrt-packages/luci-app-partexp/luci-app-partexp/root/usr/share/rpcd/acl.d/luci-app-partexp.json @@ -1,11 +1,23 @@ { - "luci-app-partexp": { - "description": "Grant UCI access for luci-app-partexp", - "read": { - "uci": [ "partexp" ] - }, - "write": { - "uci": [ "partexp" ] - } - } + "luci-app-partexp": { + "description": "Grant UCI access for luci-app-partexp", + "read": { + "file": { + "/etc/init.d/partexp": [ "exec" ], + "/var/partexp": ["read"], + "/etc/partexppath": ["read"], + "/etc/partexp/": ["read"] + }, + "uci": [ "partexp" ] + }, + "write": { + "file": { + "/var/partexp": ["write"], + "/etc/partexppath": ["write"], + "/etc/partexp/": ["write"] + + }, + "uci": [ "partexp" ] + } + } } diff --git a/openwrt-packages/luci-theme-kucat/Makefile b/openwrt-packages/luci-theme-kucat/Makefile index 75dd19ab8d..17f8ae0772 100644 --- a/openwrt-packages/luci-theme-kucat/Makefile +++ b/openwrt-packages/luci-theme-kucat/Makefile @@ -10,8 +10,8 @@ THEME_TITLE:=Kucat Theme PKG_NAME:=luci-theme-$(THEME_NAME) LUCI_TITLE:=Kucat Theme by sirpdboy LUCI_DEPENDS:= -PKG_VERSION:=2.7.2 -PKG_RELEASE:=20251022 +PKG_VERSION:=2.7.3 +PKG_RELEASE:=20251028 define Package/luci-theme-$(THEME_NAME)/conffiles /www/luci-static/resources/background/ diff --git a/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css b/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css index 23dff0feb8..eb9e7beb80 100644 --- a/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css +++ b/openwrt-packages/luci-theme-kucat/htdocs/luci-static/kucat/css/style.css @@ -2689,6 +2689,12 @@ select,input { background-color: rgba(var(--primary-rgbbody),1); } +#cbi-dockerd .shadow +{ + background-color: rgba(var(--primary-rgbm), 0.1) !important; +} + + body.modal-overlay-active { overflow: hidden; height: 100vh @@ -3900,8 +3906,8 @@ body.lang_pl.node-main-login .cbi-value-title { .pure-g .block h4, [data-page="admin-services-vssr"] .block h4 { - color: var(--body-color); - background-image: none + color: var(--body-color)!important; + background-image: none!important } [data-page="admin-services-vssr"] .status-bar { @@ -4017,60 +4023,35 @@ pre.command-output { margin-right: 0 !important } -[data-page^="admin-services-openclash"] .select-popup-header, -[data-page^="admin-services-openclash"] .oc, -.oc .main-cards-container { - background-color: rgba(255,255,255,0) !important; +[data-page^="admin-services-openclash"] .cbi-section .oc{ + --bg-white: rgba(var(--primary-rgbbody), 0.4); + --bg-light: rgba(255, 255, 255, 0); + --bg-gray: rgba(var(--primary-rgbm), 0.02); + --text-title: var(--primary-title-color); + --border-color: rgba(255, 255, 255, 0); + --border-light: rgba(255, 255, 255, 0); + --text-primary: var(--inputtext-color); } - -[data-page^="admin-services-openclash"] .select-popup { - background-color: rgba(255,255,255,1) !important; -} - [data-page^="admin-services-openclash"] .select-class { background-color: rgba(255,255,255,0) !important; padding: 0 20px 0 10px!important; } -[data-page^="admin-services-openclash"] .oc .version-display, -[data-page^="admin-services-openclash"] .oc .value-indicator, -[data-page^="admin-services-openclash"] .oc .cbi-button-group{ -border: 0px solid #ddd !important; +[data-page^="admin-services-openclash"] .oc .myip-ip-item, +[data-page^="admin-services-openclash"] .oc .myip-check-item { + background-color: rgba(var(--primary-rgbbody),0.2) !important; + border: 1px solid rgba(var(--primary-rgbm),0.2); } -[data-page^="admin-services-openclash"] .oc .myip-ip-item, -[data-page^="admin-services-openclash"] .oc .myip-check-item, -[data-page^="admin-services-openclash"] .oc .developer-container, -[data-page^="admin-services-openclash"] .oc .sub-card { - background-color: rgba(var(--primary-rgbm),0.02) !important; - border: 1px solid rgba(var(--primary-rgbm),0.2) ; +[data-page^="admin-services-openclash"] .oc .sub-card { + border: 1px solid rgba(var(--primary-rgbm),0.2) !important; } -[data-page^="admin-services-openclash"] .oc>div>div, -[data-page^="admin-services-openclash"] .oc .myip-main-card, -[data-page^="admin-services-openclash"] .oc .myip-content-grid, -[data-page^="admin-services-openclash"] .oc .main-card, -[data-page^="admin-services-openclash"] .oc .announcement-card - { - background-color: rgba(255, 255, 255, 0) !important; - border: 0px solid #ddd !important; - box-shadow: none !important; +[data-page^="admin-services-openclash"] .oc .main-card { + border: 0px solid rgba(var(--primary-rgbm),0.1) !important; } -[data-page^="admin-services-openclash"] .oc .ip-result,.oc .ip-geo, -[data-page^="admin-services-openclash"] .oc .ip-title, .oc .ip-state_title, -[data-page^="admin-services-openclash"] .oc .myip-section-title, -.oc .card-title -{ - color: var(--primary-title-color)!important; - border: 0px solid #ddd !important; -} - -#tool_label .tool_label_span { - color: var(--inputtext-color); -} - [data-page^="admin-services-openclash"] #tab-content .dom { padding: 0 1rem 1rem 1rem } @@ -4168,7 +4149,17 @@ border: 0px solid #ddd !important; background-color: var(--inputbg-color)!important; border: 1px solid var(--input-boxcolor)!important; } +.history-tabs { + background-color: rgba(255, 255, 255, 0)!important; +} +.history-tabs>button { + color: var(--primary-title-color)!important; + background-color: rgba(var(--primary-rgbm), 0.2); +} +.history-tabs>button.active { + background-color: rgba(var(--primary-rgbm), 0.5); +} .action-button { background-color: rgba(var(--primary-rgbm), 0.9)!important; } diff --git a/openwrt-passwall/luci-app-passwall/Makefile b/openwrt-passwall/luci-app-passwall/Makefile index 84ff929b8b..ff2afc9749 100644 --- a/openwrt-passwall/luci-app-passwall/Makefile +++ b/openwrt-passwall/luci-app-passwall/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=25.9.23 PKG_RELEASE:=1 +PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua index f387d70184..715bcf393a 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua +++ b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua @@ -3,9 +3,28 @@ local appname = "passwall" local datatypes = api.datatypes m = Map(appname, "Sing-Box/Xray " .. translate("Shunt Rule")) -m.redirect = api.url() +m.redirect = api.url("rule") api.set_apply_on_parse(m) +if not arg[1] or not m:get(arg[1]) then + luci.http.redirect(m.redirect) +end + +-- Add inline CSS to map description +m.description = (m.description or "") .. "\n" .. [[ + +]] + function clean_text(text) local nbsp = string.char(0xC2, 0xA0) -- 不间断空格（U+00A0） local fullwidth_space = string.char(0xE3, 0x80, 0x80) -- 全角空格（U+3000） @@ -31,10 +50,14 @@ protocol = s:option(MultiValue, "protocol", translate("Protocol")) protocol:value("http") protocol:value("tls") protocol:value("bittorrent") +protocol.widget = "checkbox" +protocol.default = nil o = s:option(MultiValue, "inbound", translate("Inbound Tag")) o:value("tproxy", translate("Transparent proxy")) o:value("socks", "Socks") +o.widget = "checkbox" +o.default = nil network = s:option(ListValue, "network", translate("Network")) network:value("tcp,udp", "TCP UDP") diff --git a/openwrt-passwall/luci-app-passwall/luasrc/passwall/api.lua b/openwrt-passwall/luci-app-passwall/luasrc/passwall/api.lua index 8bb4d8a1e3..6b30d387d7 100644 --- a/openwrt-passwall/luci-app-passwall/luasrc/passwall/api.lua +++ b/openwrt-passwall/luci-app-passwall/luasrc/passwall/api.lua @@ -411,22 +411,13 @@ function is_special_node(e) end function is_ip(val) - if is_ipv6(val) then - val = get_ipv6_only(val) - end - return datatypes.ipaddr(val) + local str = val:match("%[(.-)%]") or val + return datatypes.ipaddr(str) or false end function is_ipv6(val) - local str = val - local address = val:match('%[(.*)%]') - if address then - str = address - end - if datatypes.ip6addr(str) then - return true - end - return false + local str = val:match("%[(.-)%]") or val + return datatypes.ip6addr(str) or false end function is_local_ip(ip) @@ -442,22 +433,18 @@ function is_local_ip(ip) end function is_ipv6addrport(val) - if is_ipv6(val) then - local address, port = val:match('%[(.*)%]:([^:]+)$') - if port then - return datatypes.port(port) - end + local address, port = val:match("%[(.-)%]:([0-9]+)$") + if address and datatypes.ip6addr(address) and datatypes.port(port) then + return true end return false end function get_ipv6_only(val) local result = "" - if is_ipv6(val) then - result = val - if val:match('%[(.*)%]') then - result = val:match('%[(.*)%]') - end + local inner = val:match("%[(.-)%]") or val + if datatypes.ip6addr(inner) then + result = inner end return result end @@ -466,7 +453,7 @@ function get_ipv6_full(val) local result = "" if is_ipv6(val) then result = val - if not val:match('%[(.*)%]') then + if not val:match("%[.-%]") then result = "[" .. result .. "]" end end diff --git a/shadowsocks-rust/Cargo.lock b/shadowsocks-rust/Cargo.lock index ede5d493de..90d10a312e 100644 --- a/shadowsocks-rust/Cargo.lock +++ b/shadowsocks-rust/Cargo.lock @@ -550,18 +550,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.50" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstream", "anstyle", @@ -840,7 +840,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -976,7 +976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2194,7 +2194,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2631,7 +2631,7 @@ dependencies = [ "once_cell", "socket2 0.5.10", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2904,7 +2904,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3603,7 +3603,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] diff --git a/sing-box/Dockerfile b/sing-box/Dockerfile index ce4c7231d3..5162d46131 100644 --- a/sing-box/Dockerfile +++ b/sing-box/Dockerfile @@ -20,8 +20,6 @@ RUN set -ex \ FROM --platform=$TARGETPLATFORM alpine AS dist LABEL maintainer="nekohasekai " RUN set -ex \ - && apk upgrade \ - && apk add bash tzdata ca-certificates nftables \ - && rm -rf /var/cache/apk/* + && apk add --no-cache --upgrade bash tzdata ca-certificates nftables COPY --from=builder /go/bin/sing-box /usr/local/bin/sing-box ENTRYPOINT ["sing-box"] diff --git a/small/luci-app-passwall/Makefile b/small/luci-app-passwall/Makefile index 84ff929b8b..ff2afc9749 100644 --- a/small/luci-app-passwall/Makefile +++ b/small/luci-app-passwall/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=25.9.23 PKG_RELEASE:=1 +PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua index f387d70184..715bcf393a 100644 --- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua +++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua @@ -3,9 +3,28 @@ local appname = "passwall" local datatypes = api.datatypes m = Map(appname, "Sing-Box/Xray " .. translate("Shunt Rule")) -m.redirect = api.url() +m.redirect = api.url("rule") api.set_apply_on_parse(m) +if not arg[1] or not m:get(arg[1]) then + luci.http.redirect(m.redirect) +end + +-- Add inline CSS to map description +m.description = (m.description or "") .. "\n" .. [[ + +]] + function clean_text(text) local nbsp = string.char(0xC2, 0xA0) -- 不间断空格（U+00A0） local fullwidth_space = string.char(0xE3, 0x80, 0x80) -- 全角空格（U+3000） @@ -31,10 +50,14 @@ protocol = s:option(MultiValue, "protocol", translate("Protocol")) protocol:value("http") protocol:value("tls") protocol:value("bittorrent") +protocol.widget = "checkbox" +protocol.default = nil o = s:option(MultiValue, "inbound", translate("Inbound Tag")) o:value("tproxy", translate("Transparent proxy")) o:value("socks", "Socks") +o.widget = "checkbox" +o.default = nil network = s:option(ListValue, "network", translate("Network")) network:value("tcp,udp", "TCP UDP") diff --git a/small/luci-app-passwall/luasrc/passwall/api.lua b/small/luci-app-passwall/luasrc/passwall/api.lua index 8bb4d8a1e3..6b30d387d7 100644 --- a/small/luci-app-passwall/luasrc/passwall/api.lua +++ b/small/luci-app-passwall/luasrc/passwall/api.lua @@ -411,22 +411,13 @@ function is_special_node(e) end function is_ip(val) - if is_ipv6(val) then - val = get_ipv6_only(val) - end - return datatypes.ipaddr(val) + local str = val:match("%[(.-)%]") or val + return datatypes.ipaddr(str) or false end function is_ipv6(val) - local str = val - local address = val:match('%[(.*)%]') - if address then - str = address - end - if datatypes.ip6addr(str) then - return true - end - return false + local str = val:match("%[(.-)%]") or val + return datatypes.ip6addr(str) or false end function is_local_ip(ip) @@ -442,22 +433,18 @@ function is_local_ip(ip) end function is_ipv6addrport(val) - if is_ipv6(val) then - local address, port = val:match('%[(.*)%]:([^:]+)$') - if port then - return datatypes.port(port) - end + local address, port = val:match("%[(.-)%]:([0-9]+)$") + if address and datatypes.ip6addr(address) and datatypes.port(port) then + return true end return false end function get_ipv6_only(val) local result = "" - if is_ipv6(val) then - result = val - if val:match('%[(.*)%]') then - result = val:match('%[(.*)%]') - end + local inner = val:match("%[(.-)%]") or val + if datatypes.ip6addr(inner) then + result = inner end return result end @@ -466,7 +453,7 @@ function get_ipv6_full(val) local result = "" if is_ipv6(val) then result = val - if not val:match('%[(.*)%]') then + if not val:match("%[.-%]") then result = "[" .. result .. "]" end end diff --git a/v2rayn/.github/workflows/build-linux.yml b/v2rayn/.github/workflows/build-linux.yml index e030e4652b..b67527a1f8 100644 --- a/v2rayn/.github/workflows/build-linux.yml +++ b/v2rayn/.github/workflows/build-linux.yml @@ -116,7 +116,7 @@ jobs: fetch-depth: '0' - name: Restore build artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: v2rayN-linux path: ${{ github.workspace }}/v2rayN/Release diff --git a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs index c3bba36388..e88db5d1c4 100644 --- a/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs +++ b/v2rayn/v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs @@ -168,7 +168,7 @@ public partial class MainWindow : WindowBase } menuAddServerViaScan.IsVisible = false; - if (_config.UiItem.AutoHideStartup) + if (_config.UiItem.AutoHideStartup && Utils.IsWindows()) { this.WindowState = WindowState.Minimized; } @@ -402,9 +402,9 @@ public partial class MainWindow : WindowBase public void ShowHideWindow(bool? blShow) { var bl = blShow ?? - Utils.IsLinux() + (Utils.IsLinux() ? (!_config.UiItem.ShowInTaskbar ^ (WindowState == WindowState.Minimized)) - : !_config.UiItem.ShowInTaskbar; + : !_config.UiItem.ShowInTaskbar); if (bl) { this.Show();