astro 2.2.2 → 2.2.3

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

@@ -10,7 +10,6 @@ import { appendForwardSlash, joinPaths, prependForwardSlash } from "../core/path
 import { VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from "./consts.js";
 import { isESMImportedImage } from "./internal.js";
 import { isLocalService } from "./services/service.js";
-import { copyWasmFiles } from "./services/vendor/squoosh/copy-wasm.js";
 import { emitESMImage } from "./utils/emitAsset.js";
 import { imageMetadata } from "./utils/metadata.js";
 import { getOrigQueryParams } from "./utils/queryParams.js";
@@ -143,15 +142,6 @@ function assets({
           }
         };
       },
-      async buildEnd() {
-        if (mode != "build") {
-          return;
-        }
-        if (settings.config.image.service === "astro/assets/services/squoosh") {
-          const dir = settings.config.output === "server" ? settings.config.build.server : settings.config.outDir;
-          await copyWasmFiles(new URL("./chunks", dir));
-        }
-      },
       // In build, rewrite paths to ESM imported images in code to their final location
       async renderChunk(code) {
         const assetUrlRE = /__ASTRO_ASSET_IMAGE__([a-z\d]{8})__(?:_(.*?)__)?/g;

package/dist/content/index.d.ts

@@ -1,3 +1,4 @@
+export { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from './consts.js';
 export { errorMap } from './error-map.js';
 export { attachContentServerListeners } from './server-listeners.js';
 export { createContentTypesGenerator } from './types-generator.js';

package/dist/content/index.js

@@ -1,3 +1,4 @@
+import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from "./consts.js";
 import { errorMap } from "./error-map.js";
 import { attachContentServerListeners } from "./server-listeners.js";
 import { createContentTypesGenerator } from "./types-generator.js";
@@ -6,6 +7,8 @@ import { astroContentAssetPropagationPlugin } from "./vite-plugin-content-assets
 import { astroContentImportPlugin } from "./vite-plugin-content-imports.js";
 import { astroContentVirtualModPlugin } from "./vite-plugin-content-virtual-mod.js";
 export {
+  CONTENT_FLAG,
+  PROPAGATED_ASSET_FLAG,
   astroContentAssetPropagationPlugin,
   astroContentImportPlugin,
   astroContentVirtualModPlugin,

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

@@ -12,9 +12,9 @@ import {
   STYLES_PLACEHOLDER
 } from "./consts.js";
 import { getContentEntryExts } from "./utils.js";
-function isPropagatedAsset(viteId, contentEntryExts) {
-  const url = new URL(viteId, "file://");
-  return url.searchParams.has(PROPAGATED_ASSET_FLAG) && contentEntryExts.some((ext) => url.pathname.endsWith(ext));
+function isPropagatedAsset(viteId) {
+  const flags = new URLSearchParams(viteId.split("?")[1]);
+  return flags.has(PROPAGATED_ASSET_FLAG);
 }
 function astroContentAssetPropagationPlugin({
   mode,
@@ -24,48 +24,47 @@ function astroContentAssetPropagationPlugin({
   const contentEntryExts = getContentEntryExts(settings);
   return {
     name: "astro:content-asset-propagation",
-    enforce: "pre",
     configureServer(server) {
       if (mode === "dev") {
         devModuleLoader = createViteLoader(server);
       }
     },
-    load(id) {
-      if (isPropagatedAsset(id, contentEntryExts)) {
+    async transform(_, id, options) {
+      var _a;
+      if (isPropagatedAsset(id)) {
         const basePath = id.split("?")[0];
+        let stringifiedLinks, stringifiedStyles, stringifiedScripts;
+        if ((options == null ? void 0 : options.ssr) && devModuleLoader) {
+          if (!((_a = devModuleLoader.getModuleById(basePath)) == null ? void 0 : _a.ssrModule)) {
+            await devModuleLoader.import(basePath);
+          }
+          const { stylesMap, urls } = await getStylesForURL(
+            pathToFileURL(basePath),
+            devModuleLoader,
+            "development"
+          );
+          const hoistedScripts = await getScriptsForURL(
+            pathToFileURL(basePath),
+            settings.config.root,
+            devModuleLoader
+          );
+          stringifiedLinks = JSON.stringify([...urls]);
+          stringifiedStyles = JSON.stringify([...stylesMap.values()]);
+          stringifiedScripts = JSON.stringify([...hoistedScripts]);
+        } else {
+          stringifiedLinks = JSON.stringify(LINKS_PLACEHOLDER);
+          stringifiedStyles = JSON.stringify(STYLES_PLACEHOLDER);
+          stringifiedScripts = JSON.stringify(SCRIPTS_PLACEHOLDER);
+        }
         const code = `
 					export async function getMod() {
 						return import(${JSON.stringify(basePath)});
 					}
-					export const collectedLinks = ${JSON.stringify(LINKS_PLACEHOLDER)};
-					export const collectedStyles = ${JSON.stringify(STYLES_PLACEHOLDER)};
-					export const collectedScripts = ${JSON.stringify(SCRIPTS_PLACEHOLDER)};
+					export const collectedLinks = ${stringifiedLinks};
+					export const collectedStyles = ${stringifiedStyles};
+					export const collectedScripts = ${stringifiedScripts};
 				`;
-        return { code };
-      }
-    },
-    async transform(code, id, options) {
-      var _a;
-      if (!(options == null ? void 0 : options.ssr))
-        return;
-      if (devModuleLoader && isPropagatedAsset(id, contentEntryExts)) {
-        const basePath = id.split("?")[0];
-        if (!((_a = devModuleLoader.getModuleById(basePath)) == null ? void 0 : _a.ssrModule)) {
-          await devModuleLoader.import(basePath);
-        }
-        const { stylesMap, urls } = await getStylesForURL(
-          pathToFileURL(basePath),
-          devModuleLoader,
-          "development"
-        );
-        const hoistedScripts = await getScriptsForURL(
-          pathToFileURL(basePath),
-          settings.config.root,
-          devModuleLoader
-        );
-        return {
-          code: code.replace(JSON.stringify(LINKS_PLACEHOLDER), JSON.stringify([...urls])).replace(JSON.stringify(STYLES_PLACEHOLDER), JSON.stringify([...stylesMap.values()])).replace(JSON.stringify(SCRIPTS_PLACEHOLDER), JSON.stringify([...hoistedScripts]))
-        };
+        return { code, map: { mappings: "" } };
       }
     }
   };

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

@@ -15,9 +15,9 @@ import {
   globalContentConfigObserver,
   NoCollectionError
 } from "./utils.js";
-function isContentFlagImport(viteId, contentEntryExts) {
-  const { searchParams, pathname } = new URL(viteId, "file://");
-  return searchParams.has(CONTENT_FLAG) && contentEntryExts.some((ext) => pathname.endsWith(ext));
+function isContentFlagImport(viteId) {
+  const flags = new URLSearchParams(viteId.split("?")[1]);
+  return flags.has(CONTENT_FLAG);
 }
 function getContentRendererByViteId(viteId, settings) {
   let ext = viteId.split(".").pop();
@@ -46,32 +46,31 @@ function astroContentImportPlugin({
   const plugins = [
     {
       name: "astro:content-imports",
-      async load(viteId) {
-        if (isContentFlagImport(viteId, contentEntryExts)) {
-          const { fileId } = getFileInfo(viteId, settings.config);
+      async transform(_, viteId) {
+        if (isContentFlagImport(viteId)) {
+          const fileId = viteId.split("?")[0];
           const { id, slug, collection, body, data, _internal } = await setContentEntryModuleCache({
             fileId,
             pluginContext: this
           });
           const code = escapeViteEnvReferences(`
-export const id = ${JSON.stringify(id)};
-export const collection = ${JSON.stringify(collection)};
-export const slug = ${JSON.stringify(slug)};
-export const body = ${JSON.stringify(body)};
-export const data = ${devalue.uneval(data)};
-export const _internal = {
-	filePath: ${JSON.stringify(_internal.filePath)},
-	rawData: ${JSON.stringify(_internal.rawData)},
-};
-`);
-          return { code };
+						export const id = ${JSON.stringify(id)};
+						export const collection = ${JSON.stringify(collection)};
+						export const slug = ${JSON.stringify(slug)};
+						export const body = ${JSON.stringify(body)};
+						export const data = ${devalue.uneval(data)};
+						export const _internal = {
+							filePath: ${JSON.stringify(_internal.filePath)},
+							rawData: ${JSON.stringify(_internal.rawData)},
+						};`);
+          return { code, map: { mappings: "" } };
         }
       },
       configureServer(viteServer) {
         viteServer.watcher.on("all", async (event, entry) => {
           if (CHOKIDAR_MODIFIED_EVENTS.includes(event) && getEntryType(entry, contentPaths, contentEntryExts) === "config") {
             for (const modUrl of viteServer.moduleGraph.urlToModuleMap.keys()) {
-              if (isContentFlagImport(modUrl, contentEntryExts) || Boolean(getContentRendererByViteId(modUrl, settings))) {
+              if (isContentFlagImport(modUrl) || Boolean(getContentRendererByViteId(modUrl, settings))) {
                 const mod = await viteServer.moduleGraph.getModuleByUrl(modUrl);
                 if (mod) {
                   viteServer.moduleGraph.invalidateModule(mod);
@@ -80,11 +79,6 @@ export const _internal = {
             }
           }
         });
-      },
-      async transform(code, id) {
-        if (isContentFlagImport(id, contentEntryExts)) {
-          return { code: escapeViteEnvReferences(code) };
-        }
       }
     }
   ];

package/dist/core/build/generate.js

@@ -6,7 +6,6 @@ import {
   generateImage as generateImageInternal,
   getStaticImageList
 } from "../../assets/internal.js";
-import { deleteWasmFiles } from "../../assets/services/vendor/squoosh/copy-wasm.js";
 import { hasPrerenderedPages } from "../../core/build/internal.js";
 import {
   prependForwardSlash,
@@ -88,9 +87,6 @@ ${bgGreen(black(` generating optimized images `))}`);
     for (const imageData of getStaticImageList()) {
       await generateImage(opts, imageData[1].options, imageData[1].path);
     }
-    if (opts.settings.config.image.service === "astro/assets/services/squoosh" && opts.settings.config.output === "static") {
-      await deleteWasmFiles(new URL("./chunks", opts.settings.config.outDir));
-    }
     delete globalThis.astroAsset.addStaticImage;
   }
   await runHookBuildGenerated({

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

@@ -34,7 +34,14 @@ function rollupPluginAstroBuildCSS(options) {
   return [
     {
       name: "astro:rollup-plugin-build-css",
+      transform(_, id) {
+        if (options.target === "client" && internals.cssChunkModuleIds.has(id)) {
+          return "";
+        }
+      },
       outputOptions(outputOptions) {
+        if (options.target === "client")
+          return;
         const assetFileNames = outputOptions.assetFileNames;
         const namingIncludesHash = assetFileNames == null ? void 0 : assetFileNames.toString().includes("[hash]");
         const createNameForParentPages = namingIncludesHash ? assetName.shortHashedName : assetName.createSlugger(settings);
@@ -82,15 +89,6 @@ function rollupPluginAstroBuildCSS(options) {
                     internals.cssChunkModuleIds.add(id);
                   }
                 }
-                if (options.target === "client") {
-                  if (Object.keys(c.modules).every((id) => internals.cssChunkModuleIds.has(id))) {
-                    for (const importedCssImport of meta.importedCss) {
-                      delete bundle[importedCssImport];
-                      meta.importedCss.delete(importedCssImport);
-                    }
-                    return;
-                  }
-                }
                 if (options.target === "client") {
                   for (const id of Object.keys(c.modules)) {
                     for (const pageData of getParentClientOnlys(id, this)) {

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.2.2";
+const ASTRO_VERSION = "2.2.3";
 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.2.2";
+  const currentVersion = "2.2.3";
   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.2.2";
+  const version = "2.2.3";
   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.2.2"}`
+        `v${"2.2.3"}`
       )} ${headline}`
     );
   }

package/dist/runtime/server/render/slot.js

@@ -17,7 +17,7 @@ async function* renderSlot(result, slotted, fallback) {
     let iterator = renderChild(typeof slotted === "function" ? slotted(result) : slotted);
     yield* iterator;
   }
-  if (fallback) {
+  if (fallback && !slotted) {
     yield* renderSlot(result, fallback);
   }
 }

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

@@ -4,6 +4,7 @@ import {
 import babel from "@babel/core";
 import * as colors from "kleur/colors";
 import path from "path";
+import { CONTENT_FLAG, PROPAGATED_ASSET_FLAG } from "../content/index.js";
 import { error } from "../core/logger/core.js";
 import { removeQueryString } from "../core/path.js";
 import { detectImportSource } from "./import-source.js";
@@ -75,6 +76,9 @@ async function transformJSX({
     map: result.map
   };
 }
+const SPECIAL_QUERY_REGEX = new RegExp(
+  `[?&](?:worker|sharedworker|raw|url|${CONTENT_FLAG}|${PROPAGATED_ASSET_FLAG})\\b`
+);
 function jsx({ settings, logging }) {
   let viteConfig;
   const jsxRenderers = /* @__PURE__ */ new Map();
@@ -100,6 +104,9 @@ function jsx({ settings, logging }) {
     },
     async transform(code, id, opts) {
       const ssr = Boolean(opts == null ? void 0 : opts.ssr);
+      if (SPECIAL_QUERY_REGEX.test(id)) {
+        return null;
+      }
       id = removeQueryString(id);
       if (!JSX_EXTENSIONS.has(path.extname(id))) {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

package/dist/assets/services/vendor/squoosh/copy-wasm.d.ts

@@ -1,2 +0,0 @@
-export declare function copyWasmFiles(dir: URL): Promise<void>;
-export declare function deleteWasmFiles(dir: URL): Promise<void>;

package/dist/assets/services/vendor/squoosh/copy-wasm.js

@@ -1,37 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-async function copyWasmFiles(dir) {
-  const src = new URL("./", import.meta.url);
-  const fileList = await listFiles(fileURLToPath(src), fileURLToPath(dir));
-  for (let file of fileList) {
-    await fs.mkdir(path.dirname(file.dest), { recursive: true });
-    await fs.copyFile(file.src, file.dest);
-  }
-}
-async function deleteWasmFiles(dir) {
-  const src = new URL("./", import.meta.url);
-  const fileList = await listFiles(fileURLToPath(src), fileURLToPath(dir));
-  for (let file of fileList) {
-    await fs.rm(file.dest);
-  }
-}
-async function listFiles(src, dest) {
-  const itemNames = await fs.readdir(src);
-  const copiedFiles = [];
-  await Promise.all(itemNames.map(async (srcName) => {
-    const srcPath = path.join(src, srcName);
-    const destPath = path.join(dest, srcName);
-    const s = await fs.stat(srcPath);
-    if (s.isFile() && /.wasm$/.test(srcPath)) {
-      copiedFiles.push({ src: srcPath, dest: destPath });
-    } else if (s.isDirectory()) {
-      copiedFiles.push(...await listFiles(srcPath, destPath));
-    }
-  }));
-  return copiedFiles;
-}
-export {
-  copyWasmFiles,
-  deleteWasmFiles
-};