astro 2.10.4 → 2.10.6

package/components/ViewTransitions.astro

@@ -63,9 +63,16 @@ const { fallback = 'animate' } = Astro.props as Props;
 		return 'animate';
 	}
 
+	function markScriptsExec() {
+		for (const script of document.scripts) {
+			script.dataset.astroExec = '';
+		}
+	}
+
 	function runScripts() {
 		let wait = Promise.resolve();
 		for (const script of Array.from(document.scripts)) {
+			if (script.dataset.astroExec === '') continue;
 			const s = document.createElement('script');
 			s.innerHTML = script.innerHTML;
 			for (const attr of script.attributes) {
@@ -77,6 +84,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				}
 				s.setAttribute(attr.name, attr.value);
 			}
+			s.dataset.astroExec = '';
 			script.replaceWith(s);
 		}
 		return wait;
@@ -100,6 +108,19 @@ const { fallback = 'animate' } = Astro.props as Props;
 				const href = el.getAttribute('href');
 				return doc.head.querySelector(`link[rel=stylesheet][href="${href}"]`);
 			}
+			if (el.tagName === 'SCRIPT') {
+				let s1 = el as HTMLScriptElement;
+				for (const s2 of doc.scripts) {
+					if (
+						// Inline
+						(s1.textContent && s1.textContent === s2.textContent) ||
+						// External
+						(s1.type === s2.type && s1.src === s2.src)
+					) {
+						return s2;
+					}
+				}
+			}
 			return null;
 		};
 
@@ -132,6 +153,10 @@ const { fallback = 'animate' } = Astro.props as Props;
 				}
 			}
 
+			if (state?.scrollY === 0 && location.hash) {
+				const id = decodeURIComponent(location.hash.slice(1));
+				state.scrollY = document.getElementById(id)?.offsetTop || 0;
+			}
 			if (state?.scrollY != null) {
 				scrollTo(0, state.scrollY);
 			}
@@ -203,6 +228,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 		} finally {
 			document.documentElement.removeAttribute('data-astro-transition');
 			await runScripts();
+			markScriptsExec();
 			onload();
 		}
 	}
@@ -221,6 +247,8 @@ const { fallback = 'animate' } = Astro.props as Props;
 	}
 
 	if (supportsViewTransitions || getFallback() !== 'none') {
+		markScriptsExec();
+
 		document.addEventListener('click', (ev) => {
 			let link = ev.target;
 			if (link instanceof Element && link.tagName !== 'A') {
@@ -235,7 +263,7 @@ const { fallback = 'animate' } = Astro.props as Props;
 				link.href &&
 				(!link.target || link.target === '_self') &&
 				link.origin === location.origin &&
-				!link.hash &&
+				location.pathname !== link.pathname &&
 				ev.button === 0 && // left clicks only
 				!ev.metaKey && // new tab (mac)
 				!ev.ctrlKey && // new tab (windows)

package/content-types.template.d.ts

@@ -10,7 +10,9 @@ declare module 'astro:content' {
 
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
-	export type CollectionEntry<C extends keyof AnyEntryMap> = AnyEntryMap[C][keyof AnyEntryMap[C]];
+
+	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
+	export type CollectionEntry<C extends keyof AnyEntryMap> = Flatten<AnyEntryMap[C]>;
 
 	// TODO: Remove this when having this fallback is no longer relevant. 2.3? 3.0? - erika, 2023-04-04
 	/**

package/dist/@types/astro.d.ts

@@ -1186,6 +1186,27 @@ export interface AstroUserConfig {
          * ```
          */
         viewTransitions?: boolean;
+        /**
+         * @docs
+         * @name experimental.optimizeHoistedScript
+         * @type {boolean}
+         * @default `false`
+         * @version 2.10.4
+         * @description
+         * Prevents unused components' scripts from being included in a page unexpectedly.
+         * The optimization is best-effort and may inversely miss including the used scripts. Make sure to double-check your built pages
+         * before publishing.
+         * Enable hoisted script analysis optimization by adding the experimental flag:
+         *
+         * ```js
+         * {
+         * 	experimental: {
+         *		optimizeHoistedScript: true,
+         * 	},
+         * }
+         * ```
+         */
+        optimizeHoistedScript?: boolean;
     };
     /** @deprecated - Use "integrations" instead. Run Astro to learn more about migrating. */
     renderers?: never;

package/dist/content/runtime.js

@@ -49,7 +49,7 @@ function createGetCollection({
     );
     let entries = [];
     if (import.meta.env.PROD && cacheEntriesByCollection.has(collection)) {
-      entries = cacheEntriesByCollection.get(collection);
+      entries = [...cacheEntriesByCollection.get(collection)];
     } else {
       entries = await Promise.all(
         lazyImports.map(async (lazyImport) => {

package/dist/core/build/plugins/index.js

@@ -14,7 +14,7 @@ import { pluginSSR, pluginSSRSplit } from "./plugin-ssr.js";
 function registerAllPlugins({ internals, options, register }) {
   register(pluginComponentEntry(internals));
   register(pluginAliasResolve(internals));
-  register(pluginAnalyzer(internals));
+  register(pluginAnalyzer(options, internals));
   register(pluginInternals(internals));
   register(pluginRenderers(options));
   register(pluginMiddleware(options, internals));

package/dist/core/build/plugins/plugin-analyzer.d.ts

@@ -1,5 +1,6 @@
 import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from '../internal.js';
 import type { AstroBuildPlugin } from '../plugin.js';
-export declare function vitePluginAnalyzer(internals: BuildInternals): VitePlugin;
-export declare function pluginAnalyzer(internals: BuildInternals): AstroBuildPlugin;
+import type { StaticBuildOptions } from '../types.js';
+export declare function vitePluginAnalyzer(options: StaticBuildOptions, internals: BuildInternals): VitePlugin;
+export declare function pluginAnalyzer(options: StaticBuildOptions, internals: BuildInternals): AstroBuildPlugin;

package/dist/core/build/plugins/plugin-analyzer.js

@@ -1,4 +1,3 @@
-import { walk } from "estree-walker";
 import { PROPAGATED_ASSET_FLAG } from "../../../content/consts.js";
 import { prependForwardSlash } from "../../../core/path.js";
 import { getTopLevelPages, moduleIsTopLevelPage, walkParentInfos } from "../graph.js";
@@ -19,15 +18,13 @@ async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
   }
   const imports = [];
   const exports = [];
-  walk(parentInfo.ast, {
-    enter(node) {
-      if (node.type === "ImportDeclaration") {
-        imports.push(node);
-      } else if (node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration") {
-        exports.push(node);
-      }
+  for (const node of parentInfo.ast.body) {
+    if (node.type === "ImportDeclaration") {
+      imports.push(node);
+    } else if (node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration") {
+      exports.push(node);
     }
-  });
+  }
   const importNames = [];
   const exportNames = [];
   for (const node of imports) {
@@ -89,7 +86,7 @@ async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
   }
   return exportNames;
 }
-function vitePluginAnalyzer(internals) {
+function vitePluginAnalyzer(options, internals) {
   function hoistedScriptScanner() {
     const uniqueHoistedIds = /* @__PURE__ */ new Map();
     const pageScripts = /* @__PURE__ */ new Map();
@@ -108,20 +105,22 @@ function vitePluginAnalyzer(internals) {
           for (const [parentInfo, depth] of walkParentInfos(from, this, function until(importer) {
             return isPropagatedAsset(importer);
           })) {
-            depthsToChildren.set(depth, parentInfo);
-            if (depth > 0) {
-              const childInfo = depthsToChildren.get(depth - 1);
-              const childExportNames = depthsToExportNames.get(depth - 1);
-              const doesImport = await doesParentImportChild.call(
-                this,
-                parentInfo,
-                childInfo,
-                childExportNames
-              );
-              if (doesImport === "no") {
-                continue;
+            if (options.settings.config.experimental.optimizeHoistedScript) {
+              depthsToChildren.set(depth, parentInfo);
+              if (depth > 0) {
+                const childInfo = depthsToChildren.get(depth - 1);
+                const childExportNames = depthsToExportNames.get(depth - 1);
+                const doesImport = await doesParentImportChild.call(
+                  this,
+                  parentInfo,
+                  childInfo,
+                  childExportNames
+                );
+                if (doesImport === "no") {
+                  continue;
+                }
+                depthsToExportNames.set(depth, doesImport);
               }
-              depthsToExportNames.set(depth, doesImport);
             }
             if (isPropagatedAsset(parentInfo.id)) {
               for (const [nestedParentInfo] of walkParentInfos(from, this)) {
@@ -241,13 +240,13 @@ function vitePluginAnalyzer(internals) {
     }
   };
 }
-function pluginAnalyzer(internals) {
+function pluginAnalyzer(options, internals) {
   return {
     build: "ssr",
     hooks: {
       "build:before": () => {
         return {
-          vitePlugin: vitePluginAnalyzer(internals)
+          vitePlugin: vitePluginAnalyzer(options, internals)
         };
       }
     }

package/dist/core/build/plugins/plugin-middleware.js

@@ -42,7 +42,7 @@ function vitePluginMiddleware(opts, internals) {
         if (chunk.type === "asset") {
           continue;
         }
-        if (chunk.fileName === "middleware.mjs") {
+        if (chunk.fileName === "middleware.mjs" && opts.settings.config.build.excludeMiddleware) {
           internals.middlewareEntryPoint = new URL(chunkName, opts.settings.config.build.server);
         }
       }

package/dist/core/config/schema.d.ts

@@ -179,18 +179,23 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         viewTransitions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        optimizeHoistedScript: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
 }, "strip", z.ZodTypeAny, {
@@ -259,6 +264,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental: {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     };
     legacy: {};
 }, {
@@ -319,6 +325,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     experimental?: {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;
@@ -435,18 +442,23 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental: z.ZodDefault<z.ZodOptional<z.ZodEffects<z.ZodObject<{
         assets: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         viewTransitions: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+        optimizeHoistedScript: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "passthrough", z.ZodTypeAny, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>, {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     }, {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     }>>>;
     legacy: z.ZodDefault<z.ZodOptional<z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>>>;
     root: z.ZodEffects<z.ZodDefault<z.ZodString>, import("url").URL, string | undefined>;
@@ -581,6 +593,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental: {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     };
     legacy: {};
 }, {
@@ -641,6 +654,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental?: {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>, {
@@ -710,6 +724,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental: {
         assets: boolean;
         viewTransitions: boolean;
+        optimizeHoistedScript: boolean;
     };
     legacy: {};
 }, {
@@ -770,6 +785,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: stri
     experimental?: {
         assets?: boolean | undefined;
         viewTransitions?: boolean | undefined;
+        optimizeHoistedScript?: boolean | undefined;
     } | undefined;
     legacy?: {} | undefined;
 }>;

package/dist/core/config/schema.js

@@ -39,7 +39,8 @@ const ASTRO_CONFIG_DEFAULTS = {
   redirects: {},
   experimental: {
     assets: false,
-    viewTransitions: false
+    viewTransitions: false,
+    optimizeHoistedScript: false
   }
 };
 const AstroConfigSchema = z.object({
@@ -143,7 +144,8 @@ const AstroConfigSchema = z.object({
   vite: z.custom((data) => data instanceof Object && !Array.isArray(data)).default(ASTRO_CONFIG_DEFAULTS.vite),
   experimental: z.object({
     assets: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.assets),
-    viewTransitions: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.viewTransitions)
+    viewTransitions: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.viewTransitions),
+    optimizeHoistedScript: z.boolean().optional().default(ASTRO_CONFIG_DEFAULTS.experimental.optimizeHoistedScript)
   }).passthrough().refine(
     (d) => {
       const validKeys = Object.keys(ASTRO_CONFIG_DEFAULTS.experimental);

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.10.4";
+const ASTRO_VERSION = "2.10.6";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "2.10.4";
+  const currentVersion = "2.10.6";
   if (currentVersion.includes("-")) {
     warn(logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.10.4";
+  const version = "2.10.6";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.10.4"}`
+        `v${"2.10.6"}`
       )} ${headline}`
     );
   }

package/dist/template/4xx.js

@@ -1,5 +1,4 @@
 import { escape } from "html-escaper";
-import { baseCSS } from "./css.js";
 function template({
   title,
   pathname,
@@ -13,14 +12,40 @@ function template({
 		<meta charset="UTF-8">
 		<title>${tabTitle}</title>
 		<style>
-			${baseCSS}
 			:root {
+				--gray-10: hsl(258, 7%, 10%);
+				--gray-20: hsl(258, 7%, 20%);
+				--gray-30: hsl(258, 7%, 30%);
+				--gray-40: hsl(258, 7%, 40%);
+				--gray-50: hsl(258, 7%, 50%);
+				--gray-60: hsl(258, 7%, 60%);
+				--gray-70: hsl(258, 7%, 70%);
+				--gray-80: hsl(258, 7%, 80%);
+				--gray-90: hsl(258, 7%, 90%);
 				--black: #13151A;
 				--accent-light: #E0CCFA;
 			}
 
-			body {
+			* {
+				box-sizing: border-box;
+			}
+
+			html {
 				background: var(--black);
+				color-scheme: dark;
+				accent-color: var(--accent-light);
+			}
+
+			body {
+				background-color: var(--gray-10);
+				color: var(--gray-80);
+				font-family: ui-monospace, Menlo, Monaco, "Cascadia Mono", "Segoe UI Mono", "Roboto Mono", "Oxygen Mono", "Ubuntu Monospace", "Source Code Pro", "Fira Mono", "Droid Sans Mono", "Courier New", monospace;
+				line-height: 1.5;
+				margin: 0;
+			}
+
+			a {
+				color: var(--accent-light);
 			}
 
 			.center {
@@ -37,6 +62,8 @@ function template({
 				color: white;
 				font-family: system-ui, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 				font-weight: 700;
+				margin-top: 1rem;
+				margin-bottom: 0;
 			}
 
 			.statusCode {
@@ -48,11 +75,14 @@ function template({
 				width: 124px;
 			}
 
-			pre {
+			pre, code {
 				padding: 2px 8px;
 				background: rgba(0,0,0, 0.25);
 				border: 1px solid rgba(255,255,255, 0.25);
 				border-radius: 4px;
+				font-size: 1.2em;
+				margin-top: 0;
+				max-width: 60em;
 			}
 		</style>
 	</head>

package/dist/vite-plugin-astro-server/plugin.js

@@ -28,12 +28,10 @@ function createVitePluginAstroServer({
       viteServer.watcher.on("unlink", rebuildManifest.bind(null, true));
       viteServer.watcher.on("change", rebuildManifest.bind(null, false));
       return () => {
-        if (settings.config.base !== "/") {
-          viteServer.middlewares.stack.unshift({
-            route: "",
-            handle: baseMiddleware(settings, logging)
-          });
-        }
+        viteServer.middlewares.stack.unshift({
+          route: "",
+          handle: baseMiddleware(settings, logging)
+        });
         viteServer.middlewares.use(async function astroDevHandler(request, response) {
           if (request.url === void 0 || !request.method) {
             response.writeHead(500, "Incomplete request");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.10.4",
+  "version": "2.10.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/dist/template/css.d.ts

@@ -1,6 +0,0 @@
-/**
- *  CSS is exported as a string so the error pages:
- * 1. don’t need to resolve a deep internal CSS import
- * 2. don’t need external dependencies to render (they may be shown because of a dep!)
- */
-export declare const baseCSS = "\n:root {\n  --gray-10: hsl(258, 7%, 10%);\n  --gray-20: hsl(258, 7%, 20%);\n  --gray-30: hsl(258, 7%, 30%);\n  --gray-40: hsl(258, 7%, 40%);\n  --gray-50: hsl(258, 7%, 50%);\n  --gray-60: hsl(258, 7%, 60%);\n  --gray-70: hsl(258, 7%, 70%);\n  --gray-80: hsl(258, 7%, 80%);\n  --gray-90: hsl(258, 7%, 90%);\n  --orange: #ff5d01;\n}\n\n* {\n  box-sizing: border-box;\n}\n\nbody {\n  background-color: var(--gray-10);\n  color: var(--gray-80);\n  font-family: monospace;\n  line-height: 1.5;\n  margin: 0;\n}\n\na {\n  color: var(--orange);\n}\n\nh1 {\n  font-weight: 800;\n  margin-top: 1rem;\n  margin-bottom: 0;\n}\n\npre {\n  color:;\n  font-size: 1.2em;\n  margin-top: 0;\n  max-width: 60em;\n}\n";

package/dist/template/css.js

@@ -1,46 +0,0 @@
-const baseCSS = `
-:root {
-  --gray-10: hsl(258, 7%, 10%);
-  --gray-20: hsl(258, 7%, 20%);
-  --gray-30: hsl(258, 7%, 30%);
-  --gray-40: hsl(258, 7%, 40%);
-  --gray-50: hsl(258, 7%, 50%);
-  --gray-60: hsl(258, 7%, 60%);
-  --gray-70: hsl(258, 7%, 70%);
-  --gray-80: hsl(258, 7%, 80%);
-  --gray-90: hsl(258, 7%, 90%);
-  --orange: #ff5d01;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-body {
-  background-color: var(--gray-10);
-  color: var(--gray-80);
-  font-family: monospace;
-  line-height: 1.5;
-  margin: 0;
-}
-
-a {
-  color: var(--orange);
-}
-
-h1 {
-  font-weight: 800;
-  margin-top: 1rem;
-  margin-bottom: 0;
-}
-
-pre {
-  color:;
-  font-size: 1.2em;
-  margin-top: 0;
-  max-width: 60em;
-}
-`;
-export {
-  baseCSS
-};