astro 1.6.7 → 1.6.8

package/dist/core/app/index.js

@@ -167,7 +167,7 @@ renderPage_fn = async function(request, routeData, mod, status = 200) {
   const url = new URL(request.url);
   const manifest = __privateGet(this, _manifest);
   const info = __privateGet(this, _routeDataToRouteInfo).get(routeData);
-  const links = createLinkStylesheetElementSet(info.links, manifest.site);
+  const links = createLinkStylesheetElementSet(info.links);
   let scripts = /* @__PURE__ */ new Set();
   for (const script of info.scripts) {
     if ("stage" in script) {
@@ -178,7 +178,7 @@ renderPage_fn = async function(request, routeData, mod, status = 200) {
         });
       }
     } else {
-      scripts.add(createModuleScriptElement(script, manifest.site));
+      scripts.add(createModuleScriptElement(script));
     }
   }
   try {

package/dist/core/build/generate.js

@@ -4,7 +4,6 @@ import { bgGreen, black, cyan, dim, green, magenta } from "kleur/colors";
 import npath from "path";
 import { fileURLToPath } from "url";
 import {
-  joinPaths,
   prependForwardSlash,
   removeLeadingForwardSlash,
   removeTrailingForwardSlash
@@ -179,16 +178,17 @@ function getUrlForPath(pathname, base, origin, format, routeType) {
   return url;
 }
 async function generatePath(pathname, opts, gopts) {
-  var _a;
   const { settings, logging, origin, routeCache } = opts;
   const { mod, internals, linkIds, scripts: hoistedScripts, pageData, renderers } = gopts;
   if (pageData.route.type === "page") {
     addPageName(pathname, opts);
   }
   debug("build", `Generating: ${pathname}`);
-  const site = settings.config.base !== "/" ? joinPaths(((_a = settings.config.site) == null ? void 0 : _a.toString()) || "http://localhost/", settings.config.base) : settings.config.site;
-  const links = createLinkStylesheetElementSet(linkIds, site);
-  const scripts = createModuleScriptsSet(hoistedScripts ? [hoistedScripts] : [], site);
+  const links = createLinkStylesheetElementSet(linkIds, settings.config.base);
+  const scripts = createModuleScriptsSet(
+    hoistedScripts ? [hoistedScripts] : [],
+    settings.config.base
+  );
   if (settings.scripts.some((script) => script.stage === "page")) {
     const hashedFilePath = internals.entrySpecifierToBundleMap.get(PAGE_SCRIPT_ID);
     if (typeof hashedFilePath !== "string") {

package/dist/core/build/vite-plugin-hoisted-scripts.js

@@ -29,7 +29,10 @@ function vitePluginHoistedScripts(settings, internals) {
     },
     async generateBundle(_options, bundle) {
       var _a, _b;
-      let assetInlineLimit = ((_b = (_a = settings.config.vite) == null ? void 0 : _a.build) == null ? void 0 : _b.assetsInlineLimit) || 4096;
+      let assetInlineLimit = 4096;
+      if (((_a = settings.config.vite) == null ? void 0 : _a.build) && settings.config.vite.build.assetsInlineLimit !== void 0) {
+        assetInlineLimit = (_b = settings.config.vite) == null ? void 0 : _b.build.assetsInlineLimit;
+      }
       for (const [id, output] of Object.entries(bundle)) {
         if (output.type === "chunk" && output.facadeModuleId && virtualHoistedEntry(output.facadeModuleId)) {
           const canBeInlined = output.imports.length === 0 && output.dynamicImports.length === 0 && Buffer.byteLength(output.code) <= assetInlineLimit;

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

@@ -105,16 +105,21 @@ function buildManifest(opts, internals, staticFiles) {
   if (settings.scripts.some((script) => script.stage === "page")) {
     staticFiles.push(entryModules[PAGE_SCRIPT_ID]);
   }
+  const bareBase = removeTrailingForwardSlash(removeLeadingForwardSlash(settings.config.base));
+  const joinBase = (pth) => bareBase ? bareBase + "/" + pth : pth;
   for (const pageData of eachPageData(internals)) {
     const scripts = [];
     if (pageData.hoistedScript) {
-      scripts.unshift(pageData.hoistedScript);
+      scripts.unshift(
+        Object.assign({}, pageData.hoistedScript, {
+          value: joinBase(pageData.hoistedScript.value)
+        })
+      );
     }
     if (settings.scripts.some((script) => script.stage === "page")) {
       scripts.push({ type: "external", value: entryModules[PAGE_SCRIPT_ID] });
     }
-    const bareBase = removeTrailingForwardSlash(removeLeadingForwardSlash(settings.config.base));
-    const links = sortedCSS(pageData).map((pth) => bareBase ? bareBase + "/" + pth : pth);
+    const links = sortedCSS(pageData).map((pth) => joinBase(pth));
     routes.push({
       file: "",
       links,

package/dist/core/config/schema.d.ts

@@ -8,7 +8,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     publicDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     outDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     site: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
-    base: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, string | undefined>;
+    base: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
     output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">]>>>;
     adapter: z.ZodOptional<z.ZodObject<{
@@ -239,7 +239,7 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     publicDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     outDir: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     site: z.ZodEffects<z.ZodOptional<z.ZodString>, string | undefined, string | undefined>;
-    base: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, string, string | undefined>;
+    base: z.ZodDefault<z.ZodOptional<z.ZodString>>;
     trailingSlash: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"always">, z.ZodLiteral<"never">, z.ZodLiteral<"ignore">]>>>;
     output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">]>>>;
     adapter: z.ZodOptional<z.ZodObject<{

package/dist/core/config/schema.js

@@ -47,7 +47,7 @@ const AstroConfigSchema = z.object({
   publicDir: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.publicDir).transform((val) => new URL(val)),
   outDir: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.outDir).transform((val) => new URL(val)),
   site: z.string().url().optional().transform((val) => val ? appendForwardSlash(val) : val),
-  base: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.base).transform((val) => prependForwardSlash(appendForwardSlash(trimSlashes(val)))),
+  base: z.string().optional().default(ASTRO_CONFIG_DEFAULTS.base),
   trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default(ASTRO_CONFIG_DEFAULTS.trailingSlash),
   output: z.union([z.literal("static"), z.literal("server")]).optional().default("static"),
   adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
@@ -171,6 +171,19 @@ function createRelativeSchema(cmd, fileProtocolRoot) {
     if (!config.build.client.toString().startsWith(config.outDir.toString()) && config.build.client.toString().endsWith("dist/client/")) {
       config.build.client = new URL("./dist/client/", config.outDir);
     }
+    const trimmedBase = trimSlashes(config.base);
+    const sitePathname = config.site && new URL(config.site).pathname;
+    if (!trimmedBase.length && sitePathname && sitePathname !== "/") {
+      config.base = sitePathname;
+      console.warn(`The site configuration value includes a pathname of ${sitePathname} but there is no base configuration.
+			
+A future version of Astro will stop using the site pathname when producing <link> and <script> tags. Set your site's base with the base configuration.`);
+    }
+    if (trimmedBase.length && config.trailingSlash === "never") {
+      config.base = prependForwardSlash(trimmedBase);
+    } else {
+      config.base = prependForwardSlash(appendForwardSlash(trimmedBase));
+    }
     return config;
   });
   return AstroConfigRelativeSchema;

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.6.7";
+const ASTRO_VERSION = "1.6.8";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/create-vite.js

@@ -38,6 +38,7 @@ async function createVite(commandConfig, { settings, logging, mode, fs = nodeFs
   const astroPkgsConfig = await crawlFrameworkPkgs({
     root: fileURLToPath(settings.config.root),
     isBuild: mode === "build",
+    viteUserConfig: settings.config.vite,
     isFrameworkPkgByJson(pkgJson) {
       var _a, _b, _c, _d;
       return ((_a = pkgJson.peerDependencies) == null ? void 0 : _a.astro) || ((_b = pkgJson.dependencies) == null ? void 0 : _b.astro) || ((_c = pkgJson.keywords) == null ? void 0 : _c.includes("astro")) || ((_d = pkgJson.keywords) == null ? void 0 : _d.includes("astro-component")) || /^(@[^\/]+\/)?astro\-/.test(pkgJson.name);

package/dist/core/dev/dev.js

@@ -30,7 +30,7 @@ async function dev(settings, options) {
       isRestart: options.isRestart
     })
   );
-  const currentVersion = "1.6.7";
+  const currentVersion = "1.6.8";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

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

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

@@ -24,10 +24,12 @@ async function callGetStaticPaths({
       throw new AstroError(AstroErrorData.GetStaticPathsDeprecatedRSS);
     }
   });
+  if (Array.isArray(staticPaths)) {
+    staticPaths = staticPaths.flat();
+  }
   if (isValidate) {
     validateGetStaticPathsResult(staticPaths, logging, route);
   }
-  staticPaths = staticPaths.flat();
   const keyedStaticPaths = staticPaths;
   keyedStaticPaths.keyed = /* @__PURE__ */ new Map();
   for (const sp of keyedStaticPaths) {

package/dist/core/render/ssr-element.d.ts

@@ -1,13 +1,13 @@
 import type { SSRElement } from '../../@types/astro';
-export declare function createLinkStylesheetElement(href: string, site?: string): SSRElement;
-export declare function createLinkStylesheetElementSet(hrefs: string[], site?: string): Set<SSRElement>;
+export declare function createLinkStylesheetElement(href: string, base?: string): SSRElement;
+export declare function createLinkStylesheetElementSet(hrefs: string[], base?: string): Set<SSRElement>;
 export declare function createModuleScriptElement(script: {
     type: 'inline' | 'external';
     value: string;
-}, site?: string): SSRElement;
+}, base?: string): SSRElement;
 export declare function createModuleScriptElementWithSrc(src: string, site?: string): SSRElement;
 export declare function createModuleScriptElementWithSrcSet(srces: string[], site?: string): Set<SSRElement>;
 export declare function createModuleScriptsSet(scripts: {
     type: 'inline' | 'external';
     value: string;
-}[], site?: string): Set<SSRElement>;
+}[], base?: string): Set<SSRElement>;

package/dist/core/render/ssr-element.js

@@ -1,26 +1,26 @@
 import npath from "path-browserify";
 import { appendForwardSlash } from "../../core/path.js";
-function getRootPath(site) {
-  return appendForwardSlash(new URL(site || "http://localhost/").pathname);
+function getRootPath(base) {
+  return appendForwardSlash(new URL(base || "/", "http://localhost/").pathname);
 }
-function joinToRoot(href, site) {
-  return npath.posix.join(getRootPath(site), href);
+function joinToRoot(href, base) {
+  return npath.posix.join(getRootPath(base), href);
 }
-function createLinkStylesheetElement(href, site) {
+function createLinkStylesheetElement(href, base) {
   return {
     props: {
       rel: "stylesheet",
-      href: joinToRoot(href, site)
+      href: joinToRoot(href, base)
     },
     children: ""
   };
 }
-function createLinkStylesheetElementSet(hrefs, site) {
-  return new Set(hrefs.map((href) => createLinkStylesheetElement(href, site)));
+function createLinkStylesheetElementSet(hrefs, base) {
+  return new Set(hrefs.map((href) => createLinkStylesheetElement(href, base)));
 }
-function createModuleScriptElement(script, site) {
+function createModuleScriptElement(script, base) {
   if (script.type === "external") {
-    return createModuleScriptElementWithSrc(script.value, site);
+    return createModuleScriptElementWithSrc(script.value, base);
   } else {
     return {
       props: {
@@ -42,8 +42,8 @@ function createModuleScriptElementWithSrc(src, site) {
 function createModuleScriptElementWithSrcSet(srces, site) {
   return new Set(srces.map((src) => createModuleScriptElementWithSrc(src, site)));
 }
-function createModuleScriptsSet(scripts, site) {
-  return new Set(scripts.map((script) => createModuleScriptElement(script, site)));
+function createModuleScriptsSet(scripts, base) {
+  return new Set(scripts.map((script) => createModuleScriptElement(script, base)));
 }
 export {
   createLinkStylesheetElement,

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

@@ -35,7 +35,7 @@ function getParts(part, file) {
   });
   return result;
 }
-function getPattern(segments, addTrailingSlash) {
+function getPattern(segments, base, addTrailingSlash) {
   const pathname = segments.map((segment) => {
     if (segment.length === 1 && segment[0].spread) {
       return "(?:\\/(.*?))?";
@@ -52,7 +52,11 @@ function getPattern(segments, addTrailingSlash) {
     }
   }).join("");
   const trailing = addTrailingSlash && segments.length ? getTrailingSlashPattern(addTrailingSlash) : "$";
-  return new RegExp(`^${pathname || "\\/"}${trailing}`);
+  let initial = "\\/";
+  if (addTrailingSlash === "never" && base !== "/") {
+    initial = "";
+  }
+  return new RegExp(`^${pathname || initial}${trailing}`);
 }
 function getTrailingSlashPattern(addTrailingSlash) {
   if (addTrailingSlash === "always") {
@@ -209,7 +213,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
         components.push(item.file);
         const component = item.file;
         const trailingSlash = item.isPage ? settings.config.trailingSlash : "never";
-        const pattern = getPattern(segments, trailingSlash);
+        const pattern = getPattern(segments, settings.config.base, trailingSlash);
         const generate = getRouteGenerator(segments, trailingSlash);
         const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
         const route = `/${segments.map(([{ dynamic, content }]) => dynamic ? `[${content}]` : content).join("/")}`.toLowerCase();
@@ -251,7 +255,7 @@ function createRouteManifest({ settings, cwd, fsMod }, logging) {
     const type = resolved.endsWith(".astro") ? "page" : "endpoint";
     const isPage = type === "page";
     const trailingSlash = isPage ? config.trailingSlash : "never";
-    const pattern = getPattern(segments, trailingSlash);
+    const pattern = getPattern(segments, settings.config.base, trailingSlash);
     const generate = getRouteGenerator(segments, trailingSlash);
     const pathname = segments.every((segment) => segment.length === 1 && !segment[0].dynamic) ? `/${segments.map((segment) => segment[0].content).join("/")}` : null;
     const params = segments.flat().filter((p) => p.dynamic).map((p) => p.content);

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

@@ -8,12 +8,13 @@ function baseMiddleware(settings, logging) {
   const site = config.site ? new URL(config.base, config.site) : void 0;
   const devRootURL = new URL(config.base, "http://localhost");
   const devRoot = site ? site.pathname : devRootURL.pathname;
+  const devRootReplacement = devRoot.endsWith("/") ? "/" : "";
   return function devBaseMiddleware(req, res, next) {
     var _a;
     const url = req.url;
     const pathname = decodeURI(new URL(url, "http://localhost").pathname);
     if (pathname.startsWith(devRoot)) {
-      req.url = url.replace(devRoot, "/");
+      req.url = url.replace(devRoot, devRootReplacement);
       return next();
     }
     if (pathname === "/" || pathname === "/index.html") {

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

@@ -33,8 +33,10 @@ function createVitePluginAstroServer({
           });
         }
         viteServer.middlewares.use(async (req, res) => {
-          if (!req.url || !req.method) {
-            throw new Error("Incomplete request");
+          if (req.url === void 0 || !req.method) {
+            res.writeHead(500, "Incomplete request");
+            res.end();
+            return;
           }
           handleRequest(env, manifest, serverController, req, res);
         });

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

@@ -2,18 +2,23 @@ import { collectErrorMetadata } from "../core/errors/dev/index.js";
 import { createSafeError } from "../core/errors/index.js";
 import { error } from "../core/logger/core.js";
 import * as msg from "../core/messages.js";
+import { removeTrailingForwardSlash } from "../core/path.js";
 import { runWithErrorHandling } from "./controller.js";
 import { handle500Response } from "./response.js";
 import { handleRoute, matchRoute } from "./route.js";
 async function handleRequest(env, manifest, controller, req, res) {
-  var _a;
   const { settings, loader: moduleLoader } = env;
   const { config } = settings;
   const origin = `${moduleLoader.isHttps() ? "https" : "http"}://${req.headers.host}`;
   const buildingToSSR = config.output === "server";
-  const url = new URL(origin + ((_a = req.url) == null ? void 0 : _a.replace(/(index)?\.html$/, "")));
-  const pathname = decodeURI(url.pathname);
-  url.pathname = config.base.substring(0, config.base.length - 1) + url.pathname;
+  const url = new URL(origin + req.url);
+  let pathname;
+  if (config.trailingSlash === "never" && !req.url) {
+    pathname = "";
+  } else {
+    pathname = decodeURI(url.pathname);
+  }
+  url.pathname = removeTrailingForwardSlash(config.base) + url.pathname;
   if (!buildingToSSR && pathname !== "/_image") {
     const allSearchParams = Array.from(url.searchParams);
     for (const [key] of allSearchParams) {
@@ -36,7 +41,18 @@ async function handleRequest(env, manifest, controller, req, res) {
     pathname,
     async run() {
       const matchedRoute = await matchRoute(pathname, env, manifest);
-      return await handleRoute(matchedRoute, url, pathname, body, origin, env, manifest, req, res);
+      const resolvedPathname = (matchedRoute == null ? void 0 : matchedRoute.resolvedPathname) ?? pathname;
+      return await handleRoute(
+        matchedRoute,
+        url,
+        resolvedPathname,
+        body,
+        origin,
+        env,
+        manifest,
+        req,
+        res
+      );
     },
     onError(_err) {
       const err = createSafeError(_err);

package/dist/vite-plugin-astro-server/route.d.ts

@@ -1,13 +1,15 @@
 /// <reference types="node" />
 import type http from 'http';
-import type { ManifestData } from '../@types/astro';
-import { DevelopmentEnvironment } from '../core/render/dev/index';
+import type { ComponentInstance, ManifestData, RouteData } from '../@types/astro';
+import { ComponentPreload, DevelopmentEnvironment } from '../core/render/dev/index';
 declare type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (...args: any) => Promise<infer R> ? R : any;
-export declare function matchRoute(pathname: string, env: DevelopmentEnvironment, manifest: ManifestData): Promise<{
-    route: import("../@types/astro").RouteData;
+interface MatchedRoute {
+    route: RouteData;
     filePath: URL;
-    preloadedComponent: import("../core/render/dev/index").ComponentPreload;
-    mod: import("../@types/astro").ComponentInstance;
-} | undefined>;
+    resolvedPathname: string;
+    preloadedComponent: ComponentPreload;
+    mod: ComponentInstance;
+}
+export declare function matchRoute(pathname: string, env: DevelopmentEnvironment, manifest: ManifestData): Promise<MatchedRoute | undefined>;
 export declare function handleRoute(matchedRoute: AsyncReturnType<typeof matchRoute>, url: URL, pathname: string, body: ArrayBuffer | undefined, origin: string, env: DevelopmentEnvironment, manifest: ManifestData, req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;
 export {};

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

@@ -36,11 +36,16 @@ async function matchRoute(pathname, env, manifest) {
       return {
         route: maybeRoute,
         filePath,
+        resolvedPathname: pathname,
         preloadedComponent,
         mod
       };
     }
   }
+  const altPathname = pathname.replace(/(index)?\.html$/, "");
+  if (altPathname !== pathname) {
+    return await matchRoute(altPathname, env, manifest);
+  }
   if (matches.length) {
     const possibleRoutes = matches.flatMap((route) => route.component);
     warn(
@@ -62,6 +67,7 @@ ${AstroErrorData.NoMatchingStaticPathFound.hint(possibleRoutes)}`
     return {
       route: custom404,
       filePath,
+      resolvedPathname: pathname,
       preloadedComponent,
       mod
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -87,7 +87,7 @@
     "vendor"
   ],
   "dependencies": {
-    "@astrojs/compiler": "^0.29.11",
+    "@astrojs/compiler": "^0.29.15",
     "@astrojs/language-server": "^0.28.3",
     "@astrojs/markdown-remark": "^1.1.3",
     "@astrojs/telemetry": "^1.0.1",
@@ -145,7 +145,7 @@
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
     "vite": "~3.2.1",
-    "vitefu": "^0.1.0",
+    "vitefu": "^0.2.0",
     "yargs-parser": "^21.0.1",
     "zod": "^3.17.3"
   },