astro 2.0.17 → 2.1.0

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

@@ -5,9 +5,11 @@ import {
 } from "@astrojs/markdown-remark/dist/internal.js";
 import fs from "fs";
 import matter from "gray-matter";
+import npath from "node:path";
 import { fileURLToPath } from "node:url";
+import { pathToFileURL } from "url";
 import { normalizePath } from "vite";
-import { getContentPaths } from "../content/index.js";
+import { imageMetadata } from "../assets/index.js";
 import { AstroError, AstroErrorData, MarkdownError } from "../core/errors/index.js";
 import { warn } from "../core/logger/core.js";
 import { isMarkdownFile } from "../core/util.js";
@@ -40,6 +42,24 @@ const astroJsxRuntimeModulePath = normalizePath(
   fileURLToPath(new URL("../jsx-runtime/index.js", import.meta.url))
 );
 function markdown({ settings, logging }) {
+  const markdownAssetMap = /* @__PURE__ */ new Map();
+  async function resolveImage(fileId, path) {
+    const resolved = await this.resolve(path, fileId);
+    if (!resolved)
+      return path;
+    const rel = npath.relative(normalizePath(fileURLToPath(settings.config.root)), resolved.id);
+    const buffer = await fs.promises.readFile(resolved.id);
+    if (markdownAssetMap.has(resolved.id)) {
+      return `ASTRO_ASSET_MD_${markdownAssetMap.get(resolved.id)}`;
+    }
+    const file = this.emitFile({
+      type: "asset",
+      name: rel,
+      source: buffer
+    });
+    markdownAssetMap.set(resolved.id, file);
+    return `ASTRO_ASSET_MD_${file}`;
+  }
   return {
     enforce: "pre",
     name: "astro:markdown",
@@ -48,14 +68,32 @@ function markdown({ settings, logging }) {
         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;
+        }
         const renderResult = await renderMarkdown(raw.content, {
           ...settings.config.markdown,
           fileURL: new URL(`file://${fileId}`),
-          contentDir: getContentPaths(settings.config).contentDir,
-          frontmatter: raw.data
+          frontmatter: raw.data,
+          experimentalAssets: settings.config.experimental.assets,
+          imageService,
+          assetsDir: new URL("./assets/", settings.config.srcDir),
+          resolveImage: this.meta.watchMode ? void 0 : resolveImage.bind(this, fileId)
         });
-        const html = renderResult.code;
+        this;
+        let html = renderResult.code;
         const { headings } = renderResult.metadata;
+        let imagePaths = [];
+        if (settings.config.experimental.assets) {
+          let paths = renderResult.vfile.data.imagePaths ?? [];
+          imagePaths = await Promise.all(
+            paths.map(async (imagePath) => {
+              var _a;
+              return ((_a = await this.resolve(imagePath)) == null ? void 0 : _a.id) ?? imagePath;
+            })
+          );
+        }
         const astroData = safelyGetAstroData(renderResult.vfile.data);
         if (astroData instanceof InvalidAstroDataError) {
           throw new AstroError(AstroErrorData.InvalidFrontmatterInjectionError);
@@ -72,6 +110,11 @@ function markdown({ settings, logging }) {
         const code = escapeViteEnvReferences(`
 				import { Fragment, jsx as h } from ${JSON.stringify(astroJsxRuntimeModulePath)};
 				${layout ? `import Layout from ${JSON.stringify(layout)};` : ""}
+				${settings.config.experimental.assets ? 'import { getConfiguredImageService } from "astro:assets";\ngetConfiguredImageService();' : ""}
+
+				const images = {
+					${imagePaths.map((entry) => `'${entry}': await import('${entry}')`)}
+				}
 
 				const html = ${JSON.stringify(html)};
 
@@ -123,6 +166,29 @@ function markdown({ settings, logging }) {
           }
         };
       }
+    },
+    async generateBundle(_opts, bundle) {
+      for (const [, output] of Object.entries(bundle)) {
+        if (output.type === "asset")
+          continue;
+        if (markdownAssetMap.size) {
+          const optimizedPaths = /* @__PURE__ */ new Map();
+          for (const [filename, hash] of markdownAssetMap) {
+            const image = await imageMetadata(pathToFileURL(filename));
+            if (!image) {
+              continue;
+            }
+            const fileName = this.getFileName(hash);
+            image.src = npath.join(settings.config.base, fileName);
+            const optimized = globalThis.astroAsset.addStaticImage({ src: image });
+            optimizedPaths.set(hash, optimized);
+          }
+          output.code = output.code.replace(/ASTRO_ASSET_MD_([0-9a-z]{8})/, (_str, hash) => {
+            const optimizedName = optimizedPaths.get(hash);
+            return optimizedName || this.getFileName(hash);
+          });
+        }
+      }
     }
   };
 }

package/dist/vite-plugin-ssr-manifest/index.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin as VitePlugin } from 'vite';
+export declare function vitePluginSSRManifest(): VitePlugin;

package/dist/vite-plugin-ssr-manifest/index.js

@@ -0,0 +1,25 @@
+const manifestVirtualModuleId = "astro:ssr-manifest";
+const resolvedManifestVirtualModuleId = "\0" + manifestVirtualModuleId;
+function vitePluginSSRManifest() {
+  return {
+    name: "@astrojs/vite-plugin-astro-ssr-manifest",
+    enforce: "post",
+    resolveId(id, parent) {
+      if (id === manifestVirtualModuleId) {
+        return resolvedManifestVirtualModuleId;
+      }
+    },
+    load(id) {
+      if (id === resolvedManifestVirtualModuleId) {
+        return `export let manifest = {};
+export function _privateSetManifestDontUseThis(ssrManifest) {
+  manifest = ssrManifest;
+}`;
+      }
+      return void 0;
+    }
+  };
+}
+export {
+  vitePluginSSRManifest
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.0.17",
+  "version": "2.1.0",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -32,6 +32,7 @@
     "./types": "./types.d.ts",
     "./client": "./client.d.ts",
     "./client-base": "./client-base.d.ts",
+    "./client-image": "./client-image.d.ts",
     "./import-meta": "./import-meta.d.ts",
     "./astro-jsx": "./astro-jsx.d.ts",
     "./tsconfigs/*.json": "./tsconfigs/*",
@@ -47,6 +48,10 @@
     "./client/*": "./dist/runtime/client/*",
     "./components": "./components/index.ts",
     "./components/*": "./components/*",
+    "./assets": "./dist/assets/index.js",
+    "./assets/image-endpoint": "./dist/assets/image-endpoint.js",
+    "./assets/services/sharp": "./dist/assets/services/sharp.js",
+    "./assets/services/squoosh": "./dist/assets/services/squoosh.js",
     "./content/internal": "./dist/content/internal.js",
     "./debug": "./components/Debug.astro",
     "./internal/*": "./dist/runtime/server/*",
@@ -77,6 +82,7 @@
     "env.d.ts",
     "client.d.ts",
     "client-base.d.ts",
+    "client-image.d.ts",
     "import-meta.d.ts",
     "astro-jsx.d.ts",
     "types.d.ts",
@@ -87,9 +93,9 @@
   "dependencies": {
     "@astrojs/compiler": "^1.2.0",
     "@astrojs/language-server": "^0.28.3",
-    "@astrojs/markdown-remark": "^2.0.1",
-    "@astrojs/telemetry": "^2.0.1",
-    "@astrojs/webapi": "^2.0.2",
+    "@astrojs/markdown-remark": "^2.1.0",
+    "@astrojs/telemetry": "^2.1.0",
+    "@astrojs/webapi": "^2.1.0",
     "@babel/core": "^7.18.2",
     "@babel/generator": "^7.18.2",
     "@babel/parser": "^7.18.4",
@@ -100,6 +106,7 @@
     "@types/yargs-parser": "^21.0.0",
     "acorn": "^8.8.1",
     "boxen": "^6.2.1",
+    "chokidar": "^3.5.3",
     "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.5.0",
@@ -114,6 +121,7 @@
     "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",
@@ -159,8 +167,9 @@
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/server-destroy": "^1.0.1",
+    "@types/sharp": "^0.31.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.12",
+    "astro-scripts": "0.0.14",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",
     "eol": "^0.9.1",
@@ -173,21 +182,29 @@
     "remark-code-titles": "^0.1.2",
     "rollup": "^3.9.0",
     "sass": "^1.52.2",
+    "sharp": "^0.31.3",
     "srcset-parse": "^1.1.0",
     "undici": "^5.20.0",
     "unified": "^10.1.2"
   },
+  "peerDependencies": {
+    "sharp": "^0.31.3"
+  },
+  "peerDependenciesMeta": {
+    "sharp": {
+      "optional": true
+    }
+  },
   "engines": {
     "node": ">=16.12.0",
     "npm": ">=6.14.0"
   },
   "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",
+    "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 --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\"",
-    "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
+    "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",
     "test:unit:match": "mocha --exit --timeout 30000 ./test/units/**/*.test.js -g",
     "test": "pnpm run test:unit && mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",

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

@@ -1,7 +1,24 @@
+declare module 'astro:content' {
+	interface Render {
+		'.md': Promise<{
+			Content: import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
+			remarkPluginFrontmatter: Record<string, any>;
+		}>;
+	}
+}
+
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
 	export type CollectionEntry<C extends keyof typeof entryMap> =
-		(typeof entryMap)[C][keyof (typeof entryMap)[C]] & Render;
+		(typeof entryMap)[C][keyof (typeof entryMap)[C]];
+
+	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;
+	}>;
 
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
@@ -57,14 +74,6 @@ declare module 'astro:content' {
 		Required<ContentConfig['collections'][C]>['schema']
 	>;
 
-	type Render = {
-		render(): Promise<{
-			Content: import('astro').MarkdownInstance<{}>['Content'];
-			headings: import('astro').MarkdownHeading[];
-			remarkPluginFrontmatter: Record<string, any>;
-		}>;
-	};
-
 	const entryMap: {
 		// @@ENTRY_MAP@@
 	};

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

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

package/tsconfigs/base.json

@@ -17,6 +17,11 @@
     // Properly support importing CJS modules in ESM
     "esModuleInterop": true,
     // Skip typechecking libraries and .d.ts files
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    // Add alias for assets folder for easy reference to assets
+    "baseUrl": ".",
+    "paths": {
+      "~/assets/*": ["src/assets/*"]
+    }
   }
 }