astro 1.0.0-beta.6 → 1.0.0-beta.60

package/LICENSE

@@ -32,3 +32,30 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
+
+
+"""
+This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
+
+MIT License
+
+Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""

package/README.md

@@ -1,106 +1,46 @@
-<a href="https://astro.build">
-  <img src="https://raw.githubusercontent.com/withastro/astro/main/assets/social/banner.svg" />
-</a>
+<br/>
+<p align="center">
+  <img src="../../assets/social/banner-minimal.png" alt="Astro logo">
+  <br/><br/>
+  <a href="https://astro.build">Astro</a> is a website build tool for the modern web &mdash;
+  <br/>
+  powerful developer experience meets lightweight output.
+  <br/><br/>
+</p>
 
-<div center>
 
-**Astro** is a new kind of static site builder for the modern web&mdash;powerful developer experience meets lightweight output.
+## Install
 
-</div>
 
-### [🚀 Read the launch post →](https://astro.build/blog/introducing-astro)
+```bash
+# Recommended!
+npm create astro@latest
 
-### [📚 Learn Astro →](https://docs.astro.build/en/getting-started/)
+# Manual:
+npm install --save-dev astro
+```
 
-## Project Status
+Looking for help? Start with our [Getting Started](https://docs.astro.build/en/getting-started/) guide.  
 
-⚠️ **Astro is still beta software&mdash;missing features and bugs are to be expected!** We are quickly working our way towards a stable, production-ready v1.0 release, but we are still finalizing some of Astro's APIs.
+Looking for quick examples? [Open a starter project](https://astro.new/) right in your browser.
 
-That being said, there are quite a few Astro sites in production already. We're incredibly grateful to everyone who has made an early bet on Astro!
+## Documentation
 
-## Quick Start
+Visit our [offical documentation](https://docs.astro.build/).
 
-<table>
-  <tbody>
-    <tr>
-      <td>
-        <img width="441" height="1px">
-        <strong>👾 Online</strong>
-      </td>
-      <td>
-        <img width="441" height="1px">
-        <strong>📦 Local</strong>
-      </td>
-    </tr>
-    <tr>
-<td>
+## Support
 
-Try Astro in your browser!
+Having trouble? Get help in the official [Astro Discord](https://astro.build/chat).
+## Contributing
 
-[Launch astro.new →](https://astro.new)
+**New contributors welcome!** Check out our [Contributors Guide](CONTRIBUTING.md) for help getting started. 
 
-</td>
-<td>
+Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll help you get your first contribution in no time!
 
-Get started with Astro using our interactive CLI!
+## Sponsors
 
-```bash
-npm init astro my-astro-project
-```
+Astro is generously supported by [Netlify](https://www.netlify.com/), [Vercel](https://vercel.com/), and several other amazing organizations [listed here.](https://astro.build/)
 
-</td>
-    </tr>
-  </tbody>
-</table>
+[❤️ Sponsor Astro! ❤️](https://github.com/withastro/astro/blob/main/FUNDING.md)
 
-## Sponsors
 
-You can sponsor Astro's development on [Open Collective](https://opencollective.com/astrodotbuild). Astro is generously supported by the following companies and individuals:
-
-### Platinum Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <td align="center"><a href="https://www.netlify.com/#gh-light-mode-only" target="_blank"><img width="147" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/netlify.svg#gh-light-mode-only" alt="Netlify" /></a><a href="https://www.netlify.com/#gh-dark-mode-only" target="_blank"><img width="147" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/netlify-dark.svg#gh-dark-mode-only" alt="Netlify" />
-      </a></td>
-      <td align="center"><a href="https://www.vercel.com/#gh-light-mode-only" target="_blank"><img width="150" height="34" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/vercel.svg#gh-light-mode-only" alt="Vercel" /></a><a href="https://www.vercel.com/#gh-dark-mode-only"><img width="150" height="34" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/vercel-dark.svg#gh-dark-mode-only" alt="Vercel" />
-      </a></td>
-    </tr>
-  </tbody>
-</table>
-
-### Gold Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <td align="center">
-        <a href="https://divRIOTS.com#gh-light-mode-only" target="_blank">
-        <img width="150" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots.svg#gh-light-mode-only" alt="‹div›RIOTS" />
-        </a>
-        <a href="https://divRIOTS.com#gh-dark-mode-only" target="_blank">
-        <img width="150" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/divriots-dark.svg#gh-dark-mode-only" alt="‹div›RIOTS" />
-        </a>
-      </td>
-      <td align="center">
-        <a href="https://stackupdigital.co.uk/#gh-light-mode-only" target="_blank">
-        <img width="162" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup.svg#gh-light-mode-only" alt="StackUp Digital" />
-        </a>
-        <a href="https://stackupdigital.co.uk/#gh-dark-mode-only" target="_blank">
-        <img width="130" height="32" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/stackup-dark.svg#gh-dark-mode-only" alt="StackUp Digital" />
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-### Sponsors
-
-<table>
-  <tbody>
-    <tr>
-      <td align="center"><a href="https://sentry.io" target="_blank"><img width="147" height="40" src="https://raw.githubusercontent.com/withastro/astro/main/.github/assets/sentry.svg" alt="Sentry" /></a></td><td align="center"><a href="https://qoddi.com" target="_blank"><img width="147" height="40" src="https://devcenter.qoddi.com/wp-content/uploads/2021/11/blog-transparent-logo-1.png" alt="Qoddi App Platform" /></a></td>
-    </tr>
-  </tbody>
-</table>

package/astro-jsx.d.ts

@@ -621,7 +621,10 @@ declare namespace astroHTML.JSX {
 	//   - "number | string"
 	//   - "string"
 	//   - union of string literals
-	interface SVGAttributes<T extends EventTarget> extends AriaAttributes, DOMAttributes<T> {
+	interface SVGAttributes<T extends EventTarget>
+		extends AriaAttributes,
+			DOMAttributes<T>,
+			AstroBuiltinAttributes {
 		// Attributes which also defined in HTMLAttributes
 		className?: string | undefined | null;
 		class?: string | undefined | null;

package/components/Code.astro

@@ -1,6 +1,6 @@
 ---
 import type * as shiki from 'shiki';
-import { getHighlighter } from 'shiki';
+import { getHighlighter } from './Shiki.js';
 
 export interface Props {
 	/** The code to highlight. Required. */

package/components/Markdown.astro

@@ -3,6 +3,13 @@ export interface Props {
 	content?: string;
 }
 
+// NOTE(fks): We are most likely moving this component out of Astro core
+// in a few weeks. Checking the name like this is a bit of a hack, but we
+// intentionally don't want to add an SSR flag for others to read from, just yet.
+if (Astro.redirect.name !== '_onlyAvailableInSSR') {
+	console.error(`\x1B[31mThe <Markdown> component is not available in SSR. See https://github.com/withastro/rfcs/discussions/179 for more info.\x1B[39m`);
+}
+
 const dedent = (str: string) => {
 	const _str = str.split('\n').filter(s => s.trimStart().length > 0);
 	if (_str.length === 0) {

package/components/Shiki.js

@@ -0,0 +1,24 @@
+import { getHighlighter as getShikiHighlighter } from 'shiki';
+
+// Caches Promise<Highligher> for reuse when the same theme and langs are provided
+const _resolvedHighlighters = new Map();
+
+function stringify(opts) {
+	// Always sort keys before stringifying to make sure objects match regardless of parameter ordering
+	return JSON.stringify(opts, Object.keys(opts).sort());
+}
+
+export function getHighlighter(opts) {
+	const key = stringify(opts);
+
+	// Highlighter has already been requested, reuse the same instance
+	if (_resolvedHighlighters.has(key)) {
+		return _resolvedHighlighters.get(key);
+	}
+
+	// Start the async getHighlighter call and cache the Promise
+	const highlighter = getShikiHighlighter(opts);
+	_resolvedHighlighters.set(key, highlighter);
+
+	return highlighter;
+}

package/dist/cli/check.js

@@ -1,9 +1,9 @@
 import { AstroCheck, DiagnosticSeverity } from "@astrojs/language-server";
-import { bold, black, bgWhite, red, cyan, yellow } from "kleur/colors";
 import glob from "fast-glob";
+import * as fs from "fs";
+import { bgWhite, black, bold, cyan, red, yellow } from "kleur/colors";
 import * as path from "path";
 import { pathToFileURL } from "url";
-import * as fs from "fs";
 async function openAllDocuments(workspaceUri, filePathsToIgnore, checker) {
   const files = await glob("**/*.astro", {
     cwd: workspaceUri.pathname,

package/dist/cli/index.js

@@ -1,51 +1,57 @@
 import * as colors from "kleur/colors";
 import yargs from "yargs-parser";
 import { z } from "zod";
-import { nodeLogDestination, enableVerboseLogging } from "../core/logger/node.js";
-import build from "../core/build/index.js";
 import add from "../core/add/index.js";
+import build from "../core/build/index.js";
+import { openConfig } from "../core/config.js";
 import devServer from "../core/dev/index.js";
+import { collectErrorMetadata } from "../core/errors.js";
+import { debug } from "../core/logger/core.js";
+import { enableVerboseLogging, nodeLogDestination } from "../core/logger/node.js";
+import { formatConfigErrorMessage, formatErrorMessage, printHelp } from "../core/messages.js";
 import preview from "../core/preview/index.js";
+import { ASTRO_VERSION, createSafeError } from "../core/util.js";
+import * as event from "../events/index.js";
+import { eventConfigError, eventError, telemetry } from "../events/index.js";
 import { check } from "./check.js";
 import { openInBrowser } from "./open.js";
-import { loadConfig } from "../core/config.js";
-import { printHelp, formatErrorMessage, formatConfigErrorMessage } from "../core/messages.js";
-import { createSafeError } from "../core/util.js";
+import * as telemetryHandler from "./telemetry.js";
 function printAstroHelp() {
   printHelp({
     commandName: "astro",
+    usage: "[command] [...flags]",
     headline: "Futuristic web development tool.",
-    commands: [
-      ["add", "Add an integration to your configuration."],
-      ["docs", "Launch Astro's Doc site directly from the terminal. "],
-      ["dev", "Run Astro in development mode."],
-      ["build", "Build a pre-compiled production-ready site."],
-      ["preview", "Preview your build locally before deploying."],
-      ["check", "Check your project for errors."],
-      ["--version", "Show the version number and exit."],
-      ["--help", "Show this help message."]
-    ],
-    flags: [
-      ["--host [optional IP]", "Expose server on network"],
-      ["--config <path>", "Specify the path to the Astro config file."],
-      ["--root <path>", "Specify the path to the project root folder."],
-      ["--legacy-build", "Use the build strategy prior to 0.24.0"],
-      ["--experimental-ssr", "Enable SSR compilation fot 3rd-party adapters."],
-      ["--drafts", "Include markdown draft pages in the build."],
-      ["--verbose", "Enable verbose logging"],
-      ["--silent", "Disable logging"]
-    ]
+    tables: {
+      Commands: [
+        ["add", "Add an integration."],
+        ["build", "Build your project and write it to disk."],
+        ["check", "Check your project for errors."],
+        ["dev", "Start the development server."],
+        ["docs", "Open documentation in your web browser."],
+        ["preview", "Preview your build locally."],
+        ["telemetry", "Configure telemetry settings."]
+      ],
+      "Global Flags": [
+        ["--config <path>", "Specify your config file."],
+        ["--root <path>", "Specify your project root folder."],
+        ["--verbose", "Enable verbose logging."],
+        ["--silent", "Disable all logging."],
+        ["--version", "Show the version number and exit."],
+        ["--help", "Show this help message."]
+      ]
+    }
   });
 }
 async function printVersion() {
-  const version = "1.0.0-beta.5";
   console.log();
-  console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${version}`)}`);
+  console.log(`  ${colors.bgGreen(colors.black(` astro `))} ${colors.green(`v${ASTRO_VERSION}`)}`);
 }
 function resolveCommand(flags) {
   const cmd = flags._[2];
   if (cmd === "add")
     return "add";
+  if (cmd === "telemetry")
+    return "telemetry";
   if (flags.version)
     return "version";
   else if (flags.help)
@@ -56,9 +62,8 @@ function resolveCommand(flags) {
   }
   return "help";
 }
-async function cli(args) {
-  const flags = yargs(args);
-  const cmd = resolveCommand(flags);
+async function runCommand(cmd, flags) {
+  var _a;
   const root = flags.root;
   switch (cmd) {
     case "help":
@@ -78,68 +83,69 @@ async function cli(args) {
   } else if (flags.silent) {
     logging.level = "silent";
   }
-  let config;
-  try {
-    config = await loadConfig({ cwd: root, flags, cmd });
-  } catch (err) {
-    return throwAndExit(err);
-  }
   switch (cmd) {
     case "add": {
-      try {
-        const packages = flags._.slice(3);
-        return await add(packages, { cwd: root, flags, logging });
-      } catch (err) {
-        return throwAndExit(err);
-      }
+      telemetry.record(event.eventCliSession(cmd));
+      const packages = flags._.slice(3);
+      return await add(packages, { cwd: root, flags, logging, telemetry });
+    }
+    case "docs": {
+      telemetry.record(event.eventCliSession(cmd));
+      return await openInBrowser("https://docs.astro.build/");
+    }
+    case "telemetry": {
+      const subcommand = (_a = flags._[3]) == null ? void 0 : _a.toString();
+      return await telemetryHandler.update(subcommand, { flags, telemetry });
     }
+  }
+  const { astroConfig, userConfig } = await openConfig({ cwd: root, flags, cmd });
+  telemetry.record(event.eventCliSession(cmd, userConfig, flags));
+  switch (cmd) {
     case "dev": {
-      try {
-        await devServer(config, { logging });
-        return await new Promise(() => {
-        });
-      } catch (err) {
-        return throwAndExit(err);
-      }
+      await devServer(astroConfig, { logging, telemetry });
+      return await new Promise(() => {
+      });
     }
     case "build": {
-      try {
-        return await build(config, { logging });
-      } catch (err) {
-        return throwAndExit(err);
-      }
+      return await build(astroConfig, { logging, telemetry });
     }
     case "check": {
-      const ret = await check(config);
+      const ret = await check(astroConfig);
       return process.exit(ret);
     }
     case "preview": {
-      try {
-        const server = await preview(config, { logging });
-        return await server.closed();
-      } catch (err) {
-        return throwAndExit(err);
-      }
-    }
-    case "docs": {
-      try {
-        return await openInBrowser("https://docs.astro.build/");
-      } catch (err) {
-        return throwAndExit(err);
-      }
-    }
-    default: {
-      throw new Error(`Error running ${cmd}`);
+      const server = await preview(astroConfig, { logging, telemetry });
+      return await server.closed();
     }
   }
+  throw new Error(`Error running ${cmd} -- no command found.`);
+}
+async function cli(args) {
+  const flags = yargs(args);
+  const cmd = resolveCommand(flags);
+  try {
+    await runCommand(cmd, flags);
+  } catch (err) {
+    await throwAndExit(cmd, err);
+  }
 }
-function throwAndExit(err) {
+async function throwAndExit(cmd, err) {
+  let telemetryPromise;
+  let errorMessage;
+  function exitWithErrorMessage() {
+    console.error(errorMessage);
+    process.exit(1);
+  }
   if (err instanceof z.ZodError) {
-    console.error(formatConfigErrorMessage(err));
+    telemetryPromise = telemetry.record(eventConfigError({ cmd, err, isFatal: true }));
+    errorMessage = formatConfigErrorMessage(err);
   } else {
-    console.error(formatErrorMessage(createSafeError(err)));
+    const errorWithMetadata = collectErrorMetadata(createSafeError(err));
+    telemetryPromise = telemetry.record(eventError({ cmd, err: errorWithMetadata, isFatal: true }));
+    errorMessage = formatErrorMessage(errorWithMetadata);
   }
-  process.exit(1);
+  setTimeout(exitWithErrorMessage, 400);
+  await telemetryPromise.catch((err2) => debug("telemetry", `record() error: ${err2.message}`)).then(exitWithErrorMessage);
 }
 export {
   cli

package/dist/cli/telemetry.js

@@ -0,0 +1,38 @@
+import * as msg from "../core/messages.js";
+async function update(subcommand, { flags, telemetry }) {
+  const isValid = ["enable", "disable", "reset"].includes(subcommand);
+  if (flags.help || !isValid) {
+    msg.printHelp({
+      commandName: "astro telemetry",
+      usage: "[command]",
+      tables: {
+        Commands: [
+          ["enable", "Enable anonymous data collection."],
+          ["disable", "Disable anonymous data collection."],
+          ["reset", "Reset anonymous data collection settings."]
+        ]
+      }
+    });
+    return;
+  }
+  switch (subcommand) {
+    case "enable": {
+      telemetry.setEnabled(true);
+      console.log(msg.telemetryEnabled());
+      return;
+    }
+    case "disable": {
+      telemetry.setEnabled(false);
+      console.log(msg.telemetryDisabled());
+      return;
+    }
+    case "reset": {
+      telemetry.clear();
+      console.log(msg.telemetryReset());
+      return;
+    }
+  }
+}
+export {
+  update
+};

package/dist/core/add/babel.js

@@ -1,7 +1,7 @@
-import traverse from "@babel/traverse";
 import generator from "@babel/generator";
-import * as t from "@babel/types";
 import parser from "@babel/parser";
+import traverse from "@babel/traverse";
+import * as t from "@babel/types";
 const visit = traverse.default;
 async function generate(ast) {
   const astToText = generator.default;

package/dist/core/add/index.js

@@ -1,74 +1,83 @@
-import path from "path";
-import { existsSync, promises as fs } from "fs";
-import { execa } from "execa";
-import { fileURLToPath, pathToFileURL } from "url";
-import { diffWords } from "diff";
 import boxen from "boxen";
-import prompts from "prompts";
-import preferredPM from "preferred-pm";
+import { diffWords } from "diff";
+import { execa } from "execa";
+import { existsSync, promises as fs } from "fs";
+import { bold, cyan, dim, green, magenta } from "kleur/colors";
 import ora from "ora";
+import path from "path";
+import preferredPM from "preferred-pm";
+import prompts from "prompts";
+import { fileURLToPath, pathToFileURL } from "url";
 import { resolveConfigURL } from "../config.js";
-import { apply as applyPolyfill } from "../polyfill.js";
-import { error, info, debug } from "../logger/core.js";
-import { printHelp } from "../messages.js";
+import { debug, info } from "../logger/core.js";
 import * as msg from "../messages.js";
-import * as CONSTS from "./consts.js";
-import { dim, cyan, green, magenta, bold } from "kleur/colors";
+import { printHelp } from "../messages.js";
+import { appendForwardSlash } from "../path.js";
+import { apply as applyPolyfill } from "../polyfill.js";
 import { parseNpmName } from "../util.js";
-import { wrapDefaultExport } from "./wrapper.js";
+import { generate, parse, t, visit } from "./babel.js";
 import { ensureImport } from "./imports.js";
-import { t, parse, visit, generate } from "./babel.js";
-async function add(names, { cwd, flags, logging }) {
-  if (flags.help) {
+import { wrapDefaultExport } from "./wrapper.js";
+const ALIASES = /* @__PURE__ */ new Map([
+  ["solid", "solid-js"],
+  ["tailwindcss", "tailwind"]
+]);
+const ASTRO_CONFIG_STUB = `import { defineConfig } from 'astro/config';
+
+default defineConfig({});`;
+const TAILWIND_CONFIG_STUB = `/** @type {import('tailwindcss').Config} */
+module.exports = {
+	content: ['./src/**/*.{astro,html,js,jsx,md,svelte,ts,tsx,vue}'],
+	theme: {
+		extend: {},
+	},
+	plugins: [],
+}
+`;
+async function add(names, { cwd, flags, logging, telemetry }) {
+  if (flags.help || names.length === 0) {
     printHelp({
       commandName: "astro add",
-      usage: "[FLAGS] [INTEGRATIONS...]",
-      flags: [
-        ["--yes", "Add the integration without user interaction."],
-        ["--help", "Show this help message."]
-      ]
+      usage: "[...integrations]",
+      tables: {
+        Flags: [
+          ["--yes", "Accept all prompts."],
+          ["--help", "Show this help message."]
+        ],
+        "Example: Add a UI Framework": [
+          ["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"]
+        ],
+        "Example: Add an Integration": [
+          ["tailwind", "astro add tailwind"],
+          ["partytown", "astro add partytown"],
+          ["sitemap", "astro add sitemap"]
+        ]
+      },
+      description: `Check out the full integration catalog: ${cyan("https://astro.build/integrations")}`
     });
     return;
   }
   let configURL;
   const root = pathToFileURL(cwd ? path.resolve(cwd) : process.cwd());
   configURL = await resolveConfigURL({ cwd, flags });
-  if (configURL == null ? void 0 : configURL.pathname.endsWith("package.json")) {
-    throw new Error(`Unable to use astro add with package.json#astro configuration! Try migrating to \`astro.config.mjs\` and try again.`);
-  }
   applyPolyfill();
-  if (names.length === 0) {
-    const response = await prompts([
-      {
-        type: "multiselect",
-        name: "frameworks",
-        message: "What frameworks would you like to enable?",
-        instructions: "\n  Space to select. Return to submit",
-        choices: CONSTS.FIRST_PARTY_FRAMEWORKS
-      },
-      {
-        type: "multiselect",
-        name: "addons",
-        message: "What additional integrations would you like to enable?",
-        instructions: "\n  Space to select. Return to submit",
-        choices: CONSTS.FIRST_PARTY_ADDONS
-      }
-    ]);
-    names = [...response.frameworks ?? [], ...response.addons ?? []];
-  }
-  if (names.length === 0) {
-    error(logging, null, `No integrations specified.`);
-    return;
-  }
-  names = names.map((name) => CONSTS.ALIASES.has(name) ? CONSTS.ALIASES.get(name) : name);
   if (configURL) {
     debug("add", `Found config at ${configURL}`);
   } else {
     info(logging, "add", `Unable to locate a config file, generating one for you.`);
-    configURL = new URL("./astro.config.mjs", root);
-    await fs.writeFile(fileURLToPath(configURL), CONSTS.CONFIG_STUB, { encoding: "utf-8" });
+    configURL = new URL("./astro.config.mjs", appendForwardSlash(root.href));
+    await fs.writeFile(fileURLToPath(configURL), ASTRO_CONFIG_STUB, { encoding: "utf-8" });
+  }
+  if (configURL == null ? void 0 : configURL.pathname.endsWith("package.json")) {
+    throw new Error(`Unable to use "astro add" with package.json configuration. Try migrating to \`astro.config.mjs\` and try again.`);
   }
-  const integrations = await validateIntegrations(names);
+  const integrationNames = names.map((name) => ALIASES.has(name) ? ALIASES.get(name) : name);
+  const integrations = await validateIntegrations(integrationNames);
   let ast = null;
   try {
     ast = await parseAstroConfig(configURL);
@@ -137,7 +146,7 @@ async function add(names, { cwd, flags, logging }) {
   ${magenta(`Astro will generate a minimal ${bold("./tailwind.config.cjs")} file.`)}
 `);
           if (await askToContinue({ flags })) {
-            await fs.writeFile(fileURLToPath(new URL("./tailwind.config.cjs", configURL)), CONSTS.TAILWIND_CONFIG_STUB, { encoding: "utf-8" });
+            await fs.writeFile(fileURLToPath(new URL("./tailwind.config.cjs", configURL)), TAILWIND_CONFIG_STUB, { encoding: "utf-8" });
             debug("add", `Generated default ./tailwind.config.cjs file`);
           }
         } else {
@@ -288,7 +297,7 @@ async function getInstallIntegrationsCommand({
   debug("add", `package manager: ${JSON.stringify(pm)}`);
   if (!pm)
     return null;
-  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(([name, version]) => version === null ? name : `${name}@${version}`).sort();
+  let dependencies = integrations.map((i) => [[i.packageName, null], ...i.dependencies]).flat(1).filter((dep, i, arr) => arr.findIndex((d) => d[0] === dep[0]) === i).map(([name, version]) => version === null ? name : `${name}@${version.split(/\s*\|\|\s*/).pop()}`).sort();
   switch (pm.name) {
     case "npm":
       return { pm: "npm", command: "install", flags: ["--save-dev"], dependencies };