astro 1.0.0-beta.49 → 1.0.0-beta.51

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.49";
+  const version = "1.0.0-beta.51";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -83,7 +83,7 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.49" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.51" });
   if (cmd === "telemetry") {
     try {
       const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
@@ -97,7 +97,7 @@ async function cli(args) {
       try {
         const packages = flags._.slice(3);
         telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.49",
+          astroVersion: "1.0.0-beta.51",
           cliCommand: "add"
         }));
         return await add(packages, { cwd: root, flags, logging, telemetry });
@@ -108,7 +108,7 @@ async function cli(args) {
     case "dev": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.49", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.51", cliCommand: "dev" }, userConfig, flags));
         await devServer(astroConfig, { logging, telemetry });
         return await new Promise(() => {
         });
@@ -119,7 +119,7 @@ async function cli(args) {
     case "build": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.49", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.51", cliCommand: "build" }, userConfig, flags));
         return await build(astroConfig, { logging, telemetry });
       } catch (err) {
         return throwAndExit(err);
@@ -127,14 +127,14 @@ async function cli(args) {
     }
     case "check": {
       const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.49", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.51", cliCommand: "check" }, userConfig, flags));
       const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
       try {
         const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
-        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.49", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.51", cliCommand: "preview" }, userConfig, flags));
         const server = await preview(astroConfig, { logging, telemetry });
         return await server.closed();
       } catch (err) {
@@ -144,7 +144,7 @@ async function cli(args) {
     case "docs": {
       try {
         await telemetry.record(event.eventCliSession({
-          astroVersion: "1.0.0-beta.49",
+          astroVersion: "1.0.0-beta.51",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

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

@@ -1,4 +1,5 @@
 import { prependForwardSlash } from "../../core/path.js";
+import { resolveClientDevPath } from "../../core/render/dev/resolve.js";
 import { getTopLevelPages } from "./graph.js";
 import { getPageDataByViteID, trackClientOnlyPageDatas } from "./internal.js";
 function vitePluginAnalyzer(astroConfig, internals) {
@@ -64,13 +65,14 @@ function vitePluginAnalyzer(astroConfig, internals) {
           continue;
         const astro = info.meta.astro;
         for (const c of astro.hydratedComponents) {
-          internals.discoveredHydratedComponents.add(c.resolvedPath || c.specifier);
+          const rid = c.resolvedPath ? resolveClientDevPath(c.resolvedPath) : c.specifier;
+          internals.discoveredHydratedComponents.add(rid);
         }
         hoistScanner.scan.call(this, astro.scripts, id);
         if (astro.clientOnlyComponents.length) {
           const clientOnlys = [];
           for (const c of astro.clientOnlyComponents) {
-            const cid = c.resolvedPath || c.specifier;
+            const cid = c.resolvedPath ? resolveClientDevPath(c.resolvedPath) : c.specifier;
             internals.discoveredClientOnlyComponents.add(cid);
             clientOnlys.push(cid);
           }

package/dist/core/dev/index.js

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

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.0.0-beta.49";
+  const version = "1.0.0-beta.51";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -207,7 +207,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.49"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.51"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

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

@@ -25,6 +25,7 @@ import { createModuleScriptElementWithSrcSet } from "../ssr-element.js";
 import { collectMdMetadata } from "../util.js";
 import { getStylesForURL } from "./css.js";
 import { injectTags } from "./html.js";
+import { resolveClientDevPath } from "./resolve.js";
 const svelteStylesRE = /svelte\?svelte&type=style/;
 async function loadRenderer(viteServer, renderer) {
   var _a;
@@ -118,7 +119,7 @@ async function render(renderers, mod, ssrOpts) {
     scripts,
     async resolve(s) {
       if (s.startsWith("/@fs")) {
-        return s;
+        return resolveClientDevPath(s);
       }
       return "/@id" + prependForwardSlash(s);
     },

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

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

package/dist/runtime/server/metadata.js

@@ -9,7 +9,14 @@ class Metadata {
     this.metadataCache = /* @__PURE__ */ new Map();
   }
   resolvePath(specifier) {
-    return specifier.startsWith(".") ? new URL(specifier, this.mockURL).pathname : 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;
+    }
+    return specifier;
   }
   getPath(Component) {
     const metadata = this.getComponentMetadata(Component);

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

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

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

@@ -208,7 +208,7 @@ ${tsResult}`;
   };
 }
 function escapeViteEnvReferences(code) {
-  return code.replace(/import\.meta\.env\./g, "import\\u002Emeta.env.");
+  return code.replace(/import\.meta\.env/g, "import\\u002Emeta.env");
 }
 export {
   markdown as default

package/package.json

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