astro 1.1.1 → 1.1.2

package/astro-jsx.d.ts

@@ -1007,7 +1007,7 @@ declare namespace astroHTML.JSX {
 	//   - "string"
 	//   - union of string literals
 	interface SVGAttributes extends AriaAttributes, DOMAttributes, AstroBuiltinAttributes {
-		// Attributes which also defined in HTMLAttributes
+		// Attributes which are also defined in HTMLAttributes
 		class?: string | undefined | null;
 		color?: string | undefined | null;
 		height?: number | string | undefined | null;
@@ -1018,6 +1018,7 @@ declare namespace astroHTML.JSX {
 		method?: string | undefined | null;
 		min?: number | string | undefined | null;
 		name?: string | undefined | null;
+		slot?: string | undefined | null;
 		style?: string | Record<string, any> | undefined | null;
 		target?: string | undefined | null;
 		type?: string | undefined | null;

package/components/Code.astro

@@ -38,11 +38,6 @@ const { code, lang = 'plaintext', theme = 'github-dark', wrap = false } = Astro.
 function repairShikiTheme(html: string): string {
 	// Replace "shiki" class naming with "astro"
 	html = html.replace('<pre class="shiki"', '<pre class="astro-code"');
-	// Replace "shiki" css variable naming with "astro".
-	html = html.replace(
-		/style="(background-)?color: var\(--shiki-/g,
-		'style="$1color: var(--astro-code-'
-	);
 	// Handle code wrapping
 	// if wrap=null, do nothing.
 	if (wrap === false) {

package/components/Shiki.js

@@ -8,6 +8,10 @@ function stringify(opts) {
 	return JSON.stringify(opts, Object.keys(opts).sort());
 }
 
+/**
+ * @param {import('shiki').HighlighterOptions} opts
+ * @returns {Promise<import('shiki').Highlighter>}
+ */
 export function getHighlighter(opts) {
 	const key = stringify(opts);
 
@@ -17,7 +21,22 @@ export function getHighlighter(opts) {
 	}
 
 	// Start the async getHighlighter call and cache the Promise
-	const highlighter = getShikiHighlighter(opts);
+	const highlighter = getShikiHighlighter(opts).then((hl) => {
+		hl.setColorReplacements({
+			'#000001': 'var(--astro-code-color-text)',
+			'#000002': 'var(--astro-code-color-background)',
+			'#000004': 'var(--astro-code-token-constant)',
+			'#000005': 'var(--astro-code-token-string)',
+			'#000006': 'var(--astro-code-token-comment)',
+			'#000007': 'var(--astro-code-token-keyword)',
+			'#000008': 'var(--astro-code-token-parameter)',
+			'#000009': 'var(--astro-code-token-function)',
+			'#000010': 'var(--astro-code-token-string-expression)',
+			'#000011': 'var(--astro-code-token-punctuation)',
+			'#000012': 'var(--astro-code-token-link)',
+		});
+		return hl;
+	});
 	_resolvedHighlighters.set(key, highlighter);
 
 	return highlighter;

package/config.d.ts

@@ -1,5 +1,5 @@
 type ViteUserConfig = import('vite').UserConfig;
-type AstroUserConfig = import('./dist/types/@types/astro').AstroUserConfig;
+type AstroUserConfig = import('./dist/@types/astro').AstroUserConfig;
 
 /**
  * See the full Astro Configuration API Documentation

package/dist/core/add/index.js

@@ -70,7 +70,7 @@ async function add(names, { cwd, flags, logging, telemetry }) {
           ["partytown", "astro add partytown"],
           ["sitemap", "astro add sitemap"]
         ],
-        "Example: Add an Adapter": [
+        "Example: Add an SSR Adapter": [
           ["netlify", "astro add netlify"],
           ["vercel", "astro add vercel"],
           ["deno", "astro add deno"]

package/dist/core/build/generate.js

@@ -153,8 +153,27 @@ async function getPathsForRoute(pageData, mod, opts, builtPaths) {
   }
   return paths;
 }
+function shouldAppendForwardSlash(trailingSlash, buildFormat) {
+  switch (trailingSlash) {
+    case "always":
+      return true;
+    case "never":
+      return false;
+    case "ignore": {
+      switch (buildFormat) {
+        case "directory":
+          return true;
+        case "file":
+          return false;
+      }
+    }
+  }
+}
 function addPageName(pathname, opts) {
-  opts.pageNames.push(pathname.replace(/^\//, ""));
+  const trailingSlash = opts.astroConfig.trailingSlash;
+  const buildFormat = opts.astroConfig.build.format;
+  const pageName = shouldAppendForwardSlash(trailingSlash, buildFormat) ? pathname.replace(/\/?$/, "/").replace(/^\//, "") : pathname.replace(/^\//, "");
+  opts.pageNames.push(pageName);
 }
 function getUrlForPath(pathname, base, origin, format, routeType) {
   const ending = format === "directory" ? "/" : ".html";

package/dist/core/build/index.js

@@ -46,8 +46,7 @@ class AstroBuilder {
         server: {
           hmr: false,
           middlewareMode: true
-        },
-        appType: "custom"
+        }
       },
       { astroConfig: this.config, logging, mode: "build" }
     );

package/dist/core/build/static-build.js

@@ -64,11 +64,8 @@ Example:
   await clientBuild(opts, internals, clientInput);
   timer.generate = performance.now();
   if (astroConfig.output === "static") {
-    try {
-      await generatePages(opts, internals);
-    } finally {
-      await cleanSsrOutput(opts);
-    }
+    await generatePages(opts, internals);
+    await cleanSsrOutput(opts);
   } else {
     await injectManifest(opts, internals);
     info(opts.logging, null, `

package/dist/core/config.d.ts

@@ -94,11 +94,11 @@ export declare const AstroConfigSchema: z.ZodObject<{
             wrap: z.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodNull]>>;
         }, "strip", z.ZodTypeAny, {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
             wrap: boolean | null;
         }, {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
             wrap?: boolean | null | undefined;
         }>>;
         remarkPlugins: z.ZodDefault<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodTuple<[z.ZodString, z.ZodAny], null>, z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodTuple<[z.ZodType<RemarkPlugin<any[]>, z.ZodTypeDef, RemarkPlugin<any[]>>, z.ZodAny], null>]>, "many">>;
@@ -110,7 +110,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
             wrap: boolean | null;
         };
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
@@ -122,7 +122,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
             wrap?: boolean | null | undefined;
         } | undefined;
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;
@@ -150,7 +150,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight: false | "shiki" | "prism";
         shikiConfig: {
             langs: ILanguageRegistration[];
-            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
+            theme: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {});
             wrap: boolean | null;
         };
         remarkPlugins: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[];
@@ -193,7 +193,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         syntaxHighlight?: false | "shiki" | "prism" | undefined;
         shikiConfig?: {
             langs?: ILanguageRegistration[] | undefined;
-            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
+            theme?: "css-variables" | "dark-plus" | "dracula-soft" | "dracula" | "github-dark-dimmed" | "github-dark" | "github-light" | "hc_light" | "light-plus" | "material-darker" | "material-default" | "material-lighter" | "material-ocean" | "material-palenight" | "min-dark" | "min-light" | "monokai" | "nord" | "one-dark-pro" | "poimandres" | "rose-pine-dawn" | "rose-pine-moon" | "rose-pine" | "slack-dark" | "slack-ochin" | "solarized-dark" | "solarized-light" | "vitesse-dark" | "vitesse-light" | import("shiki").IShikiTheme | (string & {}) | undefined;
             wrap?: boolean | null | undefined;
         } | undefined;
         remarkPlugins?: (string | [string, any] | RemarkPlugin<any[]> | [RemarkPlugin<any[]>, any])[] | undefined;

package/dist/core/create-vite.js

@@ -38,6 +38,7 @@ async function createVite(commandConfig, { astroConfig, logging, mode }) {
     cacheDir: fileURLToPath(new URL("./node_modules/.vite/", astroConfig.root)),
     clearScreen: false,
     logLevel: "warn",
+    appType: "custom",
     optimizeDeps: {
       entries: ["src/**/*"],
       exclude: ["node-fetch"]

package/dist/core/dev/index.js

@@ -46,7 +46,7 @@ async function dev(config, options) {
       https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
     })
   );
-  const currentVersion = "1.1.1";
+  const currentVersion = "1.1.2";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -46,7 +46,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.1.1";
+  const version = "1.1.2";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -225,7 +225,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.1.1"}`
+        `v${"1.1.2"}`
       )} ${headline}`
     );
   }

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

@@ -1,3 +1,3 @@
 import vite from 'vite';
 /** recursively crawl the module graph to get all style files imported by parent id */
-export declare function crawlGraph(viteServer: vite.ViteDevServer, _id: string, isFile: boolean, scanned?: Set<string>): AsyncGenerator<vite.ModuleNode, void, unknown>;
+export declare function crawlGraph(viteServer: vite.ViteDevServer, _id: string, isRootFile: boolean, scanned?: Set<string>): AsyncGenerator<vite.ModuleNode, void, unknown>;

package/dist/core/render/dev/vite.js

@@ -3,10 +3,10 @@ import { unwrapId } from "../../util.js";
 import { STYLE_EXTENSIONS } from "../util.js";
 const fileExtensionsToSSR = /* @__PURE__ */ new Set([".astro", ".md"]);
 const STRIP_QUERY_PARAMS_REGEX = /\?.*$/;
-async function* crawlGraph(viteServer, _id, isFile, scanned = /* @__PURE__ */ new Set()) {
+async function* crawlGraph(viteServer, _id, isRootFile, scanned = /* @__PURE__ */ new Set()) {
   const id = unwrapId(_id);
   const importedModules = /* @__PURE__ */ new Set();
-  const moduleEntriesForId = isFile ? viteServer.moduleGraph.getModulesByFile(id) ?? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([viteServer.moduleGraph.getModuleById(id)]);
+  const moduleEntriesForId = isRootFile ? viteServer.moduleGraph.getModulesByFile(id) ?? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([viteServer.moduleGraph.getModuleById(id)]);
   for (const entry of moduleEntriesForId) {
     if (!entry) {
       continue;
@@ -23,7 +23,10 @@ async function* crawlGraph(viteServer, _id, isFile, scanned = /* @__PURE__ */ ne
           if (fileExtensionsToSSR.has(npath.extname(importedModulePathname))) {
             const mod = viteServer.moduleGraph.getModuleById(importedModule.id);
             if (!(mod == null ? void 0 : mod.ssrModule)) {
-              await viteServer.ssrLoadModule(importedModule.id);
+              try {
+                await viteServer.ssrLoadModule(importedModule.id);
+              } catch {
+              }
             }
           }
         }

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.1.1";
+const ASTRO_VERSION = "1.1.2";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.1.1";
+const ASTRO_VERSION = "1.1.2";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

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

@@ -16,18 +16,6 @@ import { createRequest } from "../core/request.js";
 import { createRouteManifest, matchAllRoutes } from "../core/routing/index.js";
 import { createSafeError, resolvePages } from "../core/util.js";
 import notFoundTemplate, { subpathNotUsedTemplate } from "../template/4xx.js";
-const BAD_VITE_MIDDLEWARE = [
-  "viteIndexHtmlMiddleware",
-  "vite404Middleware",
-  "viteSpaFallbackMiddleware"
-];
-function removeViteHttpMiddleware(server) {
-  for (let i = server.stack.length - 1; i > 0; i--) {
-    if (BAD_VITE_MIDDLEWARE.includes(server.stack[i].handle.name)) {
-      server.stack.splice(i, 1);
-    }
-  }
-}
 function truncateString(str, n) {
   if (str.length > n) {
     return str.substring(0, n) + "…";
@@ -288,7 +276,6 @@ function createPlugin({ config, logging }) {
       viteServer.watcher.on("unlink", rebuildManifest.bind(null, true));
       viteServer.watcher.on("change", rebuildManifest.bind(null, false));
       return () => {
-        removeViteHttpMiddleware(viteServer.middlewares);
         if (config.base !== "/") {
           viteServer.middlewares.stack.unshift({
             route: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -84,7 +84,7 @@
   "dependencies": {
     "@astrojs/compiler": "^0.23.4",
     "@astrojs/language-server": "^0.23.0",
-    "@astrojs/markdown-remark": "^1.1.0",
+    "@astrojs/markdown-remark": "^1.1.1",
     "@astrojs/telemetry": "^1.0.0",
     "@astrojs/webapi": "^1.0.0",
     "@babel/core": "^7.18.2",
@@ -125,7 +125,7 @@
     "resolve": "^1.22.0",
     "rollup": "~2.77.0",
     "semver": "^7.3.7",
-    "shiki": "^0.10.1",
+    "shiki": "^0.11.1",
     "sirv": "^2.0.2",
     "slash": "^4.0.0",
     "string-width": "^5.1.2",