astro 2.1.2 → 2.1.4

package/dist/vite-plugin-config-alias/index.js

@@ -1,63 +1,54 @@
-import * as path from "path";
-const normalize = (pathname) => String(pathname).split(path.sep).join(path.posix.sep);
-const getConfigAlias = (settings) => {
-  const config = settings.tsConfig;
-  const configPath = settings.tsConfigPath;
-  if (!config || !configPath)
-    return null;
-  const compilerOptions = Object(config.compilerOptions);
-  if (!compilerOptions.baseUrl)
-    return null;
-  const baseUrl = path.posix.resolve(
-    path.posix.dirname(normalize(configPath).replace(/^\/?/, "/")),
-    normalize(compilerOptions.baseUrl)
-  );
+import fs from "fs";
+import path from "path";
+import slash from "slash";
+const getConfigAlias = (paths, baseUrl) => {
   const aliases = [];
-  for (let [alias, values] of Object.entries(
-    Object(compilerOptions.paths)
-  )) {
-    values = [].concat(values);
+  for (const [alias, values] of Object.entries(paths)) {
     const find = new RegExp(
       `^${[...alias].map(
         (segment) => segment === "*" ? "(.+)" : segment.replace(/[\\^$*+?.()|[\]{}]/, "\\$&")
       ).join("")}$`
     );
     let matchId = 0;
-    for (let value of values) {
+    for (const value of values) {
       const replacement = [...path.posix.resolve(baseUrl, value)].map((segment) => segment === "*" ? `$${++matchId}` : segment === "$" ? "$$" : segment).join("");
       aliases.push({ find, replacement });
     }
   }
-  aliases.push({
-    find: /^(?!\.*\/)(.+)$/,
-    replacement: `${[...baseUrl].map((segment) => segment === "$" ? "$$" : segment).join("")}/$1`
-  });
   return aliases;
 };
 function configAliasVitePlugin({
   settings
 }) {
-  const { config } = settings;
-  const configAlias = getConfigAlias(settings);
-  if (!configAlias)
-    return {};
+  const { tsConfig, tsConfigPath } = settings;
+  if (!tsConfig || !tsConfigPath || !tsConfig.compilerOptions)
+    return null;
+  const { baseUrl, paths } = tsConfig.compilerOptions;
+  if (!baseUrl || !paths)
+    return null;
+  const resolvedBaseUrl = path.posix.resolve(
+    path.posix.dirname(slash(tsConfigPath).replace(/^\/?/, "/")),
+    slash(baseUrl)
+  );
+  const configAlias = getConfigAlias(paths, resolvedBaseUrl);
   return {
     name: "astro:tsconfig-alias",
     enforce: "pre",
-    async resolveId(sourceId, importer, options) {
-      const resolvedId = await this.resolve(sourceId, importer, { skipSelf: true, ...options });
-      if (resolvedId)
-        return resolvedId;
-      for (const alias of configAlias) {
-        if (alias.find.test(sourceId)) {
-          const aliasedSourceId = sourceId.replace(alias.find, alias.replacement);
-          const resolvedAliasedId = await this.resolve(aliasedSourceId, importer, {
-            skipSelf: true,
-            ...options
-          });
-          if (resolvedAliasedId)
-            return resolvedAliasedId;
-        }
+    config() {
+      if (configAlias.length) {
+        return {
+          resolve: {
+            alias: configAlias
+          }
+        };
+      }
+    },
+    resolveId(id) {
+      if (id.startsWith(".") || id.startsWith("/"))
+        return;
+      const resolved = path.posix.join(resolvedBaseUrl, id);
+      if (fs.existsSync(resolved)) {
+        return resolved;
       }
     }
   };

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

@@ -51,6 +51,7 @@ function envVitePlugin({ settings }) {
       }
       let s;
       const pattern = new RegExp(
+        // Do not allow preceding '.', but do allow preceding '...' for spread operations
         `(?<!(?<!\\.\\.)\\.)\\b(import\\.meta\\.env\\.(.+?)|import\\.meta\\.env)\\b(?!\\s*?=[^=])`,
         "g"
       );

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.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import type fsMod from 'node:fs';
-import { Plugin } from 'vite';
+import { type Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';
-import { LogOptions } from '../core/logger/core.js';
+import { type LogOptions } from '../core/logger/core.js';
 export declare function getEnvTsPath({ srcDir }: {
     srcDir: URL;
 }): URL;

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

@@ -14,6 +14,8 @@ function astroInjectEnvTsPlugin({
 }) {
   return {
     name: "astro-inject-env-ts",
+    // Use `post` to ensure project setup is complete
+    // Ex. `.astro` types have been written
     enforce: "post",
     async config() {
       await setUpEnvTs({ settings, logging, fs });
@@ -39,12 +41,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-jsx/index.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from 'vite';
+import { type Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro';
 import type { LogOptions } from '../core/logger/core.js';
 interface AstroPluginJSXOptions {

package/dist/vite-plugin-jsx/index.js

@@ -1,4 +1,6 @@
-import { transformWithEsbuild } from "vite";
+import {
+  transformWithEsbuild
+} from "vite";
 import babel from "@babel/core";
 import * as colors from "kleur/colors";
 import path from "path";
@@ -61,6 +63,8 @@ async function transformJSX({
       meta: {
         astro,
         vite: {
+          // Setting this vite metadata to `ts` causes Vite to resolve .js
+          // extensions to .ts files.
           lang: "ts"
         }
       }
@@ -80,6 +84,7 @@ function jsx({ settings, logging }) {
   return {
     name: "astro:jsx",
     enforce: "pre",
+    // run transforms before other plugins
     async configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
       const possibleRenderers = collectJSXRenderers(settings.renderers);
@@ -107,6 +112,7 @@ function jsx({ settings, logging }) {
           sourcemap: "inline",
           tsconfigRaw: {
             compilerOptions: {
+              // Ensure client:only imports are treeshaken
               importsNotUsedAsValues: "remove"
             }
           }

package/dist/vite-plugin-jsx/tag.js

@@ -6,6 +6,7 @@ async function tagExportsWithRenderer({
   return {
     visitor: {
       Program: {
+        // Inject `import { __astro_tag_component__ } from 'astro/server/index.js'`
         enter(path) {
           path.node.body.splice(
             0,
@@ -21,6 +22,7 @@ async function tagExportsWithRenderer({
             )
           );
         },
+        // For each export we found, inject `__astro_tag_component__(exportName, rendererName)`
         exit(path, state) {
           const exportedIds = state.get("astro:tags");
           if (exportedIds) {
@@ -38,6 +40,11 @@ async function tagExportsWithRenderer({
         }
       },
       ExportDeclaration: {
+        /**
+         * For default anonymous function export, we need to give them a unique name
+         * @param path
+         * @returns
+         */
         enter(path) {
           var _a;
           const node = path.node;

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-markdown/index.js

@@ -10,6 +10,7 @@ import { fileURLToPath } from "node:url";
 import { pathToFileURL } from "url";
 import { normalizePath } from "vite";
 import { imageMetadata } from "../assets/index.js";
+import imageSize from "../assets/vendor/image-size/index.js";
 import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
 import { isMarkdownFile } from "../core/util.js";
@@ -43,6 +44,7 @@ const astroJsxRuntimeModulePath = normalizePath(
 );
 function markdown({ settings, logging }) {
   const markdownAssetMap = /* @__PURE__ */ new Map();
+  let imageService = void 0;
   async function resolveImage(fileId, path) {
     const resolved = await this.resolve(path, fileId);
     if (!resolved)
@@ -63,12 +65,15 @@ function markdown({ settings, logging }) {
   return {
     enforce: "pre",
     name: "astro:markdown",
+    // Why not the "transform" hook instead of "load" + readFile?
+    // A: Vite transforms all "import.meta.env" references to their values before
+    // passing to the transform hook. This lets us get the truly raw value
+    // to escape "import.meta.env" ourselves.
     async load(id) {
       if (isMarkdownFile(id)) {
         const { fileId, fileUrl } = getFileInfo(id, settings.config);
         const rawFile = await fs.promises.readFile(fileId, "utf-8");
         const raw = safeMatter(rawFile, id);
-        let imageService = void 0;
         if (settings.config.experimental.assets) {
           imageService = (await import(settings.config.image.service)).default;
         }
@@ -79,7 +84,8 @@ function markdown({ settings, logging }) {
           experimentalAssets: settings.config.experimental.assets,
           imageService,
           assetsDir: new URL("./assets/", settings.config.srcDir),
-          resolveImage: this.meta.watchMode ? void 0 : resolveImage.bind(this, fileId)
+          resolveImage: this.meta.watchMode ? void 0 : resolveImage.bind(this, fileId),
+          getImageMetadata: imageSize
         });
         this;
         let html = renderResult.code;
@@ -180,10 +186,12 @@ function markdown({ settings, logging }) {
             }
             const fileName = this.getFileName(hash);
             image.src = npath.join(settings.config.base, fileName);
-            const optimized = globalThis.astroAsset.addStaticImage({ src: image });
+            const options = { src: image };
+            const validatedOptions = (imageService == null ? void 0 : imageService.validateOptions) ? imageService.validateOptions(options) : options;
+            const optimized = globalThis.astroAsset.addStaticImage(validatedOptions);
             optimizedPaths.set(hash, optimized);
           }
-          output.code = output.code.replace(/ASTRO_ASSET_MD_([0-9a-z]{8})/, (_str, hash) => {
+          output.code = output.code.replaceAll(/ASTRO_ASSET_MD_([0-9a-z]{8})/gm, (_str, hash) => {
             const optimizedName = optimizedPaths.get(hash);
             return optimizedName || this.getFileName(hash);
           });

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 Plugin as VitePlugin } from 'vite';
+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 Plugin as VitePlugin } from 'vite';
+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.4",
   "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",
@@ -93,7 +95,7 @@
   "dependencies": {
     "@astrojs/compiler": "^1.2.0",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^2.1.0",
+    "@astrojs/markdown-remark": "^2.1.1",
     "@astrojs/telemetry": "^2.1.0",
     "@astrojs/webapi": "^2.1.0",
     "@babel/core": "^7.18.2",
@@ -121,7 +123,6 @@
     "github-slugger": "^2.0.0",
     "gray-matter": "^4.0.3",
     "html-escaper": "^3.0.3",
-    "image-size": "^1.0.2",
     "kleur": "^4.1.4",
     "magic-string": "^0.27.0",
     "mime": "^3.0.0",
@@ -201,9 +202,9 @@
   },
   "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\"",
-    "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\"",
+    "build": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && tsc && pnpm run postbuild",
+    "build:ci": "pnpm run prebuild && astro-scripts build \"src/**/*.{ts,js}\" && 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,js}\"",
     "postbuild": "astro-scripts copy \"src/**/*.astro\" && astro-scripts copy \"src/**/*.wasm\"",
     "test:unit": "mocha --exit --timeout 30000 ./test/units/**/*.test.js",
     "test:unit:match": "mocha --exit --timeout 30000 ./test/units/**/*.test.js -g",

package/src/content/template/types.d.ts

@@ -13,11 +13,22 @@ declare module 'astro:content' {
 	export type CollectionEntry<C extends keyof typeof entryMap> =
 		(typeof entryMap)[C][keyof (typeof entryMap)[C]];
 
+	// This needs to be in sync with ImageMetadata
 	export const image: () => import('astro/zod').ZodObject<{
 		src: import('astro/zod').ZodString;
 		width: import('astro/zod').ZodNumber;
 		height: import('astro/zod').ZodNumber;
-		format: import('astro/zod').ZodString;
+		format: import('astro/zod').ZodUnion<
+			[
+				import('astro/zod').ZodLiteral<'png'>,
+				import('astro/zod').ZodLiteral<'jpg'>,
+				import('astro/zod').ZodLiteral<'jpeg'>,
+				import('astro/zod').ZodLiteral<'tiff'>,
+				import('astro/zod').ZodLiteral<'webp'>,
+				import('astro/zod').ZodLiteral<'gif'>,
+				import('astro/zod').ZodLiteral<'svg'>
+			]
+		>;
 	}>;
 
 	type BaseSchemaWithoutEffects =

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,
-});

package/tsconfigs/base.json

@@ -22,6 +22,9 @@
     "baseUrl": ".",
     "paths": {
       "~/assets/*": ["src/assets/*"]
-    }
+    },
+    // TypeScript 5.0 changed how `isolatedModules` and `importsNotUsedAsValues` works, deprecating the later
+    // Until the majority of users are on TypeScript 5.0, we'll have to supress those deprecation errors
+    "ignoreDeprecations": "5.0"
   }
 }