Merge pull request #154 from sergeyyarkov/develop

upd deps

.prettierignore

@@ -1,2 +1,2 @@
-**/*.mdx
-**/*.md
+# **/*.mdx
+# **/*.md

astro.config.ts

@@ -36,7 +36,10 @@ const createAnchorLabel = (heading: string) => {
 
 // https://astro.build/config
 export default defineConfig({
-	site: "https://yarkov.tech",
+	site: "https://yarkov.tech/",
+	build: {
+		assets: "assets",
+	},
 	integrations: [
 		solid(),
 		sitemap({

package.json

@@ -19,36 +19,36 @@
 		"lint": "eslint '**/*.{js,mjs,ts,tsx}'"
 	},
 	"devDependencies": {
-		"@astrojs/image": "^0.12.1",
-		"@astrojs/mdx": "^0.14.0",
-		"@astrojs/rss": "^2.0.0",
-		"@astrojs/sitemap": "^1.0.0",
-		"@astrojs/solid-js": "^1.2.3",
+		"@astrojs/image": "^0.14.0",
+		"@astrojs/mdx": "^0.16.0",
+		"@astrojs/rss": "^2.1.0",
+		"@astrojs/sitemap": "^1.0.1",
+		"@astrojs/solid-js": "^2.0.2",
 		"@types/html-escaper": "^3.0.0",
 		"@types/mdx": "^2.0.3",
-		"@typescript-eslint/eslint-plugin": "^5.48.1",
-		"@typescript-eslint/parser": "^5.48.1",
-		"astro": "^1.9.2",
+		"@typescript-eslint/eslint-plugin": "^5.50.0",
+		"@typescript-eslint/parser": "^5.50.0",
+		"astro": "^2.0.6",
 		"astro-icon": "^0.8.0",
-		"eslint": "^8.31.0",
-		"eslint-plugin-solid": "^0.9.1",
+		"eslint": "^8.33.0",
+		"eslint-plugin-solid": "^0.9.4",
 		"hast-util-to-string": "^2.0.0",
 		"hastscript": "^7.2.0",
 		"html-escaper": "^3.0.3",
 		"mime-types": "^2.1.35",
 		"netlify-plugin-minify-html": "^0.3.1",
-		"prettier": "^2.8.1",
-		"prettier-plugin-astro": "^0.7.2",
+		"prettier": "^2.8.3",
+		"prettier-plugin-astro": "^0.8.0",
 		"rehype-autolink-headings": "^6.1.1",
 		"rehype-slug": "^5.1.0",
 		"remark-gfm": "^3.0.1",
 		"remark-smartypants": "^2.0.0",
-		"sass": "^1.57.1",
-		"solid-js": "^1.6.9"
+		"sass": "^1.58.0",
+		"solid-js": "^1.6.10"
 	},
 	"dependencies": {
 		"@netlify/functions": "^1.4.0",
-		"ioredis": "^5.2.4",
+		"ioredis": "^5.3.0",
 		"quicklink": "^2.3.0",
 		"sharp": "^0.31.3"
 	}

src/components/ArticlePost/ArticlePost.astro

@@ -60,6 +60,7 @@ const t = useTranslation(Astro);
 							formats={["webp"]}
 							aspectRatio={"16:9"}
 							alt={title}
+							background={"chocolate"}
 						/>
 					</figure>
 				</div>

src/layouts/article.astro

@@ -1,14 +1,11 @@
 ---
 import type { Props as BaseHeadProps } from "@root/components/BaseHead.astro";
-import { extname } from "node:path";
-import mime from "mime-types";
 
 import BaseHead from "@components/BaseHead.astro";
 import BaseLayout from "@components/BaseLayout";
 import ArticleContent from "@components/ArticleContent";
 import ArticlePost from "@components/ArticlePost";
 import { SITE_METADATA } from "@root/config";
-import { isURL } from '@utils/string'
 import "@styles/global.scss";
 
 export interface Props extends BaseHeadProps {
@@ -27,16 +24,15 @@ const { lang = "ru", content, canonicalUrl } = Astro.props as Props;
 		<meta property="og:description" content={content.description} />
 		<meta property="og:type" content="article" />
 		<meta property="og:url" content={canonicalUrl} />
-		{content.coverImage && (
+		<!-- {content.coverImage && (
 			<meta property="og:image" content={isURL(content.coverImage) ? content.coverImage : `${Astro.url.origin}${content.coverImage}`} />
 			<meta property="og:image:width" content="700" />
 			<meta property="og:image:height" content="400" />
 			<meta property="og:image:type" content={`${mime.lookup(extname(content.coverImage))}`} />
-		)}
+		)} -->
 		<script is:inline defer src="/assets/js/load-code-highlight.js"></script>
 	</BaseHead>
 
-
 	<BaseLayout>
 		<div class="container">
 			<ArticlePost lang={lang} data={content}>

tsconfig.json

@@ -19,8 +19,7 @@
 			"@utils/*": ["./src/utils/*"],
 			"@stores/*": ["./src/stores/*"],
 			"@hooks/*": ["./src/hooks/*"],
-			"@i18n/*": ["./src/i18n/*"],
-			"@images/*": ["./src/images/*"]
+			"@i18n/*": ["./src/i18n/*"]
 		},
 		"outDir": "./dist",
 		"typeRoots": ["./node_modules/@types", "./src/types"]