summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/astro/src/content/types-generator.ts5
-rw-r--r--packages/astro/src/content/vite-plugin-content-imports.ts4
-rw-r--r--packages/astro/src/content/vite-plugin-content-virtual-mod.ts12
3 files changed, 10 insertions, 11 deletions
diff --git a/packages/astro/src/content/types-generator.ts b/packages/astro/src/content/types-generator.ts
index d63afd812..86e47c1e3 100644
--- a/packages/astro/src/content/types-generator.ts
+++ b/packages/astro/src/content/types-generator.ts
@@ -10,17 +10,16 @@ import { info, warn, type LogOptions } from '../core/logger/core.js';
import { isRelativePath } from '../core/path.js';
import { CONTENT_TYPES_FILE, VIRTUAL_MODULE_ID } from './consts.js';
import {
+ getContentEntryConfigByExtMap,
getContentPaths,
getEntryInfo,
+ getEntrySlug,
getEntryType,
loadContentConfig,
NoCollectionError,
type ContentConfig,
type ContentObservable,
type ContentPaths,
- type EntryInfo,
- getContentEntryConfigByExtMap,
- getEntrySlug,
} from './utils.js';
type ChokidarEvent = 'add' | 'addDir' | 'change' | 'unlink' | 'unlinkDir';
diff --git a/packages/astro/src/content/vite-plugin-content-imports.ts b/packages/astro/src/content/vite-plugin-content-imports.ts
index 27a17b58e..c25eff37f 100644
--- a/packages/astro/src/content/vite-plugin-content-imports.ts
+++ b/packages/astro/src/content/vite-plugin-content-imports.ts
@@ -10,16 +10,16 @@ import { AstroError } from '../core/errors/errors.js';
import { escapeViteEnvReferences, getFileInfo } from '../vite-plugin-utils/index.js';
import { CONTENT_FLAG } from './consts.js';
import {
+ getContentEntryConfigByExtMap,
getContentEntryExts,
getContentPaths,
getEntryData,
getEntryInfo,
- parseEntrySlug,
getEntryType,
globalContentConfigObserver,
NoCollectionError,
+ parseEntrySlug,
type ContentConfig,
- getContentEntryConfigByExtMap,
} from './utils.js';
function isContentFlagImport(viteId: string) {
diff --git a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
index f36fa6187..a880510b0 100644
--- a/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
+++ b/packages/astro/src/content/vite-plugin-content-virtual-mod.ts
@@ -1,21 +1,21 @@
import glob, { type Options as FastGlobOptions } from 'fast-glob';
import fsMod from 'node:fs';
+import { extname } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
import type { Plugin } from 'vite';
import type { AstroSettings } from '../@types/astro.js';
+import { rootRelativePath } from '../core/util.js';
import { VIRTUAL_MODULE_ID } from './consts.js';
import {
getContentEntryConfigByExtMap,
getContentPaths,
- getExtGlob,
- type ContentPaths,
getEntryInfo,
- NoCollectionError,
getEntrySlug,
+ getExtGlob,
hasUnderscoreBelowContentDirectoryPath,
+ NoCollectionError,
+ type ContentPaths,
} from './utils.js';
-import { rootRelativePath } from '../core/util.js';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { extname } from 'node:path';
interface AstroContentVirtualModPluginParams {
settings: AstroSettings;