astro 2.3.0 → 2.3.1

package/dist/core/app/index.js

@@ -3,7 +3,7 @@ import { attachToResponse, getSetCookiesFromResponse } from "../cookies/index.js
 import { call as callEndpoint } from "../endpoint/index.js";
 import { consoleLogDestination } from "../logger/console.js";
 import { error } from "../logger/core.js";
-import { joinPaths, prependForwardSlash, removeTrailingForwardSlash } from "../path.js";
+import { removeTrailingForwardSlash } from "../path.js";
 import {
   createEnvironment,
   createRenderContext,
@@ -11,6 +11,7 @@ import {
 } from "../render/index.js";
 import { RouteCache } from "../render/route-cache.js";
 import {
+  createAssetLink,
   createLinkStylesheetElementSet,
   createModuleScriptElement
 } from "../render/ssr-element.js";
@@ -54,7 +55,7 @@ class App {
             return bundlePath;
           }
           default: {
-            return prependForwardSlash(joinPaths(manifest.base, bundlePath));
+            return createAssetLink(bundlePath, manifest.base, manifest.assetsPrefix);
           }
         }
       },

package/dist/core/app/types.d.ts

@@ -21,6 +21,7 @@ export interface SSRManifest {
     routes: RouteInfo[];
     site?: string;
     base?: string;
+    assetsPrefix?: string;
     markdown: MarkdownRenderingOptions;
     pageMap: Map<ComponentPath, ComponentInstance>;
     renderers: SSRLoadedRenderer[];

package/dist/core/build/generate.js

@@ -64,7 +64,7 @@ async function generatePages(opts, internals) {
   const ssr = opts.settings.config.output === "server";
   const serverEntry = opts.buildConfig.serverEntry;
   const outFolder = ssr ? opts.buildConfig.server : getOutDirWithinCwd(opts.settings.config.outDir);
-  if (opts.settings.config.output === "server" && !hasPrerenderedPages(internals))
+  if (ssr && !hasPrerenderedPages(internals))
     return;
   const verb = ssr ? "prerendering" : "generating";
   info(opts.logging, null, `
@@ -72,7 +72,7 @@ ${bgGreen(black(` ${verb} static routes `))}`);
   const ssrEntryURL = new URL("./" + serverEntry + `?time=${Date.now()}`, outFolder);
   const ssrEntry = await import(ssrEntryURL.toString());
   const builtPaths = /* @__PURE__ */ new Set();
-  if (opts.settings.config.output === "server") {
+  if (ssr) {
     for (const pageData of eachPrerenderedPageData(internals)) {
       await generatePage(opts, internals, pageData, ssrEntry, builtPaths);
     }

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

@@ -19,7 +19,7 @@ function vitePluginSSR(internals, adapter) {
     options(opts) {
       return addRollupInput(opts, [virtualModuleId]);
     },
-    resolveId(id, parent) {
+    resolveId(id) {
       if (id === virtualModuleId) {
         return resolvedVirtualModuleId;
       }
@@ -171,6 +171,7 @@ function buildManifest(opts, internals, staticFiles) {
     routes,
     site: settings.config.site,
     base: settings.config.base,
+    assetsPrefix: settings.config.build.assetsPrefix,
     markdown: settings.config.markdown,
     pageMap: null,
     componentMetadata: Array.from(internals.componentMetadata),

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

@@ -52,10 +52,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
         serverEntry: string;
     }, {
         assets?: string | undefined;
+        assetsPrefix?: string | undefined;
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
-        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
@@ -227,10 +227,10 @@ export declare const AstroConfigSchema: z.ZodObject<{
     integrations?: unknown;
     build?: {
         assets?: string | undefined;
+        assetsPrefix?: string | undefined;
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
-        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
@@ -354,10 +354,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
         serverEntry: string;
     }, {
         assets?: string | undefined;
+        assetsPrefix?: string | undefined;
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
-        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     }>>>;
     server: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodObject<{
@@ -470,10 +470,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     integrations?: unknown;
     build?: {
         assets?: string | undefined;
+        assetsPrefix?: string | undefined;
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
-        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
     image?: {
@@ -569,10 +569,10 @@ export declare function createRelativeSchema(cmd: string, fileProtocolRoot: URL)
     integrations?: unknown;
     build?: {
         assets?: string | undefined;
+        assetsPrefix?: string | undefined;
         server?: string | undefined;
         format?: "file" | "directory" | undefined;
         client?: string | undefined;
-        assetsPrefix?: string | undefined;
         serverEntry?: string | undefined;
     } | undefined;
     image?: {

package/dist/core/config/vite-load.js

@@ -4,7 +4,7 @@ import loadFallbackPlugin from "../../vite-plugin-load-fallback/index.js";
 async function createViteLoader(root, fs) {
   const viteServer = await vite.createServer({
     server: { middlewareMode: true, hmr: false },
-    optimizeDeps: { entries: [] },
+    optimizeDeps: { disabled: true },
     clearScreen: false,
     appType: "custom",
     ssr: {

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.3.0";
+  const version = "2.3.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.3.0"}`
+        `v${"2.3.1"}`
       )} ${headline}`
     );
   }

package/dist/core/render/core.js

@@ -14,7 +14,7 @@ async function getParamsAndProps(opts) {
   let pageProps;
   if (route && !route.pathname) {
     if (route.params.length) {
-      const paramsMatch = route.pattern.exec(pathname);
+      const paramsMatch = route.pattern.exec(decodeURIComponent(pathname));
       if (paramsMatch) {
         params = getParams(route.params)(paramsMatch);
         if (route.type === "endpoint" && mod.getStaticPaths) {

package/dist/core/sync/index.js

@@ -35,7 +35,7 @@ async function sync(settings, { logging, fs }) {
     await createVite(
       {
         server: { middlewareMode: true, hmr: false },
-        optimizeDeps: { entries: [] },
+        optimizeDeps: { disabled: true },
         ssr: { external: [] },
         logLevel: "silent"
       },

package/dist/core/util.js

@@ -121,7 +121,11 @@ function rootRelativePath(root, idOrUrl) {
   } else {
     id = idOrUrl;
   }
-  return prependForwardSlash(id.slice(normalizePath(fileURLToPath(root)).length));
+  const normalizedRoot = normalizePath(fileURLToPath(root));
+  if (id.startsWith(normalizedRoot)) {
+    id = id.slice(normalizedRoot.length);
+  }
+  return prependForwardSlash(id);
 }
 function emoji(char, fallback) {
   return process.platform !== "win32" ? char : fallback;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -142,7 +142,7 @@
     "typescript": "*",
     "unist-util-visit": "^4.1.0",
     "vfile": "^5.3.2",
-    "vite": "^4.2.1",
+    "vite": "^4.3.1",
     "vitefu": "^0.2.4",
     "yargs-parser": "^21.0.1",
     "zod": "^3.20.6"