Merge branch 'main' of https://github.com/overlookart/ArtWebsite

# Conflicts: # package-lock.json # src/pages/blog.astro
overlookart · Oct 28, 2024 · 22fda0a · 22fda0a
2 parents 50f38bd + 5f3444e
commit 22fda0a
Show file tree

Hide file tree

Showing 27 changed files with 104 additions and 7,346 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,9 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 
+# package-lock.json
+package-lock.json
+
 # environment variables
 .env
 .env.production

diff --git a/astro.config.mjs b/astro.config.mjs
@@ -9,5 +9,6 @@ export default defineConfig({
   site: 'https://overlookart.github.io',
   base: '/ArtWebsite',
   // 集成
-  integrations: [vue(), tailwind(), db()]
+  integrations: [vue({devtools: true}), tailwind(), db()],
+  renderers: ['@astrojs/renderer-vue'],
 });