Migrate to new config (#2962)

* wip: config migration

* fix: formatting

* refactor: projectRoot -> root

* refactor: pageUrlFormat -> format

* refactor: buildOptions.site -> site

* refactor: public -> publicDir

* refactor: dist -> outDir

* refactor: styleOptions -> style

* fix: some dist tests -> outDir

* refactor: remove legacyBuild (with TODOs)

* refactor: more legacyBuild cleanup

* refactor: server host and port

* fix: remove experimentalStaticBuild CLI flag

* refactor: src -> srcDir

* refactor: devOptions.trailing -> trailing

* refactor: remove sitemap + related flags

* refactor: experimentalSSR -> experimental.ssr

* fix: last devOptions

* refactor: drafts -> markdown.drafts

* fix: TS error on port as const

* refactor: remove pages

* refactor: more --project-root updates

* refactor: markdownOptions -> markdown

* fix: remaining type errors

* feat: update AstroUserConfig

* refactor: update CLI flag mapper + server mapper

* fix: loadFixture projectRoot

* fix: merge CLI flags before validating / transforming

* wip: attempt to fix bad createRouteManifest config

* refactor: combine config.base and config.site

* fix: skip route manifest test for now

* fix: site and base handling

* refactor: update failing config testes

* fix: build failure

* feat: update config types with migration help

* chore: update types

* fix(deno): update deno fixture

* chore: remove config migration logic

* chore: remove logLevel

* chore: clean-up config types

* chore: update config warning

* chore: add changeset

* Sitemap Integration (#2965)

* feat: add sitemap filter config option

* feat: add canonicalURL sitemap config option

* docs: update sitemap README

* fix: update for new config

* fix: filter not being applied

* chore: changeset

Co-authored-by: bholmesdev <hey@bholmes.dev>

* fred pass

* fix: Astro.resolve typo

* fix: public => publicDir

Co-authored-by: bholmesdev <hey@bholmes.dev>
Co-authored-by: Fred K. Schott <fkschott@gmail.com>

6 files changed, 18 insertions, 33 deletions

diff --git a/examples/blog-multiple-authors/src/pages/posts/[...page].astro b/examples/blog-multiple-authors/src/pages/posts/[...page].astro
index 7711a940c..f770aadb2 100644
--- a/examples/blog-multiple-authors/src/pages/posts/[...page].astro
+++ b/examples/blog-multiple-authors/src/pages/posts/[...page].astro
@@ -10,7 +10,7 @@ export async function getStaticPaths({ paginate, rss }) {
 	const sortedPosts = allPosts.sort((a, b) => new Date(b.frontmatter.date).valueOf() - new Date(a.frontmatter.date).valueOf());
 
 	// Generate an RSS feed from this collection of posts.
-	// NOTE: This is disabled by default, since it requires `buildOptions.site` to be set in your "astro.config.mjs" file.
+	// NOTE: This is disabled by default, since it requires `site` to be set in your "astro.config.mjs" file.
 	//   rss({
 	//     title: 'Don’s Blog',
 	//     description: 'An example blog on Astro',
diff --git a/examples/blog/astro.config.mjs b/examples/blog/astro.config.mjs
index e8f14324a..be7ee7079 100644
--- a/examples/blog/astro.config.mjs
+++ b/examples/blog/astro.config.mjs
@@ -4,7 +4,6 @@ import preact from '@astrojs/preact';
 // https://astro.build/config
 export default defineConfig({
 	integrations: [preact()],
-	buildOptions: {
-		site: 'https://example.com/',
-	},
+	site: 'https://example.com',
+	base: '/subpath',
 });
diff --git a/examples/component/package.json b/examples/component/package.json
index e7e63cb83..5bf96a6a0 100644
--- a/examples/component/package.json
+++ b/examples/component/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "start": "astro --project-root demo dev",
-    "build": "astro --project-root demo build",
-    "serve": "astro --project-root demo preview"
+    "start": "astro --root demo dev",
+    "build": "astro --root demo build",
+    "serve": "astro --root demo preview"
   },
   "devDependencies": {
     "astro": "^0.25.4"
diff --git a/examples/subpath/astro.config.mjs b/examples/subpath/astro.config.mjs
index bb680d762..02b050efc 100644
--- a/examples/subpath/astro.config.mjs
+++ b/examples/subpath/astro.config.mjs
@@ -4,7 +4,5 @@ import react from '@astrojs/react';
 // https://astro.build/config
 export default defineConfig({
 	integrations: [react()],
-	buildOptions: {
-		site: 'http://example.com/blog',
-	},
+	site: 'http://example.com/blog',
 });
diff --git a/examples/with-markdown-plugins/astro.config.mjs b/examples/with-markdown-plugins/astro.config.mjs
index 0e112712a..114cbbd0a 100644
--- a/examples/with-markdown-plugins/astro.config.mjs
+++ b/examples/with-markdown-plugins/astro.config.mjs
@@ -1,17 +1,11 @@
 import { defineConfig } from 'astro/config';
-import astroRemark from '@astrojs/markdown-remark';
 import addClasses from './add-classes.mjs';
 
 // https://astro.build/config
 export default defineConfig({
 	// Enable Custom Markdown options, plugins, etc.
-	markdownOptions: {
-		render: [
-			astroRemark,
-			{
-				remarkPlugins: ['remark-code-titles'],
-				rehypePlugins: [['rehype-autolink-headings', { behavior: 'prepend' }], ['rehype-toc', { headings: ['h2', 'h3'] }], [addClasses, { 'h1,h2,h3': 'title' }], 'rehype-slug'],
-			},
-		],
+	markdown: {
+		remarkPlugins: ['remark-code-titles'],
+		rehypePlugins: [['rehype-autolink-headings', { behavior: 'prepend' }], ['rehype-toc', { headings: ['h2', 'h3'] }], [addClasses, { 'h1,h2,h3': 'title' }], 'rehype-slug'],
 	},
 });
diff --git a/examples/with-markdown-shiki/astro.config.mjs b/examples/with-markdown-shiki/astro.config.mjs
index 7a0b4f0f2..0a928c898 100644
--- a/examples/with-markdown-shiki/astro.config.mjs
+++ b/examples/with-markdown-shiki/astro.config.mjs
@@ -1,20 +1,14 @@
 import { defineConfig } from 'astro/config';
-import astroRemark from '@astrojs/markdown-remark';
 
 // https://astro.build/config
 export default defineConfig({
 	// Enable Custom Markdown options, plugins, etc.
-	markdownOptions: {
-		render: [
-			astroRemark,
-			{
-				syntaxHighlight: 'shiki',
-				shikiConfig: {
-					theme: 'dracula',
-					// Learn more about this configuration here:
-					// https://docs.astro.build/en/guides/markdown-content/#syntax-highlighting
-				},
-			},
-		],
-	},
+	markdown: {
+		syntaxHighlight: 'shiki',
+		shikiConfig: {
+			theme: 'dracula',
+			// Learn more about this configuration here:
+			// https://docs.astro.build/en/guides/markdown-content/#syntax-highlighting
+		},
+	}
 });