From c86396d231c1bc744a5d2ea8ac04e43b7e14d707 Mon Sep 17 00:00:00 2001
From: sevichecc <91365763+Sevichecc@users.noreply.github.com>
Date: Thu, 26 Jan 2023 00:43:14 +0800
Subject: [PATCH] merge with upsteam
 https://github.com/importantimport/urara/commit/455fcd594118fa75aa1e52a54a971d4dcc2d533b

---
 src/lib/components/index_profile.svelte |  4 ++--
 src/lib/components/prose/img.svelte     | 10 +++++-----
 svelte.config.ts                        |  2 +-
 urara.ts                                |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/index_profile.svelte b/src/lib/components/index_profile.svelte
index 8b658a57..02c88dd8 100644
--- a/src/lib/components/index_profile.svelte
+++ b/src/lib/components/index_profile.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { site } from '$lib/config/site'
-  import Image from '$lib/components/prose/img.svelte'
+  // import Image from '$lib/components/prose/img.svelte'
 </script>
 
 <div class="sticky flex flex-col gap-4 top-24 xl:ml-auto xl:mr-8 xl:max-w-xs">
@@ -8,7 +8,7 @@
     <a href={site.protocol + site.domain} class="hidden u-url u-uid">{site.author.name}</a>
     <figure class="relative mx-auto group">
        {#if site.author.avatar}
-      <Image
+      <img
         class="u-photo rounded-full shadow-xl w-32 h-32 hover:rotate-[360deg] transition-transform duration-1000 ease-in-out"
         src={site.author.avatar}
         alt={site.author.name} />
diff --git a/src/lib/components/prose/img.svelte b/src/lib/components/prose/img.svelte
index 4f478f52..75129101 100644
--- a/src/lib/components/prose/img.svelte
+++ b/src/lib/components/prose/img.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
   /* @see {@link https://github.com/sveltejs/kit/issues/241#issuecomment-1363621896} */
 
-  const images = import.meta.glob('/static/**/*.{jpg,jpeg,png,webp,avif}', {
+  const images = import.meta.glob(['/static/**/*.{jpg,jpeg,png,webp,avif}', '!/static/assets'], {
     import: 'default',
     eager: true
   })
 
-  const sources = import.meta.glob('/static/**/*.{jpg,jpeg,png,webp,avif}', {
+  const sources = import.meta.glob(['/static/**/*.{jpg,jpeg,png,webp,avif}', '!/static/assets'], {
     query: {
-      format: 'avif',
-      width: '384;768',
+      quality: '80',
+      width: '736',
       source: ''
     },
     import: 'default',
@@ -35,5 +35,5 @@
 
 <picture>
   <source srcset={source.map(({ src, w }) => `${src} ${w}w`).join(', ')} type="image/avif" />
-  <img src={image.src} width={image.w} height={image.h} {alt} class={className ?? 'rounded-lg my-2'} {loading} {decoding} />
+  <img src={image.src} {alt} class={className ?? 'rounded-lg my-2'} {loading} {decoding} />
 </picture>
\ No newline at end of file
diff --git a/svelte.config.ts b/svelte.config.ts
index 1c83055f..727d1558 100644
--- a/svelte.config.ts
+++ b/svelte.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
   extensions: ['.svelte', ...(mdsvexConfig.extensions as string[])],
   preprocess: [mdsvex(mdsvexConfig), importAssets(), vitePreprocess()],
   kit: {
-    adapter: Object.keys(process.env).some(key => ['VERCEL', 'CF_PAGES', 'NETLIFY'].includes(key))
+    adapter: Object.keys(process.env).some(key => ['VERCEL', 'NETLIFY'].includes(key))
       ? adapterAuto()
       : process.env.ADAPTER === 'node'
       ? adapterNode({ out: 'build' })
diff --git a/urara.ts b/urara.ts
index c47c5096..045b8fbc 100644
--- a/urara.ts
+++ b/urara.ts
@@ -102,7 +102,7 @@ const clean = () => {
 switch (process.argv[2]) {
   case 'watch':
     {
-      let watcher = chokidar.watch('urara', {
+      const watcher = chokidar.watch('urara', {
         ignored: (file: string) => path.basename(file).startsWith('.')
       })
       watcher