Compare commits

..

No commits in common. "22833755ca3a419379b9519d082af7e675856054" and "86d04ebcb1eaaf83f415eb019dcee7868da5ec80" have entirely different histories.

8 changed files with 294 additions and 489 deletions

View File

@ -4,7 +4,6 @@
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"quickfix.biome": "explicit" "quickfix.biome": "explicit"
}, },
"astro.content-intellisense": true,
"[javascript]": { "[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
@ -66,7 +65,6 @@
"jian", "jian",
"jiasm", "jiasm",
"jing", "jing",
"jmoiron",
"jungshik", "jungshik",
"khalil", "khalil",
"khtml", "khtml",
@ -117,7 +115,6 @@
"shinmun", "shinmun",
"shmily", "shmily",
"skrs", "skrs",
"sqlx",
"syhily", "syhily",
"tabindex", "tabindex",
"tagcloud", "tagcloud",

View File

@ -19,8 +19,6 @@ export default defineConfig({
service: !options.isProd() ? { entrypoint: './plugins/resize', config: {} } : undefined, service: !options.isProd() ? { entrypoint: './plugins/resize', config: {} } : undefined,
}, },
experimental: { experimental: {
contentLayer: true,
contentIntellisense: true,
actions: true, actions: true,
env: { env: {
schema: { schema: {

749
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -45,8 +45,8 @@
"@astrojs/mdx": "^3.1.3", "@astrojs/mdx": "^3.1.3",
"@astrojs/rss": "^4.0.7", "@astrojs/rss": "^4.0.7",
"@zeabur/astro-adapter": "^1.0.6", "@zeabur/astro-adapter": "^1.0.6",
"astro": "^4.14.2", "astro": "^4.13.1",
"drizzle-orm": "^0.33.0", "drizzle-orm": "^0.32.2",
"fuse.js": "^7.0.0", "fuse.js": "^7.0.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"luxon": "^3.5.0", "luxon": "^3.5.0",
@ -61,10 +61,10 @@
"@napi-rs/canvas": "^0.1.53", "@napi-rs/canvas": "^0.1.53",
"@types/lodash": "^4.17.7", "@types/lodash": "^4.17.7",
"@types/luxon": "^3.4.2", "@types/luxon": "^3.4.2",
"@types/node": "^22.4.0", "@types/node": "^22.1.0",
"@types/pg": "^8.11.6", "@types/pg": "^8.11.6",
"@types/qrcode-svg": "^1.1.5", "@types/qrcode-svg": "^1.1.5",
"@types/unist": "^3.0.3", "@types/unist": "^3.0.2",
"aplayer": "^1.10.1", "aplayer": "^1.10.1",
"astro-uploader": "^1.1.3", "astro-uploader": "^1.1.3",
"bootstrap": "^5.3.3", "bootstrap": "^5.3.3",
@ -75,12 +75,12 @@
"rehype-external-links": "^3.0.0", "rehype-external-links": "^3.0.0",
"resize-sensor": "^0.0.6", "resize-sensor": "^0.0.6",
"rimraf": "^6.0.1", "rimraf": "^6.0.1",
"sharp": "^0.33.5", "sharp": "^0.33.4",
"typescript": "^5.5.4", "typescript": "^5.5.4",
"unist-util-select": "^5.1.0" "unist-util-select": "^5.1.0"
}, },
"packageManager": "npm@10.8.2", "packageManager": "npm@10.8.2",
"engines": { "engines": {
"node": "22.6.0" "node": "22.5.1"
} }
} }

3
src/env.d.ts vendored
View File

@ -1 +1,4 @@
/// <reference path="../.astro/actions.d.ts" />
/// <reference path="../.astro/env.d.ts" />
/// <reference path="../.astro/types.d.ts" /> /// <reference path="../.astro/types.d.ts" />
/// <reference types="astro/client" />

View File

@ -1,6 +1,6 @@
import { defaultCover } from '@/content/config.ts'; import { defaultCover } from '@/content/config.ts';
import options from '@/options'; import options from '@/options';
import { getCollection, getEntry, type Render } from 'astro:content'; import { getCollection, getEntryBySlug, type Render } from 'astro:content';
// Import the collections from the astro content. // Import the collections from the astro content.
const categoriesCollection = await getCollection('categories'); const categoriesCollection = await getCollection('categories');
@ -34,7 +34,7 @@ export const pages: Page[] = pagesCollection
slug: page.slug, slug: page.slug,
permalink: `/${page.slug}`, permalink: `/${page.slug}`,
render: async () => { render: async () => {
const entry = await getEntry('pages', page.slug); const entry = await getEntryBySlug('pages', page.slug);
return entry.render(); return entry.render();
}, },
...page.data, ...page.data,
@ -45,11 +45,11 @@ export const posts: Post[] = postsCollection
slug: post.slug, slug: post.slug,
permalink: `/posts/${post.slug}`, permalink: `/posts/${post.slug}`,
render: async () => { render: async () => {
const entry = await getEntry('posts', post.slug); const entry = await getEntryBySlug('posts', post.slug);
return entry.render(); return entry.render();
}, },
raw: async () => { raw: async () => {
const entry = await getEntry('posts', post.slug); const entry = await getEntryBySlug('posts', post.slug);
return entry.body; return entry.body;
}, },
...post.data, ...post.data,

View File

@ -12,5 +12,5 @@ require (
require ( require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/image v0.19.0 // indirect golang.org/x/image v0.18.0 // indirect
) )

View File

@ -19,8 +19,8 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ= golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys= golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=