diff --git a/astro.config.mjs b/astro.config.mjs index 6128ab8..71d5b78 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -21,7 +21,11 @@ export default defineConfig({ format: "file", }, output: "hybrid", - adapter: cloudflare(), + adapter: cloudflare({ + platformProxy: { + enabled: true, + }, + }), experimental: { env: { schema: { diff --git a/package-lock.json b/package-lock.json index bb59a8d..0d7680e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,15 +8,15 @@ "name": "avearistov", "version": "0.0.1", "dependencies": { - "@astrojs/check": "^0.7.0", + "@astrojs/check": "^0.8.3", "@astrojs/cloudflare": "^11.0.1", - "@astrojs/react": "^3.5.0", + "@astrojs/react": "^3.6.1", "@astrojs/sitemap": "^3.1.6", "@astrojs/tailwind": "^5.1.0", "@radix-ui/react-slot": "^1.0.2", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", - "astro": "^4.10.1", + "astro": "^4.12.3", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", "lucide-react": "^0.394.0", @@ -55,11 +55,11 @@ } }, "node_modules/@astrojs/check": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@astrojs/check/-/check-0.7.0.tgz", - "integrity": "sha512-UTqwOeKNu9IYZmJXEeWnQuTdSd/pX58Hl4TUARsMlT97SVDL//kLBE4T/ctxRz6J573N87oE5ddtW/uOOnQTug==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/@astrojs/check/-/check-0.8.3.tgz", + "integrity": "sha512-ajcSe+ezX5jCc3dreQlWzbknzXgSGnDETNe3C1mawUOtGpO4t5z2YGaD0y+wzB84lmgPWaWZa0fKSPwLq/wUHw==", "dependencies": { - "@astrojs/language-server": "^2.10.0", + "@astrojs/language-server": "^2.12.7", "chokidar": "^3.5.3", "fast-glob": "^3.3.1", "kleur": "^4.1.5", @@ -484,24 +484,25 @@ "integrity": "sha512-tGmHvrhpzuz0JBHaJX8GywN9g4rldVNHtkoVDC3m/DdzBO70jGoVuc0uuNVglRYnsdwkbG0K02Iw3nOOR3/Y4g==" }, "node_modules/@astrojs/language-server": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.10.0.tgz", - "integrity": "sha512-crHXpqYfA5qWioiuZnZFpTsNItgBlF1f0S9MzDYS7/pfCALkHNJ7K3w9U/j0uMKymsT4hC7BfMaX0DYlfdSzHg==", + "version": "2.12.8", + "resolved": "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.12.8.tgz", + "integrity": "sha512-aUppjqbCdFkd2Cdr8tDtd9id7lAZAmpwpYTQrOm69z8P4NaGUE/ksMIhd0Q99zXfSBjDVC7HlxSjPg8Y7xakfg==", "dependencies": { - "@astrojs/compiler": "^2.7.0", + "@astrojs/compiler": "^2.9.1", "@jridgewell/sourcemap-codec": "^1.4.15", - "@volar/kit": "~2.2.3", - "@volar/language-core": "~2.2.3", - "@volar/language-server": "~2.2.3", - "@volar/language-service": "~2.2.3", - "@volar/typescript": "~2.2.3", + "@volar/kit": "~2.4.0-alpha.15", + "@volar/language-core": "~2.4.0-alpha.15", + "@volar/language-server": "~2.4.0-alpha.15", + "@volar/language-service": "~2.4.0-alpha.15", + "@volar/typescript": "~2.4.0-alpha.15", "fast-glob": "^3.2.12", - "volar-service-css": "0.0.45", - "volar-service-emmet": "0.0.45", - "volar-service-html": "0.0.45", - "volar-service-prettier": "0.0.45", - "volar-service-typescript": "0.0.45", - "volar-service-typescript-twoslash-queries": "0.0.45", + "muggle-string": "^0.4.1", + "volar-service-css": "0.0.59", + "volar-service-emmet": "0.0.59", + "volar-service-html": "0.0.59", + "volar-service-prettier": "0.0.59", + "volar-service-typescript": "0.0.59", + "volar-service-typescript-twoslash-queries": "0.0.59", "vscode-html-languageservice": "^5.2.0", "vscode-uri": "^3.0.8" }, @@ -558,11 +559,11 @@ } }, "node_modules/@astrojs/react": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@astrojs/react/-/react-3.5.0.tgz", - "integrity": "sha512-+xXL2kAvURlCOnWBem4CnoUuy1XW1u284esEHN+i7ds3zcs7lLquDQNRvPu2fSW/auUMcLdllAZC631seXwI8g==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/@astrojs/react/-/react-3.6.1.tgz", + "integrity": "sha512-Mpgu+GYTba1TEzLMshojeLxi7y/FqrTNtpGTCvI366bRbnCkqtvznRj/xPQOTybwXnYXSgxsELyUvqD51iFeiw==", "dependencies": { - "@vitejs/plugin-react": "^4.3.0", + "@vitejs/plugin-react": "^4.3.1", "ultrahtml": "^1.5.3" }, "engines": { @@ -2472,12 +2473,12 @@ } }, "node_modules/@volar/kit": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/kit/-/kit-2.2.5.tgz", - "integrity": "sha512-Bmn0UCaT43xUGGRwcmFG9lKhiCCLjRT4ScSLLPn5C9ltUcSGnIFFDlbZZa1PreHYHq25/4zkXt9Ap32klAh17w==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/kit/-/kit-2.4.0-alpha.18.tgz", + "integrity": "sha512-dZMSNhesh23lhd61ax2l04IgIcYofAjm8M+5BKAmX47ROweyc8RrrslszCFUJynlmXx6JS1PoHqvo8+E0aAYQQ==", "dependencies": { - "@volar/language-service": "2.2.5", - "@volar/typescript": "2.2.5", + "@volar/language-service": "2.4.0-alpha.18", + "@volar/typescript": "2.4.0-alpha.18", "typesafe-path": "^0.2.2", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" @@ -2487,23 +2488,22 @@ } }, "node_modules/@volar/language-core": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.2.5.tgz", - "integrity": "sha512-2htyAuxRrAgETmFeUhT4XLELk3LiEcqoW/B8YUXMF6BrGWLMwIR09MFaZYvrA2UhbdAeSyeQ726HaWSWkexUcQ==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz", + "integrity": "sha512-JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==", "dependencies": { - "@volar/source-map": "2.2.5" + "@volar/source-map": "2.4.0-alpha.18" } }, "node_modules/@volar/language-server": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.2.5.tgz", - "integrity": "sha512-PV/jkUkI+m72HTXwnY7hsGqLY3VNi96ZRoWFRzVC9QG/853bixxjveXPJIiydMJ9I739lO3kcj3hnGrF5Sm+HA==", - "dependencies": { - "@volar/language-core": "2.2.5", - "@volar/language-service": "2.2.5", - "@volar/snapshot-document": "2.2.5", - "@volar/typescript": "2.2.5", - "@vscode/l10n": "^0.0.16", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.18.tgz", + "integrity": "sha512-dciHEE/R5kzI0bY71QfkoCVQ3cQI6g9MHfA4oIP6UhnJy0CdleUalWSygOXoD3Nq7Yk6wn2BRrb1PP5MsadY/Q==", + "dependencies": { + "@volar/language-core": "2.4.0-alpha.18", + "@volar/language-service": "2.4.0-alpha.18", + "@volar/snapshot-document": "2.4.0-alpha.18", + "@volar/typescript": "2.4.0-alpha.18", "path-browserify": "^1.0.1", "request-light": "^0.7.0", "vscode-languageserver": "^9.0.1", @@ -2513,40 +2513,38 @@ } }, "node_modules/@volar/language-service": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.2.5.tgz", - "integrity": "sha512-a97e/0uCe+uSu23F4zvgvldqJtZe6jugQeEHWjTfhgOEO8+Be0t5CZNNVItQqmPyAsD8eElg0S/cP6uxvCmCSQ==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz", + "integrity": "sha512-EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog==", "dependencies": { - "@volar/language-core": "2.2.5", + "@volar/language-core": "2.4.0-alpha.18", "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" } }, "node_modules/@volar/snapshot-document": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.2.5.tgz", - "integrity": "sha512-MTOvWVKxM7ugKO3Amffkv2pND03fe2JtfygYaputqjVFML7YxtTXj8SPnI2pODLeSwOKzDYL6Q8r5j6Y5AgUzQ==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.18.tgz", + "integrity": "sha512-JAeclEly/wnILhR4Pu9MpgBLInZJH49O1zoy8fU+pk5I+zpv7JIEby5z2UFAS60+sIDnxBdAGd7rZ5VibE70vg==", "dependencies": { "vscode-languageserver-protocol": "^3.17.5", "vscode-languageserver-textdocument": "^1.0.11" } }, "node_modules/@volar/source-map": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.2.5.tgz", - "integrity": "sha512-wrOEIiZNf4E+PWB0AxyM4tfhkfldPsb3bxg8N6FHrxJH2ohar7aGu48e98bp3pR9HUA7P/pR9VrLmkTrgCCnWQ==", - "dependencies": { - "muggle-string": "^0.4.0" - } + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz", + "integrity": "sha512-MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==" }, "node_modules/@volar/typescript": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.2.5.tgz", - "integrity": "sha512-eSV/n75+ppfEVugMC/salZsI44nXDPAyL6+iTYCNLtiLHGJsnMv9GwiDMujrvAUj/aLQyqRJgYtXRoxop2clCw==", + "version": "2.4.0-alpha.18", + "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz", + "integrity": "sha512-sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==", "dependencies": { - "@volar/language-core": "2.2.5", - "path-browserify": "^1.0.1" + "@volar/language-core": "2.4.0-alpha.18", + "path-browserify": "^1.0.1", + "vscode-uri": "^3.0.8" } }, "node_modules/@vscode/emmet-helper": { @@ -2567,9 +2565,9 @@ "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==" }, "node_modules/@vscode/l10n": { - "version": "0.0.16", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.16.tgz", - "integrity": "sha512-JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg==" + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", + "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" }, "node_modules/acorn": { "version": "8.12.1", @@ -7163,9 +7161,9 @@ } }, "node_modules/typescript-auto-import-cache": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz", - "integrity": "sha512-+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz", + "integrity": "sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==", "dependencies": { "semver": "^7.3.8" } @@ -7496,16 +7494,16 @@ } }, "node_modules/volar-service-css": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.45.tgz", - "integrity": "sha512-f+AlUI1+kESbcZSVaNJVAnK0c/9Da5StoxzPqA5/8VqUHJWNdubWNnwG5xpFVTfgh6pgTcey3UBhBfHytFaIOg==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz", + "integrity": "sha512-gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA==", "dependencies": { - "vscode-css-languageservice": "^6.2.10", + "vscode-css-languageservice": "^6.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.2.3" + "@volar/language-service": "~2.4.0-alpha.12" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -7514,16 +7512,17 @@ } }, "node_modules/volar-service-emmet": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.45.tgz", - "integrity": "sha512-9nLXSDkR1vA/3fQkFEsSXAu3XovQxOpTkVG2jilQgfek/K1ZLkaA/WMhN/TtmPmQg4NxE9Ni6mA5udBQ5gVXIA==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz", + "integrity": "sha512-6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q==", "dependencies": { "@emmetio/css-parser": "^0.4.0", "@emmetio/html-matcher": "^1.3.0", - "@vscode/emmet-helper": "^2.9.2" + "@vscode/emmet-helper": "^2.9.3", + "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.2.3" + "@volar/language-service": "~2.4.0-alpha.12" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -7532,16 +7531,16 @@ } }, "node_modules/volar-service-html": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.45.tgz", - "integrity": "sha512-tLTJqfy1v5C4nmeAsfekFIKPl4r4qDMyL0L9MWywr/EApZzPCsbeUGxCqdzxSMC2q7PMCfX2i167txDo+J0LVA==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz", + "integrity": "sha512-hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q==", "dependencies": { - "vscode-html-languageservice": "npm:@johnsoncodehk/vscode-html-languageservice@5.2.0-34a5462", + "vscode-html-languageservice": "^5.3.0", "vscode-languageserver-textdocument": "^1.0.11", "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.2.3" + "@volar/language-service": "~2.4.0-alpha.12" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -7549,32 +7548,15 @@ } } }, - "node_modules/volar-service-html/node_modules/@vscode/l10n": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" - }, - "node_modules/volar-service-html/node_modules/vscode-html-languageservice": { - "name": "@johnsoncodehk/vscode-html-languageservice", - "version": "5.2.0-34a5462", - "resolved": "https://registry.npmjs.org/@johnsoncodehk/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0-34a5462.tgz", - "integrity": "sha512-etqLfpSJ5zaw76KUNF603be6d6QsiQPmaHr9FKEp4zhLZJzWCCMH6Icak7MtLUFLZLMpL761mZNImi/joBo1ZA==", - "dependencies": { - "@vscode/l10n": "^0.0.18", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-languageserver-types": "^3.17.5", - "vscode-uri": "^3.0.8" - } - }, "node_modules/volar-service-prettier": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.45.tgz", - "integrity": "sha512-+mBS2EsDgp/kunKEBnHvhBwIQm5v2ahw4NKpKdg4sTpXy3UxqHt+Fq/wRYQ7Z8LlNVNRVfp75ThjM+w2zaZBAw==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.59.tgz", + "integrity": "sha512-FmBR4lsgFRGR3V0LnxZZal0WqdOJjuLL6mQSj4p57M15APtQwuocG/FiF+ONGFnwRXMOIBDBTCARdth+TKgL3A==", "dependencies": { "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.2.3", + "@volar/language-service": "~2.4.0-alpha.12", "prettier": "^2.2 || ^3.0" }, "peerDependenciesMeta": { @@ -7587,18 +7569,19 @@ } }, "node_modules/volar-service-typescript": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.45.tgz", - "integrity": "sha512-i/mMIIAMastJ2kgPo3qvX0Rrl7NyxhIYZ0ug/B4ambZcLPI1vzBgS2fmvyWX3jhBYHh8NmbAotFj+0Y9JtN47A==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz", + "integrity": "sha512-VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==", "dependencies": { "path-browserify": "^1.0.1", - "semver": "^7.5.4", - "typescript-auto-import-cache": "^0.3.1", + "semver": "^7.6.2", + "typescript-auto-import-cache": "^0.3.3", "vscode-languageserver-textdocument": "^1.0.11", - "vscode-nls": "^5.2.0" + "vscode-nls": "^5.2.0", + "vscode-uri": "^3.0.8" }, "peerDependencies": { - "@volar/language-service": "~2.2.3" + "@volar/language-service": "~2.4.0-alpha.12" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -7607,11 +7590,14 @@ } }, "node_modules/volar-service-typescript-twoslash-queries": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.45.tgz", - "integrity": "sha512-KrPUUvKggZgV9mrDpstCzmf20irgv0ooMv+FGDzIIQUkya+d2+nSS8Mx2h9FvsYgLccUVw5jU3Rhwhd3pv/7qg==", + "version": "0.0.59", + "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz", + "integrity": "sha512-skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ==", + "dependencies": { + "vscode-uri": "^3.0.8" + }, "peerDependencies": { - "@volar/language-service": "~2.2.3" + "@volar/language-service": "~2.4.0-alpha.12" }, "peerDependenciesMeta": { "@volar/language-service": { @@ -7620,9 +7606,9 @@ } }, "node_modules/vscode-css-languageservice": { - "version": "6.2.14", - "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz", - "integrity": "sha512-5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz", + "integrity": "sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.11", @@ -7630,15 +7616,10 @@ "vscode-uri": "^3.0.8" } }, - "node_modules/vscode-css-languageservice/node_modules/@vscode/l10n": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" - }, "node_modules/vscode-html-languageservice": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0.tgz", - "integrity": "sha512-cdNMhyw57/SQzgUUGSIMQ66jikqEN6nBNyhx5YuOyj9310+eY9zw8Q0cXpiKzDX8aHYFewQEXRnigl06j/TVwQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz", + "integrity": "sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==", "dependencies": { "@vscode/l10n": "^0.0.18", "vscode-languageserver-textdocument": "^1.0.11", @@ -7646,11 +7627,6 @@ "vscode-uri": "^3.0.8" } }, - "node_modules/vscode-html-languageservice/node_modules/@vscode/l10n": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz", - "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==" - }, "node_modules/vscode-jsonrpc": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz", diff --git a/package.json b/package.json index 021afac..45e6a47 100644 --- a/package.json +++ b/package.json @@ -12,15 +12,15 @@ "size": "size-limit" }, "dependencies": { - "@astrojs/check": "^0.7.0", + "@astrojs/check": "^0.8.3", "@astrojs/cloudflare": "^11.0.1", - "@astrojs/react": "^3.5.0", + "@astrojs/react": "^3.6.1", "@astrojs/sitemap": "^3.1.6", "@astrojs/tailwind": "^5.1.0", "@radix-ui/react-slot": "^1.0.2", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", - "astro": "^4.10.1", + "astro": "^4.12.3", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", "lucide-react": "^0.394.0", @@ -55,4 +55,3 @@ } ] } - diff --git a/src/pages/oauth/_config.ts b/src/pages/oauth/_config.ts deleted file mode 100644 index 14cd7a4..0000000 --- a/src/pages/oauth/_config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { getSecret } from "astro:env/server"; - -export const clientId = getSecret("OAUTH_GITHUB_CLIENT_ID"); -export const clientSecret = getSecret("OAUTH_GITHUB_CLIENT_SECRET"); - -export const authUrl = `https://github.com/login/oauth/authorize?client_id=${clientId}&scope=repo,user`; -export const tokenUrl = "https://github.com/login/oauth/access_token"; - -export const prerender = "false"; - diff --git a/src/pages/oauth/callback.ts b/src/pages/oauth/callback.ts index f873240..5ceb14d 100644 --- a/src/pages/oauth/callback.ts +++ b/src/pages/oauth/callback.ts @@ -3,18 +3,15 @@ import type { APIRoute } from "astro"; import { OAUTH_GITHUB_CLIENT_ID, OAUTH_GITHUB_CLIENT_SECRET, - getSecret, } from "astro:env/server"; export const GET: APIRoute = async ({ url, redirect }) => { - const clientId = getSecret(OAUTH_GITHUB_CLIENT_ID); - const clientSecret = getSecret(OAUTH_GITHUB_CLIENT_SECRET); const tokenUrl = "https://github.com/login/oauth/access_token"; const data = { code: url.searchParams.get("code"), - client_id: clientId, - client_secret: clientSecret, + client_id: OAUTH_GITHUB_CLIENT_ID, + client_secret: OAUTH_GITHUB_CLIENT_SECRET, }; try { diff --git a/src/pages/oauth/index.ts b/src/pages/oauth/index.ts index 346b9d4..77e766f 100644 --- a/src/pages/oauth/index.ts +++ b/src/pages/oauth/index.ts @@ -1,10 +1,8 @@ export const prerender = "false"; import type { APIRoute } from "astro"; -import { OAUTH_GITHUB_CLIENT_ID, getSecret } from "astro:env/server"; +import { OAUTH_GITHUB_CLIENT_ID } from "astro:env/server"; export const GET: APIRoute = ({ redirect }) => { - const clientId = getSecret(OAUTH_GITHUB_CLIENT_ID); - const authUrl = `https://github.com/login/oauth/authorize?client_id=${clientId}&scope=repo,user`; + const authUrl = `https://github.com/login/oauth/authorize?client_id=${OAUTH_GITHUB_CLIENT_ID}&scope=repo,user`; return redirect(authUrl); }; -