astro 2.1.2 → 2.1.3

package/dist/core/preview/vite-plugin-astro-preview.d.ts

@@ -1,3 +1,3 @@
-import { Plugin } from 'vite';
-import { AstroSettings } from '../../@types/astro.js';
+import type { Plugin } from 'vite';
+import type { AstroSettings } from '../../@types/astro.js';
 export declare function vitePluginAstroPreview(settings: AstroSettings): Plugin;

package/dist/core/render/dev/css.d.ts

@@ -1,5 +1,5 @@
 import type { ModuleLoader } from '../../module-loader/index';
-import { RuntimeMode } from '../../../@types/astro.js';
+import type { RuntimeMode } from '../../../@types/astro.js';
 /** Given a filePath URL, crawl Vite’s module graph to find all style imports. */
 export declare function getStylesForURL(filePath: URL, loader: ModuleLoader, mode: RuntimeMode): Promise<{
     urls: Set<string>;

package/dist/core/render/paginate.d.ts

@@ -1,2 +1,2 @@
-import { PaginateFunction, RouteData } from '../../@types/astro';
+import type { PaginateFunction, RouteData } from '../../@types/astro';
 export declare function generatePaginateFunction(routeMatch: RouteData): PaginateFunction;

package/dist/core/sync/index.js

@@ -36,6 +36,7 @@ async function sync(settings, { logging, fs }) {
       {
         server: { middlewareMode: true, hmr: false },
         optimizeDeps: { entries: [] },
+        ssr: { external: ["image-size"] },
         logLevel: "silent"
       },
       { settings, logging, mode: "build", command: "build", fs }

package/dist/events/error.d.ts

@@ -1,4 +1,4 @@
-import { ZodError } from 'zod';
+import type { ZodError } from 'zod';
 import { ErrorWithMetadata } from '../core/errors/index.js';
 interface ErrorEventPayload {
     code: number | undefined;

package/dist/integrations/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { AddressInfo } from 'net';
 import type { InlineConfig, ViteDevServer } from 'vite';
-import { AstroConfig, AstroSettings, BuildConfig, RouteData } from '../@types/astro.js';
+import type { AstroConfig, AstroSettings, BuildConfig, RouteData } from '../@types/astro.js';
 import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
 import { LogOptions } from '../core/logger/core.js';

package/dist/runtime/server/jsx.d.ts

@@ -1,2 +1,2 @@
-import { SSRResult } from '../../@types/astro.js';
+import type { SSRResult } from '../../@types/astro.js';
 export declare function renderJSX(result: SSRResult, vnode: any): Promise<any>;

package/dist/runtime/server/render/tags.d.ts

@@ -1,4 +1,4 @@
-import { SSRElement, SSRResult } from '../../../@types/astro';
+import type { SSRElement, SSRResult } from '../../../@types/astro';
 export declare function renderStyleElement(children: string): string;
 export declare function renderScriptElement({ props, children }: SSRElement): string;
 export declare function renderStylesheet({ href }: {

package/dist/vite-plugin-astro/compile.d.ts

@@ -1,6 +1,6 @@
 import { ESBuildTransformResult } from 'vite';
 import { CompileProps, CompileResult } from '../core/compile/index.js';
-import { LogOptions } from '../core/logger/core.js';
+import type { LogOptions } from '../core/logger/core.js';
 interface CachedFullCompilation {
     compileProps: CompileProps;
     logging: LogOptions;

package/dist/vite-plugin-astro-server/plugin.d.ts

@@ -2,7 +2,7 @@
 import type * as vite from 'vite';
 import type { AstroSettings } from '../@types/astro';
 import type fs from 'fs';
-import { LogOptions } from '../core/logger/core.js';
+import type { LogOptions } from '../core/logger/core.js';
 export interface AstroPluginOptions {
     settings: AstroSettings;
     logging: LogOptions;

package/dist/vite-plugin-astro-server/route.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type http from 'http';
 import type { ComponentInstance, ManifestData, RouteData } from '../@types/astro';
-import { ComponentPreload, DevelopmentEnvironment } from '../core/render/dev/index';
+import type { ComponentPreload, DevelopmentEnvironment } from '../core/render/dev/index';
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (...args: any) => Promise<infer R> ? R : any;
 interface MatchedRoute {
     route: RouteData;

package/dist/vite-plugin-head-propagation/index.d.ts

@@ -2,7 +2,7 @@ import type { AstroSettings } from '../@types/astro';
 import type { BuildInternals } from '../core/build/internal.js';
 import type { AstroBuildPlugin } from '../core/build/plugin.js';
 import type { StaticBuildOptions } from '../core/build/types';
-import * as vite from 'vite';
+import type * as vite from 'vite';
 /**
  * If any component is marked as doing head injection, walk up the tree
  * and mark parent Astro components as having head injection in the tree.

package/dist/vite-plugin-html/transform/slots.d.ts

@@ -1,6 +1,6 @@
 import type { Root } from 'hast';
 import type { Plugin } from 'unified';
-import MagicString from 'magic-string';
+import type MagicString from 'magic-string';
 declare const rehypeSlots: Plugin<[{
     s: MagicString;
 }], Root>;

package/dist/vite-plugin-html/transform/utils.d.ts

@@ -1,5 +1,5 @@
 import type { Element } from 'hast';
-import MagicString from 'magic-string';
+import type MagicString from 'magic-string';
 export declare function replaceAttribute(s: MagicString, node: Element, key: string, newValue: string): void;
 export declare function needsEscape(value: any): value is string;
 export declare function escape(value: string): string;

package/dist/vite-plugin-inject-env-ts/index.js

@@ -39,12 +39,14 @@ async function setUpEnvTs({
         'types="astro/client-image"'
       );
       await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
-    } else if (typesEnvContents.includes('types="astro/client-image"')) {
+      info(logging, "assets", `Added ${bold(envTsPathRelativetoRoot)} types`);
+    } else if (!settings.config.experimental.assets && typesEnvContents.includes('types="astro/client-image"')) {
       typesEnvContents = typesEnvContents.replace(
         'types="astro/client-image"',
         'types="astro/client"'
       );
       await fs.promises.writeFile(envTsPath, typesEnvContents, "utf-8");
+      info(logging, "assets", `Removed ${bold(envTsPathRelativetoRoot)} types`);
     }
     if (!fs.existsSync(dotAstroDir))
       return;

package/dist/vite-plugin-integrations-container/index.d.ts

@@ -1,6 +1,6 @@
-import { Plugin as VitePlugin } from 'vite';
-import { AstroSettings } from '../@types/astro.js';
-import { LogOptions } from '../core/logger/core.js';
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroSettings } from '../@types/astro.js';
+import type { LogOptions } from '../core/logger/core.js';
 /** Connect Astro integrations into Vite, as needed. */
 export default function astroIntegrationsContainerPlugin({ settings, logging, }: {
     settings: AstroSettings;

package/dist/vite-plugin-jsx/import-source.d.ts

@@ -1,3 +1,3 @@
-import { TsConfigJson } from 'tsconfig-resolver';
-import { AstroRenderer } from '../@types/astro';
+import type { TsConfigJson } from 'tsconfig-resolver';
+import type { AstroRenderer } from '../@types/astro';
 export declare function detectImportSource(code: string, jsxRenderers: Map<string, AstroRenderer>, tsConfig?: TsConfigJson): Promise<string | undefined>;

package/dist/vite-plugin-markdown/content-entry-type.d.ts

@@ -1,4 +1,4 @@
-import { ContentEntryType } from '../@types/astro.js';
+import type { ContentEntryType } from '../@types/astro.js';
 export declare const markdownContentEntryType: ContentEntryType;
 /**
  * MDX content type for compatibility with older `@astrojs/mdx` versions

package/dist/vite-plugin-scanner/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin as VitePlugin } from 'vite';
-import { AstroSettings } from '../@types/astro.js';
+import type { AstroSettings } from '../@types/astro.js';
 export default function astroScannerPlugin({ settings }: {
     settings: AstroSettings;
 }): VitePlugin;

package/dist/vite-plugin-scanner/scan.d.ts

@@ -1,2 +1,2 @@
-import { PageOptions } from '../vite-plugin-astro/types.js';
+import type { PageOptions } from '../vite-plugin-astro/types.js';
 export declare function scan(code: string, id: string): Promise<PageOptions>;

package/dist/vite-plugin-scripts/index.d.ts

@@ -1,5 +1,5 @@
-import { Plugin as VitePlugin } from 'vite';
-import { AstroSettings } from '../@types/astro.js';
+import type { Plugin as VitePlugin } from 'vite';
+import type { AstroSettings } from '../@types/astro.js';
 export declare const BEFORE_HYDRATION_SCRIPT_ID: string;
 export declare const PAGE_SCRIPT_ID: string;
 export declare const PAGE_SSR_SCRIPT_ID: string;

package/dist/vite-plugin-scripts/page-ssr.d.ts

@@ -1,5 +1,5 @@
 import { Plugin as VitePlugin } from 'vite';
-import { AstroSettings } from '../@types/astro.js';
+import type { AstroSettings } from '../@types/astro.js';
 export default function astroScriptsPostPlugin({ settings, }: {
     settings: AstroSettings;
 }): VitePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -53,6 +53,8 @@
     "./assets/services/sharp": "./dist/assets/services/sharp.js",
     "./assets/services/squoosh": "./dist/assets/services/squoosh.js",
     "./content/internal": "./dist/content/internal.js",
+    "./content/runtime": "./dist/content/runtime.js",
+    "./content/runtime-assets": "./dist/content/runtime-assets.js",
     "./debug": "./components/Debug.astro",
     "./internal/*": "./dist/runtime/server/*",
     "./package.json": "./package.json",
@@ -202,7 +204,7 @@
   "scripts": {
     "prebuild": "astro-scripts prebuild --to-string \"src/runtime/server/astro-island.ts\" \"src/runtime/client/{idle,load,media,only,visible}.ts\"",
     "build": "pnpm run prebuild && astro-scripts build \"src/**/*.ts\" && tsc && pnpm run postbuild",
-    "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.ts\"",
+    "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.ts\" && pnpm run postbuild",
     "dev": "astro-scripts dev --copy-wasm --prebuild \"src/runtime/server/astro-island.ts\" --prebuild \"src/runtime/client/{idle,load,media,only,visible}.ts\" \"src/**/*.ts\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
     "test:unit": "mocha --exit --timeout 30000 ./test/units/**/*.test.js",

package/src/content/template/virtual-mod-assets.mjs

@@ -0,0 +1,7 @@
+import { createImage } from 'astro/content/runtime-assets';
+
+const assetsDir = '@@ASSETS_DIR@@';
+
+export const image = createImage({
+	assetsDir,
+});

package/src/content/template/virtual-mod.mjs

@@ -3,8 +3,7 @@ import {
 	createCollectionToGlobResultMap,
 	createGetCollection,
 	createGetEntryBySlug,
-	createImage,
-} from 'astro/content/internal';
+} from 'astro/content/runtime';
 
 export { z } from 'astro/zod';
 
@@ -13,7 +12,6 @@ export function defineCollection(config) {
 }
 
 const contentDir = '@@CONTENT_DIR@@';
-const assetsDir = '@@ASSETS_DIR@@';
 
 const entryGlob = import.meta.glob('@@ENTRY_GLOB_PATH@@', {
 	query: { astroContent: true },
@@ -40,7 +38,3 @@ export const getEntryBySlug = createGetEntryBySlug({
 	getCollection,
 	collectionToRenderEntryMap,
 });
-
-export const image = createImage({
-	assetsDir,
-});