chore: use new base option for import.meta.glob

Author: benmccann

apps/svelte.dev/src/lib/server/content.ts

@@ -2,23 +2,21 @@ import { read } from '$app/server';
 import type { Document, DocumentSummary } from '@sveltejs/site-kit';
 import { create_index } from '@sveltejs/site-kit/server/content';
 
-const documents = import.meta.glob<string>('../../../content/**/*.md', {
+const documents = import.meta.glob<string>('**/*.md', {
+	base: '../../../content',
 	eager: true,
 	query: '?url',
 	import: 'default'
 });
 
-const assets = import.meta.glob<string>(
-	['../../../content/**/+assets/**', '../../../content/**/+assets/**/.env'],
-	{
-		eager: true,
-		query: '?url',
-		import: 'default'
-	}
-);
+const assets = import.meta.glob<string>(['**/+assets/**', '**/+assets/**/.env'], {
+	base: '../../../content',
+	eager: true,
+	query: '?url',
+	import: 'default'
+});
 
-// https://github.com/vitejs/vite/issues/17453
-export const index = await create_index(documents, assets, '../../../content', read);
+export const index = await create_index(documents, assets, read);
 
 const months = 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' ');
 

packages/site-kit/src/lib/server/content/index.ts

@@ -4,20 +4,18 @@ import type { Document } from '../../types';
 export async function create_index(
 	documents: Record<string, string>,
 	assets: Record<string, string>,
-	base: string,
 	read: (asset: string) => Response
 ): Promise<Record<string, Document>> {
 	const content: Record<string, Document> = {};
 
 	const roots: Document[] = [];
 
-	for (const key in documents) {
-		if (key.includes('+assets')) continue;
+	for (const file in documents) {
+		if (file.includes('+assets')) continue;
 
-		const file = key.slice(base.length + 1);
 		const slug = file.replace(/(^|\/)[\d-]+-/g, '$1').replace(/(\/index)?\.md$/, '');
 
-		const text = await read(documents[key]).text();
+		const text = await read(documents[file]).text();
 		let { metadata, body } = extract_frontmatter(text);
 
 		if (!metadata.title) {
@@ -83,13 +81,12 @@ export async function create_index(
 		}
 	}
 
-	for (const key in assets) {
-		const path = key.slice(base.length + 1);
+	for (const path in assets) {
 		const slug = path.slice(0, path.indexOf('+assets') - 1).replace(/(^|\/)\d+-/g, '$1');
 		const file = path.slice(path.indexOf('+assets') + 8);
 		const document = content[slug];
 
-		(document.assets ??= {})[file] = assets[key];
+		(document.assets ??= {})[file] = assets[path];
 	}
 
 	let prev: Document | null = null;