astro 1.0.0-beta.28 → 1.0.0-beta.30

package/dist/cli/index.js

@@ -40,7 +40,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.28";
+  const version = "1.0.0-beta.30";
   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.28" });
+  const telemetry = new AstroTelemetry({ version: "1.0.0-beta.30" });
   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.28",
+          astroVersion: "1.0.0-beta.30",
           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.28", cliCommand: "dev" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.30", 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.28", cliCommand: "build" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.30", 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.28", cliCommand: "check" }, userConfig, flags));
+      telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.30", 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.28", cliCommand: "preview" }, userConfig, flags));
+        telemetry.record(event.eventCliSession({ astroVersion: "1.0.0-beta.30", 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.28",
+          astroVersion: "1.0.0-beta.30",
           cliCommand: "docs"
         }));
         return await openInBrowser("https://docs.astro.build/");

package/dist/core/build/index.js

@@ -140,7 +140,6 @@ class AstroBuilder {
     try {
       await this.build(setupData);
     } catch (_err) {
-      debugger;
       throw fixViteErrorMessage(createSafeError(_err), setupData.viteServer);
     }
   }

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

@@ -78,7 +78,7 @@ async function staticBuild(opts) {
   timer.clientBuild = performance.now();
   await clientBuild(opts, internals, jsInput);
   timer.ssr = performance.now();
-  info(opts.logging, "build", "Building for SSR...");
+  info(opts.logging, "build", isBuildingToSSR(astroConfig) ? "Building SSR entrypoints..." : "Building entrypoints for prerendering...");
   const ssrResult = await ssrBuild(opts, internals, pageInput);
   info(opts.logging, "build", dim(`Completed in ${getTimeStat(timer.ssr, performance.now())}.`));
   timer.generate = performance.now();
@@ -93,6 +93,7 @@ ${bgMagenta(black(" finalizing server assets "))}
   }
 }
 async function ssrBuild(opts, internals, input) {
+  var _a, _b;
   const { astroConfig, viteConfig } = opts;
   const ssr = isBuildingToSSR(astroConfig);
   const out = ssr ? opts.buildConfig.server : astroConfig.outDir;
@@ -106,12 +107,12 @@ async function ssrBuild(opts, internals, input) {
       outDir: fileURLToPath(out),
       rollupOptions: {
         input: [],
-        output: {
+        output: __spreadValues({
           format: "esm",
           entryFileNames: opts.buildConfig.serverEntry,
           chunkFileNames: "chunks/chunk.[hash].mjs",
           assetFileNames: "assets/asset.[hash][extname]"
-        }
+        }, (_b = (_a = viteConfig.build) == null ? void 0 : _a.rollupOptions) == null ? void 0 : _b.output)
       },
       ssr: true,
       target: "esnext",
@@ -146,6 +147,7 @@ async function ssrBuild(opts, internals, input) {
   return await vite.build(viteBuildConfig);
 }
 async function clientBuild(opts, internals, input) {
+  var _a, _b;
   const { astroConfig, viteConfig } = opts;
   const timer = performance.now();
   const ssr = isBuildingToSSR(astroConfig);
@@ -168,12 +170,12 @@ ${bgGreen(black(" building client "))}`);
       outDir: fileURLToPath(out),
       rollupOptions: {
         input: Array.from(input),
-        output: {
+        output: __spreadValues({
           format: "esm",
           entryFileNames: "entry.[hash].js",
           chunkFileNames: "chunks/chunk.[hash].js",
           assetFileNames: "assets/asset.[hash][extname]"
-        },
+        }, (_b = (_a = viteConfig.build) == null ? void 0 : _a.rollupOptions) == null ? void 0 : _b.output),
         preserveEntrySignatures: "exports-only"
       },
       target: "esnext"

package/dist/core/dev/index.js

@@ -36,13 +36,16 @@ async function dev(config, options) {
     site,
     https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
   }));
-  const currentVersion = "1.0.0-beta.28";
+  const currentVersion = "1.0.0-beta.30";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }
   await runHookServerStart({ config, address: devServerAddressInfo });
   return {
     address: devServerAddressInfo,
+    get watcher() {
+      return viteServer.watcher;
+    },
     stop: async () => {
       await viteServer.close();
       await runHookServerDone({ config });

package/dist/core/logger/core.js

@@ -1,17 +1,6 @@
 import { bold, dim } from "kleur/colors";
 import stringWidth from "string-width";
-function getLoggerLocale() {
-  const defaultLocale = "en-US";
-  if (process.env.LANG) {
-    const extractedLocale = process.env.LANG.split(".")[0].replace(/_/g, "-");
-    if (extractedLocale.length < 2)
-      return defaultLocale;
-    else
-      return extractedLocale.substring(0, 5);
-  } else
-    return defaultLocale;
-}
-const dateTimeFormat = new Intl.DateTimeFormat(getLoggerLocale(), {
+const dateTimeFormat = new Intl.DateTimeFormat([], {
   hour: "2-digit",
   minute: "2-digit",
   second: "2-digit"

package/dist/core/messages.js

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

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

@@ -105,14 +105,10 @@ async function render(renderers, mod, ssrOpts) {
     pathname,
     scripts,
     async resolve(s) {
-      const [resolvedUrl, resolvedPath] = await viteServer.moduleGraph.resolveUrl(s);
-      if (resolvedPath.includes("node_modules/.vite")) {
-        return resolvedPath.replace(/.*?node_modules\/\.vite/, "/node_modules/.vite");
+      if (s.startsWith("/@fs")) {
+        return s;
       }
-      if (!resolvedUrl.startsWith(".") && !resolvedUrl.startsWith("/")) {
-        return "/@id" + prependForwardSlash(resolvedUrl);
-      }
-      return "/@fs" + prependForwardSlash(resolvedPath);
+      return "/@id" + prependForwardSlash(s);
     },
     renderers,
     request,

package/dist/integrations/index.js

@@ -116,7 +116,14 @@ async function runHookBuildSetup({
 }) {
   for (const integration of config.integrations) {
     if (integration.hooks["astro:build:setup"]) {
-      await integration.hooks["astro:build:setup"]({ vite, pages, target });
+      await integration.hooks["astro:build:setup"]({
+        vite,
+        pages,
+        target,
+        updateConfig: (newConfig) => {
+          mergeConfig(vite, newConfig);
+        }
+      });
     }
   }
 }

package/dist/runtime/server/index.js

@@ -1,22 +1,6 @@
-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));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -427,9 +411,7 @@ async function renderHead(result) {
     if ("data-astro-component-hydration" in script.props) {
       needsHydrationStyles = true;
     }
-    return renderElement("script", __spreadProps(__spreadValues({}, script), {
-      props: __spreadProps(__spreadValues({}, script.props), { "astro-script": result._metadata.pathname + "/script-" + i })
-    }));
+    return renderElement("script", script);
   });
   if (needsHydrationStyles) {
     styles.push(renderElement("style", {

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

@@ -858,6 +858,7 @@ export interface AstroIntegration {
             vite: ViteConfigWithSSR;
             pages: Map<string, PageBuildData>;
             target: 'client' | 'server';
+            updateConfig: (newConfig: ViteConfigWithSSR) => void;
         }) => void | Promise<void>;
         'astro:build:done'?: (options: {
             pages: {

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

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import type { AddressInfo } from 'net';
 import type { AstroTelemetry } from '@astrojs/telemetry';
+import * as vite from 'vite';
 import type { AstroConfig } from '../../@types/astro';
 import { LogOptions } from '../logger/core.js';
 export interface DevOptions {
@@ -9,6 +10,7 @@ export interface DevOptions {
 }
 export interface DevServer {
     address: AddressInfo;
+    watcher: vite.FSWatcher;
     stop(): Promise<void>;
 }
 /** `astro dev` */

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

@@ -154,15 +154,10 @@ File: ${filename}`);
             SUFFIX += `import "${id}?astro&type=script&index=${i}";`;
             i++;
           }
-          if (deps.size > 1) {
-            SUFFIX += `
-if(import.meta.hot) import.meta.hot.accept(["${id}", "${Array.from(deps).join('","')}"], (...mods) => mods);`;
-          } else {
-            SUFFIX += `
+          SUFFIX += `
 if (import.meta.hot) {
-							import.meta.hot.accept(mod => mod);
-						}`;
-          }
+						import.meta.hot.accept(mod => mod);
+					}`;
         }
         if (isPage) {
           SUFFIX += `

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

@@ -117,18 +117,20 @@ async function handle500Response(viteServer, origin, req, res, err) {
 }
 function getCustom404Route(config, manifest) {
   const relPages = resolvePages(config).href.replace(config.root.href, "");
-  return manifest.routes.find((r) => r.component === appendForwardSlash(relPages) + "404.astro");
+  const pattern = new RegExp(`${appendForwardSlash(relPages)}404.(astro|md)`);
+  return manifest.routes.find((r) => r.component.match(pattern));
 }
 function log404(logging, pathname) {
   info(logging, "serve", msg.req({ url: pathname, statusCode: 404 }));
 }
 async function handleRequest(routeCache, viteServer, logging, manifest, config, req, res) {
+  var _a;
   const reqStart = performance.now();
   const site = config.site ? new URL(config.base, config.site) : void 0;
   const devRoot = site ? site.pathname : "/";
   const origin = `${viteServer.config.server.https ? "https" : "http"}://${req.headers.host}`;
   const buildingToSSR = isBuildingToSSR(config);
-  const url = new URL(origin + req.url);
+  const url = config.build.format === "file" ? new URL(origin + ((_a = req.url) == null ? void 0 : _a.replace(/(index)?\.html$/, ""))) : new URL(origin + req.url);
   const pathname = decodeURI(url.pathname);
   const rootRelativeUrl = pathname.substring(devRoot.length - 1);
   if (!buildingToSSR) {
@@ -235,7 +237,6 @@ async function handleRequest(routeCache, viteServer, logging, manifest, config,
       return await writeSSRResult(result, res, statusCode);
     }
   } catch (_err) {
-    debugger;
     const err = fixViteErrorMessage(createSafeError(_err), viteServer);
     error(logging, null, msg.formatErrorMessage(err));
     handle500Response(viteServer, origin, req, res, err);

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

@@ -35,8 +35,8 @@ import matter from "gray-matter";
 import { fileURLToPath } from "url";
 import { PAGE_SSR_SCRIPT_ID } from "../vite-plugin-scripts/index.js";
 import { pagesVirtualModuleId } from "../core/app/index.js";
-import { appendForwardSlash } from "../core/path.js";
-import { resolvePages } from "../core/util.js";
+import { appendForwardSlash, prependForwardSlash } from "../core/path.js";
+import { resolvePages, viteID } from "../core/util.js";
 const MARKDOWN_IMPORT_FLAG = "?mdImport";
 const MARKDOWN_CONTENT_FLAG = "?content";
 function markdown({ config }) {
@@ -147,7 +147,7 @@ ${astroResult}`;
           site: config.site ? new URL(config.base, config.site).toString() : void 0,
           sourcefile: id,
           sourcemap: "inline",
-          internalURL: `/@fs${new URL("../runtime/server/index.js", import.meta.url).pathname}`
+          internalURL: `/@fs${prependForwardSlash(viteID(new URL("../runtime/server/index.js", import.meta.url)))}`
         });
         tsResult = `
 export const metadata = ${JSON.stringify(metadata)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.0.0-beta.28",
+  "version": "1.0.0-beta.30",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -72,10 +72,10 @@
     "@astrojs/prism": "0.4.1",
     "@astrojs/telemetry": "^0.1.2",
     "@astrojs/webapi": "^0.11.1",
-    "@babel/core": "^7.17.10",
-    "@babel/generator": "^7.17.10",
-    "@babel/parser": "^7.17.10",
-    "@babel/traverse": "^7.17.10",
+    "@babel/core": "^7.17.12",
+    "@babel/generator": "^7.17.12",
+    "@babel/parser": "^7.17.12",
+    "@babel/traverse": "^7.17.12",
     "@proload/core": "^0.3.2",
     "@proload/plugin-tsm": "^0.2.1",
     "ast-types": "^0.14.2",
@@ -109,7 +109,7 @@
     "prompts": "^2.4.2",
     "recast": "^0.20.5",
     "resolve": "^1.22.0",
-    "rollup": "^2.72.1",
+    "rollup": "^2.73.0",
     "semver": "^7.3.7",
     "serialize-javascript": "^6.0.0",
     "shiki": "^0.10.1",
@@ -125,7 +125,8 @@
     "zod": "^3.16.0"
   },
   "devDependencies": {
-    "@babel/types": "^7.17.10",
+    "@babel/types": "^7.17.12",
+    "@playwright/test": "^1.22.1",
     "@types/babel__core": "^7.1.19",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.17.1",
@@ -140,7 +141,7 @@
     "@types/mocha": "^9.1.1",
     "@types/parse5": "^6.0.3",
     "@types/path-browserify": "^1.0.0",
-    "@types/prettier": "^2.6.0",
+    "@types/prettier": "^2.6.1",
     "@types/resolve": "^1.20.2",
     "@types/rimraf": "^3.0.2",
     "@types/send": "^0.17.1",
@@ -163,7 +164,8 @@
     "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"
+    "test": "mocha --exit --timeout 20000 --ignore **/lit-element.test.js --ignore **/errors.test.js && mocha --timeout 20000 **/lit-element.test.js && mocha --timeout 20000 **/errors.test.js",
+    "test:match": "mocha --timeout 20000 -g",
+    "test:e2e": "playwright test e2e"
   }
 }