astro 0.25.0 → 0.25.3

package/dist/cli/index.js

@@ -37,7 +37,7 @@ function printAstroHelp() {
   });
 }
 async function printVersion() {
-  const version = "0.25.0";
+  const version = "0.25.3";
   console.log();
   console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
 }

package/dist/core/add/consts.js

@@ -20,7 +20,7 @@ const CONFIG_STUB = `import { defineConfig } from 'astro/config';
 
 export default defineConfig({});`;
 const TAILWIND_CONFIG_STUB = `module.exports = {
-	content: [],
+	content: ['./src/**/*.{astro,html,js,jsx,svelte,ts,tsx,vue}'],
 	theme: {
 		extend: {},
 	},

package/dist/core/build/internal.js

@@ -41,6 +41,9 @@ function getPageDataByViteID(internals, viteid) {
   }
   return void 0;
 }
+function hasPageDataByViteID(internals, viteid) {
+  return internals.pagesByViteID.has(viteid);
+}
 function* eachPageData(internals) {
   yield* internals.pagesByComponent.values();
 }
@@ -50,5 +53,6 @@ export {
   getPageDataByComponent,
   getPageDataByViteID,
   getPageDatasByChunk,
+  hasPageDataByViteID,
   trackPageData
 };

package/dist/core/build/scan-based-build.js

@@ -45,7 +45,8 @@ async function build(opts) {
         viteServer
       }),
       rollupPluginAstroBuildCSS({
-        internals
+        internals,
+        legacy: true
       }),
       ...viteConfig.plugins || []
     ],

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

@@ -110,8 +110,7 @@ async function ssrBuild(opts, internals, input) {
           format: "esm",
           entryFileNames: opts.buildConfig.serverEntry,
           chunkFileNames: "chunks/chunk.[hash].mjs",
-          assetFileNames: "assets/asset.[hash][extname]",
-          inlineDynamicImports: true
+          assetFileNames: "assets/asset.[hash][extname]"
         }
       },
       target: "esnext",
@@ -123,7 +122,8 @@ async function ssrBuild(opts, internals, input) {
       vitePluginInternals(input, internals),
       vitePluginPages(opts, internals),
       rollupPluginAstroBuildCSS({
-        internals
+        internals,
+        legacy: false
       }),
       ...viteConfig.plugins || [],
       isBuildingToSSR(opts.astroConfig) && vitePluginSSR(opts, internals, opts.astroConfig._ctx.adapter)
@@ -170,7 +170,8 @@ ${bgGreen(black(" building resources "))}
       vitePluginInternals(input, internals),
       vitePluginHoistedScripts(astroConfig, internals),
       rollupPluginAstroBuildCSS({
-        internals
+        internals,
+        legacy: false
       }),
       ...viteConfig.plugins || []
     ],

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

@@ -45,6 +45,7 @@ export const renderers = [${rendererItems}];`;
   };
 }
 export {
+  resolvedVirtualModuleId,
   virtualModuleId,
   vitePluginPages
 };

package/dist/core/config.js

@@ -55,9 +55,7 @@ const AstroConfigSchema = z.object({
   pages: z.string().optional().default("./src/pages").transform((val) => new URL(val)),
   public: z.string().optional().default("./public").transform((val) => new URL(val)),
   dist: z.string().optional().default("./dist").transform((val) => new URL(val)),
-  integrations: z.preprocess((val) => Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val, z.array(z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) })).default([]).refine((arr) => arr.every((integration) => integration.name.startsWith("@astrojs/")), {
-    message: `Astro integrations are still experimental, and only official integrations are currently supported`
-  })),
+  integrations: z.preprocess((val) => Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val, z.array(z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) })).default([])),
   adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
   styleOptions: z.object({
     postcss: z.object({
@@ -84,6 +82,7 @@ const AstroConfigSchema = z.object({
     port: z.number().optional().default(3e3),
     trailingSlash: z.union([z.literal("always"), z.literal("never"), z.literal("ignore")]).optional().default("ignore")
   }).optional().default({}),
+  experimentalIntegrations: z.boolean().optional().default(false),
   vite: z.any().optional().default({})
 });
 async function validateConfig(userConfig, root) {
@@ -127,9 +126,20 @@ async function validateConfig(userConfig, root) {
       }).optional().default({ options: {}, plugins: [] }))
     }).optional().default({})
   });
-  return __spreadProps(__spreadValues({}, await AstroConfigRelativeSchema.parseAsync(userConfig)), {
+  const result = __spreadProps(__spreadValues({}, await AstroConfigRelativeSchema.parseAsync(userConfig)), {
     _ctx: { scripts: [], renderers: [], adapter: void 0 }
   });
+  if (!result.experimentalIntegrations && !result.integrations.every((int) => int.name.startsWith("@astrojs/"))) {
+    throw new Error([
+      `Astro integrations are still experimental.`,
+      ``,
+      `Only official "@astrojs/*" integrations are currently supported.`,
+      `To enable 3rd-party integrations, use the "--experimental-integrations" flag.`,
+      `Breaking changes may occur in this API before Astro v1.0 is released.`,
+      ``
+    ].join("\n"));
+  }
+  return result;
 }
 function addTrailingSlash(str) {
   return str.replace(/\/*$/, "/");
@@ -148,6 +158,7 @@ function resolveFlags(flags) {
     host: typeof flags.host === "string" || typeof flags.host === "boolean" ? flags.host : void 0,
     legacyBuild: typeof flags.legacyBuild === "boolean" ? flags.legacyBuild : false,
     experimentalSsr: typeof flags.experimentalSsr === "boolean" ? flags.experimentalSsr : false,
+    experimentalIntegrations: typeof flags.experimentalIntegrations === "boolean" ? flags.experimentalIntegrations : false,
     drafts: typeof flags.drafts === "boolean" ? flags.drafts : false
   };
 }
@@ -172,6 +183,8 @@ function mergeCLIFlags(astroConfig, flags) {
       astroConfig.buildOptions.legacyBuild = false;
     }
   }
+  if (typeof flags.experimentalIntegrations === "boolean")
+    astroConfig.experimentalIntegrations = flags.experimentalIntegrations;
   if (typeof flags.drafts === "boolean")
     astroConfig.buildOptions.drafts = flags.drafts;
   return astroConfig;

package/dist/core/dev/index.js

@@ -23,7 +23,7 @@ async function dev(config, options = { logging: defaultLogOptions }) {
   const devServerAddressInfo = viteServer.httpServer.address();
   const site = config.buildOptions.site ? new URL(config.buildOptions.site) : void 0;
   info(options.logging, null, msg.devStart({ startupTime: performance.now() - devStart, config, devServerAddressInfo, site, https: !!((_a = viteConfig.server) == null ? void 0 : _a.https) }));
-  const currentVersion = "0.25.0";
+  const currentVersion = "0.25.3";
   if (currentVersion.includes("-")) {
     warn(options.logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -28,7 +28,7 @@ function devStart({
   https,
   site
 }) {
-  const version = "0.25.0";
+  const version = "0.25.3";
   const rootPath = site ? site.pathname : "/";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
@@ -121,7 +121,7 @@ function printHelp({
   };
   let message = [];
   if (headline) {
-    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"0.25.0"}`)} ${headline}`);
+    message.push(linebreak(), `  ${bgGreen(black(` ${commandName} `))} ${green(`v${"0.25.3"}`)} ${headline}`);
   }
   if (usage) {
     message.push(linebreak(), `  ${green(commandName)} ${bold(usage)}`);

package/dist/types/@types/astro.d.ts

@@ -35,6 +35,7 @@ export interface CLIFlags {
     /** @deprecated */
     experimentalStaticBuild?: boolean;
     experimentalSsr?: boolean;
+    experimentalIntegrations?: boolean;
     legacyBuild?: boolean;
     drafts?: boolean;
 }
@@ -400,6 +401,11 @@ export interface AstroUserConfig {
          */
         trailingSlash?: 'always' | 'never' | 'ignore';
     };
+    /**
+     * Enable experimental support for 3rd-party integrations.
+     * Default: false
+     */
+    experimentalIntegrations?: boolean;
     /**
      * @docs
      * @name vite

package/dist/types/core/add/consts.d.ts

@@ -8,4 +8,4 @@ export declare const FIRST_PARTY_ADDONS: {
 }[];
 export declare const ALIASES: Map<string, string>;
 export declare const CONFIG_STUB = "import { defineConfig } from 'astro/config';\n\nexport default defineConfig({});";
-export declare const TAILWIND_CONFIG_STUB = "module.exports = {\n\tcontent: [],\n\ttheme: {\n\t\textend: {},\n\t},\n\tplugins: [],\n}\n";
+export declare const TAILWIND_CONFIG_STUB = "module.exports = {\n\tcontent: ['./src/**/*.{astro,html,js,jsx,svelte,ts,tsx,vue}'],\n\ttheme: {\n\t\textend: {},\n\t},\n\tplugins: [],\n}\n";

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

@@ -37,4 +37,5 @@ export declare function trackPageData(internals: BuildInternals, component: stri
 export declare function getPageDatasByChunk(internals: BuildInternals, chunk: RenderedChunk): Generator<PageBuildData, void, unknown>;
 export declare function getPageDataByComponent(internals: BuildInternals, component: string): PageBuildData | undefined;
 export declare function getPageDataByViteID(internals: BuildInternals, viteid: ViteID): PageBuildData | undefined;
+export declare function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean;
 export declare function eachPageData(internals: BuildInternals): Generator<PageBuildData, void, undefined>;

package/dist/types/core/build/vite-plugin-pages.d.ts

@@ -2,4 +2,5 @@ import type { Plugin as VitePlugin } from 'vite';
 import type { BuildInternals } from './internal.js';
 import type { StaticBuildOptions } from './types';
 export declare const virtualModuleId = "@astrojs-pages-virtual-entry";
+export declare const resolvedVirtualModuleId: string;
 export declare function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin;

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

@@ -7,7 +7,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     pages: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     public: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
     dist: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodString>>, URL, string | undefined>;
-    integrations: z.ZodEffects<z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
+    integrations: z.ZodEffects<z.ZodDefault<z.ZodArray<z.ZodObject<{
         name: z.ZodString;
         hooks: z.ZodDefault<z.ZodObject<{}, "passthrough", z.ZodTypeAny, {}, {}>>;
     }, "strip", z.ZodTypeAny, {
@@ -22,12 +22,6 @@ export declare const AstroConfigSchema: z.ZodObject<{
     }[], {
         hooks?: {} | undefined;
         name: string;
-    }[] | undefined>, {
-        name: string;
-        hooks: {};
-    }[], {
-        hooks?: {} | undefined;
-        name: string;
     }[] | undefined>;
     adapter: z.ZodOptional<z.ZodObject<{
         name: z.ZodString;
@@ -112,6 +106,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         port?: number | undefined;
         trailingSlash?: "always" | "never" | "ignore" | undefined;
     }>>>;
+    experimentalIntegrations: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     vite: z.ZodDefault<z.ZodOptional<z.ZodAny>>;
 }, "strip", z.ZodTypeAny, {
     adapter?: {
@@ -153,6 +148,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         port: number;
         trailingSlash: "always" | "never" | "ignore";
     };
+    experimentalIntegrations: boolean;
 }, {
     projectRoot?: string | undefined;
     src?: string | undefined;
@@ -192,6 +188,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
         port?: number | undefined;
         trailingSlash?: "always" | "never" | "ignore" | undefined;
     } | undefined;
+    experimentalIntegrations?: boolean | undefined;
     vite?: any;
 }>;
 /** Turn raw config values into normalized values */

package/dist/types/vite-plugin-build-css/index.d.ts

@@ -1,10 +1,11 @@
-import type { BuildInternals } from '../core/build/internal';
+import { BuildInternals } from '../core/build/internal';
 import { Plugin as VitePlugin } from 'vite';
 export declare function getAstroPageStyleId(pathname: string): string;
 export declare function getAstroStyleId(pathname: string): string;
 export declare function getAstroStylePathFromId(id: string): string;
 interface PluginOptions {
     internals: BuildInternals;
+    legacy: boolean;
 }
 export declare function rollupPluginAstroBuildCSS(options: PluginOptions): VitePlugin;
 export {};

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

@@ -1,7 +1,7 @@
 import * as path from "path";
 import esbuild from "esbuild";
 import { isCSSRequest } from "../core/render/dev/css.js";
-import { getPageDatasByChunk } from "../core/build/internal.js";
+import { getPageDatasByChunk, getPageDataByViteID, hasPageDataByViteID } from "../core/build/internal.js";
 const PLUGIN_NAME = "@astrojs/rollup-plugin-build-css";
 const ASTRO_STYLE_PREFIX = "@astro-inline-style";
 const ASTRO_PAGE_STYLE_PREFIX = "@astro-page-all-styles";
@@ -30,8 +30,46 @@ function isPageStyleVirtualModule(id) {
   return id.startsWith(ASTRO_PAGE_STYLE_PREFIX);
 }
 function rollupPluginAstroBuildCSS(options) {
-  const { internals } = options;
+  const { internals, legacy } = options;
   const styleSourceMap = /* @__PURE__ */ new Map();
+  function* walkStyles(ctx, id, seen = /* @__PURE__ */ new Set()) {
+    seen.add(id);
+    if (styleSourceMap.has(id)) {
+      yield [id, styleSourceMap.get(id)];
+    }
+    const info = ctx.getModuleInfo(id);
+    if (info) {
+      for (const importedId of info.importedIds) {
+        if (!seen.has(importedId)) {
+          yield* walkStyles(ctx, importedId, seen);
+        }
+      }
+    }
+  }
+  async function addStyles() {
+    var _a;
+    for (const id of this.getModuleIds()) {
+      if (hasPageDataByViteID(internals, id)) {
+        let pageStyles = "";
+        for (const [_styleId, styles] of walkStyles(this, id)) {
+          pageStyles += styles;
+        }
+        if (!pageStyles)
+          continue;
+        const { code: minifiedCSS } = await esbuild.transform(pageStyles, {
+          loader: "css",
+          minify: true
+        });
+        const referenceId = this.emitFile({
+          name: "entry.css",
+          type: "asset",
+          source: minifiedCSS
+        });
+        const fileName = this.getFileName(referenceId);
+        (_a = getPageDataByViteID(internals, id)) == null ? void 0 : _a.css.add(fileName);
+      }
+    }
+  }
   return {
     name: PLUGIN_NAME,
     configResolved(resolvedConfig) {
@@ -75,6 +113,8 @@ function rollupPluginAstroBuildCSS(options) {
       return null;
     },
     async renderChunk(_code, chunk) {
+      if (!legacy)
+        return null;
       let chunkCSS = "";
       let isPureCSS = true;
       for (const [id] of Object.entries(chunk.modules)) {
@@ -108,13 +148,16 @@ function rollupPluginAstroBuildCSS(options) {
       }
       return null;
     },
-    generateBundle(opts, bundle) {
+    async generateBundle(opts, bundle) {
       const hasPureCSSChunks = internals.pureCSSChunks.size;
       const pureChunkFilenames = new Set([...internals.pureCSSChunks].map((chunk) => chunk.fileName));
       const emptyChunkFiles = [...pureChunkFilenames].map((file) => path.basename(file)).join("|").replace(/\./g, "\\.");
       const emptyChunkRE = new RegExp(opts.format === "es" ? `\\bimport\\s*"[^"]*(?:${emptyChunkFiles})";
 ?` : `\\brequire\\(\\s*"[^"]*(?:${emptyChunkFiles})"\\);
 ?`, "g");
+      if (!legacy) {
+        await addStyles.call(this);
+      }
       for (const [chunkId, chunk] of Object.entries(bundle)) {
         if (chunk.type === "chunk") {
           for (const { css: cssSet } of getPageDatasByChunk(internals, chunk)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "0.25.0",
+  "version": "0.25.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -65,7 +65,7 @@
   ],
   "dependencies": {
     "@astrojs/compiler": "^0.13.1",
-    "@astrojs/language-server": "^0.8.10",
+    "@astrojs/language-server": "^0.13.2",
     "@astrojs/markdown-remark": "^0.7.0",
     "@astrojs/prism": "0.4.1",
     "@astrojs/webapi": "^0.11.0",
@@ -85,6 +85,7 @@
     "es-module-lexer": "^0.10.4",
     "esbuild": "0.14.25",
     "estree-walker": "^3.0.1",
+    "execa": "^6.1.0",
     "fast-glob": "^3.2.11",
     "fast-xml-parser": "^4.0.7",
     "html-entities": "^2.3.2",
@@ -144,7 +145,6 @@
     "astro-scripts": "0.0.2",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.10",
-    "execa": "^6.1.0",
     "mocha": "^9.2.2",
     "sass": "^1.49.9"
   },