astro 1.4.4 → 1.4.6

package/config.mjs

@@ -1,43 +1 @@
-export function defineConfig(config) {
-	return config;
-}
-
-export function getViteConfig(inlineConfig) {
-	// Return an async Vite config getter which exposes a resolved `mode` and `command`
-	return async ({ mode, command }) => {
-		// Vite `command` is `serve | build`, but Astro uses `dev | build`
-		const cmd = command === 'serve' ? 'dev' : command;
-
-		// Use dynamic import to avoid pulling in deps unless used
-		const [
-			{ mergeConfig },
-			{ nodeLogDestination },
-			{ openConfig },
-			{ createVite },
-			{ runHookConfigSetup, runHookConfigDone },
-		] = await Promise.all([
-			import('vite'),
-			import('./dist/core/logger/node.js'),
-			import('./dist/core/config.js'),
-			import('./dist/core/create-vite.js'),
-			import('./dist/integrations/index.js'),
-		]);
-		const logging = {
-			dest: nodeLogDestination,
-			level: 'info',
-		};
-		const { astroConfig: config } = await openConfig({
-			cmd,
-			logging,
-		});
-		await runHookConfigSetup({ config, command: cmd });
-		const viteConfig = await createVite(
-			{
-				mode,
-			},
-			{ astroConfig: config, logging: logging, mode }
-		);
-		await runHookConfigDone({ config });
-		return mergeConfig(viteConfig, inlineConfig);
-	};
-}
+export { defineConfig, getViteConfig } from './dist/config/index.js';

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

@@ -69,7 +69,7 @@ export interface BuildConfig {
  *
  * [Astro reference](https://docs.astro.build/reference/api-reference/#astro-global)
  */
-export interface AstroGlobal extends AstroGlobalPartial {
+export interface AstroGlobal<Props extends Record<string, any> = Record<string, any>> extends AstroGlobalPartial {
     /**
      * Canonical URL of the current page.
      * @deprecated Use `Astro.url` instead.
@@ -125,7 +125,7 @@ export interface AstroGlobal extends AstroGlobalPartial {
      *
      * [Astro reference](https://docs.astro.build/en/core-concepts/astro-components/#component-props)
      */
-    props: Record<string, number | string | any>;
+    props: Props;
     /** Information about the current request. This is a standard [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object
      *
      * For example, to get a URL object of the current URL, you can use:
@@ -391,6 +391,15 @@ export interface AstroUserConfig {
      *   base: '/docs'
      * }
      * ```
+     *
+     * When using this option, you should mind that all of your imports will be affected. In this example, all of the imports including static resources and codes should add a prefix `/docs/`.
+     *
+     * For example, if you want to use a image in your Astro component, you need to change it from '/someimg.png' into '/docs/someimg.png'.
+     *
+     * ```astro
+     * <!-- <img src="/someimg.png"> is not correct. -->
+     * <img src="/docs/someimg.png">
+     * ```
      */
     base?: string;
     /**

package/dist/config/index.d.ts

@@ -0,0 +1,7 @@
+import type { UserConfig } from 'vite';
+import type { AstroUserConfig } from '../@types/astro';
+export declare function defineConfig(config: AstroUserConfig): AstroUserConfig;
+export declare function getViteConfig(inlineConfig: UserConfig): ({ mode, command }: {
+    mode: string;
+    command: 'serve' | 'build';
+}) => Promise<Record<string, any>>;

package/dist/config/index.js

@@ -0,0 +1,48 @@
+function defineConfig(config) {
+  return config;
+}
+function getViteConfig(inlineConfig) {
+  return async ({ mode, command }) => {
+    const cmd = command === "serve" ? "dev" : command;
+    const [
+      { mergeConfig },
+      { nodeLogDestination },
+      { openConfig, createSettings, loadTSConfig },
+      { createVite },
+      { runHookConfigSetup, runHookConfigDone }
+    ] = await Promise.all([
+      import("vite"),
+      import("../core/logger/node.js"),
+      import("../core/config/index.js"),
+      import("../core/create-vite.js"),
+      import("../integrations/index.js")
+    ]);
+    const logging = {
+      dest: nodeLogDestination,
+      level: "info"
+    };
+    const { astroConfig: config } = await openConfig({
+      cmd,
+      logging
+    });
+    const initialTsConfig = loadTSConfig(inlineConfig.root);
+    const settings = createSettings({
+      config,
+      tsConfig: initialTsConfig == null ? void 0 : initialTsConfig.config,
+      tsConfigPath: initialTsConfig == null ? void 0 : initialTsConfig.path
+    });
+    await runHookConfigSetup({ settings, command: cmd, logging });
+    const viteConfig = await createVite(
+      {
+        mode
+      },
+      { settings, logging, mode }
+    );
+    await runHookConfigDone({ settings, logging });
+    return mergeConfig(viteConfig, inlineConfig);
+  };
+}
+export {
+  defineConfig,
+  getViteConfig
+};

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

@@ -5,8 +5,9 @@ import path from "path";
 import { fileURLToPath } from "url";
 import * as vite from "vite";
 import { createBuildInternals } from "../../core/build/internal.js";
+import { emptyDir, removeDir } from "../../core/fs/index.js";
 import { prependForwardSlash } from "../../core/path.js";
-import { emptyDir, isModeServerWithNoAdapter, removeDir } from "../../core/util.js";
+import { isModeServerWithNoAdapter } from "../../core/util.js";
 import { runHookBuildSetup } from "../../integrations/index.js";
 import { PAGE_SCRIPT_ID } from "../../vite-plugin-scripts/index.js";
 import { info } from "../logger/core.js";

package/dist/core/compile/compile.d.ts

@@ -8,7 +8,6 @@ declare type CompileResult = TransformResult & {
 export interface CompileProps {
     config: AstroConfig;
     filename: string;
-    moduleId: string;
     source: string;
     transformStyle: TransformStyle;
 }

package/dist/core/compile/compile.js

@@ -1,13 +1,13 @@
+import path from "path";
 import { transform } from "@astrojs/compiler";
 import { AstroErrorCodes } from "../errors.js";
-import { prependForwardSlash } from "../path.js";
-import { AggregateError, viteID } from "../util.js";
+import { prependForwardSlash, removeLeadingForwardSlashWindows } from "../path.js";
+import { AggregateError, resolveJsToTs, viteID } from "../util.js";
 import { createStylePreprocessor } from "./style.js";
 const configCache = /* @__PURE__ */ new WeakMap();
 async function compile({
   config,
   filename,
-  moduleId,
   source,
   transformStyle
 }) {
@@ -15,7 +15,7 @@ async function compile({
   let cssDeps = /* @__PURE__ */ new Set();
   let cssTransformErrors = [];
   const transformResult = await transform(source, {
-    pathname: `/@fs${prependForwardSlash(moduleId)}`,
+    pathname: prependForwardSlash(filename),
     projectRoot: config.root.toString(),
     site: (_a = config.site) == null ? void 0 : _a.toString(),
     sourcefile: filename,
@@ -54,6 +54,24 @@ async function compile({
       value: source
     }
   });
+  for (const c of compileResult.clientOnlyComponents) {
+    c.resolvedPath = removeLeadingForwardSlashWindows(c.resolvedPath);
+    if (c.specifier.endsWith(".jsx") && !c.resolvedPath.endsWith(".jsx")) {
+      c.resolvedPath += ".jsx";
+    }
+    if (path.isAbsolute(c.resolvedPath)) {
+      c.resolvedPath = resolveJsToTs(c.resolvedPath);
+    }
+  }
+  for (const c of compileResult.hydratedComponents) {
+    c.resolvedPath = removeLeadingForwardSlashWindows(c.resolvedPath);
+    if (c.specifier.endsWith(".jsx") && !c.resolvedPath.endsWith(".jsx")) {
+      c.resolvedPath += ".jsx";
+    }
+    if (path.isAbsolute(c.resolvedPath)) {
+      c.resolvedPath = resolveJsToTs(c.resolvedPath);
+    }
+  }
   return compileResult;
 }
 function isCached(config, filename) {

package/dist/core/dev/index.js

@@ -26,6 +26,9 @@ async function dev(settings, options) {
       server: { host },
       optimizeDeps: {
         include: rendererClientEntries
+      },
+      define: {
+        "import.meta.env.BASE_URL": settings.config.base ? `'${settings.config.base}'` : "undefined"
       }
     },
     { settings, logging: options.logging, mode: "dev" }
@@ -46,7 +49,7 @@ async function dev(settings, options) {
       isRestart
     })
   );
-  const currentVersion = "1.4.4";
+  const currentVersion = "1.4.6";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/fs/index.d.ts

@@ -0,0 +1,3 @@
+/** An fs utility, similar to `rimraf` or `rm -rf` */
+export declare function removeDir(_dir: URL): void;
+export declare function emptyDir(_dir: URL, skip?: Set<string>): void;

package/dist/core/fs/index.js

@@ -0,0 +1,79 @@
+import fs from "fs";
+import path from "path";
+import { fileURLToPath } from "url";
+const isWindows = process.platform === "win32";
+function removeDir(_dir) {
+  const dir = fileURLToPath(_dir);
+  fs.rmSync(dir, { recursive: true, force: true, maxRetries: 3 });
+}
+function emptyDir(_dir, skip) {
+  const dir = fileURLToPath(_dir);
+  if (!fs.existsSync(dir))
+    return void 0;
+  for (const file of fs.readdirSync(dir)) {
+    if (skip == null ? void 0 : skip.has(file)) {
+      continue;
+    }
+    const p = path.resolve(dir, file);
+    const rmOptions = { recursive: true, force: true, maxRetries: 3 };
+    try {
+      fs.rmSync(p, rmOptions);
+    } catch (er) {
+      if (er.code === "ENOENT") {
+        return;
+      }
+      if (er.code === "EPERM" && isWindows) {
+        fixWinEPERMSync(p, rmOptions, er);
+      }
+    }
+  }
+}
+/**
+ * https://github.com/isaacs/rimraf/blob/8c10fb8d685d5cc35708e0ffc4dac9ec5dd5b444/rimraf.js#L183
+ * @license ISC
+ * The ISC License
+ *
+ * Copyright (c) Isaac Z. Schlueter and Contributors
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+const fixWinEPERMSync = (p, options, er) => {
+  try {
+    fs.chmodSync(p, 438);
+  } catch (er2) {
+    if (er2.code === "ENOENT") {
+      return;
+    } else {
+      throw er;
+    }
+  }
+  let stats;
+  try {
+    stats = fs.statSync(p);
+  } catch (er3) {
+    if (er3.code === "ENOENT") {
+      return;
+    } else {
+      throw er;
+    }
+  }
+  if (stats.isDirectory()) {
+    fs.rmdirSync(p, options);
+  } else {
+    fs.unlinkSync(p);
+  }
+};
+export {
+  emptyDir,
+  removeDir
+};

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   site,
   isRestart = false
 }) {
-  const version = "1.4.4";
+  const version = "1.4.6";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -250,7 +250,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.4.4"}`
+        `v${"1.4.6"}`
       )} ${headline}`
     );
   }

package/dist/core/path.d.ts

@@ -3,6 +3,7 @@ export declare function appendForwardSlash(path: string): string;
 export declare function prependForwardSlash(path: string): string;
 export declare function removeTrailingForwardSlash(path: string): string;
 export declare function removeLeadingForwardSlash(path: string): string;
+export declare function removeLeadingForwardSlashWindows(path: string): string;
 export declare function trimSlashes(path: string): string;
 export declare function startsWithForwardSlash(path: string): boolean;
 export declare function startsWithDotDotSlash(path: string): boolean;

package/dist/core/path.js

@@ -13,6 +13,9 @@ function removeTrailingForwardSlash(path) {
 function removeLeadingForwardSlash(path) {
   return path.startsWith("/") ? path.substring(1) : path;
 }
+function removeLeadingForwardSlashWindows(path) {
+  return path.startsWith("/") && path[2] === ":" ? path.substring(1) : path;
+}
 function trimSlashes(path) {
   return path.replace(/^\/|\/$/g, "");
 }
@@ -51,6 +54,7 @@ export {
   prependForwardSlash,
   removeFileExtension,
   removeLeadingForwardSlash,
+  removeLeadingForwardSlashWindows,
   removeTrailingForwardSlash,
   startsWithDotDotSlash,
   startsWithDotSlash,

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

@@ -4,7 +4,6 @@ import { isPage, resolveIdToUrl } from "../../util.js";
 import { render as coreRender } from "../core.js";
 import { collectMdMetadata } from "../util.js";
 import { getStylesForURL } from "./css.js";
-import { resolveClientDevPath } from "./resolve.js";
 import { getScriptsForURL } from "./scripts.js";
 const svelteStylesRE = /svelte\?svelte&type=style/;
 async function loadRenderer(viteServer, renderer) {
@@ -111,10 +110,12 @@ async function render(renderers, mod, ssrOpts) {
     pathname,
     scripts,
     async resolve(s) {
-      if (s.startsWith("/@fs")) {
-        return resolveClientDevPath(s);
+      const url = await resolveIdToUrl(viteServer, s);
+      if (url.startsWith("/@fs") && url.endsWith(".jsx")) {
+        return url.slice(0, -4);
+      } else {
+        return url;
       }
-      return await resolveIdToUrl(viteServer, s);
     },
     renderers,
     request,

package/dist/core/render/result.js

@@ -19,6 +19,7 @@ var __privateSet = (obj, member, value, setter) => {
 var _cache, _result, _slots, _loggingOpts;
 import { bold } from "kleur/colors";
 import { renderSlot } from "../../runtime/server/index.js";
+import { renderJSX } from "../../runtime/server/jsx.js";
 import { AstroCookies } from "../cookies/index.js";
 import { warn } from "../logger/core.js";
 import { isScriptRequest } from "./script.js";
@@ -80,7 +81,6 @@ Please update the name of this slot.`
       return void 0;
     if (!cacheable) {
       const component = await __privateGet(this, _slots)[name]();
-      const expression = getFunctionExpression(component);
       if (!Array.isArray(args)) {
         warn(
           __privateGet(this, _loggingOpts),
@@ -88,12 +88,18 @@ Please update the name of this slot.`
           `Expected second parameter to be an array, received a ${typeof args}. If you're trying to pass an array as a single argument and getting unexpected results, make sure you're passing your array as a item of an array. Ex: Astro.slots.render('default', [["Hello", "World"]])`
         );
       } else {
+        const expression = getFunctionExpression(component);
         if (expression) {
           const slot = expression(...args);
           return await renderSlot(__privateGet(this, _result), slot).then(
             (res) => res != null ? String(res) : res
           );
         }
+        if (typeof component === "function") {
+          return await renderJSX(__privateGet(this, _result), component(...args)).then(
+            (res) => res != null ? String(res) : res
+          );
+        }
       }
     }
     const content = await renderSlot(__privateGet(this, _result), __privateGet(this, _slots)[name]).then(

package/dist/core/render/route-cache.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentInstance, GetStaticPathsItem, GetStaticPathsResultKeyed, Params, RouteData } from '../../@types/astro';
+import type { ComponentInstance, GetStaticPathsItem, GetStaticPathsResultKeyed, Params, RouteData, RuntimeMode } from '../../@types/astro';
 import { LogOptions } from '../logger/core.js';
 interface CallGetStaticPathsOptions {
     mod: ComponentInstance;
@@ -19,7 +19,8 @@ export interface RouteCacheEntry {
 export declare class RouteCache {
     private logging;
     private cache;
-    constructor(logging: LogOptions);
+    private mode;
+    constructor(logging: LogOptions, mode?: RuntimeMode);
     /** Clear the cache. */
     clearAll(): void;
     set(route: RouteData, entry: RouteCacheEntry): void;

package/dist/core/render/route-cache.js

@@ -39,15 +39,16 @@ async function callGetStaticPaths({
   };
 }
 class RouteCache {
-  constructor(logging) {
+  constructor(logging, mode = "production") {
     this.cache = {};
     this.logging = logging;
+    this.mode = mode;
   }
   clearAll() {
     this.cache = {};
   }
   set(route, entry) {
-    if (this.cache[route.component]) {
+    if (this.mode === "production" && this.cache[route.component]) {
       warn(
         this.logging,
         "routeCache",

package/dist/core/util.d.ts

@@ -33,9 +33,6 @@ export declare function resolveDependency(dep: string, projectRoot: URL): string
 export declare function viteID(filePath: URL): string;
 export declare const VALID_ID_PREFIX = "/@id/";
 export declare function unwrapId(id: string): string;
-/** An fs utility, similar to `rimraf` or `rm -rf` */
-export declare function removeDir(_dir: URL): void;
-export declare function emptyDir(_dir: URL, skip?: Set<string>): void;
 export declare function resolvePages(config: AstroConfig): URL;
 export declare function isPage(file: URL, settings: AstroSettings): boolean;
 export declare function isModeServerWithNoAdapter(settings: AstroSettings): boolean;
@@ -47,6 +44,7 @@ export declare function getLocalAddress(serverAddress: string, host: string | bo
  * through a script tag or a dynamic import as-is.
  */
 export declare function resolveIdToUrl(viteServer: ViteDevServer, id: string): Promise<string>;
+export declare function resolveJsToTs(filePath: string): string;
 export declare const AggregateError: AggregateErrorConstructor | {
     new (errors: Iterable<any>, message?: string | undefined): {
         errors: Array<any>;

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.4.4";
+const ASTRO_VERSION = "1.4.6";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }
@@ -93,21 +93,6 @@ const VALID_ID_PREFIX = `/@id/`;
 function unwrapId(id) {
   return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length) : id;
 }
-function removeDir(_dir) {
-  const dir = fileURLToPath(_dir);
-  fs.rmSync(dir, { recursive: true, force: true, maxRetries: 3 });
-}
-function emptyDir(_dir, skip) {
-  const dir = fileURLToPath(_dir);
-  if (!fs.existsSync(dir))
-    return void 0;
-  for (const file of fs.readdirSync(dir)) {
-    if (skip == null ? void 0 : skip.has(file)) {
-      continue;
-    }
-    fs.rmSync(path.resolve(dir, file), { recursive: true, force: true, maxRetries: 3 });
-  }
-}
 function resolvePages(config) {
   return new URL("./pages", config.srcDir);
 }
@@ -161,7 +146,10 @@ function getLocalAddress(serverAddress, host) {
   }
 }
 async function resolveIdToUrl(viteServer, id) {
-  const result = await viteServer.pluginContainer.resolveId(id);
+  let result = await viteServer.pluginContainer.resolveId(id, void 0);
+  if (!result && id.endsWith(".jsx")) {
+    result = await viteServer.pluginContainer.resolveId(id.slice(0, -4), void 0);
+  }
   if (!result) {
     return VALID_ID_PREFIX + id;
   }
@@ -170,6 +158,15 @@ async function resolveIdToUrl(viteServer, id) {
   }
   return VALID_ID_PREFIX + result.id;
 }
+function resolveJsToTs(filePath) {
+  if (filePath.endsWith(".jsx") && !fs.existsSync(filePath)) {
+    const tryPath = filePath.slice(0, -4) + ".tsx";
+    if (fs.existsSync(tryPath)) {
+      return tryPath;
+    }
+  }
+  return filePath;
+}
 const AggregateError = typeof globalThis.AggregateError !== "undefined" ? globalThis.AggregateError : class extends Error {
   constructor(errors, message) {
     super(message);
@@ -185,7 +182,6 @@ export {
   codeFrame,
   createSafeError,
   emoji,
-  emptyDir,
   getLocalAddress,
   getOutputFilename,
   isModeServerWithNoAdapter,
@@ -194,9 +190,9 @@ export {
   padMultilineString,
   parseNpmName,
   relativeToSrcDir,
-  removeDir,
   resolveDependency,
   resolveIdToUrl,
+  resolveJsToTs,
   resolvePages,
   unwrapId,
   viteID

package/dist/jsx/babel.js

@@ -1,6 +1,7 @@
 import * as t from "@babel/types";
-import { pathToFileURL } from "node:url";
-import { resolveClientDevPath } from "../core/render/dev/resolve.js";
+import npath from "path";
+import { normalizePath } from "vite";
+import { resolveJsToTs } from "../core/util.js";
 import { HydrationDirectiveProps } from "../runtime/server/hydration.js";
 const ClientOnlyPlaceholder = "astro-client-only";
 function isComponent(tagName) {
@@ -195,8 +196,8 @@ function astroJSX() {
         if (meta) {
           let resolvedPath;
           if (meta.path.startsWith(".")) {
-            const fileURL = pathToFileURL(state.filename);
-            resolvedPath = resolveClientDevPath(`/@fs${new URL(meta.path, fileURL).pathname}`);
+            resolvedPath = normalizePath(npath.resolve(npath.dirname(state.filename), meta.path));
+            resolvedPath = resolveJsToTs(resolvedPath);
           } else {
             resolvedPath = meta.path;
           }
@@ -271,8 +272,8 @@ function astroJSX() {
           }
           let resolvedPath;
           if (meta.path.startsWith(".")) {
-            const fileURL = pathToFileURL(state.filename);
-            resolvedPath = resolveClientDevPath(`/@fs${new URL(meta.path, fileURL).pathname}`);
+            resolvedPath = normalizePath(npath.resolve(npath.dirname(state.filename), meta.path));
+            resolvedPath = resolveJsToTs(resolvedPath);
           } else {
             resolvedPath = meta.path;
           }

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

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

package/dist/runtime/server/jsx.js

@@ -22,6 +22,8 @@ async function renderJSX(result, vnode) {
       return vnode;
     case typeof vnode === "string":
       return markHTMLString(escapeHTML(vnode));
+    case typeof vnode === "function":
+      return vnode;
     case (!vnode && vnode !== 0):
       return "";
     case Array.isArray(vnode):

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

@@ -10,12 +10,13 @@ interface CreateMetadataOptions {
     hoisted: any[];
 }
 export declare class Metadata {
-    mockURL: URL;
+    filePath: string;
     modules: ModuleInfo[];
     hoisted: any[];
     hydratedComponents: any[];
     clientOnlyComponents: any[];
     hydrationDirectives: Set<string>;
+    private mockURL;
     private metadataCache;
     constructor(filePathname: string, opts: CreateMetadataOptions);
     resolvePath(specifier: string): string;

package/dist/runtime/server/metadata.js

@@ -1,3 +1,4 @@
+import { removeLeadingForwardSlashWindows } from "../../core/path.js";
 class Metadata {
   constructor(filePathname, opts) {
     this.modules = opts.modules;
@@ -5,18 +6,17 @@ class Metadata {
     this.hydratedComponents = opts.hydratedComponents;
     this.clientOnlyComponents = opts.clientOnlyComponents;
     this.hydrationDirectives = opts.hydrationDirectives;
+    this.filePath = removeLeadingForwardSlashWindows(filePathname);
     this.mockURL = new URL(filePathname, "http://example.com");
     this.metadataCache = /* @__PURE__ */ new Map();
   }
   resolvePath(specifier) {
     if (specifier.startsWith(".")) {
-      const resolved = new URL(specifier, this.mockURL).pathname;
-      if (resolved.startsWith("/@fs") && resolved.endsWith(".jsx")) {
-        return resolved.slice(0, resolved.length - 4);
-      }
-      return resolved;
+      const url = new URL(specifier, this.mockURL);
+      return removeLeadingForwardSlashWindows(decodeURI(url.pathname));
+    } else {
+      return specifier;
     }
-    return specifier;
   }
   getPath(Component) {
     const metadata = this.getComponentMetadata(Component);

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

@@ -1,4 +1,5 @@
 import type { SSRResult } from '../../../@types/astro';
 import type { RenderInstruction } from './types.js';
 import { HTMLBytes } from '../escape.js';
-export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<string | AsyncIterable<string | HTMLBytes | RenderInstruction>>;
+export declare type ComponentIterable = AsyncIterable<string | HTMLBytes | RenderInstruction>;
+export declare function renderComponent(result: SSRResult, displayName: string, Component: unknown, _props: Record<string | number, any>, slots?: any): Promise<ComponentIterable>;

package/dist/runtime/server/render/component.js

@@ -205,10 +205,16 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
     }
   }
   if (!hydration) {
-    if (isPage || (renderer == null ? void 0 : renderer.name) === "astro:jsx") {
-      return html;
-    }
-    return markHTMLString(html.replace(/\<\/?astro-slot\>/g, ""));
+    return async function* () {
+      if (slotInstructions) {
+        yield* slotInstructions;
+      }
+      if (isPage || (renderer == null ? void 0 : renderer.name) === "astro:jsx") {
+        yield html;
+      } else {
+        yield markHTMLString(html.replace(/\<\/?astro-slot\>/g, ""));
+      }
+    }();
   }
   const astroId = shorthash(
     `<!--${metadata.componentExport.value}:${metadata.componentUrl}-->

package/dist/runtime/server/render/page.js

@@ -8,6 +8,24 @@ const needsHeadRenderingSymbol = Symbol.for("astro.needsHeadRendering");
 function nonAstroPageNeedsHeadInjection(pageComponent) {
   return needsHeadRenderingSymbol in pageComponent && !!pageComponent[needsHeadRenderingSymbol];
 }
+async function iterableToHTMLBytes(result, iterable, onDocTypeInjection) {
+  const parts = new HTMLParts();
+  let i = 0;
+  for await (const chunk of iterable) {
+    if (isHTMLString(chunk)) {
+      if (i === 0) {
+        if (!/<!doctype html/i.test(String(chunk))) {
+          parts.append("<!DOCTYPE html>\n", result);
+          if (onDocTypeInjection) {
+            await onDocTypeInjection(parts);
+          }
+        }
+      }
+    }
+    parts.append(chunk, result);
+  }
+  return parts.toArrayBuffer();
+}
 async function renderPage(result, componentFactory, props, children, streaming) {
   if (!isAstroComponentFactory(componentFactory)) {
     const pageProps = { ...props ?? {}, "server:root": true };
@@ -18,18 +36,13 @@ async function renderPage(result, componentFactory, props, children, streaming)
       pageProps,
       null
     );
-    let html = output.toString();
-    if (!/<!doctype html/i.test(html)) {
-      let rest = html;
-      html = `<!DOCTYPE html>`;
+    const bytes = await iterableToHTMLBytes(result, output, async (parts) => {
       if (nonAstroPageNeedsHeadInjection(componentFactory)) {
         for await (let chunk of maybeRenderHead(result)) {
-          html += chunk;
+          parts.append(chunk, result);
         }
       }
-      html += rest;
-    }
-    const bytes = encoder.encode(html);
+    });
     return new Response(bytes, {
       headers: new Headers([
         ["Content-Type", "text/html; charset=utf-8"],
@@ -57,7 +70,7 @@ async function renderPage(result, componentFactory, props, children, streaming)
                     }
                   }
                 }
-                let bytes = chunkToByteArray(result, chunk);
+                const bytes = chunkToByteArray(result, chunk);
                 controller.enqueue(bytes);
                 i++;
               }
@@ -70,20 +83,7 @@ async function renderPage(result, componentFactory, props, children, streaming)
         }
       });
     } else {
-      let parts = new HTMLParts();
-      let i = 0;
-      for await (const chunk of iterable) {
-        if (isHTMLString(chunk)) {
-          if (i === 0) {
-            if (!/<!doctype html/i.test(String(chunk))) {
-              parts.append("<!DOCTYPE html>\n", result);
-            }
-          }
-        }
-        parts.append(chunk, result);
-        i++;
-      }
-      body = parts.toArrayBuffer();
+      body = await iterableToHTMLBytes(result, iterable);
       headers.set("Content-Length", body.byteLength.toString());
     }
     let response = createResponse(body, { ...init, headers });

package/dist/runtime/server/render/util.js

@@ -44,14 +44,14 @@ Make sure to use the static attribute syntax (\`${key}={value}\`) instead of the
     return "";
   }
   if (key === "class:list") {
-    const listValue = toAttributeString(serializeListValue(value));
+    const listValue = toAttributeString(serializeListValue(value), shouldEscape);
     if (listValue === "") {
       return "";
     }
     return markHTMLString(` ${key.slice(0, -5)}="${listValue}"`);
   }
   if (key === "style" && !(value instanceof HTMLString) && typeof value === "object") {
-    return markHTMLString(` ${key}="${toStyleString(value)}"`);
+    return markHTMLString(` ${key}="${toAttributeString(toStyleString(value), shouldEscape)}"`);
   }
   if (key === "className") {
     return markHTMLString(` class="${toAttributeString(value, shouldEscape)}"`);

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

@@ -94,7 +94,6 @@ function astro({ settings, logging }) {
       const compileProps = {
         config,
         filename,
-        moduleId: id,
         source,
         transformStyle: createTransformStyles(styleTransformer, filename, Boolean(opts == null ? void 0 : opts.ssr), this)
       };
@@ -183,7 +182,6 @@ File: ${filename}`
       const compileProps = {
         config,
         filename,
-        moduleId: id,
         source,
         transformStyle: createTransformStyles(styleTransformer, filename, Boolean(opts == null ? void 0 : opts.ssr), this)
       };
@@ -282,7 +280,6 @@ ${source}
       const compileProps = {
         config,
         filename: context.file,
-        moduleId: context.file,
         source: await context.read(),
         transformStyle: createTransformStyles(styleTransformer, context.file, true)
       };

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

@@ -1,6 +1,10 @@
 import { parse as babelParser } from "@babel/parser";
+import npath from "path";
 import { parse, print, types, visit } from "recast";
+import { removeLeadingForwardSlashWindows } from "../core/path.js";
+import { resolveJsToTs } from "../core/util.js";
 const ASTRO_GLOB_REGEX = /Astro2?\s*\.\s*glob\s*\(/;
+const CLIENT_COMPONENT_PATH_REGEX = /['"]client:component-path['"]:/;
 const validAstroGlobalNames = /* @__PURE__ */ new Set(["Astro", "Astro2"]);
 function astro(_opts) {
   return {
@@ -9,7 +13,7 @@ function astro(_opts) {
       if (!id.endsWith(".astro") && !id.endsWith(".md")) {
         return null;
       }
-      if (!ASTRO_GLOB_REGEX.test(code)) {
+      if (!ASTRO_GLOB_REGEX.test(code) && !CLIENT_COMPONENT_PATH_REGEX.test(code)) {
         return null;
       }
       const ast = parse(code, {
@@ -45,6 +49,24 @@ function astro(_opts) {
             }
           );
           return false;
+        },
+        visitObjectProperty: function(path) {
+          if (!types.namedTypes.StringLiteral.check(path.node.key) || path.node.key.value !== "client:component-path" || !types.namedTypes.StringLiteral.check(path.node.value)) {
+            this.traverse(path);
+            return;
+          }
+          const valuePath = path.get("value");
+          let value = valuePath.value.value;
+          value = removeLeadingForwardSlashWindows(value);
+          if (code.includes(npath.basename(value) + ".jsx")) {
+            value += ".jsx";
+          }
+          value = resolveJsToTs(value);
+          valuePath.replace({
+            type: "StringLiteral",
+            value
+          });
+          return false;
         }
       });
       const result = print(ast);

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

@@ -315,7 +315,7 @@ function createPlugin({ settings, logging }) {
   return {
     name: "astro:server",
     configureServer(viteServer) {
-      let routeCache = new RouteCache(logging);
+      let routeCache = new RouteCache(logging, "development");
       let manifest = createRouteManifest({ settings }, logging);
       function rebuildManifest(needsManifestRebuild, file) {
         routeCache.clearAll();

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

@@ -164,7 +164,6 @@ ${astroResult}
         const compileProps = {
           config,
           filename,
-          moduleId: id,
           source: astroResult,
           transformStyle: createTransformStyles(
             styleTransformer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -82,7 +82,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.25.0",
+    "@astrojs/compiler": "^0.26.0",
     "@astrojs/language-server": "^0.26.2",
     "@astrojs/markdown-remark": "^1.1.3",
     "@astrojs/telemetry": "^1.0.1",

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

@@ -1 +0,0 @@
-export declare function resolveClientDevPath(id: string): string;

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

@@ -1,11 +0,0 @@
-function resolveClientDevPath(id) {
-  if (id.startsWith("/@fs")) {
-    if (id.endsWith(".jsx")) {
-      return id.slice(0, id.length - 4);
-    }
-  }
-  return id;
-}
-export {
-  resolveClientDevPath
-};