astro 1.0.0-beta.1 → 1.0.0-beta.4

package/dist/cli/index.js

@@ -7,6 +7,7 @@ import add from "../core/add/index.js";
 import devServer from "../core/dev/index.js";
 import preview from "../core/preview/index.js";
 import { check } from "./check.js";
+import { openInBrowser } from "./open.js";
 import { loadConfig } from "../core/config.js";
 import { printHelp, formatErrorMessage, formatConfigErrorMessage } from "../core/messages.js";
 import { createSafeError } from "../core/util.js";
@@ -16,6 +17,7 @@ function printAstroHelp() {
     headline: "Futuristic web development tool.",
     commands: [
       ["add", "Add an integration to your configuration."],
+      ["docs", "Launch Astro's Doc site directly from the terminal. "],
       ["dev", "Run Astro in development mode."],
       ["build", "Build a pre-compiled production-ready site."],
       ["preview", "Preview your build locally before deploying."],
@@ -36,7 +38,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.1";
+  const version = "1.0.0-beta.4";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }
@@ -48,7 +50,7 @@ function resolveCommand(flags) {
     return "version";
   else if (flags.help)
     return "help";
-  const supportedCommands = /* @__PURE__ */ new Set(["dev", "build", "preview", "check"]);
+  const supportedCommands = /* @__PURE__ */ new Set(["dev", "build", "preview", "check", "docs"]);
   if (supportedCommands.has(cmd)) {
     return cmd;
   }
@@ -113,7 +115,15 @@ async function cli(args) {
     }
     case "preview": {
       try {
-        return await preview(config, { logging });
+        const server = await preview(config, { logging });
+        return await server.closed();
+      } catch (err) {
+        return throwAndExit(err);
+      }
+    }
+    case "docs": {
+      try {
+        return await openInBrowser("https://docs.astro.build/");
       } catch (err) {
         return throwAndExit(err);
       }

package/dist/cli/open.js

@@ -0,0 +1,26 @@
+import { execa } from "execa";
+const getPlatformSpecificCommand = () => {
+  const isGitPod = Boolean(process.env.GITPOD_REPO_ROOT);
+  const platform = isGitPod ? "gitpod" : process.platform;
+  switch (platform) {
+    case "android":
+    case "linux":
+      return ["xdg-open"];
+    case "darwin":
+      return ["open"];
+    case "win32":
+      return ["cmd", ["/c", "start"]];
+    case "gitpod":
+      return ["/ide/bin/remote-cli/gitpod-code", ["--openExternal"]];
+    default:
+      throw new Error(`It looks like your platform ("${platform}") isn't supported!
+To view Astro's docs, please visit https://docs.astro.build`);
+  }
+};
+async function openInBrowser(url) {
+  const [command, args = []] = getPlatformSpecificCommand();
+  return execa(command, [...args, encodeURI(url)]);
+}
+export {
+  openInBrowser
+};

package/dist/core/app/index.js

@@ -128,7 +128,7 @@ renderPage_fn = async function(request, routeData, mod) {
   });
 };
 _callEndpoint = new WeakSet();
-callEndpoint_fn = async function(request, _routeData, mod) {
+callEndpoint_fn = async function(request, routeData, mod) {
   const url = new URL(request.url);
   const handler = mod;
   const result = await callEndpoint(handler, {
@@ -136,6 +136,7 @@ callEndpoint_fn = async function(request, _routeData, mod) {
     origin: url.origin,
     pathname: url.pathname,
     request,
+    route: routeData,
     routeCache: __privateGet(this, _routeCache),
     ssr: true
   });

package/dist/core/build/index.js

@@ -122,6 +122,7 @@ class AstroBuilder {
     await viteServer.close();
     await runHookBuildDone({
       config: this.config,
+      buildConfig,
       pages: pageNames,
       routes: Object.values(allPages).map((pd) => pd.route)
     });

package/dist/core/config.js

@@ -22,7 +22,7 @@ import path from "path";
 import { pathToFileURL, fileURLToPath } from "url";
 import { mergeConfig as mergeViteConfig } from "vite";
 import { z } from "zod";
-import load from "@proload/core";
+import load, { ProloadError } from "@proload/core";
 import loadTypeScript from "@proload/plugin-tsm";
 import postcssrc from "postcss-load-config";
 import { arraify, isObject } from "./util.js";
@@ -89,7 +89,7 @@ const AstroConfigSchema = z.object({
   }).optional().default({}),
   markdown: z.object({
     drafts: z.boolean().optional().default(false),
-    mode: z.union([z.literal("md"), z.literal("mdx")]).optional().default("md"),
+    mode: z.union([z.literal("md"), z.literal("mdx")]).optional().default("mdx"),
     syntaxHighlight: z.union([z.literal("shiki"), z.literal("prism"), z.literal(false)]).optional().default("shiki"),
     shikiConfig: z.any().optional().default({}),
     remarkPlugins: z.array(z.any()).optional().default([]),
@@ -224,9 +224,21 @@ async function loadConfig(configOptions) {
   let userConfigPath;
   if (flags == null ? void 0 : flags.config) {
     userConfigPath = /^\.*\//.test(flags.config) ? flags.config : `./${flags.config}`;
-    userConfigPath = fileURLToPath(new URL(userConfigPath, pathToFileURL(root)));
+    userConfigPath = fileURLToPath(new URL(userConfigPath, appendForwardSlash(pathToFileURL(root).toString())));
+  }
+  let config;
+  try {
+    config = await load("astro", {
+      mustExist: !!userConfigPath,
+      cwd: root,
+      filePath: userConfigPath
+    });
+  } catch (err) {
+    if (err instanceof ProloadError && flags.config) {
+      throw new Error(`Unable to resolve --config "${flags.config}"! Does the file exist?`);
+    }
+    throw err;
   }
-  const config = await load("astro", { mustExist: false, cwd: root, filePath: userConfigPath });
   if (config) {
     userConfig = config.value;
   }

package/dist/core/dev/index.js

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

package/dist/core/messages.js

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

package/dist/core/preview/index.js

@@ -88,9 +88,16 @@ async function preview(config, { logging }) {
     });
   }
   await startServer(startServerTime);
+  function closed() {
+    return new Promise((resolve, reject) => {
+      httpServer.addListener("close", resolve);
+      httpServer.addListener("error", reject);
+    });
+  }
   return {
     host,
     port,
+    closed,
     server: httpServer,
     stop: async () => {
       await new Promise((resolve, reject) => {

package/dist/core/routing/manifest/create.js

@@ -189,6 +189,7 @@ function createRouteManifest({ config, cwd }, logging) {
         routes.push({
           type: item.isPage ? "page" : "endpoint",
           pattern,
+          segments,
           params,
           component,
           generate,

package/dist/core/routing/manifest/serialization.js

@@ -1,11 +1,12 @@
-function createRouteData(pattern, params, component, pathname, type) {
+function createRouteData(pattern, params, component, pathname, type, segments) {
   return {
     type,
     pattern,
     params,
     component,
     generate: () => "",
-    pathname: pathname || void 0
+    pathname: pathname || void 0,
+    segments
   };
 }
 function serializeRouteData(routeData) {
@@ -14,9 +15,9 @@ function serializeRouteData(routeData) {
   return outRouteData;
 }
 function deserializeRouteData(rawRouteData) {
-  const { component, params, pathname, type } = rawRouteData;
+  const { component, params, pathname, type, segments } = rawRouteData;
   const pattern = new RegExp(rawRouteData.pattern);
-  return createRouteData(pattern, params, component, pathname, type);
+  return createRouteData(pattern, params, component, pathname, type, segments);
 }
 export {
   deserializeRouteData,

package/dist/integrations/index.js

@@ -16,6 +16,7 @@ var __spreadValues = (a, b) => {
 };
 import { mergeConfig } from "../core/config.js";
 import ssgAdapter from "../adapter-ssg/index.js";
+import { isBuildingToSSR } from "../core/util.js";
 async function runHookConfigSetup({
   config: _config,
   command
@@ -120,14 +121,16 @@ async function runHookBuildSetup({
 }
 async function runHookBuildDone({
   config,
+  buildConfig,
   pages,
   routes
 }) {
+  const dir = isBuildingToSSR(config) ? buildConfig.client : config.outDir;
   for (const integration of config.integrations) {
     if (integration.hooks["astro:build:done"]) {
       await integration.hooks["astro:build:done"]({
         pages: pages.map((p) => ({ pathname: p })),
-        dir: config.outDir,
+        dir,
         routes
       });
     }

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

@@ -724,12 +724,18 @@ export interface AstroIntegration {
     };
 }
 export declare type RouteType = 'page' | 'endpoint';
+export interface RoutePart {
+    content: string;
+    dynamic: boolean;
+    spread: boolean;
+}
 export interface RouteData {
     component: string;
     generate: (data?: any) => string;
     params: string[];
     pathname?: string;
     pattern: RegExp;
+    segments: RoutePart[][];
     type: RouteType;
 }
 export declare type SerializedRouteData = Omit<RouteData, 'generate' | 'pattern'> & {

package/dist/types/cli/open.d.ts

@@ -0,0 +1,2 @@
+import type { ExecaChildProcess } from 'execa';
+export declare function openInBrowser(url: string): Promise<ExecaChildProcess>;

package/dist/types/core/preview/index.d.ts

@@ -9,6 +9,7 @@ export interface PreviewServer {
     host?: string;
     port: number;
     server: http.Server;
+    closed(): Promise<void>;
     stop(): Promise<void>;
 }
 /** The primary dev action */

package/dist/types/integrations/index.d.ts

@@ -30,8 +30,9 @@ export declare function runHookBuildSetup({ config, vite, target, }: {
     vite: ViteConfigWithSSR;
     target: 'server' | 'client';
 }): Promise<void>;
-export declare function runHookBuildDone({ config, pages, routes, }: {
+export declare function runHookBuildDone({ config, buildConfig, pages, routes, }: {
     config: AstroConfig;
+    buildConfig: BuildConfig;
     pages: string[];
     routes: RouteData[];
 }): Promise<void>;

package/package.json

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