bubble/yarkov.tech
1
0
Fork 0
mirror of https://github.com/sergeyyarkov/yarkov.tech.git synced 2026-10-11 18:39:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: render articles with multiple translations

Browse Source
This commit is contained in:
Sergey Yarkov 2022-08-17 13:57:57 +03:00
parent c9a45efccd
commit b00382f1cc
12 changed files with 238 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -11,8 +11,8 @@ Personal website created with Astro.
- [x] Adaptive & Responsive layout - [x] Adaptive & Responsive layout
- [x] Search articles by title or description - [x] Search articles by title or description
- [x] Dark/Light Theme - [x] Dark/Light Theme
- [x] Form handling via Netlify Forms
- [ ] Multilang web-site - [ ] Multilang web-site
- [ ] Form handling via Netlify Forms
- [ ] SEO optimized - [ ] SEO optimized
## License ## License

557
package-lock.json generated
View File

@ -10,15 +10,15 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@astrojs/image": "^0.3.4", "@astrojs/image": "^0.3.4",
"@astrojs/mdx": "^0.9.0", "@astrojs/mdx": "^0.10.0",
"@astrojs/solid-js": "^1.0.0", "@astrojs/solid-js": "^1.0.0",
"@types/mdx": "^2.0.2", "@types/mdx": "^2.0.2",
"@typescript-eslint/eslint-plugin": "^5.33.0", "@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.0", "@typescript-eslint/parser": "^5.33.1",
"astro": "^1.0.4", "astro": "^1.0.6",
"astro-compress": "^0.0.18", "astro-compress": "^0.0.19",
"astro-icon": "^0.7.3", "astro-icon": "^0.7.3",
"eslint": "^8.21.0", "eslint": "^8.22.0",
"eslint-plugin-solid": "^0.7.1", "eslint-plugin-solid": "^0.7.1",
"hast-util-to-string": "^2.0.0", "hast-util-to-string": "^2.0.0",
"hastscript": "^7.0.2", "hastscript": "^7.0.2",
@ -130,9 +130,9 @@
} }
}, },
"node_modules/@astrojs/mdx": { "node_modules/@astrojs/mdx": {
"version": "0.9.0", "version": "0.10.0",
"resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.9.0.tgz", "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.10.0.tgz",
"integrity": "sha512-Z6W7YvCc36BenJZGkcG0oFi01OswR6KhUDWXL06prhgu51YSlKrpcvpykruGXaDQb1YkqGi3yxmWAmQwzgx6pQ==", "integrity": "sha512-nQcYzjPB8p0KWyP8g/8V6Rnxd7+5/VzNP4JLvQWUFs6mo7Akq98y4i+QjOl9/k5erzikl96Uul70MS/rjBheNQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@astrojs/prism": "^1.0.1", "@astrojs/prism": "^1.0.1",
@ -145,7 +145,6 @@
"rehype-raw": "^6.1.1", "rehype-raw": "^6.1.1",
"remark-frontmatter": "^4.0.1", "remark-frontmatter": "^4.0.1",
"remark-gfm": "^3.0.1", "remark-gfm": "^3.0.1",
"remark-shiki-twoslash": "^3.1.0",
"remark-smartypants": "^2.0.0", "remark-smartypants": "^2.0.0",
"shiki": "^0.10.1", "shiki": "^0.10.1",
"unist-util-visit": "^4.1.0", "unist-util-visit": "^4.1.0",
@ -1046,14 +1045,14 @@
"dev": true "dev": true
}, },
"node_modules/@typescript-eslint/eslint-plugin": { "node_modules/@typescript-eslint/eslint-plugin": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
"integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==", "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.33.0", "@typescript-eslint/scope-manager": "5.33.1",
"@typescript-eslint/type-utils": "5.33.0", "@typescript-eslint/type-utils": "5.33.1",
"@typescript-eslint/utils": "5.33.0", "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0", "ignore": "^5.2.0",
@ -1094,14 +1093,14 @@
} }
}, },
"node_modules/@typescript-eslint/parser": { "node_modules/@typescript-eslint/parser": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
"integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==", "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/scope-manager": "5.33.0", "@typescript-eslint/scope-manager": "5.33.1",
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/typescript-estree": "5.33.0", "@typescript-eslint/typescript-estree": "5.33.1",
"debug": "^4.3.4" "debug": "^4.3.4"
}, },
"engines": { "engines": {
@ -1121,13 +1120,13 @@
} }
}, },
"node_modules/@typescript-eslint/scope-manager": { "node_modules/@typescript-eslint/scope-manager": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
"integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==", "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/visitor-keys": "5.33.0" "@typescript-eslint/visitor-keys": "5.33.1"
}, },
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -1138,12 +1137,12 @@
} }
}, },
"node_modules/@typescript-eslint/type-utils": { "node_modules/@typescript-eslint/type-utils": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
"integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==", "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/utils": "5.33.0", "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
}, },
@ -1164,9 +1163,9 @@
} }
}, },
"node_modules/@typescript-eslint/types": { "node_modules/@typescript-eslint/types": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
"integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==", "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0" "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@ -1177,13 +1176,13 @@
} }
}, },
"node_modules/@typescript-eslint/typescript-estree": { "node_modules/@typescript-eslint/typescript-estree": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
"integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==", "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/visitor-keys": "5.33.0", "@typescript-eslint/visitor-keys": "5.33.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -1219,15 +1218,15 @@
} }
}, },
"node_modules/@typescript-eslint/utils": { "node_modules/@typescript-eslint/utils": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
"integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==", "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/json-schema": "^7.0.9", "@types/json-schema": "^7.0.9",
"@typescript-eslint/scope-manager": "5.33.0", "@typescript-eslint/scope-manager": "5.33.1",
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/typescript-estree": "5.33.0", "@typescript-eslint/typescript-estree": "5.33.1",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0" "eslint-utils": "^3.0.0"
}, },
@ -1243,12 +1242,12 @@
} }
}, },
"node_modules/@typescript-eslint/visitor-keys": { "node_modules/@typescript-eslint/visitor-keys": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
"integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==", "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
}, },
"engines": { "engines": {
@ -1259,35 +1258,6 @@
"url": "https://opencollective.com/typescript-eslint" "url": "https://opencollective.com/typescript-eslint"
} }
}, },
"node_modules/@typescript/twoslash": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@typescript/twoslash/-/twoslash-3.1.0.tgz",
"integrity": "sha512-kTwMUQ8xtAZaC4wb2XuLkPqFVBj2dNBueMQ89NWEuw87k2nLBbuafeG5cob/QEr6YduxIdTVUjix0MtC7mPlmg==",
"dev": true,
"dependencies": {
"@typescript/vfs": "1.3.5",
"debug": "^4.1.1",
"lz-string": "^1.4.4"
}
},
"node_modules/@typescript/twoslash/node_modules/@typescript/vfs": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.5.tgz",
"integrity": "sha512-pI8Saqjupf9MfLw7w2+og+fmb0fZS0J6vsKXXrp4/PDXEFvntgzXmChCXC/KefZZS0YGS6AT8e0hGAJcTsdJlg==",
"dev": true,
"dependencies": {
"debug": "^4.1.1"
}
},
"node_modules/@typescript/vfs": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.4.tgz",
"integrity": "sha512-RbyJiaAGQPIcAGWFa3jAXSuAexU4BFiDRF1g3hy7LmRqfNpYlTQWGXjcrOaVZjJ8YkkpuwG0FcsYvtWQpd9igQ==",
"dev": true,
"dependencies": {
"debug": "^4.1.1"
}
},
"node_modules/@vscode/emmet-helper": { "node_modules/@vscode/emmet-helper": {
"version": "2.8.4", "version": "2.8.4",
"resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz",
@ -1498,9 +1468,9 @@
} }
}, },
"node_modules/astro": { "node_modules/astro": {
"version": "1.0.4", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/astro/-/astro-1.0.4.tgz", "resolved": "https://registry.npmjs.org/astro/-/astro-1.0.6.tgz",
"integrity": "sha512-wNXmDSHnhiFcEeMy2VWMJV1i8mPx8Lu4qLBfZSmP9nWrc/oxgBZfDQTWOj0/NFu+MkfZ2JEGJlL9RZFmHrKlew==", "integrity": "sha512-QAkdkzP3PbauiO4YnOgVTWY6z26heKruoXW9TnN8Bbmwtf7DUFIchi6CFSAVYSONX8XtRnj+p6fCkk06OWfJ4w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@astrojs/compiler": "^0.23.3", "@astrojs/compiler": "^0.23.3",
@ -1568,15 +1538,15 @@
} }
}, },
"node_modules/astro-compress": { "node_modules/astro-compress": {
"version": "0.0.18", "version": "0.0.19",
"resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.18.tgz", "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.19.tgz",
"integrity": "sha512-6AaT8vlJkXYyImIQ70+bCkPTPfgSfvw3T+S9AOlSv65GFf1pZBuhO5nRuCg2jtEVBw4Eo/T4qC9khYbd6cVsWA==", "integrity": "sha512-Hgv1wX43vOwzUNuqRm7hbCMUXoH2xF+kTjBR+6RqAbM6hjqIlB8aKEGOVdELj6BiwnMDLf1dl6C1TmYPPgDMAg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"csso": "5.0.5", "csso": "5.0.5",
"deepmerge-ts": "4.2.1", "deepmerge-ts": "4.2.1",
"fast-glob": "3.2.11", "fast-glob": "3.2.11",
"html-minifier-terser": "6.1.0", "html-minifier-terser": "7.0.0",
"sharp": "0.30.7", "sharp": "0.30.7",
"svgo": "2.8.0", "svgo": "2.8.0",
"terser": "5.14.2" "terser": "5.14.2"
@ -2069,9 +2039,9 @@
"dev": true "dev": true
}, },
"node_modules/clean-css": { "node_modules/clean-css": {
"version": "5.3.1", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.0.tgz",
"integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==", "integrity": "sha512-2639sWGa43EMmG7fn8mdVuBSs6HuWaSor+ZPoFWzenBc6oN+td8YhTfghWXZ25G1NiiSvz8bOFBS7PdSbTiqEA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
@ -2204,12 +2174,12 @@
} }
}, },
"node_modules/commander": { "node_modules/commander": {
"version": "8.3.0", "version": "9.4.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">= 12" "node": "^12.20.0 || >=14"
} }
}, },
"node_modules/common-ancestor-path": { "node_modules/common-ancestor-path": {
@ -3041,9 +3011,9 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.21.0", "version": "8.22.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
"integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^1.3.0", "@eslint/eslintrc": "^1.3.0",
@ -3610,15 +3580,6 @@
"url": "https://github.com/sponsors/wooorm" "url": "https://github.com/sponsors/wooorm"
} }
}, },
"node_modules/fenceparser": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/fenceparser/-/fenceparser-1.1.1.tgz",
"integrity": "sha512-VdkTsK7GWLT0VWMK5S5WTAPn61wJ98WPFwJiRHumhg4ESNUO/tnkU8bzzzc62o6Uk1SVhuZFLnakmDA4SGV7wA==",
"dev": true,
"engines": {
"node": ">=12"
}
},
"node_modules/fetch-blob": { "node_modules/fetch-blob": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
@ -4300,15 +4261,6 @@
"url": "https://opencollective.com/unified" "url": "https://opencollective.com/unified"
} }
}, },
"node_modules/he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true,
"bin": {
"he": "bin/he"
}
},
"node_modules/html-entities": { "node_modules/html-entities": {
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
@ -4322,24 +4274,36 @@
"dev": true "dev": true
}, },
"node_modules/html-minifier-terser": { "node_modules/html-minifier-terser": {
"version": "6.1.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.0.0.tgz",
"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", "integrity": "sha512-Adqk0b/pWKIQiGvEAuzPKpBKNHiwblr3QSGS7TTr6v+xXKV9AI2k4vWW+6Oytt6Z5SeBnfvYypKOnz8r75pz3Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"camel-case": "^4.1.2", "camel-case": "^4.1.2",
"clean-css": "^5.2.2", "clean-css": "5.2.0",
"commander": "^8.3.0", "commander": "^9.4.0",
"he": "^1.2.0", "entities": "^4.3.1",
"param-case": "^3.0.4", "param-case": "^3.0.4",
"relateurl": "^0.2.7", "relateurl": "^0.2.7",
"terser": "^5.10.0" "terser": "^5.14.2"
}, },
"bin": { "bin": {
"html-minifier-terser": "cli.js" "html-minifier-terser": "cli.js"
}, },
"engines": { "engines": {
"node": ">=12" "node": "^14.13.1 || >=16.0.0"
}
},
"node_modules/html-minifier-terser/node_modules/entities": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz",
"integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==",
"dev": true,
"engines": {
"node": ">=0.12"
},
"funding": {
"url": "https://github.com/fb55/entities?sponsor=1"
} }
}, },
"node_modules/html-tags": { "node_modules/html-tags": {
@ -5143,15 +5107,6 @@
"node": ">=10" "node": ">=10"
} }
}, },
"node_modules/lz-string": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
"integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==",
"dev": true,
"bin": {
"lz-string": "bin/bin.js"
}
},
"node_modules/magic-string": { "node_modules/magic-string": {
"version": "0.25.9", "version": "0.25.9",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@ -7252,12 +7207,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/regenerator-runtime": {
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
"dev": true
},
"node_modules/regexp.prototype.flags": { "node_modules/regexp.prototype.flags": {
"version": "1.4.3", "version": "1.4.3",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@ -7473,68 +7422,6 @@
"url": "https://opencollective.com/unified" "url": "https://opencollective.com/unified"
} }
}, },
"node_modules/remark-shiki-twoslash": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/remark-shiki-twoslash/-/remark-shiki-twoslash-3.1.0.tgz",
"integrity": "sha512-6LqSqVtHQR4S0DKfdQ2/ePn9loTKUtpyopYvwk8johjDTeUW5MkaLQuZHlWNkkST/4aMbz6aTkstIcwfwcHpXg==",
"dev": true,
"dependencies": {
"@typescript/twoslash": "3.1.0",
"@typescript/vfs": "1.3.4",
"fenceparser": "^1.1.0",
"regenerator-runtime": "^0.13.7",
"shiki": "0.10.1",
"shiki-twoslash": "3.1.0",
"tslib": "2.1.0",
"typescript": ">3",
"unist-util-visit": "^2.0.0"
}
},
"node_modules/remark-shiki-twoslash/node_modules/tslib": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
"integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
"dev": true
},
"node_modules/remark-shiki-twoslash/node_modules/unist-util-is": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
"dev": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/remark-shiki-twoslash/node_modules/unist-util-visit": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
"dev": true,
"dependencies": {
"@types/unist": "^2.0.0",
"unist-util-is": "^4.0.0",
"unist-util-visit-parents": "^3.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/remark-shiki-twoslash/node_modules/unist-util-visit-parents": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
"dev": true,
"dependencies": {
"@types/unist": "^2.0.0",
"unist-util-is": "^4.0.0"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/unified"
}
},
"node_modules/remark-smartypants": { "node_modules/remark-smartypants": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz", "resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz",
@ -7930,18 +7817,6 @@
"vscode-textmate": "5.2.0" "vscode-textmate": "5.2.0"
} }
}, },
"node_modules/shiki-twoslash": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/shiki-twoslash/-/shiki-twoslash-3.1.0.tgz",
"integrity": "sha512-uDqrTutOIZzyHbo103GsK7Vvc10saK1XCCivnOQ1NHJzgp3FBilEpftGeVzVSMOJs+JyhI7whkvhXV7kXQ5zCg==",
"dev": true,
"dependencies": {
"@typescript/twoslash": "3.1.0",
"@typescript/vfs": "1.3.4",
"shiki": "0.10.1",
"typescript": ">3"
}
},
"node_modules/shiki/node_modules/jsonc-parser": { "node_modules/shiki/node_modules/jsonc-parser": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz",
@ -8673,6 +8548,7 @@
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
"integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
"dev": true, "dev": true,
"peer": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
"tsserver": "bin/tsserver" "tsserver": "bin/tsserver"
@ -9412,9 +9288,9 @@
} }
}, },
"@astrojs/mdx": { "@astrojs/mdx": {
"version": "0.9.0", "version": "0.10.0",
"resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.9.0.tgz", "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-0.10.0.tgz",
"integrity": "sha512-Z6W7YvCc36BenJZGkcG0oFi01OswR6KhUDWXL06prhgu51YSlKrpcvpykruGXaDQb1YkqGi3yxmWAmQwzgx6pQ==", "integrity": "sha512-nQcYzjPB8p0KWyP8g/8V6Rnxd7+5/VzNP4JLvQWUFs6mo7Akq98y4i+QjOl9/k5erzikl96Uul70MS/rjBheNQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@astrojs/prism": "^1.0.1", "@astrojs/prism": "^1.0.1",
@ -9427,7 +9303,6 @@
"rehype-raw": "^6.1.1", "rehype-raw": "^6.1.1",
"remark-frontmatter": "^4.0.1", "remark-frontmatter": "^4.0.1",
"remark-gfm": "^3.0.1", "remark-gfm": "^3.0.1",
"remark-shiki-twoslash": "^3.1.0",
"remark-smartypants": "^2.0.0", "remark-smartypants": "^2.0.0",
"shiki": "^0.10.1", "shiki": "^0.10.1",
"unist-util-visit": "^4.1.0", "unist-util-visit": "^4.1.0",
@ -10149,14 +10024,14 @@
"dev": true "dev": true
}, },
"@typescript-eslint/eslint-plugin": { "@typescript-eslint/eslint-plugin": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
"integrity": "sha512-jHvZNSW2WZ31OPJ3enhLrEKvAZNyAFWZ6rx9tUwaessTc4sx9KmgMNhVcqVAl1ETnT5rU5fpXTLmY9YvC1DCNg==", "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "5.33.0", "@typescript-eslint/scope-manager": "5.33.1",
"@typescript-eslint/type-utils": "5.33.0", "@typescript-eslint/type-utils": "5.33.1",
"@typescript-eslint/utils": "5.33.0", "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0", "ignore": "^5.2.0",
@ -10177,52 +10052,52 @@
} }
}, },
"@typescript-eslint/parser": { "@typescript-eslint/parser": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
"integrity": "sha512-cgM5cJrWmrDV2KpvlcSkelTBASAs1mgqq+IUGKJvFxWrapHpaRy5EXPQz9YaKF3nZ8KY18ILTiVpUtbIac86/w==", "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/scope-manager": "5.33.0", "@typescript-eslint/scope-manager": "5.33.1",
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/typescript-estree": "5.33.0", "@typescript-eslint/typescript-estree": "5.33.1",
"debug": "^4.3.4" "debug": "^4.3.4"
} }
}, },
"@typescript-eslint/scope-manager": { "@typescript-eslint/scope-manager": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
"integrity": "sha512-/Jta8yMNpXYpRDl8EwF/M8It2A9sFJTubDo0ATZefGXmOqlaBffEw0ZbkbQ7TNDK6q55NPHFshGBPAZvZkE8Pw==", "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/visitor-keys": "5.33.0" "@typescript-eslint/visitor-keys": "5.33.1"
} }
}, },
"@typescript-eslint/type-utils": { "@typescript-eslint/type-utils": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
"integrity": "sha512-2zB8uEn7hEH2pBeyk3NpzX1p3lF9dKrEbnXq1F7YkpZ6hlyqb2yZujqgRGqXgRBTHWIUG3NGx/WeZk224UKlIA==", "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/utils": "5.33.0", "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"tsutils": "^3.21.0" "tsutils": "^3.21.0"
} }
}, },
"@typescript-eslint/types": { "@typescript-eslint/types": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
"integrity": "sha512-nIMt96JngB4MYFYXpZ/3ZNU4GWPNdBbcB5w2rDOCpXOVUkhtNlG2mmm8uXhubhidRZdwMaMBap7Uk8SZMU/ppw==", "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==",
"dev": true "dev": true
}, },
"@typescript-eslint/typescript-estree": { "@typescript-eslint/typescript-estree": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
"integrity": "sha512-tqq3MRLlggkJKJUrzM6wltk8NckKyyorCSGMq4eVkyL5sDYzJJcMgZATqmF8fLdsWrW7OjjIZ1m9v81vKcaqwQ==", "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/visitor-keys": "5.33.0", "@typescript-eslint/visitor-keys": "5.33.1",
"debug": "^4.3.4", "debug": "^4.3.4",
"globby": "^11.1.0", "globby": "^11.1.0",
"is-glob": "^4.0.3", "is-glob": "^4.0.3",
@ -10242,60 +10117,29 @@
} }
}, },
"@typescript-eslint/utils": { "@typescript-eslint/utils": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
"integrity": "sha512-JxOAnXt9oZjXLIiXb5ZIcZXiwVHCkqZgof0O8KPgz7C7y0HS42gi75PdPlqh1Tf109M0fyUw45Ao6JLo7S5AHw==", "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/json-schema": "^7.0.9", "@types/json-schema": "^7.0.9",
"@typescript-eslint/scope-manager": "5.33.0", "@typescript-eslint/scope-manager": "5.33.1",
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"@typescript-eslint/typescript-estree": "5.33.0", "@typescript-eslint/typescript-estree": "5.33.1",
"eslint-scope": "^5.1.1", "eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0" "eslint-utils": "^3.0.0"
} }
}, },
"@typescript-eslint/visitor-keys": { "@typescript-eslint/visitor-keys": {
"version": "5.33.0", "version": "5.33.1",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.0.tgz", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
"integrity": "sha512-/XsqCzD4t+Y9p5wd9HZiptuGKBlaZO5showwqODii5C0nZawxWLF+Q6k5wYHBrQv96h6GYKyqqMHCSTqta8Kiw==", "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@typescript-eslint/types": "5.33.0", "@typescript-eslint/types": "5.33.1",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
} }
}, },
"@typescript/twoslash": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@typescript/twoslash/-/twoslash-3.1.0.tgz",
"integrity": "sha512-kTwMUQ8xtAZaC4wb2XuLkPqFVBj2dNBueMQ89NWEuw87k2nLBbuafeG5cob/QEr6YduxIdTVUjix0MtC7mPlmg==",
"dev": true,
"requires": {
"@typescript/vfs": "1.3.5",
"debug": "^4.1.1",
"lz-string": "^1.4.4"
},
"dependencies": {
"@typescript/vfs": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.5.tgz",
"integrity": "sha512-pI8Saqjupf9MfLw7w2+og+fmb0fZS0J6vsKXXrp4/PDXEFvntgzXmChCXC/KefZZS0YGS6AT8e0hGAJcTsdJlg==",
"dev": true,
"requires": {
"debug": "^4.1.1"
}
}
}
},
"@typescript/vfs": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.3.4.tgz",
"integrity": "sha512-RbyJiaAGQPIcAGWFa3jAXSuAexU4BFiDRF1g3hy7LmRqfNpYlTQWGXjcrOaVZjJ8YkkpuwG0FcsYvtWQpd9igQ==",
"dev": true,
"requires": {
"debug": "^4.1.1"
}
},
"@vscode/emmet-helper": { "@vscode/emmet-helper": {
"version": "2.8.4", "version": "2.8.4",
"resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz",
@ -10458,9 +10302,9 @@
"dev": true "dev": true
}, },
"astro": { "astro": {
"version": "1.0.4", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/astro/-/astro-1.0.4.tgz", "resolved": "https://registry.npmjs.org/astro/-/astro-1.0.6.tgz",
"integrity": "sha512-wNXmDSHnhiFcEeMy2VWMJV1i8mPx8Lu4qLBfZSmP9nWrc/oxgBZfDQTWOj0/NFu+MkfZ2JEGJlL9RZFmHrKlew==", "integrity": "sha512-QAkdkzP3PbauiO4YnOgVTWY6z26heKruoXW9TnN8Bbmwtf7DUFIchi6CFSAVYSONX8XtRnj+p6fCkk06OWfJ4w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@astrojs/compiler": "^0.23.3", "@astrojs/compiler": "^0.23.3",
@ -10538,15 +10382,15 @@
} }
}, },
"astro-compress": { "astro-compress": {
"version": "0.0.18", "version": "0.0.19",
"resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.18.tgz", "resolved": "https://registry.npmjs.org/astro-compress/-/astro-compress-0.0.19.tgz",
"integrity": "sha512-6AaT8vlJkXYyImIQ70+bCkPTPfgSfvw3T+S9AOlSv65GFf1pZBuhO5nRuCg2jtEVBw4Eo/T4qC9khYbd6cVsWA==", "integrity": "sha512-Hgv1wX43vOwzUNuqRm7hbCMUXoH2xF+kTjBR+6RqAbM6hjqIlB8aKEGOVdELj6BiwnMDLf1dl6C1TmYPPgDMAg==",
"dev": true, "dev": true,
"requires": { "requires": {
"csso": "5.0.5", "csso": "5.0.5",
"deepmerge-ts": "4.2.1", "deepmerge-ts": "4.2.1",
"fast-glob": "3.2.11", "fast-glob": "3.2.11",
"html-minifier-terser": "6.1.0", "html-minifier-terser": "7.0.0",
"sharp": "0.30.7", "sharp": "0.30.7",
"svgo": "2.8.0", "svgo": "2.8.0",
"terser": "5.14.2" "terser": "5.14.2"
@ -10875,9 +10719,9 @@
"dev": true "dev": true
}, },
"clean-css": { "clean-css": {
"version": "5.3.1", "version": "5.2.0",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.0.tgz",
"integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==", "integrity": "sha512-2639sWGa43EMmG7fn8mdVuBSs6HuWaSor+ZPoFWzenBc6oN+td8YhTfghWXZ25G1NiiSvz8bOFBS7PdSbTiqEA==",
"dev": true, "dev": true,
"requires": { "requires": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
@ -10977,9 +10821,9 @@
"dev": true "dev": true
}, },
"commander": { "commander": {
"version": "8.3.0", "version": "9.4.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
"integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==",
"dev": true "dev": true
}, },
"common-ancestor-path": { "common-ancestor-path": {
@ -11508,9 +11352,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "8.21.0", "version": "8.22.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
"integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@eslint/eslintrc": "^1.3.0", "@eslint/eslintrc": "^1.3.0",
@ -11935,12 +11779,6 @@
"format": "^0.2.0" "format": "^0.2.0"
} }
}, },
"fenceparser": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/fenceparser/-/fenceparser-1.1.1.tgz",
"integrity": "sha512-VdkTsK7GWLT0VWMK5S5WTAPn61wJ98WPFwJiRHumhg4ESNUO/tnkU8bzzzc62o6Uk1SVhuZFLnakmDA4SGV7wA==",
"dev": true
},
"fetch-blob": { "fetch-blob": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
@ -12454,12 +12292,6 @@
"space-separated-tokens": "^2.0.0" "space-separated-tokens": "^2.0.0"
} }
}, },
"he": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
"dev": true
},
"html-entities": { "html-entities": {
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
@ -12473,18 +12305,26 @@
"dev": true "dev": true
}, },
"html-minifier-terser": { "html-minifier-terser": {
"version": "6.1.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.0.0.tgz",
"integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", "integrity": "sha512-Adqk0b/pWKIQiGvEAuzPKpBKNHiwblr3QSGS7TTr6v+xXKV9AI2k4vWW+6Oytt6Z5SeBnfvYypKOnz8r75pz3Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"camel-case": "^4.1.2", "camel-case": "^4.1.2",
"clean-css": "^5.2.2", "clean-css": "5.2.0",
"commander": "^8.3.0", "commander": "^9.4.0",
"he": "^1.2.0", "entities": "^4.3.1",
"param-case": "^3.0.4", "param-case": "^3.0.4",
"relateurl": "^0.2.7", "relateurl": "^0.2.7",
"terser": "^5.10.0" "terser": "^5.14.2"
},
"dependencies": {
"entities": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz",
"integrity": "sha512-o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg==",
"dev": true
}
} }
}, },
"html-tags": { "html-tags": {
@ -13029,12 +12869,6 @@
"yallist": "^4.0.0" "yallist": "^4.0.0"
} }
}, },
"lz-string": {
"version": "1.4.4",
"resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
"integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==",
"dev": true
},
"magic-string": { "magic-string": {
"version": "0.25.9", "version": "0.25.9",
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@ -14478,12 +14312,6 @@
} }
} }
}, },
"regenerator-runtime": {
"version": "0.13.9",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
"dev": true
},
"regexp.prototype.flags": { "regexp.prototype.flags": {
"version": "1.4.3", "version": "1.4.3",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
@ -14640,58 +14468,6 @@
"unified": "^10.0.0" "unified": "^10.0.0"
} }
}, },
"remark-shiki-twoslash": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/remark-shiki-twoslash/-/remark-shiki-twoslash-3.1.0.tgz",
"integrity": "sha512-6LqSqVtHQR4S0DKfdQ2/ePn9loTKUtpyopYvwk8johjDTeUW5MkaLQuZHlWNkkST/4aMbz6aTkstIcwfwcHpXg==",
"dev": true,
"requires": {
"@typescript/twoslash": "3.1.0",
"@typescript/vfs": "1.3.4",
"fenceparser": "^1.1.0",
"regenerator-runtime": "^0.13.7",
"shiki": "0.10.1",
"shiki-twoslash": "3.1.0",
"tslib": "2.1.0",
"typescript": ">3",
"unist-util-visit": "^2.0.0"
},
"dependencies": {
"tslib": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
"integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==",
"dev": true
},
"unist-util-is": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
"integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
"dev": true
},
"unist-util-visit": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
"dev": true,
"requires": {
"@types/unist": "^2.0.0",
"unist-util-is": "^4.0.0",
"unist-util-visit-parents": "^3.0.0"
}
},
"unist-util-visit-parents": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
"dev": true,
"requires": {
"@types/unist": "^2.0.0",
"unist-util-is": "^4.0.0"
}
}
}
},
"remark-smartypants": { "remark-smartypants": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz", "resolved": "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.0.0.tgz",
@ -14984,18 +14760,6 @@
} }
} }
}, },
"shiki-twoslash": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/shiki-twoslash/-/shiki-twoslash-3.1.0.tgz",
"integrity": "sha512-uDqrTutOIZzyHbo103GsK7Vvc10saK1XCCivnOQ1NHJzgp3FBilEpftGeVzVSMOJs+JyhI7whkvhXV7kXQ5zCg==",
"dev": true,
"requires": {
"@typescript/twoslash": "3.1.0",
"@typescript/vfs": "1.3.4",
"shiki": "0.10.1",
"typescript": ">3"
}
},
"side-channel": { "side-channel": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@ -15520,7 +15284,8 @@
"version": "4.7.4", "version": "4.7.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
"integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
"dev": true "dev": true,
"peer": true
}, },
"unbox-primitive": { "unbox-primitive": {
"version": "1.0.2", "version": "1.0.2",

12
package.json
View File

@ -20,15 +20,15 @@
}, },
"devDependencies": { "devDependencies": {
"@astrojs/image": "^0.3.4", "@astrojs/image": "^0.3.4",
"@astrojs/mdx": "^0.9.0", "@astrojs/mdx": "^0.10.0",
"@astrojs/solid-js": "^1.0.0", "@astrojs/solid-js": "^1.0.0",
"@types/mdx": "^2.0.2", "@types/mdx": "^2.0.2",
"@typescript-eslint/eslint-plugin": "^5.33.0", "@typescript-eslint/eslint-plugin": "^5.33.1",
"@typescript-eslint/parser": "^5.33.0", "@typescript-eslint/parser": "^5.33.1",
"astro": "^1.0.4", "astro": "^1.0.6",
"astro-compress": "^0.0.18", "astro-compress": "^0.0.19",
"astro-icon": "^0.7.3", "astro-icon": "^0.7.3",
"eslint": "^8.21.0", "eslint": "^8.22.0",
"eslint-plugin-solid": "^0.7.1", "eslint-plugin-solid": "^0.7.1",
"hast-util-to-string": "^2.0.0", "hast-util-to-string": "^2.0.0",
"hastscript": "^7.0.2", "hastscript": "^7.0.2",

4
src/components/ArticleItem/ArticleItem.scss
View File

@ -8,6 +8,10 @@
column-gap: 10px; column-gap: 10px;
color: var(--font-color); color: var(--font-color);
padding: 8px 0; padding: 8px 0;
& sup {
margin-left: 5px;
font-size: 0.7em;
}
& h3 { & h3 {
font-size: var(--font-size-md); font-size: var(--font-size-md);
font-weight: normal; font-weight: normal;

13
src/components/ArticleItem/ArticleItem.tsx
View File

@ -1,6 +1,8 @@
/* eslint-disable solid/reactivity */
import type { Component } from "solid-js"; import type { Component } from "solid-js";
import { createDateFormatter } from "@utils/date"; import { createDateFormatter } from "@utils/date";
import "./ArticleItem.scss"; import "./ArticleItem.scss";
import { DEFAULT_LANGUAGE } from "@root/config";
export type ArticleItemProps = { export type ArticleItemProps = {
data: ArticleType; data: ArticleType;
@ -8,14 +10,17 @@ export type ArticleItemProps = {
}; };
export const ArticleItem: Component<ArticleItemProps> = (props) => { export const ArticleItem: Component<ArticleItemProps> = (props) => {
// eslint-disable-next-line solid/reactivity const isNonDefaultLanguage = props.data.lang && props.data.lang !== props.lang;
const DateFormatter = createDateFormatter(props.lang); const hrefLangPrefix = props.data.lang && props.data.lang !== DEFAULT_LANGUAGE ? "/en" : "";
return ( return (
<article class="article-item"> <article class="article-item">
<a href={`/blog/${new Date(props.data.published_at).toLocaleDateString("en-CA")}/${props.data.slug}/`}> <a href={`/blog/${new Date(props.data.published_at).toLocaleDateString("en-CA")}${hrefLangPrefix}/${props.data.slug}/`}>
<div class="flex">
<h3>{props.data.title}</h3> <h3>{props.data.title}</h3>
{isNonDefaultLanguage && <sup>{props.data.lang.toLocaleUpperCase()}</sup>}
</div>
<p> <p>
<time datetime={props.data.published_at.toString()}>{DateFormatter.format(new Date(props.data.published_at))}</time> <time datetime={props.data.published_at.toString()}>{createDateFormatter(props.lang).format(new Date(props.data.published_at))}</time>
</p> </p>
</a> </a>
</article> </article>

3
src/components/ArticlePost/ArticlePost.astro
View File

@ -11,7 +11,6 @@ export type Props = {
const { data, lang } = Astro.props as Props; const { data, lang } = Astro.props as Props;
const { title, tags, author, published_at } = data; const { title, tags, author, published_at } = data;
const DateFormatter = createDateFormatter("ru");
--- ---
<article class="article"> <article class="article">
@ -31,7 +30,7 @@ const DateFormatter = createDateFormatter("ru");
<h1>{title}</h1> <h1>{title}</h1>
</div> </div>
<div class="published"> <div class="published">
<time datetime={published_at}>{DateFormatter.format(new Date(published_at))}</time> <time datetime={published_at}>{createDateFormatter(lang).format(new Date(published_at))}</time>
<span>{author}</span> <span>{author}</span>
</div> </div>
{ {

37
src/i18n/utils.ts
View File

@ -1,8 +1,43 @@
import type { AstroGlobal } from "astro"; import type { AstroGlobal, MDXInstance } from "astro";
import * as utils from "@utils/url"; import * as utils from "@utils/url";
import { DEFAULT_LANGUAGE } from "@root/config"; import { DEFAULT_LANGUAGE } from "@root/config";
import languages from "./languages"; import languages from "./languages";
export function getTranslatedArticles(Astro: Readonly<AstroGlobal>): MDXInstance<ArticleType>[] {
const data = import.meta.glob<MDXInstance<ArticleType>>("../../content/articles/**/*.mdx", { eager: true });
const modules: Record<string, Record<string, MDXInstance<ArticleType>>> = {};
const siteLang = utils.getLanguageFromURL(Astro.url.pathname);
const articles: MDXInstance<ArticleType>[] = [];
for (const module of Object.values(data)) {
const splitted = module.file.split("/");
const lang = splitted.at(-2);
const name = splitted.at(-3);
if (!modules[name]) modules[name] = {};
modules[name][lang] = module;
}
for (const key of Object.keys(modules)) {
const langs = Object.keys(modules[key]);
for (const articleLang of langs) {
const isNonDefaultLanguage = !langs.includes(siteLang) && langs.length === 1;
const article = modules[key];
if (articleLang === siteLang) {
articles.push(article[siteLang]);
article[siteLang].frontmatter.lang = siteLang;
}
if (isNonDefaultLanguage) {
articles.push(article[articleLang]);
article[articleLang].frontmatter.lang = articleLang;
}
}
}
return articles;
}
export function getLanguageKeys(): Array<string> { export function getLanguageKeys(): Array<string> {
return Object.keys(languages); return Object.keys(languages);
} }

10
src/pages/blog/[...slug].astro
View File

@ -3,14 +3,20 @@ import type { MDXInstance } from "astro";
import ArticleLayout from "@layouts/article.astro"; import ArticleLayout from "@layouts/article.astro";
import { getLanguageFromURL } from "@root/utils"; import { getLanguageFromURL } from "@root/utils";
import { DEFAULT_LANGUAGE } from "@root/config";
const lang = getLanguageFromURL(Astro.url.pathname); const lang = getLanguageFromURL(Astro.url.pathname);
export async function getStaticPaths() { export async function getStaticPaths() {
const modules = import.meta.glob<MDXInstance<ArticleType>>("../../../content/articles/**/*.mdx", { eager: true });
const entries = Object.keys(modules).map((key) => [key, key.split("/").slice(7)[0]]);
const data = await Astro.glob<ArticleType>("../../../content/articles/**/*.mdx"); const data = await Astro.glob<ArticleType>("../../../content/articles/**/*.mdx");
return data.map((article) => {
return entries.map(([key, lang]) => {
const article = modules[key];
const published_at = new Date(article.frontmatter.published_at).toLocaleDateString("en-CA"); const published_at = new Date(article.frontmatter.published_at).toLocaleDateString("en-CA");
const slug = `${published_at}/${article.frontmatter.slug}`; const slug = `${published_at}/${lang !== DEFAULT_LANGUAGE ? lang + "/" : ""}${article.frontmatter.slug}`;
return { params: { slug }, props: article }; return { params: { slug }, props: article };
}); });
} }

9
src/templates/Articles.astro
View File

@ -3,12 +3,13 @@ import PageLayout from "@layouts/default.astro";
import ArticlesList from "@components/ArticlesList"; import ArticlesList from "@components/ArticlesList";
import { transformArticles, formatToArticleBlocks } from "@utils/articles"; import { transformArticles, formatToArticleBlocks } from "@utils/articles";
import { getLanguageFromURL } from "@root/utils"; import { getLanguageFromURL } from "@root/utils";
import { useTranslation } from "@i18n/utils"; import { useTranslation, getTranslatedArticles } from "@i18n/utils";
const t = useTranslation(Astro); const t = useTranslation(Astro);
const articles = await Astro.glob<ArticleType>("../../content/articles/**/*.mdx"); const data = getTranslatedArticles(Astro);
const tags = new Set(articles.map((article) => article.frontmatter.tags).flat()); const tags = new Set(data.map((article) => article.frontmatter.tags).flat());
const lang = getLanguageFromURL(Astro.url.pathname); const lang = getLanguageFromURL(Astro.url.pathname);
const articles = transformArticles(data);
--- ---
<PageLayout lang={lang} title={t("pageTitle.articles")} description={t("pageDescription.articles")}> <PageLayout lang={lang} title={t("pageTitle.articles")} description={t("pageDescription.articles")}>
@ -20,7 +21,7 @@ const lang = getLanguageFromURL(Astro.url.pathname);
"input.search": t("input.search"), "input.search": t("input.search"),
"articles.empty": t("articles.empty"), "articles.empty": t("articles.empty"),
}} }}
data={{ articles: formatToArticleBlocks(transformArticles(articles)), tags: [...tags] }} data={{ articles: formatToArticleBlocks(articles), tags: [...tags] }}
/> />
</section> </section>
</PageLayout> </PageLayout>

8
src/templates/Home.astro
View File

@ -4,13 +4,13 @@ import PageLayout from "@layouts/default.astro";
import RecentArticles from "@components/RecentArticles"; import RecentArticles from "@components/RecentArticles";
import { Splash, SplashHeading, SplashLinks, Link } from "@components/Splash"; import { Splash, SplashHeading, SplashLinks, Link } from "@components/Splash";
import { getLanguageFromURL } from "@root/utils"; import { getLanguageFromURL } from "@root/utils";
import { useTranslation } from "@i18n/utils"; import { getTranslatedArticles, useTranslation } from "@i18n/utils";
import UIString from "@components/UIString"; import UIString from "@components/UIString";
const data = await Astro.glob<ArticleType>("../../content/articles/**/*.mdx"); const data = getTranslatedArticles(Astro);
const articles = utils.transformArticles(data);
const t = useTranslation(Astro); const t = useTranslation(Astro);
const lang = getLanguageFromURL(Astro.url.pathname); const lang = getLanguageFromURL(Astro.url.pathname);
const articles = utils.transformArticles(data);
--- ---
<PageLayout lang={lang} description={t("site.description")} showPageHeading={false}> <PageLayout lang={lang} description={t("site.description")} showPageHeading={false}>
@ -27,5 +27,5 @@ const lang = getLanguageFromURL(Astro.url.pathname);
<Link icon="email_filled" href="/contacts/"><UIString key={"splash.contact"} /></Link> <Link icon="email_filled" href="/contacts/"><UIString key={"splash.contact"} /></Link>
</SplashLinks> </SplashLinks>
</Splash> </Splash>
<RecentArticles articles={articles} length={4} /> <RecentArticles articles={articles} length={10} />
</PageLayout> </PageLayout>

1
src/types/main.d.ts vendored
View File

@ -38,6 +38,7 @@ declare global {
author: string; author: string;
tags: Array<string>; tags: Array<string>;
published_at: string; published_at: string;
lang?: string;
}; };
type ProjectType = { type ProjectType = {

1
src/utils/articles.ts
View File

@ -8,6 +8,7 @@ export const transformArticles = (articles: MDXInstance<ArticleType>[]): Article
author: article.frontmatter.author, author: article.frontmatter.author,
tags: article.frontmatter.tags, tags: article.frontmatter.tags,
published_at: article.frontmatter.published_at, published_at: article.frontmatter.published_at,
lang: article.frontmatter.lang,
})); }));
export const sortArtcilesByDate = (articles: ArticleType[]): ArticleType[] => { export const sortArtcilesByDate = (articles: ArticleType[]): ArticleType[] => {