astro 4.4.14 → 4.4.15

package/dist/cli/add/index.js

@@ -34,10 +34,11 @@ const ALIASES = /* @__PURE__ */ new Map([
   ["solid", "solid-js"],
   ["tailwindcss", "tailwind"]
 ]);
-const ASTRO_CONFIG_STUB = `import { defineConfig } from 'astro/config';
-
-export default defineConfig({});`;
-const TAILWIND_CONFIG_STUB = `/** @type {import('tailwindcss').Config} */
+const STUBS = {
+  ASTRO_CONFIG: `import { defineConfig } from 'astro/config';
+// https://astro.build/config
+export default defineConfig({});`,
+  TAILWIND_CONFIG: `/** @type {import('tailwindcss').Config} */
 export default {
 	content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],
 	theme: {
@@ -45,16 +46,31 @@ export default {
 	},
 	plugins: [],
 }
-`;
-const SVELTE_CONFIG_STUB = `import { vitePreprocess } from '@astrojs/svelte';
+`,
+  SVELTE_CONFIG: `import { vitePreprocess } from '@astrojs/svelte';
 
 export default {
 	preprocess: vitePreprocess(),
-};
-`;
-const LIT_NPMRC_STUB = `# Lit libraries are required to be hoisted due to dependency issues.
+}
+`,
+  LIT_NPMRC: `# Lit libraries are required to be hoisted due to dependency issues.
 public-hoist-pattern[]=*lit*
-`;
+`,
+  DB_CONFIG: `import { defineDb } from 'astro:db';
+
+// https://astro.build/db/config
+export default defineDb({
+  tables: {}
+});
+`,
+  DB_SEED: `import { db } from 'astro:db';
+
+// https://astro.build/db/seed
+export default async function seed() {
+	// TODO
+}
+`
+};
 const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
   netlify: "@astrojs/netlify",
   vercel: "@astrojs/vercel/serverless",
@@ -147,7 +163,7 @@ async function add(names, { flags }) {
             "./tailwind.config.js"
           ],
           defaultConfigFile: "./tailwind.config.mjs",
-          defaultConfigContent: TAILWIND_CONFIG_STUB
+          defaultConfigContent: STUBS.TAILWIND_CONFIG
         });
       }
       if (integrations.find((integration) => integration.id === "svelte")) {
@@ -158,9 +174,38 @@ async function add(names, { flags }) {
           integrationName: "Svelte",
           possibleConfigFiles: ["./svelte.config.js", "./svelte.config.cjs", "./svelte.config.mjs"],
           defaultConfigFile: "./svelte.config.js",
-          defaultConfigContent: SVELTE_CONFIG_STUB
+          defaultConfigContent: STUBS.SVELTE_CONFIG
         });
       }
+      if (integrations.find((integration) => integration.id === "db")) {
+        if (!existsSync(new URL("./db/", root))) {
+          logger.info(
+            "SKIP_FORMAT",
+            `
+  ${magenta(
+              `Astro will scaffold ${green("./db/config.ts")}${magenta(" and ")}${green(
+                "./db/seed.ts"
+              )}${magenta(" files.")}`
+            )}
+`
+          );
+          if (await askToContinue({ flags })) {
+            await fs.mkdir(new URL("./db", root));
+            await Promise.all([
+              fs.writeFile(new URL("./db/config.ts", root), STUBS.DB_CONFIG, { encoding: "utf-8" }),
+              fs.writeFile(new URL("./db/seed.ts", root), STUBS.DB_SEED, { encoding: "utf-8" })
+            ]);
+          } else {
+            logger.info(
+              "SKIP_FORMAT",
+              `
+  Astro DB requires additional configuration. Please refer to https://astro.build/db/config`
+            );
+          }
+        } else {
+          logger.debug("add", `Using existing db configuration`);
+        }
+      }
       if (integrations.find((integration) => integration.id === "lit") && (await preferredPM(fileURLToPath(root)))?.name === "pnpm") {
         await setupIntegrationConfig({
           root,
@@ -169,14 +214,14 @@ async function add(names, { flags }) {
           integrationName: "Lit",
           possibleConfigFiles: ["./.npmrc"],
           defaultConfigFile: "./.npmrc",
-          defaultConfigContent: LIT_NPMRC_STUB
+          defaultConfigContent: STUBS.LIT_NPMRC
         });
       }
       break;
     }
     case 2 /* cancelled */: {
       logger.info(
-        null,
+        "SKIP_FORMAT",
         msg.cancelled(
           `Dependencies ${bold("NOT")} installed.`,
           `Be sure to install them manually before continuing!`
@@ -201,7 +246,7 @@ async function add(names, { flags }) {
   } else {
     logger.info("add", `Unable to locate a config file, generating one for you.`);
     configURL = new URL("./astro.config.mjs", root);
-    await fs.writeFile(fileURLToPath(configURL), ASTRO_CONFIG_STUB, { encoding: "utf-8" });
+    await fs.writeFile(fileURLToPath(configURL), STUBS.ASTRO_CONFIG, { encoding: "utf-8" });
   }
   let ast = null;
   try {
@@ -224,7 +269,7 @@ async function add(names, { flags }) {
           await setAdapter(ast, integration, officialExportName);
         } else {
           logger.info(
-            null,
+            "SKIP_FORMAT",
             `
   ${magenta(
               `Check our deployment docs for ${bold(
@@ -259,7 +304,10 @@ async function add(names, { flags }) {
   }
   switch (configResult) {
     case 2 /* cancelled */: {
-      logger.info(null, msg.cancelled(`Your configuration has ${bold("NOT")} been updated.`));
+      logger.info(
+        "SKIP_FORMAT",
+        msg.cancelled(`Your configuration has ${bold("NOT")} been updated.`)
+      );
       break;
     }
     case 0 /* none */: {
@@ -271,17 +319,17 @@ async function add(names, { flags }) {
           (integration) => !deps.includes(integration.packageName)
         );
         if (missingDeps.length === 0) {
-          logger.info(null, msg.success(`Configuration up-to-date.`));
+          logger.info("SKIP_FORMAT", msg.success(`Configuration up-to-date.`));
           break;
         }
       }
-      logger.info(null, msg.success(`Configuration up-to-date.`));
+      logger.info("SKIP_FORMAT", msg.success(`Configuration up-to-date.`));
       break;
     }
     default: {
       const list = integrations.map((integration) => `  - ${integration.packageName}`).join("\n");
       logger.info(
-        null,
+        "SKIP_FORMAT",
         msg.success(
           `Added the following integration${integrations.length === 1 ? "" : "s"} to your project:
 ${list}`
@@ -296,7 +344,7 @@ ${list}`
     }
     case 2 /* cancelled */: {
       logger.info(
-        null,
+        "SKIP_FORMAT",
         msg.cancelled(`Your TypeScript configuration has ${bold("NOT")} been updated.`)
       );
       break;
@@ -307,7 +355,7 @@ ${list}`
       );
     }
     default:
-      logger.info(null, msg.success(`Successfully updated TypeScript settings`));
+      logger.info("SKIP_FORMAT", msg.success(`Successfully updated TypeScript settings`));
   }
 }
 function isAdapter(integration) {
@@ -488,14 +536,14 @@ ${boxen(diff, {
   })}
 `;
   logger.info(
-    null,
+    "SKIP_FORMAT",
     `
   ${magenta("Astro will make the following changes to your config file:")}
 ${message}`
   );
   if (logAdapterInstructions) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       magenta(
         `  For complete deployment options, visit
   ${bold(
@@ -597,7 +645,7 @@ ${boxen(coloredOutput, {
     })}
 `;
     logger.info(
-      null,
+      "SKIP_FORMAT",
       `
   ${magenta("Astro will run the following command:")}
   ${dim(
@@ -801,7 +849,7 @@ ${boxen(diff, {
   })}
 `;
   logger.info(
-    null,
+    "SKIP_FORMAT",
     `
   ${magenta(`Astro will make the following changes to your ${configFileName}:`)}
 ${message}`
@@ -810,7 +858,7 @@ ${message}`
   const hasConflictingIntegrations = integrations.filter((integration) => presets.has(integration)).length > 1 && integrations.filter((integration) => conflictingIntegrations.includes(integration)).length > 0;
   if (hasConflictingIntegrations) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       red(
         `  ${bold(
           "Caution:"
@@ -895,7 +943,7 @@ async function setupIntegrationConfig(opts) {
   }
   if (!alreadyConfigured) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       `
   ${magenta(`Astro will generate a minimal ${bold(opts.defaultConfigFile)} file.`)}
 `

package/dist/cli/install-package.js

@@ -25,7 +25,7 @@ async function getPackage(packageName, logger, options, otherDeps = []) {
     return packageImport;
   } catch (e) {
     logger.info(
-      null,
+      "SKIP_FORMAT",
       `To continue, Astro requires the following dependency to be installed: ${bold(packageName)}.`
     );
     const result = await installPackage([packageName, ...otherDeps], options, logger);
@@ -87,7 +87,7 @@ ${boxen(coloredOutput, {
   })}
 `;
   logger.info(
-    null,
+    "SKIP_FORMAT",
     `
   ${magenta("Astro will run the following command:")}
   ${dim(

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.4.14";
+const ASTRO_VERSION = "4.4.15";
 const REROUTE_DIRECTIVE_HEADER = "X-Astro-Reroute";
 const ROUTE_TYPE_HEADER = "X-Astro-Route-Type";
 const REROUTABLE_STATUS_CODES = [404, 500];

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.4.14";
+  const currentVersion = "4.4.15";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.4.14";
+  const version = "4.4.15";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.4.14"}`
+        `v${"4.4.15"}`
       )} ${headline}`
     );
   }

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

@@ -49,7 +49,7 @@ function isHTMLComponent(Component) {
 }
 const ASTRO_SLOT_EXP = /<\/?astro-slot\b[^>]*>/g;
 const ASTRO_STATIC_SLOT_EXP = /<\/?astro-static-slot\b[^>]*>/g;
-function removeStaticAstroSlot(html, supportsAstroStaticSlot) {
+function removeStaticAstroSlot(html, supportsAstroStaticSlot = true) {
   const exp = supportsAstroStaticSlot ? ASTRO_STATIC_SLOT_EXP : ASTRO_SLOT_EXP;
   return html.replace(exp, "");
 }
@@ -245,9 +245,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
           destination.write(html);
         } else if (html && html.length > 0) {
           destination.write(
-            markHTMLString(
-              removeStaticAstroSlot(html, renderer?.ssr?.supportsAstroStaticSlot ?? false)
-            )
+            markHTMLString(removeStaticAstroSlot(html, renderer?.ssr?.supportsAstroStaticSlot))
           );
         }
       }
@@ -306,7 +304,8 @@ ${serializeProps(
           })
         );
       }
-      destination.write(markHTMLString(renderElement("astro-island", island, false)));
+      const renderedElement = renderElement("astro-island", island, false);
+      destination.write(markHTMLString(renderedElement));
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.4.14",
+  "version": "4.4.15",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -163,9 +163,9 @@
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4",
-    "@astrojs/telemetry": "3.0.4",
     "@astrojs/internal-helpers": "0.2.1",
-    "@astrojs/markdown-remark": "4.2.1"
+    "@astrojs/markdown-remark": "4.2.1",
+    "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
     "sharp": "^0.32.6"