astro 1.0.0-beta.3 → 1.0.0-beta.6

package/LICENSE

@@ -0,0 +1,34 @@
+MIT License
+
+Copyright (c) 2021 Fred K. Schott
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
+
+Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""

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.3";
+  const version = "1.0.0-beta.5";
   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;
   }
@@ -119,6 +121,13 @@ async function cli(args) {
         return throwAndExit(err);
       }
     }
+    case "docs": {
+      try {
+        return await openInBrowser("https://docs.astro.build/");
+      } catch (err) {
+        return throwAndExit(err);
+      }
+    }
     default: {
       throw new Error(`Error running ${cmd}`);
     }

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/build/generate.js

@@ -116,6 +116,7 @@ async function generatePath(pathname, opts, gopts) {
       });
     }
   }
+  const ssr = isBuildingToSSR(opts.astroConfig);
   const url = new URL(origin + pathname);
   const options = {
     legacyBuild: false,
@@ -139,11 +140,11 @@ async function generatePath(pathname, opts, gopts) {
       const fullyRelativePath = relPath[0] === "." ? relPath : "./" + relPath;
       return fullyRelativePath;
     },
-    request: createRequest({ url, headers: new Headers(), logging }),
+    request: createRequest({ url, headers: new Headers(), logging, ssr }),
     route: pageData.route,
     routeCache,
     site: astroConfig.site ? new URL(astroConfig.base, astroConfig.site).toString() : astroConfig.site,
-    ssr: isBuildingToSSR(opts.astroConfig)
+    ssr
   };
   let body;
   if (pageData.route.type === "endpoint") {

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/build/static-build.js

@@ -204,11 +204,11 @@ async function copyFiles(fromFolder, toFolder) {
   const files = await glob("**/*", {
     cwd: fileURLToPath(fromFolder)
   });
-  await fs.promises.mkdir(toFolder, { recursive: true });
   await Promise.all(files.map(async (filename) => {
     const from = new URL(filename, fromFolder);
     const to = new URL(filename, toFolder);
-    return fs.promises.copyFile(from, to);
+    const lastFolder = new URL("./", to);
+    return fs.promises.mkdir(lastFolder, { recursive: true }).then(() => fs.promises.copyFile(from, to));
   }));
 }
 async function ssrMoveAssets(opts) {

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

@@ -31,8 +31,14 @@ const _manifest = Object.assign(_deserializeManifest('${manifestReplace}'), {
 const _args = ${adapter.args ? JSON.stringify(adapter.args) : "undefined"};
 
 ${adapter.exports ? `const _exports = adapter.createExports(_manifest, _args);
-${adapter.exports.map((name) => `export const ${name} = _exports['${name}'];`).join("\n")}
-${adapter.exports.includes("_default") ? `export default _default` : ""}
+${adapter.exports.map((name) => {
+          if (name === "default") {
+            return `const _default = _exports['default'];
+export { _default as default };`;
+          } else {
+            return `export const ${name} = _exports['${name}'];`;
+          }
+        }).join("\n")}
 ` : ""}
 const _start = 'start';
 if(_start in adapter) {

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";
@@ -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.3";
+  const currentVersion = "1.0.0-beta.5";
   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.3";
+  const version = "1.0.0-beta.5";
   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.3"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"1.0.0-beta.5"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/core/request.js

@@ -1,10 +1,30 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { warn } from "./logger/core.js";
 function createRequest({
   url,
   headers,
   method = "GET",
   body = void 0,
-  logging
+  logging,
+  ssr
 }) {
   let headersObj = headers instanceof Headers ? headers : new Headers(Object.entries(headers));
   const request = new Request(url.toString(), {
@@ -26,6 +46,16 @@ function createRequest({
       }
     }
   });
+  if (!ssr) {
+    const _headers = request.headers;
+    const headersDesc = Object.getOwnPropertyDescriptor(request, "headers") || {};
+    Object.defineProperty(request, "headers", __spreadProps(__spreadValues({}, headersDesc), {
+      get() {
+        warn(logging, "ssg", `Headers are not exposed in static-site generation (SSG) mode. To enable reading headers you need to set an SSR adapter in your config.`);
+        return _headers;
+      }
+    }));
+  }
   return request;
 }
 export {

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

@@ -62,21 +62,107 @@ export interface BuildConfig {
     staticMode: boolean | undefined;
 }
 /**
- * Astro.* available in all components
- * Docs: https://docs.astro.build/reference/api-reference/#astro-global
+ * Astro global available in all contexts in .astro files
+ *
+ * [Astro reference](https://docs.astro.build/reference/api-reference/#astro-global)
  */
 export interface AstroGlobal extends AstroGlobalPartial {
-    /** get the current canonical URL */
+    /** Canonical URL of the current page. If the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option is set, its origin will be the origin of this URL.
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrocanonicalurl)
+     */
     canonicalURL: URL;
-    /** get page params (dynamic pages only) */
+    /** Parameters passed to a dynamic page generated using [getStaticPaths](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
+     *
+     * Example usage:
+     * ```astro
+     * ---
+     * export async function getStaticPaths() {
+     *    return [
+     *     { params: { id: '1' } },
+     *   ];
+     * }
+     *
+     * const { id } = Astro.params;
+     * ---
+     * <h1>{id}</h1>
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#params)
+     */
     params: Params;
-    /** set props for this astro component (along with default values) */
+    /** List of props passed to this component
+     *
+     * A common way to get specific props is through [destructuring](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment), ex:
+     * ```typescript
+     * const { name } = Astro.props
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/core-concepts/astro-components/#component-props)
+     */
     props: Record<string, number | string | any>;
-    /** get information about this page */
+    /** 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:
+     * ```typescript
+     * const url = new URL(Astro.request.url);
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrorequest)
+     */
     request: Request;
-    /** see if slots are used */
+    /** Redirect to another page (**SSR Only**)
+     *
+     * Example usage:
+     * ```typescript
+     * if(!isLoggedIn) {
+     *   return Astro.redirect('/login');
+     * }
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/guides/server-side-rendering/#astroredirect)
+     */
+    redirect(path: string): Response;
+    /**
+     * The <Astro.self /> element allows a component to reference itself recursively.
+     *
+     * [Astro reference](https://docs.astro.build/en/guides/server-side-rendering/#astroself)
+     */
+    self: AstroComponentFactory;
+    /** Utility functions for modifying an Astro component’s slotted children
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
+     */
     slots: Record<string, true | undefined> & {
+        /**
+         * Check whether content for this slot name exists
+         *
+         * Example usage:
+         * ```typescript
+         *	if (Astro.slots.has('default')) {
+         *   // Do something...
+         *	}
+         * ```
+         *
+         * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
+         */
         has(slotName: string): boolean;
+        /**
+         * Asychronously renders this slot and returns HTML
+         *
+         * Example usage:
+         * ```astro
+         * ---
+         * let html: string = '';
+         * if (Astro.slots.has('default')) {
+         *   html = await Astro.slots.render('default')
+         * }
+         * ---
+         * <Fragment set:html={html} />
+         * ```
+         *
+         * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
+         */
         render(slotName: string, args?: any[]): Promise<string>;
     };
 }
@@ -84,12 +170,29 @@ export interface AstroGlobalPartial {
     /**
      * @deprecated since version 0.24. See the {@link https://astro.build/deprecated/resolve upgrade guide} for more details.
      */
-    resolve: (path: string) => string;
-    /** @deprecated Use `Astro.glob()` instead. */
+    resolve(path: string): string;
+    /** @deprecated since version 0.26. Use [Astro.glob()](https://docs.astro.build/en/reference/api-reference/#astroglob) instead. */
     fetchContent(globStr: string): Promise<any[]>;
+    /**
+     * Fetch local files into your static site setup
+     *
+     * Example usage:
+     * ```typescript
+     * const posts = await Astro.glob('../pages/post/*.md');
+     * ```
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroglob)
+     */
     glob(globStr: `${any}.astro`): Promise<ComponentInstance[]>;
     glob<T extends Record<string, any>>(globStr: `${any}.md`): Promise<MarkdownInstance<T>[]>;
     glob<T extends Record<string, any>>(globStr: string): Promise<T[]>;
+    /**
+     * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
+     *
+     * If `site` is undefined, the URL object will instead be built from `localhost`
+     *
+     * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
+     */
     site: URL;
 }
 declare type ServerConfig = {
@@ -724,12 +827,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/request.d.ts

@@ -9,6 +9,7 @@ export interface CreateRequestOptions {
     method?: string;
     body?: RequestBody | undefined;
     logging: LogOptions;
+    ssr: boolean;
 }
-export declare function createRequest({ url, headers, method, body, logging, }: CreateRequestOptions): Request;
+export declare function createRequest({ url, headers, method, body, logging, ssr, }: CreateRequestOptions): Request;
 export {};

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/dist/vite-plugin-astro-server/index.js

@@ -34,7 +34,15 @@ function writeHtmlResponse(res, statusCode, html) {
 }
 async function writeWebResponse(res, webResponse) {
   const { status, headers, body } = webResponse;
-  res.writeHead(status, Object.fromEntries(headers.entries()));
+  let _headers = {};
+  if ("raw" in headers) {
+    for (const [key, value] of Object.entries(headers.raw())) {
+      res.setHeader(key, value);
+    }
+  } else {
+    _headers = Object.fromEntries(headers.entries());
+  }
+  res.writeHead(status, _headers);
   if (body) {
     if (body instanceof Readable) {
       body.pipe(res);
@@ -128,7 +136,8 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
     headers: buildingToSSR ? req.headers : new Headers(),
     method: req.method,
     body,
-    logging
+    logging,
+    ssr: buildingToSSR
   });
   try {
     if (!pathname.startsWith(devRoot)) {

package/dist/vite-plugin-build-css/index.js

@@ -33,6 +33,9 @@ function isStyleVirtualModule(id) {
 function isPageStyleVirtualModule(id) {
   return id.startsWith(ASTRO_PAGE_STYLE_PREFIX);
 }
+function isRawOrUrlModule(id) {
+  return id.match(/(\?|\&)([^=]+)(raw|url)/gm);
+}
 function rollupPluginAstroBuildCSS(options) {
   const { internals, legacy } = options;
   const styleSourceMap = /* @__PURE__ */ new Map();
@@ -44,7 +47,7 @@ function rollupPluginAstroBuildCSS(options) {
     const info = ctx.getModuleInfo(id);
     if (info) {
       for (const importedId of info.importedIds) {
-        if (!seen.has(importedId)) {
+        if (!seen.has(importedId) && !isRawOrUrlModule(importedId)) {
           yield* walkStyles(ctx, importedId, seen);
         }
       }

package/dist/vite-plugin-build-html/index.js

@@ -92,7 +92,8 @@ function rollupPluginAstroScanHTML(options) {
             request: createRequest({
               url: new URL(origin + pathname),
               headers: new Headers(),
-              logging
+              logging,
+              ssr: false
             }),
             mode: "production",
             origin,

package/env.d.ts

@@ -4,8 +4,9 @@ type Astro = import('astro').AstroGlobal;
 
 // We duplicate the description here because editors won't show the JSDoc comment from the imported type (but will for its properties, ex: Astro.request will show the AstroGlobal.request description)
 /**
- * Astro.* available in all components
- * Docs: https://docs.astro.build/reference/api-reference/#astro-global
+ * Astro global available in all contexts in .astro files
+ *
+ * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
  */
 declare const Astro: Readonly<Astro>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.6",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -65,25 +65,16 @@
     "README.md",
     "vendor"
   ],
-  "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
-    "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "postbuild": "astro-scripts copy \"src/**/*.astro\"",
-    "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
-    "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
-    "test:match": "mocha --timeout 20000 -g"
-  },
   "dependencies": {
     "@astrojs/compiler": "^0.14.1",
-    "@astrojs/language-server": "^0.13.3",
+    "@astrojs/language-server": "^0.13.4",
     "@astrojs/markdown-remark": "^0.8.1",
     "@astrojs/prism": "0.4.1",
     "@astrojs/webapi": "^0.11.0",
-    "@babel/core": "^7.17.8",
-    "@babel/generator": "^7.17.7",
-    "@babel/parser": "^7.17.8",
-    "@babel/traverse": "^7.17.3",
+    "@babel/core": "^7.17.9",
+    "@babel/generator": "^7.17.9",
+    "@babel/parser": "^7.17.9",
+    "@babel/traverse": "^7.17.9",
     "@proload/core": "^0.2.2",
     "@proload/plugin-tsm": "^0.1.1",
     "@web/parse5-utils": "^1.3.0",
@@ -94,8 +85,8 @@
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "eol": "^0.9.1",
-    "es-module-lexer": "^0.10.4",
-    "esbuild": "0.14.25",
+    "es-module-lexer": "^0.10.5",
+    "esbuild": "^0.14.34",
     "estree-walker": "^3.0.1",
     "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
@@ -120,7 +111,7 @@
     "rehype-slug": "^5.0.1",
     "resolve": "^1.22.0",
     "rollup": "^2.70.1",
-    "semver": "^7.3.5",
+    "semver": "^7.3.6",
     "serialize-javascript": "^6.0.0",
     "shiki": "^0.10.1",
     "shorthash": "^0.0.2",
@@ -134,7 +125,7 @@
     "tsconfig-resolver": "^3.0.1",
     "vite": "^2.9.1",
     "yargs-parser": "^21.0.1",
-    "zod": "^3.14.3"
+    "zod": "^3.14.4"
   },
   "devDependencies": {
     "@babel/types": "^7.17.0",
@@ -152,19 +143,29 @@
     "@types/mocha": "^9.1.0",
     "@types/parse5": "^6.0.3",
     "@types/path-browserify": "^1.0.0",
-    "@types/prettier": "^2.4.4",
+    "@types/prettier": "^2.6.0",
     "@types/resolve": "^1.20.1",
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
     "@types/yargs-parser": "^21.0.0",
-    "astro-scripts": "workspace:*",
+    "astro-scripts": "0.0.2",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.10",
     "mocha": "^9.2.2",
-    "sass": "^1.49.11"
+    "sass": "^1.50.0"
   },
   "engines": {
     "node": "^14.15.0 || >=16.0.0",
     "npm": ">=6.14.0"
-  }
-}
+  },
+  "scripts": {
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+    "build:ci": "astro-scripts build \"src/**/*.ts\"",
+    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "postbuild": "astro-scripts copy \"src/**/*.astro\"",
+    "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js",
+    "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js && mocha --timeout 20000 **/lit-element.test.js",
+    "test:match": "mocha --timeout 20000 -g"
+  },
+  "readme": "<a href=\"https://astro.build\">\n  <img src=\"https://raw.githubusercontent.com/withastro/astro/main/assets/social/banner.svg\" />\n</a>\n\n<div center>\n\n**Astro** is a new kind of static site builder for the modern web&mdash;powerful developer experience meets lightweight output.\n\n</div>\n\n### [🚀 Read the launch post →](https://astro.build/blog/introducing-astro)\n\n### [📚 Learn Astro →](https://docs.astro.build/en/getting-started/)\n\n## Project Status\n\n⚠️ **Astro is still beta software&mdash;missing features and bugs are to be expected!** We are quickly working our way towards a stable, production-ready v1.0 release, but we are still finalizing some of Astro's APIs.\n\nThat being said, there are quite a few Astro sites in production already. We're incredibly grateful to everyone who has made an early bet on Astro!\n\n## Quick Start\n\n<table>\n  <tbody>\n    <tr>\n      <td>\n        <img width=\"441\" height=\"1px\">\n        <strong>👾 Online</strong>\n      </td>\n      <td>\n        <img width=\"441\" height=\"1px\">\n        <strong>📦 Local</strong>\n      </td>\n    </tr>\n    <tr>\n<td>\n\nTry Astro in your browser!\n\n[Launch astro.new →](https://astro.new)\n\n</td>\n<td>\n\nGet started with Astro using our interactive CLI!\n\n```bash\nnpm init astro my-astro-project\n```\n\n</td>\n    </tr>\n  </tbody>\n</table>\n\n## Sponsors\n\nYou can sponsor Astro's development on [Open Collective](https://opencollective.com/astrodotbuild). Astro is generously supported by the following companies and individuals:\n\n### Platinum Sponsors\n\n<table>\n  <tbody>\n    <tr>\n      <td align=\"center\"><a href=\"https://www.netlify.com/#gh-light-mode-only\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/netlify.svg#gh-light-mode-only\" alt=\"Netlify\" /></a><a href=\"https://www.netlify.com/#gh-dark-mode-only\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/netlify-dark.svg#gh-dark-mode-only\" alt=\"Netlify\" />\n      </a></td>\n      <td align=\"center\"><a href=\"https://www.vercel.com/#gh-light-mode-only\" target=\"_blank\"><img width=\"150\" height=\"34\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/vercel.svg#gh-light-mode-only\" alt=\"Vercel\" /></a><a href=\"https://www.vercel.com/#gh-dark-mode-only\"><img width=\"150\" height=\"34\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/vercel-dark.svg#gh-dark-mode-only\" alt=\"Vercel\" />\n      </a></td>\n    </tr>\n  </tbody>\n</table>\n\n### Gold Sponsors\n\n<table>\n  <tbody>\n    <tr>\n      <td align=\"center\">\n        <a href=\"https://divRIOTS.com#gh-light-mode-only\" target=\"_blank\">\n        <img width=\"150\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots.svg#gh-light-mode-only\" alt=\"‹div›RIOTS\" />\n        </a>\n        <a href=\"https://divRIOTS.com#gh-dark-mode-only\" target=\"_blank\">\n        <img width=\"150\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots-dark.svg#gh-dark-mode-only\" alt=\"‹div›RIOTS\" />\n        </a>\n      </td>\n      <td align=\"center\">\n        <a href=\"https://stackupdigital.co.uk/#gh-light-mode-only\" target=\"_blank\">\n        <img width=\"162\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup.svg#gh-light-mode-only\" alt=\"StackUp Digital\" />\n        </a>\n        <a href=\"https://stackupdigital.co.uk/#gh-dark-mode-only\" target=\"_blank\">\n        <img width=\"130\" height=\"32\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup-dark.svg#gh-dark-mode-only\" alt=\"StackUp Digital\" />\n        </a>\n      </td>\n    </tr>\n  </tbody>\n</table>\n\n### Sponsors\n\n<table>\n  <tbody>\n    <tr>\n      <td align=\"center\"><a href=\"https://sentry.io\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://raw.githubusercontent.com/withastro/astro/main/.github/assets/sentry.svg\" alt=\"Sentry\" /></a></td><td align=\"center\"><a href=\"https://qoddi.com\" target=\"_blank\"><img width=\"147\" height=\"40\" src=\"https://devcenter.qoddi.com/wp-content/uploads/2021/11/blog-transparent-logo-1.png\" alt=\"Qoddi App Platform\" /></a></td>\n    </tr>\n  </tbody>\n</table>\n"
+}