From 2f24e33ee0ca49fa7e4187531aace862d65b2474 Mon Sep 17 00:00:00 2001 From: Amio Date: Wed, 6 May 2026 19:15:13 +0800 Subject: [PATCH 1/3] chore(deps): upgrade dependencies and migrate linting to oxlint --- package-lock.json | 225 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/package-lock.json b/package-lock.json index 3f6a39ba..5dd8564c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,11 @@ "@types/url-parse": "^1.4.11", "csstype": "^3.2.3", "fs-extra": "^11.3.4", +<<<<<<< HEAD "next": "^16.2.6", +======= + "next": "^16.2.4", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "oxlint": "^1.63.0", "react": "^19.2.5", "react-dom": "^19.2.5", @@ -909,6 +913,9 @@ "cpu": [ "arm" ], + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -925,6 +932,9 @@ "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -941,6 +951,9 @@ "cpu": [ "ppc64" ], + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -957,6 +970,9 @@ "cpu": [ "riscv64" ], + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -973,6 +989,9 @@ "cpu": [ "s390x" ], + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -989,6 +1008,9 @@ "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -1005,6 +1027,9 @@ "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -1021,6 +1046,9 @@ "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "LGPL-3.0-or-later", "optional": true, "os": [ @@ -1037,6 +1065,9 @@ "cpu": [ "arm" ], + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1059,6 +1090,9 @@ "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1081,6 +1115,9 @@ "cpu": [ "ppc64" ], + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1103,6 +1140,9 @@ "cpu": [ "riscv64" ], + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1125,6 +1165,9 @@ "cpu": [ "s390x" ], + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1147,6 +1190,9 @@ "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1169,6 +1215,9 @@ "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1191,6 +1240,9 @@ "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "Apache-2.0", "optional": true, "os": [ @@ -1354,6 +1406,7 @@ } }, "node_modules/@next/env": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.6.tgz", "integrity": "sha512-gd8HoHN4ufj73WmR3JmVolrpJR47ILK6LouP5xElPglaVxir6e1a7VzvTvDWkOoPXT9rkkTzyCxBu4yeZfZwcw==", @@ -1363,6 +1416,17 @@ "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.6.tgz", "integrity": "sha512-ZJGkkcNfYgrrMkqOdZ7zoLa1TOy0qpcMfk/z4Mh/FKUz40gVO+HNQWqmLxf67Z5WB64DRp0dhEbyHfel+6sJUg==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.4.tgz", + "integrity": "sha512-dKkkOzOSwFYe5RX6y26fZgkSpVAlIOJKQHIiydQcrWH6y/97+RceSOAdjZ14Qa3zLduVUy0TXcn+EiM6t4rPgw==", + "license": "MIT" + }, + "node_modules/@next/swc-darwin-arm64": { + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.4.tgz", + "integrity": "sha512-OXTFFox5EKN1Ym08vfrz+OXxmCcEjT4SFMbNRsWZE99dMqt2Kcusl5MqPXcW232RYkMLQTy0hqgAMEsfEd/l2A==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], @@ -1376,9 +1440,15 @@ } }, "node_modules/@next/swc-darwin-x64": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.6.tgz", "integrity": "sha512-v/YLBHIY132Ced3puBJ7YJKw1lqsCrgcNo2aRJlCEyQrrCeRJlvGlnmxhPxNQI3KE3N1DN5r9TPNPvka3nq5RQ==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.4.tgz", + "integrity": "sha512-XhpVnUfmYWvD3YrXu55XdcAkQtOnvaI6wtQa8fuF5fGoKoxIUZ0kWPtcOfqJEWngFF/lOS9l3+O9CcownhiQxQ==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], @@ -1392,12 +1462,21 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.6.tgz", "integrity": "sha512-RPOvqlYBbcQjkz9VQQDZ2T2bARIjXZV1KFlt+V2Mr6SW/e4I9fcKsaA0hdyf2FHoTlsV2xnBd5Y912rP/1Ce6w==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.4.tgz", + "integrity": "sha512-Mx/tjlNA3G8kg14QvuGAJ4xBwPk1tUHq56JxZ8CXnZwz1Etz714soCEzGQQzVMz4bEnGPowzkV6Xrp6wAkEWOQ==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1408,12 +1487,21 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.6.tgz", "integrity": "sha512-URUTu1+dMkxJsPFgm+OeEvq9wf5sujw0EvgYy80TDGHTSLTnIHeqb0Eu8A3sC95IRgjejQL+kC4mw+4yPxiAXA==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.4.tgz", + "integrity": "sha512-iVMMp14514u7Nup2umQS03nT/bN9HurK8ufylC3FZNykrwjtx7V1A7+4kvhbDSCeonTVqV3Txnv0Lu+m2oDXNg==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1424,12 +1512,21 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.6.tgz", "integrity": "sha512-DOj182mPV8G3UkrayLoREM5YEYI+Dk5wv7Ox9xl1fFibAELEsFD0lDPfHIeILlutMMfdyhlzYPELG3peuKaurw==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.4.tgz", + "integrity": "sha512-EZOvm1aQWgnI/N/xcWOlnS3RQBk0VtVav5Zo7n4p0A7UKyTDx047k8opDbXgBpHl4CulRqRfbw3QrX2w5UOXMQ==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -1440,12 +1537,21 @@ } }, "node_modules/@next/swc-linux-x64-musl": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.6.tgz", "integrity": "sha512-HKQ5SP/V/ub73UvF7n/zeJlxk2kLmtL7Wzrg4WfmkjmNos5onJ2tKu7yZOPdL18A6Svfn3max29ym+ry7NkK4g==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.4.tgz", + "integrity": "sha512-h9FxsngCm9cTBf71AR4fGznDEDx1hS7+kSEiIRjq5kO1oXWm07DxVGZjCvk0SGx7TSjlUqhI8oOyz7NfwAdPoA==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -1456,9 +1562,15 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.6.tgz", "integrity": "sha512-LZXpTlPyS5v7HhSmnvsLGP3iIYgYOBnc8r8ArlT55sGHV89bR2HlDdBjWQ+PY6SJMmk8TuVGFuxalnP3k/0Dwg==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.4.tgz", + "integrity": "sha512-3NdJV5OXMSOeJYijX+bjaLge3mJBlh4ybydbT4GFoB/2hAojWHtMhl3CYlYoMrjPuodp0nzFVi4Tj2+WaMg+Ow==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], @@ -1472,9 +1584,15 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.6.tgz", "integrity": "sha512-F0+4i0h9J6C4eE3EAPWsoCk7UW/dbzOjyzxY0qnDUOYFu6FFmdZ6l97/XdV3/Nz3VYyO7UWjyEJUXkGqcoXfMA==", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.4.tgz", + "integrity": "sha512-kMVGgsqhO5YTYODD9IPGGhA6iprWidQckK3LmPeW08PIFENRmgfb4MjXHO+p//d+ts2rpjvK5gXWzXSMrPl9cw==", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], @@ -2081,6 +2199,12 @@ "arm64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "glibc" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2098,6 +2222,12 @@ "arm64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "musl" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2115,6 +2245,12 @@ "ppc64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "glibc" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2132,6 +2268,12 @@ "riscv64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "glibc" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2149,6 +2291,12 @@ "riscv64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "musl" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2166,6 +2314,12 @@ "s390x" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "glibc" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2183,6 +2337,12 @@ "x64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "glibc" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2200,6 +2360,12 @@ "x64" ], "dev": true, +<<<<<<< HEAD +======= + "libc": [ + "musl" + ], +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2463,6 +2629,9 @@ "cpu": [ "arm" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2476,6 +2645,9 @@ "cpu": [ "arm" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2489,6 +2661,9 @@ "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2502,6 +2677,9 @@ "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2515,6 +2693,9 @@ "cpu": [ "loong64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2528,6 +2709,9 @@ "cpu": [ "loong64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2541,6 +2725,9 @@ "cpu": [ "ppc64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2554,6 +2741,9 @@ "cpu": [ "ppc64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2567,6 +2757,9 @@ "cpu": [ "riscv64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2580,6 +2773,9 @@ "cpu": [ "riscv64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2593,6 +2789,9 @@ "cpu": [ "s390x" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2606,6 +2805,9 @@ "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2619,6 +2821,9 @@ "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -5226,12 +5431,21 @@ "peer": true }, "node_modules/next": { +<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/next/-/next-16.2.6.tgz", "integrity": "sha512-qOVgKJg1+At15NpeUP+eJgCHvTCgXsogweq87Ri/Ix7PkqQHg4sdaXmSFqKlgaIXE4kW0g25LE68W87UANlHtw==", "license": "MIT", "dependencies": { "@next/env": "16.2.6", +======= + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/next/-/next-16.2.4.tgz", + "integrity": "sha512-kPvz56wF5frc+FxlHI5qnklCzbq53HTwORaWBGdT0vNoKh1Aya9XC8aPauH4NJxqtzbWsS5mAbctm4cr+EkQ2Q==", + "license": "MIT", + "dependencies": { + "@next/env": "16.2.4", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "@swc/helpers": "0.5.15", "baseline-browser-mapping": "^2.9.19", "caniuse-lite": "^1.0.30001579", @@ -5245,6 +5459,7 @@ "node": ">=20.9.0" }, "optionalDependencies": { +<<<<<<< HEAD "@next/swc-darwin-arm64": "16.2.6", "@next/swc-darwin-x64": "16.2.6", "@next/swc-linux-arm64-gnu": "16.2.6", @@ -5253,6 +5468,16 @@ "@next/swc-linux-x64-musl": "16.2.6", "@next/swc-win32-arm64-msvc": "16.2.6", "@next/swc-win32-x64-msvc": "16.2.6", +======= + "@next/swc-darwin-arm64": "16.2.4", + "@next/swc-darwin-x64": "16.2.4", + "@next/swc-linux-arm64-gnu": "16.2.4", + "@next/swc-linux-arm64-musl": "16.2.4", + "@next/swc-linux-x64-gnu": "16.2.4", + "@next/swc-linux-x64-musl": "16.2.4", + "@next/swc-win32-arm64-msvc": "16.2.4", + "@next/swc-win32-x64-msvc": "16.2.4", +>>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "sharp": "^0.34.5" }, "peerDependencies": { From 58a36677994c7011665d80aefbdc1bece91ae675 Mon Sep 17 00:00:00 2001 From: Amio Date: Wed, 13 May 2026 18:46:49 +0800 Subject: [PATCH 2/3] refactor: remove deprecated badge-list legacy metadata path --- components/builder-helper.tsx | 19 ++------- libs/badge-list.ts | 74 ----------------------------------- next.config.js | 2 - pages/help.tsx | 1 - tools/gen-examples.ts | 8 ---- 5 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 libs/badge-list.ts diff --git a/components/builder-helper.tsx b/components/builder-helper.tsx index e42c1086..d2603bac 100644 --- a/components/builder-helper.tsx +++ b/components/builder-helper.tsx @@ -1,9 +1,4 @@ import badgeList from '../public/.meta/badge-list.json' -import badgeListLegacy from '../public/.meta/badges.json' - -// const examples = [...badgeList.live, ...badgeList.static].reduce((accu, curr) => { -// return (accu as any).concat(Object.entries(curr.examples)) -// }, [] as [string, string][]) type BadgeExamples = { [pathname: string]: string @@ -11,23 +6,17 @@ type BadgeExamples = { type BadgeList = { [id: string]: { title: string; - examples: BadgeExamples; + examples?: BadgeExamples; } } - const examples = extractExampleList(badgeList) function extractExampleList (badgeList: BadgeList): BadgeExamples { - let examples = {} - - Object.entries(badgeList).forEach((x) => { - examples = { ...examples, ...x[1].examples } - }) + let examples: BadgeExamples = {} - // Also apply legacy examples - badgeListLegacy.live.forEach((x) => { - examples = { ...examples, ...x.examples } + Object.values(badgeList).forEach((meta) => { + examples = { ...examples, ...(meta.examples || {}) } }) return examples diff --git a/libs/badge-list.ts b/libs/badge-list.ts deleted file mode 100644 index 3caca9e4..00000000 --- a/libs/badge-list.ts +++ /dev/null @@ -1,74 +0,0 @@ -import path from 'path' -import staticBadges from '../pages/api/static' - -const rel = (...args) => path.resolve(__dirname, ...args) - -/** @deprecated use badge-list2.ts instead */ -// sort live badge manually -export const liveBadgeList = [ - // // source control - // 'github', - // 'gitlab', - // release registries - 'homebrew', - 'nuget', - 'packagist', - 'melpa', - 'maven', - 'cocoapods', - 'haxelib', - 'opam', - 'cpan', - 'cran', - 'ctan', - 'dub', - 'elm-package', - 'scoop', - 'f-droid', - 'shards', - 'wapm', - 'snapcraft', - // CI - 'appveyor', - 'codacy', - 'azure-pipelines', - // quality & metrics - 'snyk', - 'deepscan', - 'uptime-robot', - 'badgesize', - // social - 'devrant', - 'reddit', - // utilities - 'opencollective', - 'keybase', - 'mastodon', - 'tidelift', - 'jenkins', -] - -export async function loadBadgeMeta() { - const liveBadgeExamples = await Promise.all(liveBadgeList.map(async id => { - const mod = await import(rel('../pages/api', id)) - const { title, examples, handlers } = mod.default.meta - - return { - id, - title, - examples, - routes: Object.keys(handlers), - } - })) - - const statics = { - title: staticBadges.meta.title, - examples: staticBadges.meta.examples, - routes: Object.keys(staticBadges.meta.handlers) - } - - return { - live: liveBadgeExamples, - static: [statics] - } -} diff --git a/next.config.js b/next.config.js index f92b38f3..70f517d5 100644 --- a/next.config.js +++ b/next.config.js @@ -2,8 +2,6 @@ const { withSentryConfig } = require('@sentry/nextjs') -const badgeList = require('./public/.meta/badges.json') - const nextConfig = { reactStrictMode: true, optimizeFonts: false, diff --git a/pages/help.tsx b/pages/help.tsx index a63fabd0..7246b20c 100644 --- a/pages/help.tsx +++ b/pages/help.tsx @@ -6,7 +6,6 @@ import { useState, useEffect } from 'react' import BadgenTitle from '../components/badgen-title' import HelpInfo from '../components/help-info' import Footer from '../components/footer' -import examples from '../public/.meta/badges.json' export default function Index () { const [host, setHost] = useState('') diff --git a/tools/gen-examples.ts b/tools/gen-examples.ts index 3a76d907..4fd31643 100644 --- a/tools/gen-examples.ts +++ b/tools/gen-examples.ts @@ -1,18 +1,10 @@ import path from 'path' import fse from 'fs-extra' -import { loadBadgeMeta } from '../libs/badge-list' import BadgeList2 from '../libs/badge-list2' const rel = (...args) => path.resolve(__dirname, ...args) ;(async function main () { - // old list - const badgeMeta = await loadBadgeMeta() - await fse.outputJson(rel('../public/.meta/badges.json'), badgeMeta, { - spaces: 2 - }) - - // new list await fse.outputJson(rel('../public/.meta/badge-list.json'), BadgeList2, { spaces: 2 }) From a5c18796957016c9fd89009a18101de246eb9d29 Mon Sep 17 00:00:00 2001 From: Amio Date: Wed, 13 May 2026 19:13:50 +0800 Subject: [PATCH 3/3] chore: fix package-lock.json --- package-lock.json | 102 ---------------------------------------------- 1 file changed, 102 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dd8564c..21a57223 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,11 +44,7 @@ "@types/url-parse": "^1.4.11", "csstype": "^3.2.3", "fs-extra": "^11.3.4", -<<<<<<< HEAD "next": "^16.2.6", -======= - "next": "^16.2.4", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "oxlint": "^1.63.0", "react": "^19.2.5", "react-dom": "^19.2.5", @@ -1406,7 +1402,6 @@ } }, "node_modules/@next/env": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.6.tgz", "integrity": "sha512-gd8HoHN4ufj73WmR3JmVolrpJR47ILK6LouP5xElPglaVxir6e1a7VzvTvDWkOoPXT9rkkTzyCxBu4yeZfZwcw==", @@ -1416,17 +1411,6 @@ "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.6.tgz", "integrity": "sha512-ZJGkkcNfYgrrMkqOdZ7zoLa1TOy0qpcMfk/z4Mh/FKUz40gVO+HNQWqmLxf67Z5WB64DRp0dhEbyHfel+6sJUg==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.4.tgz", - "integrity": "sha512-dKkkOzOSwFYe5RX6y26fZgkSpVAlIOJKQHIiydQcrWH6y/97+RceSOAdjZ14Qa3zLduVUy0TXcn+EiM6t4rPgw==", - "license": "MIT" - }, - "node_modules/@next/swc-darwin-arm64": { - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.4.tgz", - "integrity": "sha512-OXTFFox5EKN1Ym08vfrz+OXxmCcEjT4SFMbNRsWZE99dMqt2Kcusl5MqPXcW232RYkMLQTy0hqgAMEsfEd/l2A==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], @@ -1440,15 +1424,9 @@ } }, "node_modules/@next/swc-darwin-x64": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.6.tgz", "integrity": "sha512-v/YLBHIY132Ced3puBJ7YJKw1lqsCrgcNo2aRJlCEyQrrCeRJlvGlnmxhPxNQI3KE3N1DN5r9TPNPvka3nq5RQ==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.4.tgz", - "integrity": "sha512-XhpVnUfmYWvD3YrXu55XdcAkQtOnvaI6wtQa8fuF5fGoKoxIUZ0kWPtcOfqJEWngFF/lOS9l3+O9CcownhiQxQ==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], @@ -1462,15 +1440,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.6.tgz", "integrity": "sha512-RPOvqlYBbcQjkz9VQQDZ2T2bARIjXZV1KFlt+V2Mr6SW/e4I9fcKsaA0hdyf2FHoTlsV2xnBd5Y912rP/1Ce6w==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.4.tgz", - "integrity": "sha512-Mx/tjlNA3G8kg14QvuGAJ4xBwPk1tUHq56JxZ8CXnZwz1Etz714soCEzGQQzVMz4bEnGPowzkV6Xrp6wAkEWOQ==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], @@ -1487,15 +1459,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.6.tgz", "integrity": "sha512-URUTu1+dMkxJsPFgm+OeEvq9wf5sujw0EvgYy80TDGHTSLTnIHeqb0Eu8A3sC95IRgjejQL+kC4mw+4yPxiAXA==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.4.tgz", - "integrity": "sha512-iVMMp14514u7Nup2umQS03nT/bN9HurK8ufylC3FZNykrwjtx7V1A7+4kvhbDSCeonTVqV3Txnv0Lu+m2oDXNg==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], @@ -1512,15 +1478,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.6.tgz", "integrity": "sha512-DOj182mPV8G3UkrayLoREM5YEYI+Dk5wv7Ox9xl1fFibAELEsFD0lDPfHIeILlutMMfdyhlzYPELG3peuKaurw==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.4.tgz", - "integrity": "sha512-EZOvm1aQWgnI/N/xcWOlnS3RQBk0VtVav5Zo7n4p0A7UKyTDx047k8opDbXgBpHl4CulRqRfbw3QrX2w5UOXMQ==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], @@ -1537,15 +1497,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.6.tgz", "integrity": "sha512-HKQ5SP/V/ub73UvF7n/zeJlxk2kLmtL7Wzrg4WfmkjmNos5onJ2tKu7yZOPdL18A6Svfn3max29ym+ry7NkK4g==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.4.tgz", - "integrity": "sha512-h9FxsngCm9cTBf71AR4fGznDEDx1hS7+kSEiIRjq5kO1oXWm07DxVGZjCvk0SGx7TSjlUqhI8oOyz7NfwAdPoA==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], @@ -1562,15 +1516,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.6.tgz", "integrity": "sha512-LZXpTlPyS5v7HhSmnvsLGP3iIYgYOBnc8r8ArlT55sGHV89bR2HlDdBjWQ+PY6SJMmk8TuVGFuxalnP3k/0Dwg==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.4.tgz", - "integrity": "sha512-3NdJV5OXMSOeJYijX+bjaLge3mJBlh4ybydbT4GFoB/2hAojWHtMhl3CYlYoMrjPuodp0nzFVi4Tj2+WaMg+Ow==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "arm64" ], @@ -1584,15 +1532,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.6.tgz", "integrity": "sha512-F0+4i0h9J6C4eE3EAPWsoCk7UW/dbzOjyzxY0qnDUOYFu6FFmdZ6l97/XdV3/Nz3VYyO7UWjyEJUXkGqcoXfMA==", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.4.tgz", - "integrity": "sha512-kMVGgsqhO5YTYODD9IPGGhA6iprWidQckK3LmPeW08PIFENRmgfb4MjXHO+p//d+ts2rpjvK5gXWzXSMrPl9cw==", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "cpu": [ "x64" ], @@ -2199,12 +2141,9 @@ "arm64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "glibc" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2222,12 +2161,9 @@ "arm64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "musl" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2245,12 +2181,9 @@ "ppc64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "glibc" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2268,12 +2201,9 @@ "riscv64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "glibc" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2291,12 +2221,9 @@ "riscv64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "musl" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2314,12 +2241,9 @@ "s390x" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "glibc" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2337,12 +2261,9 @@ "x64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "glibc" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -2360,12 +2281,9 @@ "x64" ], "dev": true, -<<<<<<< HEAD -======= "libc": [ "musl" ], ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "license": "MIT", "optional": true, "os": [ @@ -5431,21 +5349,12 @@ "peer": true }, "node_modules/next": { -<<<<<<< HEAD "version": "16.2.6", "resolved": "https://registry.npmjs.org/next/-/next-16.2.6.tgz", "integrity": "sha512-qOVgKJg1+At15NpeUP+eJgCHvTCgXsogweq87Ri/Ix7PkqQHg4sdaXmSFqKlgaIXE4kW0g25LE68W87UANlHtw==", "license": "MIT", "dependencies": { "@next/env": "16.2.6", -======= - "version": "16.2.4", - "resolved": "https://registry.npmjs.org/next/-/next-16.2.4.tgz", - "integrity": "sha512-kPvz56wF5frc+FxlHI5qnklCzbq53HTwORaWBGdT0vNoKh1Aya9XC8aPauH4NJxqtzbWsS5mAbctm4cr+EkQ2Q==", - "license": "MIT", - "dependencies": { - "@next/env": "16.2.4", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "@swc/helpers": "0.5.15", "baseline-browser-mapping": "^2.9.19", "caniuse-lite": "^1.0.30001579", @@ -5459,7 +5368,6 @@ "node": ">=20.9.0" }, "optionalDependencies": { -<<<<<<< HEAD "@next/swc-darwin-arm64": "16.2.6", "@next/swc-darwin-x64": "16.2.6", "@next/swc-linux-arm64-gnu": "16.2.6", @@ -5468,16 +5376,6 @@ "@next/swc-linux-x64-musl": "16.2.6", "@next/swc-win32-arm64-msvc": "16.2.6", "@next/swc-win32-x64-msvc": "16.2.6", -======= - "@next/swc-darwin-arm64": "16.2.4", - "@next/swc-darwin-x64": "16.2.4", - "@next/swc-linux-arm64-gnu": "16.2.4", - "@next/swc-linux-arm64-musl": "16.2.4", - "@next/swc-linux-x64-gnu": "16.2.4", - "@next/swc-linux-x64-musl": "16.2.4", - "@next/swc-win32-arm64-msvc": "16.2.4", - "@next/swc-win32-x64-msvc": "16.2.4", ->>>>>>> c609089 (chore(deps): upgrade dependencies and migrate linting to oxlint) "sharp": "^0.34.5" }, "peerDependencies": {