astro 4.4.14 → 4.5.0

package/dist/content/types-generator.js

@@ -3,6 +3,8 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import glob from "fast-glob";
 import { bold, cyan } from "kleur/colors";
 import { normalizePath } from "vite";
+import { z } from "zod";
+import { zodToJsonSchema } from "zod-to-json-schema";
 import { AstroError } from "../core/errors/errors.js";
 import { AstroErrorData } from "../core/errors/index.js";
 import { isRelativePath } from "../core/path.js";
@@ -72,7 +74,10 @@ async function createContentTypesGenerator({
         return { shouldGenerateTypes: false };
       switch (event.name) {
         case "addDir":
-          collectionEntryMap[JSON.stringify(collection2)] = { type: "unknown", entries: {} };
+          collectionEntryMap[JSON.stringify(collection2)] = {
+            type: "unknown",
+            entries: {}
+          };
           logger.debug("content", `${cyan(collection2)} collection added`);
           break;
         case "unlinkDir":
@@ -150,7 +155,11 @@ async function createContentTypesGenerator({
     const contentEntryType = contentEntryConfigByExt.get(path.extname(event.entry.pathname));
     if (!contentEntryType)
       return { shouldGenerateTypes: false };
-    const { id, slug: generatedSlug } = getContentEntryIdAndSlug({ entry, contentDir, collection });
+    const { id, slug: generatedSlug } = getContentEntryIdAndSlug({
+      entry,
+      contentDir,
+      collection
+    });
     const collectionKey = JSON.stringify(collection);
     if (!(collectionKey in collectionEntryMap)) {
       collectionEntryMap[collectionKey] = { type: "content", entries: {} };
@@ -181,7 +190,10 @@ async function createContentTypesGenerator({
         if (!(entryKey in collectionEntryMap[collectionKey].entries)) {
           collectionEntryMap[collectionKey] = {
             type: "content",
-            entries: { ...collectionInfo.entries, [entryKey]: { slug: addedSlug } }
+            entries: {
+              ...collectionInfo.entries,
+              [entryKey]: { slug: addedSlug }
+            }
           };
         }
         return { shouldGenerateTypes: true };
@@ -244,7 +256,9 @@ async function createContentTypesGenerator({
         typeTemplateContent,
         contentConfig: observable.status === "loaded" ? observable.config : void 0,
         contentEntryTypes: settings.contentEntryTypes,
-        viteServer
+        viteServer,
+        logger,
+        settings
       });
       invalidateVirtualMod(viteServer);
     }
@@ -269,12 +283,21 @@ async function writeContentFiles({
   typeTemplateContent,
   contentEntryTypes,
   contentConfig,
-  viteServer
+  viteServer,
+  logger,
+  settings
 }) {
   let contentTypesStr = "";
   let dataTypesStr = "";
+  const collectionSchemasDir = new URL("./collections/", contentPaths.cacheDir);
+  if (settings.config.experimental.contentCollectionJsonSchema && !fs.existsSync(collectionSchemasDir)) {
+    fs.mkdirSync(collectionSchemasDir, { recursive: true });
+  }
   for (const [collection, config] of Object.entries(contentConfig?.collections ?? {})) {
-    collectionEntryMap[JSON.stringify(collection)] ??= { type: config.type, entries: {} };
+    collectionEntryMap[JSON.stringify(collection)] ??= {
+      type: config.type,
+      entries: {}
+    };
   }
   for (const collectionKey of Object.keys(collectionEntryMap).sort()) {
     const collectionConfig = contentConfig?.collections[JSON.parse(collectionKey)];
@@ -292,7 +315,6 @@ async function writeContentFiles({
           hint: collection.type === "data" ? "Try adding `type: 'data'` to your collection config." : void 0,
           location: {
             file: ""
-            /** required for error overlay `hot` messages */
           }
         })
       });
@@ -337,6 +359,33 @@ async function writeContentFiles({
   data: ${dataType}
 };
 `;
+          if (settings.config.experimental.contentCollectionJsonSchema && collectionConfig?.schema) {
+            let zodSchemaForJson = collectionConfig.schema;
+            if (zodSchemaForJson instanceof z.ZodObject) {
+              zodSchemaForJson = zodSchemaForJson.extend({
+                $schema: z.string().optional()
+              });
+            }
+            try {
+              await fs.promises.writeFile(
+                new URL(`./${collectionKey.replace(/"/g, "")}.schema.json`, collectionSchemasDir),
+                JSON.stringify(
+                  zodToJsonSchema(zodSchemaForJson, {
+                    name: collectionKey.replace(/"/g, ""),
+                    markdownDescription: true,
+                    errorMessages: true
+                  }),
+                  null,
+                  2
+                )
+              );
+            } catch (err) {
+              logger.warn(
+                "content",
+                `An error was encountered while creating the JSON schema. Proceeding without it. Error: ${err}`
+              );
+            }
+          }
         }
         dataTypesStr += `};
 `;

package/dist/content/vite-plugin-content-assets.js

@@ -1,5 +1,6 @@
 import { extname } from "node:path";
 import { pathToFileURL } from "node:url";
+import { getAssetsPrefix } from "../assets/utils/getAssetsPrefix.js";
 import { moduleIsTopLevelPage, walkParentInfos } from "../core/build/graph.js";
 import { getPageDataByViteID } from "../core/build/internal.js";
 import { createViteLoader } from "../core/module-loader/vite.js";
@@ -54,7 +55,11 @@ function astroContentAssetPropagationPlugin({
             urls,
             crawledFiles: styleCrawledFiles
           } = await getStylesForURL(pathToFileURL(basePath), devModuleLoader);
-          const { scripts: hoistedScripts, crawledFiles: scriptCrawledFiles } = await getScriptsForURL(pathToFileURL(basePath), settings.config.root, devModuleLoader);
+          const { scripts: hoistedScripts, crawledFiles: scriptCrawledFiles } = settings.config.experimental.directRenderScript ? { scripts: /* @__PURE__ */ new Set(), crawledFiles: /* @__PURE__ */ new Set() } : await getScriptsForURL(
+            pathToFileURL(basePath),
+            settings.config.root,
+            devModuleLoader
+          );
           for (const file of styleCrawledFiles) {
             if (!file.includes("node_modules")) {
               this.addWatchFile(file);
@@ -108,8 +113,11 @@ function astroConfigBuildPlugin(options, internals) {
       "build:post": ({ ssrOutputs, clientOutputs, mutate }) => {
         const outputs = ssrOutputs.flatMap((o) => o.output);
         const prependBase = (src) => {
-          if (options.settings.config.build.assetsPrefix) {
-            return joinPaths(options.settings.config.build.assetsPrefix, src);
+          const { assetsPrefix } = options.settings.config.build;
+          if (assetsPrefix) {
+            const fileExtension = extname(src);
+            const pf = getAssetsPrefix(fileExtension, assetsPrefix);
+            return joinPaths(pf, src);
           } else {
             return prependForwardSlash(joinPaths(options.settings.config.base, src));
           }

package/dist/core/app/common.js

@@ -11,6 +11,7 @@ function deserializeManifest(serializedManifest) {
   }
   const assets = new Set(serializedManifest.assets);
   const componentMetadata = new Map(serializedManifest.componentMetadata);
+  const inlinedScripts = new Map(serializedManifest.inlinedScripts);
   const clientDirectives = new Map(serializedManifest.clientDirectives);
   return {
     // in case user middleware exists, this no-op middleware will be reassigned (see plugin-ssr.ts)
@@ -20,6 +21,7 @@ function deserializeManifest(serializedManifest) {
     ...serializedManifest,
     assets,
     componentMetadata,
+    inlinedScripts,
     clientDirectives,
     routes
   };

package/dist/core/app/index.js

@@ -1,5 +1,6 @@
 import { normalizeTheLocale } from "../../i18n/index.js";
 import {
+  DEFAULT_404_COMPONENT,
   REROUTABLE_STATUS_CODES,
   REROUTE_DIRECTIVE_HEADER,
   clientAddressSymbol,
@@ -20,6 +21,7 @@ import {
 import { RedirectSinglePageBuiltModule } from "../redirects/index.js";
 import { RenderContext } from "../render-context.js";
 import { createAssetLink } from "../render/ssr-element.js";
+import { ensure404Route } from "../routing/astro-designed-error-pages.js";
 import { matchRoute } from "../routing/match.js";
 import { AppPipeline } from "./pipeline.js";
 import { deserializeManifest } from "./common.js";
@@ -36,9 +38,9 @@ class App {
   #renderOptionsDeprecationWarningShown = false;
   constructor(manifest, streaming = true) {
     this.#manifest = manifest;
-    this.#manifestData = {
+    this.#manifestData = ensure404Route({
       routes: manifest.routes.map((route) => route.routeData)
-    };
+    });
     this.#baseWithoutTrailingSlash = removeTrailingForwardSlash(this.#manifest.base);
     this.#pipeline = this.#createPipeline(streaming);
     this.#adapterLogger = new AstroIntegrationLogger(
@@ -348,6 +350,12 @@ class App {
     return 200;
   }
   async #getModuleForRoute(route) {
+    if (route.component === DEFAULT_404_COMPONENT) {
+      return {
+        page: async () => ({ default: () => new Response(null, { status: 404 }) }),
+        renderers: []
+      };
+    }
     if (route.type === "redirect") {
       return RedirectSinglePageBuiltModule;
     } else {

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

@@ -26,6 +26,9 @@ export type SerializedRouteInfo = Omit<RouteInfo, 'routeData'> & {
     routeData: SerializedRouteData;
 };
 export type ImportComponentInstance = () => Promise<SinglePageBuiltModule>;
+export type AssetsPrefix = string | ({
+    fallback: string;
+} & Record<string, string>) | undefined;
 export type SSRManifest = {
     adapterName: string;
     routes: RouteInfo[];
@@ -34,13 +37,14 @@ export type SSRManifest = {
     trailingSlash: 'always' | 'never' | 'ignore';
     buildFormat: 'file' | 'directory' | 'preserve';
     compressHTML: boolean;
-    assetsPrefix?: string;
+    assetsPrefix?: AssetsPrefix;
     renderers: SSRLoadedRenderer[];
     /**
      * Map of directive name (e.g. `load`) to the directive script code
      */
     clientDirectives: Map<string, string>;
     entryModules: Record<string, string>;
+    inlinedScripts: Map<string, string>;
     assets: Set<string>;
     componentMetadata: SSRResult['componentMetadata'];
     pageModule?: SinglePageBuiltModule;
@@ -55,9 +59,10 @@ export type SSRManifestI18n = {
     defaultLocale: string;
     domainLookupTable: Record<string, string>;
 };
-export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'clientDirectives'> & {
+export type SerializedSSRManifest = Omit<SSRManifest, 'middleware' | 'routes' | 'assets' | 'componentMetadata' | 'inlinedScripts' | 'clientDirectives'> & {
     routes: SerializedRouteInfo[];
     assets: string[];
     componentMetadata: [string, SSRComponentMetadata][];
+    inlinedScripts: [string, string][];
     clientDirectives: [string, string][];
 };

package/dist/core/base-pipeline.d.ts

@@ -26,6 +26,7 @@ export declare abstract class Pipeline {
      */
     readonly adapterName: string;
     readonly clientDirectives: Map<string, string>;
+    readonly inlinedScripts: Map<string, string>;
     readonly compressHTML: boolean;
     readonly i18n: import("./app/types.js").SSRManifestI18n | undefined;
     readonly middleware: MiddlewareHandler;
@@ -47,7 +48,7 @@ export declare abstract class Pipeline {
     /**
      * Used to provide better error messages for `Astro.clientAddress`
      */
-    adapterName?: string, clientDirectives?: Map<string, string>, compressHTML?: boolean, i18n?: import("./app/types.js").SSRManifestI18n | undefined, middleware?: MiddlewareHandler, routeCache?: RouteCache, 
+    adapterName?: string, clientDirectives?: Map<string, string>, inlinedScripts?: Map<string, string>, compressHTML?: boolean, i18n?: import("./app/types.js").SSRManifestI18n | undefined, middleware?: MiddlewareHandler, routeCache?: RouteCache, 
     /**
      * Used for `Astro.site`.
      */

package/dist/core/base-pipeline.js

@@ -1,7 +1,7 @@
 import { createI18nMiddleware } from "../i18n/middleware.js";
 import { RouteCache } from "./render/route-cache.js";
 class Pipeline {
-  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0) {
+  constructor(logger, manifest, mode, renderers, resolve, serverLike, streaming, adapterName = manifest.adapterName, clientDirectives = manifest.clientDirectives, inlinedScripts = manifest.inlinedScripts, compressHTML = manifest.compressHTML, i18n = manifest.i18n, middleware = manifest.middleware, routeCache = new RouteCache(logger, mode), site = manifest.site ? new URL(manifest.site) : void 0) {
     this.logger = logger;
     this.manifest = manifest;
     this.mode = mode;
@@ -11,6 +11,7 @@ class Pipeline {
     this.streaming = streaming;
     this.adapterName = adapterName;
     this.clientDirectives = clientDirectives;
+    this.inlinedScripts = inlinedScripts;
     this.compressHTML = compressHTML;
     this.i18n = i18n;
     this.middleware = middleware;

package/dist/core/build/generate.js

@@ -421,6 +421,7 @@ function createBuildManifest(settings, internals, renderers, middleware) {
     trailingSlash: settings.config.trailingSlash,
     assets: /* @__PURE__ */ new Set(),
     entryModules: Object.fromEntries(internals.entrySpecifierToBundleMap.entries()),
+    inlinedScripts: internals.inlinedScripts,
     routes: [],
     adapterName: "",
     clientDirectives: settings.clientDirectives,

package/dist/core/build/internal.d.ts

@@ -13,6 +13,12 @@ export interface BuildInternals {
     cssModuleToChunkIdMap: Map<string, string>;
     hoistedScriptIdToHoistedMap: Map<string, Set<string>>;
     hoistedScriptIdToPagesMap: Map<string, Set<string>>;
+    /**
+     * Used by the `directRenderScript` option. If script is inlined, its id and
+     * inlined code is mapped here. The resolved id is an URL like "/_astro/something.js"
+     * but will no longer exist as the content is now inlined in this map.
+     */
+    inlinedScripts: Map<string, string>;
     entrySpecifierToBundleMap: Map<string, string>;
     /**
      * A map to get a specific page's bundled output file.

package/dist/core/build/internal.js

@@ -14,6 +14,7 @@ function createBuildInternals() {
     cssModuleToChunkIdMap: /* @__PURE__ */ new Map(),
     hoistedScriptIdToHoistedMap,
     hoistedScriptIdToPagesMap,
+    inlinedScripts: /* @__PURE__ */ new Map(),
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
     pageToBundleMap: /* @__PURE__ */ new Map(),
     pagesByComponent: /* @__PURE__ */ new Map(),

package/dist/core/build/plugins/index.js

@@ -12,6 +12,7 @@ import { pluginMiddleware } from "./plugin-middleware.js";
 import { pluginPages } from "./plugin-pages.js";
 import { pluginPrerender } from "./plugin-prerender.js";
 import { pluginRenderers } from "./plugin-renderers.js";
+import { pluginScripts } from "./plugin-scripts.js";
 import { pluginSSR, pluginSSRSplit } from "./plugin-ssr.js";
 function registerAllPlugins({ internals, options, register }) {
   register(pluginComponentEntry(internals));
@@ -26,7 +27,11 @@ function registerAllPlugins({ internals, options, register }) {
   register(astroHeadBuildPlugin(internals));
   register(pluginPrerender(options, internals));
   register(astroConfigBuildPlugin(options, internals));
-  register(pluginHoistedScripts(options, internals));
+  if (options.settings.config.experimental.directRenderScript) {
+    register(pluginScripts(internals));
+  } else {
+    register(pluginHoistedScripts(options, internals));
+  }
   register(pluginSSR(options, internals));
   register(pluginSSRSplit(options, internals));
   register(pluginChunks());

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

@@ -9,82 +9,6 @@ function isPropagatedAsset(id) {
     return false;
   }
 }
-async function doesParentImportChild(parentInfo, childInfo, childExportNames) {
-  if (!childInfo || !parentInfo.ast || !childExportNames)
-    return "no";
-  if (childExportNames === "dynamic" || parentInfo.dynamicallyImportedIds?.includes(childInfo.id)) {
-    return "dynamic";
-  }
-  const imports = [];
-  const exports = [];
-  for (const node of parentInfo.ast.body) {
-    if (node.type === "ImportDeclaration") {
-      imports.push(node);
-    } else if (node.type === "ExportDefaultDeclaration" || node.type === "ExportNamedDeclaration") {
-      exports.push(node);
-    }
-  }
-  const importNames = [];
-  const exportNames = [];
-  for (const node of imports) {
-    const resolved = await this.resolve(node.source.value, parentInfo.id);
-    if (!resolved || resolved.id !== childInfo.id)
-      continue;
-    for (const specifier of node.specifiers) {
-      if (specifier.type === "ImportNamespaceSpecifier")
-        continue;
-      const name = specifier.type === "ImportDefaultSpecifier" ? "default" : specifier.imported.name;
-      if (childExportNames.includes(name)) {
-        importNames.push(specifier.local.name);
-      }
-    }
-  }
-  for (const node of exports) {
-    if (node.type === "ExportDefaultDeclaration") {
-      if (node.declaration.type === "Identifier" && importNames.includes(node.declaration.name)) {
-        exportNames.push("default");
-      }
-    } else {
-      if (node.source) {
-        const resolved = await this.resolve(node.source.value, parentInfo.id);
-        if (!resolved || resolved.id !== childInfo.id)
-          continue;
-        for (const specifier of node.specifiers) {
-          if (childExportNames.includes(specifier.local.name)) {
-            importNames.push(specifier.local.name);
-            exportNames.push(specifier.exported.name);
-          }
-        }
-      }
-      if (node.declaration) {
-        if (node.declaration.type !== "VariableDeclaration")
-          continue;
-        for (const declarator of node.declaration.declarations) {
-          if (declarator.init?.type !== "Identifier")
-            continue;
-          if (declarator.id.type !== "Identifier")
-            continue;
-          if (importNames.includes(declarator.init.name)) {
-            exportNames.push(declarator.id.name);
-          }
-        }
-      }
-      for (const specifier of node.specifiers) {
-        if (importNames.includes(specifier.local.name)) {
-          exportNames.push(specifier.exported.name);
-        }
-      }
-    }
-  }
-  if (!importNames.length)
-    return "no";
-  if (parentInfo.id.endsWith(".astro")) {
-    exportNames.push("default");
-  } else if (parentInfo.id.endsWith(".mdx")) {
-    exportNames.push("Content");
-  }
-  return exportNames;
-}
 function vitePluginAnalyzer(options, internals) {
   function hoistedScriptScanner() {
     const uniqueHoistedIds = /* @__PURE__ */ new Map();
@@ -97,29 +21,9 @@ function vitePluginAnalyzer(options, internals) {
           hoistedScripts.add(hid);
         }
         if (hoistedScripts.size) {
-          const depthsToChildren = /* @__PURE__ */ new Map();
-          const depthsToExportNames = /* @__PURE__ */ new Map();
-          depthsToExportNames.set(0, ["default"]);
-          for (const [parentInfo, depth] of walkParentInfos(from, this, function until(importer) {
+          for (const [parentInfo] of walkParentInfos(from, this, function until(importer) {
             return isPropagatedAsset(importer);
           })) {
-            if (options.settings.config.experimental.optimizeHoistedScript) {
-              depthsToChildren.set(depth, parentInfo);
-              if (depth > 0) {
-                const childInfo = depthsToChildren.get(depth - 1);
-                const childExportNames = depthsToExportNames.get(depth - 1);
-                const doesImport = await doesParentImportChild.call(
-                  this,
-                  parentInfo,
-                  childInfo,
-                  childExportNames
-                );
-                if (doesImport === "no") {
-                  continue;
-                }
-                depthsToExportNames.set(depth, doesImport);
-              }
-            }
             if (isPropagatedAsset(parentInfo.id)) {
               for (const [nestedParentInfo] of walkParentInfos(from, this)) {
                 if (moduleIsTopLevelPage(nestedParentInfo)) {
@@ -188,7 +92,9 @@ function vitePluginAnalyzer(options, internals) {
   return {
     name: "@astro/rollup-plugin-astro-analyzer",
     async generateBundle() {
-      const hoistScanner = hoistedScriptScanner();
+      const hoistScanner = options.settings.config.experimental.directRenderScript ? { scan: async () => {
+      }, finalize: () => {
+      } } : hoistedScriptScanner();
       const ids = this.getModuleIds();
       for (const id of ids) {
         const info = this.getModuleInfo(id);
@@ -232,6 +138,12 @@ function vitePluginAnalyzer(options, internals) {
             trackClientOnlyPageDatas(internals, newPageData, clientOnlys);
           }
         }
+        if (options.settings.config.experimental.directRenderScript && astro.scripts.length) {
+          for (let i = 0; i < astro.scripts.length; i++) {
+            const hid = `${id.replace("/@fs", "")}?astro&type=script&index=${i}&lang.ts`;
+            internals.discoveredScripts.add(hid);
+          }
+        }
       }
       hoistScanner.finalize();
     }

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

@@ -125,6 +125,22 @@ function rollupPluginAstroBuildCSS(options) {
       }
     }
   };
+  const cssScopeToPlugin = {
+    name: "astro:rollup-plugin-css-scope-to",
+    renderChunk(_, chunk, __, meta) {
+      for (const id in chunk.modules) {
+        const modMeta = this.getModuleInfo(id)?.meta;
+        const cssScopeTo = modMeta?.astroCss?.cssScopeTo;
+        if (cssScopeTo && !isCssScopeToRendered(cssScopeTo, Object.values(meta.chunks))) {
+          delete chunk.modules[id];
+          const moduleIdsIndex = chunk.moduleIds.indexOf(id);
+          if (moduleIdsIndex > -1) {
+            chunk.moduleIds.splice(moduleIdsIndex, 1);
+          }
+        }
+      }
+    }
+  };
   const singleCssPlugin = {
     name: "astro:rollup-plugin-single-css",
     enforce: "post",
@@ -197,7 +213,7 @@ function rollupPluginAstroBuildCSS(options) {
       });
     }
   };
-  return [cssBuildPlugin, singleCssPlugin, inlineStylesheetsPlugin];
+  return [cssBuildPlugin, cssScopeToPlugin, singleCssPlugin, inlineStylesheetsPlugin];
 }
 function* getParentClientOnlys(id, ctx, internals) {
   for (const [info] of walkParentInfos(id, ctx)) {
@@ -222,6 +238,16 @@ function appendCSSToPage(pageData, meta, pagesToCss, depth, order) {
     }
   }
 }
+function isCssScopeToRendered(cssScopeTo, chunks) {
+  for (const moduleId in cssScopeTo) {
+    const exports = cssScopeTo[moduleId];
+    const renderedModule = chunks.find((c) => c.moduleIds.includes(moduleId))?.modules[moduleId];
+    if (renderedModule?.renderedExports.some((e) => exports.includes(e))) {
+      return true;
+    }
+  }
+  return false;
+}
 export {
   pluginCSS
 };

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

@@ -1,11 +1,12 @@
 import { fileURLToPath } from "node:url";
 import glob from "fast-glob";
 import {} from "vite";
+import { getAssetsPrefix } from "../../../assets/utils/getAssetsPrefix.js";
 import { normalizeTheLocale } from "../../../i18n/index.js";
 import { toRoutingStrategy } from "../../../i18n/utils.js";
 import { runHookBuildSsr } from "../../../integrations/index.js";
 import { BEFORE_HYDRATION_SCRIPT_ID, PAGE_SCRIPT_ID } from "../../../vite-plugin-scripts/index.js";
-import { joinPaths, prependForwardSlash } from "../../path.js";
+import { fileExtension, joinPaths, prependForwardSlash } from "../../path.js";
 import { serializeRouteData } from "../../routing/index.js";
 import { addRollupInput } from "../add-rollup-input.js";
 import { getOutFile, getOutFolder } from "../common.js";
@@ -120,7 +121,8 @@ function buildManifest(opts, internals, staticFiles) {
   }
   const prefixAssetPath = (pth) => {
     if (settings.config.build.assetsPrefix) {
-      return joinPaths(settings.config.build.assetsPrefix, pth);
+      const pf = getAssetsPrefix(fileExtension(pth), settings.config.build.assetsPrefix);
+      return joinPaths(pf, pth);
     } else {
       return prependForwardSlash(joinPaths(settings.config.base, pth));
     }
@@ -208,6 +210,7 @@ function buildManifest(opts, internals, staticFiles) {
     renderers: [],
     clientDirectives: Array.from(settings.clientDirectives),
     entryModules,
+    inlinedScripts: Array.from(internals.inlinedScripts),
     assets: staticFiles.map(prefixAssetPath),
     i18n: i18nManifest,
     buildFormat: settings.config.build.format

package/dist/core/build/plugins/plugin-scripts.d.ts

@@ -0,0 +1,8 @@
+import type { Plugin as VitePlugin } from 'vite';
+import type { BuildInternals } from '../internal.js';
+import type { AstroBuildPlugin } from '../plugin.js';
+/**
+ * Used by the `experimental.directRenderScript` option to inline scripts directly into the HTML.
+ */
+export declare function vitePluginScripts(internals: BuildInternals): VitePlugin;
+export declare function pluginScripts(internals: BuildInternals): AstroBuildPlugin;

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

@@ -0,0 +1,34 @@
+import { shouldInlineAsset } from "./util.js";
+function vitePluginScripts(internals) {
+  let assetInlineLimit;
+  return {
+    name: "@astro/plugin-scripts",
+    configResolved(config) {
+      assetInlineLimit = config.build.assetsInlineLimit;
+    },
+    async generateBundle(_options, bundle) {
+      for (const [id, output] of Object.entries(bundle)) {
+        if (output.type === "chunk" && output.facadeModuleId && internals.discoveredScripts.has(output.facadeModuleId) && output.imports.length === 0 && output.dynamicImports.length === 0 && shouldInlineAsset(output.code, output.fileName, assetInlineLimit)) {
+          internals.inlinedScripts.set(output.facadeModuleId, output.code.trim());
+          delete bundle[id];
+        }
+      }
+    }
+  };
+}
+function pluginScripts(internals) {
+  return {
+    targets: ["client"],
+    hooks: {
+      "build:before": () => {
+        return {
+          vitePlugin: vitePluginScripts(internals)
+        };
+      }
+    }
+  };
+}
+export {
+  pluginScripts,
+  vitePluginScripts
+};

package/dist/core/compile/compile.d.ts

@@ -2,6 +2,7 @@ import type { TransformResult } from '@astrojs/compiler';
 import type { ResolvedConfig } from 'vite';
 import type { AstroConfig } from '../../@types/astro.js';
 import type { AstroPreferences } from '../../preferences/index.js';
+import type { CompileCssResult } from './types.js';
 export interface CompileProps {
     astroConfig: AstroConfig;
     viteConfig: ResolvedConfig;
@@ -9,13 +10,6 @@ export interface CompileProps {
     filename: string;
     source: string;
 }
-export interface CompileCssResult {
-    code: string;
-    /**
-     * The dependencies of the transformed CSS (Normalized paths)
-     */
-    dependencies?: string[];
-}
 export interface CompileResult extends Omit<TransformResult, 'css'> {
     css: CompileCssResult[];
 }

package/dist/core/compile/compile.js

@@ -12,7 +12,7 @@ async function compile({
   filename,
   source
 }) {
-  const cssDeps = [];
+  const cssPartialCompileResults = [];
   const cssTransformErrors = [];
   let transformResult;
   try {
@@ -29,10 +29,11 @@ async function compile({
       resultScopedSlot: true,
       transitionsAnimationURL: "astro/components/viewtransitions.css",
       annotateSourceFile: viteConfig.command === "serve" && astroConfig.devToolbar && astroConfig.devToolbar.enabled && await preferences.get("devToolbar.enabled"),
+      renderScript: astroConfig.experimental.directRenderScript,
       preprocessStyle: createStylePreprocessor({
         filename,
         viteConfig,
-        cssDeps,
+        cssPartialCompileResults,
         cssTransformErrors
       }),
       async resolvePath(specifier) {
@@ -53,8 +54,8 @@ async function compile({
   return {
     ...transformResult,
     css: transformResult.css.map((code, i) => ({
-      code,
-      dependencies: cssDeps[i]
+      ...cssPartialCompileResults[i],
+      code
     }))
   };
 }