astro 1.1.2 → 1.1.5

package/dist/core/add/index.js

@@ -51,29 +51,29 @@ async function add(names, { cwd, flags, logging, telemetry }) {
           ["--yes", "Accept all prompts."],
           ["--help", "Show this help message."]
         ],
-        "Recommended: UI Frameworks": [
+        "UI Frameworks": [
           ["react", "astro add react"],
           ["preact", "astro add preact"],
           ["vue", "astro add vue"],
           ["svelte", "astro add svelte"],
           ["solid-js", "astro add solid-js"],
-          ["lit", "astro add lit"]
+          ["lit", "astro add lit"],
+          ["alpine", "astro add alpine"]
         ],
-        "Recommended: Hosting": [
+        "SSR Adapters": [
           ["netlify", "astro add netlify"],
           ["vercel", "astro add vercel"],
+          ["deno", "astro add deno"],
           ["cloudflare", "astro add cloudflare"],
-          ["deno", "astro add deno"]
+          ["node", "astro add node"]
         ],
-        "Recommended: Integrations": [
+        Others: [
           ["tailwind", "astro add tailwind"],
+          ["image", "astro add image"],
+          ["mdx", "astro add mdx"],
           ["partytown", "astro add partytown"],
-          ["sitemap", "astro add sitemap"]
-        ],
-        "Example: Add an SSR Adapter": [
-          ["netlify", "astro add netlify"],
-          ["vercel", "astro add vercel"],
-          ["deno", "astro add deno"]
+          ["sitemap", "astro add sitemap"],
+          ["prefetch", "astro add prefetch"]
         ]
       },
       description: `For more integrations, check out: ${cyan("https://astro.build/integrations")}`

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

@@ -1,7 +1,11 @@
 import type { OutputChunk, RenderedChunk } from 'rollup';
 import type { PageBuildData, ViteID } from './types';
 export interface BuildInternals {
-    pureCSSChunks: Set<RenderedChunk>;
+    /**
+     * The module ids of all CSS chunks, used to deduplicate CSS assets between
+     * SSR build and client build in vite-plugin-css.
+     */
+    cssChunkModuleIds: Set<string>;
     hoistedScriptIdToHoistedMap: Map<string, Set<string>>;
     hoistedScriptIdToPagesMap: Map<string, Set<string>>;
     entrySpecifierToBundleMap: Map<string, string>;

package/dist/core/build/internal.js

@@ -1,11 +1,10 @@
-import { prependForwardSlash } from "../path.js";
+import { prependForwardSlash, removeFileExtension } from "../path.js";
 import { viteID } from "../util.js";
 function createBuildInternals() {
-  const pureCSSChunks = /* @__PURE__ */ new Set();
   const hoistedScriptIdToHoistedMap = /* @__PURE__ */ new Map();
   const hoistedScriptIdToPagesMap = /* @__PURE__ */ new Map();
   return {
-    pureCSSChunks,
+    cssChunkModuleIds: /* @__PURE__ */ new Set(),
     hoistedScriptIdToHoistedMap,
     hoistedScriptIdToPagesMap,
     entrySpecifierToBundleMap: /* @__PURE__ */ new Map(),
@@ -46,8 +45,12 @@ function* getPageDatasByChunk(internals, chunk) {
 function* getPageDatasByClientOnlyID(internals, viteid) {
   const pagesByClientOnly = internals.pagesByClientOnly;
   if (pagesByClientOnly.size) {
-    const pathname = `/@fs${prependForwardSlash(viteid)}`;
-    const pageBuildDatas = pagesByClientOnly.get(pathname);
+    let pathname = `/@fs${prependForwardSlash(viteid)}`;
+    let pageBuildDatas = pagesByClientOnly.get(viteid);
+    if (!pageBuildDatas) {
+      pathname = `/@fs${prependForwardSlash(removeFileExtension(viteid))}`;
+      pageBuildDatas = pagesByClientOnly.get(pathname);
+    }
     if (pageBuildDatas) {
       for (const pageData of pageBuildDatas) {
         yield pageData;

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

@@ -23,9 +23,9 @@ async function staticBuild(opts) {
   if (isModeServerWithNoAdapter(opts.astroConfig)) {
     throw new Error(`Cannot use \`output: 'server'\` without an adapter.
 Install and configure the appropriate server adapter for your final deployment.
-Example:
+Learn more: https://docs.astro.build/en/guides/server-side-rendering/
 
-  // astro.config.js
+  // Example: astro.config.js
   import netlify from '@astrojs/netlify';
   export default {
     output: 'server',

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

@@ -83,8 +83,21 @@ function rollupPluginAstroBuildCSS(options) {
             if ("viteMetadata" in chunk) {
               const meta = chunk["viteMetadata"];
               if (meta.importedCss.size) {
+                if (options.target === "server") {
+                  for (const id of Object.keys(c.modules)) {
+                    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];
+                    }
+                    return;
+                  }
+                }
                 if (options.target === "client") {
-                  for (const [id] of Object.entries(c.modules)) {
+                  for (const id of Object.keys(c.modules)) {
                     for (const pageData of getParentClientOnlys(id, this)) {
                       for (const importedCssImport of meta.importedCss) {
                         pageData.css.set(importedCssImport, { depth: -1 });
@@ -92,7 +105,7 @@ function rollupPluginAstroBuildCSS(options) {
                     }
                   }
                 }
-                for (const [id] of Object.entries(c.modules)) {
+                for (const id of Object.keys(c.modules)) {
                   for (const [pageInfo, depth] of walkParentInfos(id, this)) {
                     if (moduleIsTopLevelPage(pageInfo)) {
                       const pageViteID = pageInfo.id;

package/dist/core/dev/index.js

@@ -46,7 +46,7 @@ async function dev(config, options) {
       https: !!((_a = viteConfig.server) == null ? void 0 : _a.https)
     })
   );
-  const currentVersion = "1.1.2";
+  const currentVersion = "1.1.5";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -46,7 +46,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "1.1.2";
+  const version = "1.1.5";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -225,7 +225,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"1.1.2"}`
+        `v${"1.1.5"}`
       )} ${headline}`
     );
   }

package/dist/core/path.d.ts

@@ -8,3 +8,4 @@ export declare function startsWithDotDotSlash(path: string): boolean;
 export declare function startsWithDotSlash(path: string): boolean;
 export declare function isRelativePath(path: string): boolean;
 export declare function joinPaths(...paths: (string | undefined)[]): string;
+export declare function removeFileExtension(path: string): string;

package/dist/core/path.js

@@ -36,11 +36,16 @@ function isString(path) {
 function joinPaths(...paths) {
   return paths.filter(isString).map(trimSlashes).join("/");
 }
+function removeFileExtension(path) {
+  let idx = path.lastIndexOf(".");
+  return idx === -1 ? path : path.slice(0, idx);
+}
 export {
   appendForwardSlash,
   isRelativePath,
   joinPaths,
   prependForwardSlash,
+  removeFileExtension,
   removeLeadingForwardSlash,
   removeTrailingForwardSlash,
   startsWithDotDotSlash,

package/dist/core/util.js

@@ -5,7 +5,7 @@ import resolve from "resolve";
 import slash from "slash";
 import { fileURLToPath, pathToFileURL } from "url";
 import { prependForwardSlash, removeTrailingForwardSlash } from "./path.js";
-const ASTRO_VERSION = "1.1.2";
+const ASTRO_VERSION = "1.1.5";
 function isObject(value) {
   return typeof value === "object" && value != null;
 }

package/dist/runtime/server/astro-global.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "1.1.2";
+const ASTRO_VERSION = "1.1.5";
 function createDeprecatedFetchContentFn() {
   return () => {
     throw new Error("Deprecated: Astro.fetchContent() has been replaced with Astro.glob().");

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

@@ -112,7 +112,7 @@ function jsx({ config, logging }) {
     enforce: "pre",
     async configResolved(resolvedConfig) {
       viteConfig = resolvedConfig;
-      const possibleRenderers = await collectJSXRenderers(config._ctx.renderers);
+      const possibleRenderers = collectJSXRenderers(config._ctx.renderers);
       for (const [importSource, renderer] of possibleRenderers) {
         jsxRenderers.set(importSource, renderer);
         if (importSource === "astro") {
@@ -163,8 +163,8 @@ function jsx({ config, logging }) {
       if (!importSource && IMPORT_KEYWORD_REGEX.test(code)) {
         importSource = await detectImportSourceFromImports(code, id, jsxRenderers);
       }
-      if (!importSource) {
-        const [defaultRendererName] = defaultJSXRendererEntry[0];
+      if (!importSource && defaultJSXRendererEntry) {
+        const [defaultRendererName] = defaultJSXRendererEntry;
         error(
           logging,
           "renderer",
@@ -173,6 +173,16 @@ Unable to resolve a renderer that handles this file! With more than one renderer
 Add ${colors.cyan(
             IMPORT_STATEMENTS[defaultRendererName] || `import '${defaultRendererName}';`
           )} or ${colors.cyan(`/* jsxImportSource: ${defaultRendererName} */`)} to this file.
+`
+        );
+        return null;
+      } else if (!importSource) {
+        error(
+          logging,
+          "renderer",
+          `${colors.yellow(id)}
+Unable to find a renderer for JSX. Do you have one configured in your Astro config? See this page to learn how:
+https://docs.astro.build/en/core-concepts/framework-components/#installing-integrations
 `
         );
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "1.1.2",
+  "version": "1.1.5",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -95,7 +95,6 @@
     "@babel/types": "^7.18.4",
     "@proload/core": "^0.3.2",
     "@proload/plugin-tsm": "^0.2.1",
-    "ast-types": "^0.14.2",
     "boxen": "^6.2.1",
     "ci-info": "^3.3.1",
     "common-ancestor-path": "^1.0.1",
@@ -160,6 +159,7 @@
     "@types/send": "^0.17.1",
     "@types/unist": "^2.0.6",
     "@types/yargs-parser": "^21.0.0",
+    "ast-types": "^0.14.2",
     "astro-scripts": "0.0.7",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",