From ddefb172f66bcd646dd0b75a7ea8360157dd2ba0 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Thu, 21 Jul 2022 10:45:59 -0700
Subject: [PATCH] Replace/Rename Astro.canonicalURL with new Astro.url helper
 (#3959)

* add Astro.url

* Add examples of how to create the canonicalURL

Co-authored-by: Matthew Phillips <matthew@skypack.dev>
---
 .changeset/unlucky-panthers-yawn.md           |  5 +++
 .changeset/yellow-drinks-judge.md             |  5 +++
 .../blog-multiple-authors/astro.config.mjs    |  1 +
 .../src/layouts/post.astro                    |  3 +-
 .../src/pages/about.astro                     |  2 +-
 .../src/pages/authors/[author].astro          |  3 +-
 .../src/pages/index.astro                     |  2 +-
 .../src/pages/posts/[...page].astro           |  2 +-
 examples/blog/astro.config.mjs                |  1 +
 examples/blog/src/components/BaseHead.astro   |  5 ++-
 examples/docs/astro.config.mjs                |  1 +
 examples/docs/src/components/HeadSEO.astro    |  4 +-
 examples/docs/src/layouts/MainLayout.astro    |  5 ++-
 packages/astro/src/@types/astro.ts            | 24 +++++++++---
 packages/astro/src/core/config.ts             |  6 +--
 packages/astro/src/core/render/result.ts      | 30 ++++++++++-----
 packages/astro/src/core/render/util.ts        | 12 ------
 packages/astro/src/core/request.ts            | 10 -----
 packages/astro/src/runtime/server/index.ts    |  8 ++--
 .../astro/src/vite-plugin-astro/compile.ts    |  4 +-
 .../astro/test/astro-get-static-paths.test.js |  4 +-
 packages/astro/test/astro-global.test.js      | 38 +------------------
 packages/astro/test/custom-404.test.js        |  3 +-
 .../src/pages/posts/[page].astro              |  3 +-
 .../astro-global/src/components/Child.astro   |  2 +-
 .../src/components/NestedChild.astro          |  2 +-
 .../astro-global/src/layouts/post.astro       |  3 +-
 .../astro-global/src/pages/index.astro        |  7 ++--
 .../astro-global/src/pages/posts/[page].astro |  4 +-
 .../astro-pagination/src/pages/index.astro    |  5 ++-
 .../src/pages/posts/[slug]/[page].astro       |  3 +-
 .../pages/posts/named-root-page/[page].astro  |  3 +-
 .../posts/optional-root-page/[...page].astro  |  3 +-
 .../fixtures/custom-404/src/pages/404.astro   |  3 +-
 .../ssr-request/src/pages/request.astro       |  2 +-
 35 files changed, 101 insertions(+), 117 deletions(-)
 create mode 100644 .changeset/unlucky-panthers-yawn.md
 create mode 100644 .changeset/yellow-drinks-judge.md

diff --git a/.changeset/unlucky-panthers-yawn.md b/.changeset/unlucky-panthers-yawn.md
new file mode 100644
index 000000000..b8e325b15
--- /dev/null
+++ b/.changeset/unlucky-panthers-yawn.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Deprecate Astro.canonicalURL, in favor of Astro.url instead.
diff --git a/.changeset/yellow-drinks-judge.md b/.changeset/yellow-drinks-judge.md
new file mode 100644
index 000000000..fdd65d6b9
--- /dev/null
+++ b/.changeset/yellow-drinks-judge.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Add Astro.url helper for getting the request URL
diff --git a/examples/blog-multiple-authors/astro.config.mjs b/examples/blog-multiple-authors/astro.config.mjs
index 5a51e487a..2b6a0fe14 100644
--- a/examples/blog-multiple-authors/astro.config.mjs
+++ b/examples/blog-multiple-authors/astro.config.mjs
@@ -5,4 +5,5 @@ import preact from '@astrojs/preact';
 export default defineConfig({
 	// Enable the Preact integration to support Preact JSX components.
 	integrations: [preact()],
+	site: `http://astro.build`
 });
diff --git a/examples/blog-multiple-authors/src/layouts/post.astro b/examples/blog-multiple-authors/src/layouts/post.astro
index b940bbb40..8aaa5ba5e 100644
--- a/examples/blog-multiple-authors/src/layouts/post.astro
+++ b/examples/blog-multiple-authors/src/layouts/post.astro
@@ -1,10 +1,9 @@
 ---
 import MainHead from "../components/MainHead.astro";
 import Nav from "../components/Nav.astro";
-import authorData from "../data/authors.json";
 
 const { content } = Astro.props;
-let canonicalURL = Astro.canonicalURL;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html lang={content.lang || "en"}>
diff --git a/examples/blog-multiple-authors/src/pages/about.astro b/examples/blog-multiple-authors/src/pages/about.astro
index 2d2c9665b..0edb1446e 100644
--- a/examples/blog-multiple-authors/src/pages/about.astro
+++ b/examples/blog-multiple-authors/src/pages/about.astro
@@ -4,7 +4,7 @@ import Nav from "../components/Nav.astro";
 
 let title = "About";
 let description = "About page of an example blog on Astro";
-let canonicalURL = Astro.canonicalURL;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html lang="en">
diff --git a/examples/blog-multiple-authors/src/pages/authors/[author].astro b/examples/blog-multiple-authors/src/pages/authors/[author].astro
index cc83c6bbb..368fdd591 100644
--- a/examples/blog-multiple-authors/src/pages/authors/[author].astro
+++ b/examples/blog-multiple-authors/src/pages/authors/[author].astro
@@ -13,6 +13,7 @@ export async function getStaticPaths() {
 const { allPosts } = Astro.props;
 const title = "Don’s Blog";
 const description = "An example blog on Astro";
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 
 /** filter posts by author, sort by date */
 const posts = allPosts
@@ -28,7 +29,7 @@ const author = authorData[posts[0].frontmatter.author];
 			{title}
 			{description}
 			image={posts[0].frontmatter.image}
-			canonicalURL={Astro.canonicalURL.toString()}
+			canonicalURL={canonicalURL.toString()}
 		/>
 
 		<style lang="scss">
diff --git a/examples/blog-multiple-authors/src/pages/index.astro b/examples/blog-multiple-authors/src/pages/index.astro
index 91168ed43..8e47b8f15 100644
--- a/examples/blog-multiple-authors/src/pages/index.astro
+++ b/examples/blog-multiple-authors/src/pages/index.astro
@@ -12,7 +12,7 @@ import authorData from "../data/authors.json";
 // All variables are available to use in the HTML template below.
 let title = "Don’s Blog";
 let description = "An example blog on Astro";
-let canonicalURL = Astro.canonicalURL;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 
 // Data Fetching: List all Markdown posts in the repo.
 let allPosts = await Astro.glob("./post/*.md");
diff --git a/examples/blog-multiple-authors/src/pages/posts/[...page].astro b/examples/blog-multiple-authors/src/pages/posts/[...page].astro
index 8a6c9a730..3c6488855 100644
--- a/examples/blog-multiple-authors/src/pages/posts/[...page].astro
+++ b/examples/blog-multiple-authors/src/pages/posts/[...page].astro
@@ -32,7 +32,7 @@ export async function getStaticPaths({ paginate, rss }) {
 // page
 const title = "Don’s Blog";
 const description = "An example blog on Astro";
-const { canonicalURL } = Astro;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 const { page } = Astro.props;
 ---
 
diff --git a/examples/blog/astro.config.mjs b/examples/blog/astro.config.mjs
index 08916b1fe..39670fcbd 100644
--- a/examples/blog/astro.config.mjs
+++ b/examples/blog/astro.config.mjs
@@ -4,4 +4,5 @@ import preact from '@astrojs/preact';
 // https://astro.build/config
 export default defineConfig({
 	integrations: [preact()],
+	site: `http://astro.build`
 });
diff --git a/examples/blog/src/components/BaseHead.astro b/examples/blog/src/components/BaseHead.astro
index f7395b4e3..cc6f89ff1 100644
--- a/examples/blog/src/components/BaseHead.astro
+++ b/examples/blog/src/components/BaseHead.astro
@@ -6,6 +6,7 @@ export interface Props {
 	description: string;
 }
 
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 const { title, description } = Astro.props;
 ---
 
@@ -21,14 +22,14 @@ const { title, description } = Astro.props;
 
 <!-- Open Graph / Facebook -->
 <meta property="og:type" content="website" />
-<meta property="og:url" content={Astro.canonicalURL} />
+<meta property="og:url" content={canonicalURL} />
 <meta property="og:title" content={title} />
 <meta property="og:description" content={description} />
 <meta property="og:image" content="https://astro.build/social.png" />
 
 <!-- Twitter -->
 <meta property="twitter:card" content="summary_large_image" />
-<meta property="twitter:url" content={Astro.canonicalURL} />
+<meta property="twitter:url" content={canonicalURL} />
 <meta property="twitter:title" content={title} />
 <meta property="twitter:description" content={description} />
 <meta property="twitter:image" content="https://astro.build/social.png" />
diff --git a/examples/docs/astro.config.mjs b/examples/docs/astro.config.mjs
index 7ae8d6f7b..da05d8c36 100644
--- a/examples/docs/astro.config.mjs
+++ b/examples/docs/astro.config.mjs
@@ -10,4 +10,5 @@ export default defineConfig({
 		// Enable React for the Algolia search component.
 		react(),
 	],
+	site: `http://astro.build`
 });
diff --git a/examples/docs/src/components/HeadSEO.astro b/examples/docs/src/components/HeadSEO.astro
index 5d1a2bcb5..43a19c52b 100644
--- a/examples/docs/src/components/HeadSEO.astro
+++ b/examples/docs/src/components/HeadSEO.astro
@@ -5,7 +5,9 @@ export interface Props {
 	site: any;
 	canonicalURL: URL | string;
 }
-const { content = {}, canonicalURL } = Astro.props;
+
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
+const { content = {} } = Astro.props;
 const formattedContentTitle = content.title ? `${content.title} 🚀 ${SITE.title}` : SITE.title;
 const imageSrc = content?.image?.src ?? OPEN_GRAPH.image.src;
 const canonicalImageSrc = new URL(imageSrc, Astro.site);
diff --git a/examples/docs/src/layouts/MainLayout.astro b/examples/docs/src/layouts/MainLayout.astro
index e9812acdd..93ba323e4 100644
--- a/examples/docs/src/layouts/MainLayout.astro
+++ b/examples/docs/src/layouts/MainLayout.astro
@@ -9,7 +9,8 @@ import RightSidebar from "../components/RightSidebar/RightSidebar.astro";
 import * as CONFIG from "../config";
 
 const { content = {} } = Astro.props;
-const currentPage = new URL(Astro.request.url).pathname;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
+const currentPage = Astro.url.pathname;
 const currentFile = `src/pages${currentPage.replace(/\/$/, "")}.md`;
 const githubEditUrl = CONFIG.GITHUB_EDIT_URL && CONFIG.GITHUB_EDIT_URL + currentFile;
 ---
@@ -17,7 +18,7 @@ const githubEditUrl = CONFIG.GITHUB_EDIT_URL && CONFIG.GITHUB_EDIT_URL + current
 <html dir={content.dir ?? "ltr"} lang={content.lang ?? "en-us"} class="initial">
 	<head>
 		<HeadCommon />
-		<HeadSEO {content} canonicalURL={Astro.canonicalURL} />
+		<HeadSEO {content} canonicalURL={canonicalURL} />
 		<title>{content.title ? `${content.title} 🚀 ${CONFIG.SITE.title}` : CONFIG.SITE.title}</title>
 		<style>
 			body {
diff --git a/packages/astro/src/@types/astro.ts b/packages/astro/src/@types/astro.ts
index f4bb441c3..2fa7a4caf 100644
--- a/packages/astro/src/@types/astro.ts
+++ b/packages/astro/src/@types/astro.ts
@@ -85,15 +85,29 @@ export interface BuildConfig {
  * [Astro reference](https://docs.astro.build/reference/api-reference/#astro-global)
  */
 export interface AstroGlobal extends AstroGlobalPartial {
-	/** Canonical URL of the current page. If the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option is set, its origin will be the origin of this URL.
-	 *
-	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrocanonicalurl)
+	/** 
+	 * Canonical URL of the current page.
+	 * @deprecated Use `Astro.url` instead.
+	 * 
+	 * Example:
+	 * ```astro
+	 * ---
+	 * const canonicalURL = new URL(Astro.url.pathname, Astro.site);
+	 * ---
+	 * ```
 	 */
 	canonicalURL: URL;
 	/** The address (usually IP address) of the user. Used with SSR only.
 	 *
 	 */
 	clientAddress: string;
+	/**
+	 * A full URL object of the request URL. 
+	 * Equivalent to: `new URL(Astro.request.url)`
+	 * 
+	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#url)
+	 */
+	url: URL;
 	/** Parameters passed to a dynamic page generated using [getStaticPaths](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
 	 *
 	 * Example usage:
@@ -224,11 +238,9 @@ export interface AstroGlobalPartial {
 	/**
 	 * Returns a [URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) object built from the [site](https://docs.astro.build/en/reference/configuration-reference/#site) config option
 	 *
-	 * If `site` is undefined, the URL object will instead be built from `localhost`
-	 *
 	 * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astrosite)
 	 */
-	site: URL;
+	site: URL | undefined;
 }
 
 type ServerConfig = {
diff --git a/packages/astro/src/core/config.ts b/packages/astro/src/core/config.ts
index b474b29df..75fabdc89 100644
--- a/packages/astro/src/core/config.ts
+++ b/packages/astro/src/core/config.ts
@@ -114,11 +114,7 @@ export const AstroConfigSchema = z.object({
 		.string()
 		.url()
 		.optional()
-		.transform((val) => (val ? appendForwardSlash(val) : val))
-		.refine((val) => !val || new URL(val).pathname.length <= 1, {
-			message:
-				'"site" must be a valid URL origin (ex: "https://example.com") but cannot contain a URL path (ex: "https://example.com/blog"). Use "base" to configure your deployed URL path',
-		}),
+		.transform((val) => (val ? appendForwardSlash(val) : val)),
 	base: z
 		.string()
 		.optional()
diff --git a/packages/astro/src/core/render/result.ts b/packages/astro/src/core/render/result.ts
index 4ecf04b44..45190e71d 100644
--- a/packages/astro/src/core/render/result.ts
+++ b/packages/astro/src/core/render/result.ts
@@ -14,7 +14,7 @@ import type {
 import { renderSlot } from '../../runtime/server/index.js';
 import { LogOptions, warn } from '../logger/core.js';
 import { isScriptRequest } from './script.js';
-import { createCanonicalURL, isCSSRequest } from './util.js';
+import { isCSSRequest } from './util.js';
 
 const clientAddressSymbol = Symbol.for('astro.clientAddress');
 
@@ -109,16 +109,10 @@ class Slots {
 
 let renderMarkdown: any = null;
 
-function isPaginatedRoute({ page }: { page?: Page }) {
-	return page && 'currentPage' in page;
-}
-
 export function createResult(args: CreateResultArgs): SSRResult {
-	const { markdown, params, pathname, props: pageProps, renderers, request, resolve, site } = args;
+	const { markdown, params, pathname, props: pageProps, renderers, request, resolve } = args;
 
-	const paginated = isPaginatedRoute(pageProps);
 	const url = new URL(request.url);
-	const canonicalURL = createCanonicalURL('.' + pathname, site ?? url.origin, paginated);
 	const headers = new Headers();
 	if (args.streaming) {
 		headers.set('Transfer-Encoding', 'chunked');
@@ -155,7 +149,6 @@ export function createResult(args: CreateResultArgs): SSRResult {
 
 			const Astro = {
 				__proto__: astroGlobal,
-				canonicalURL,
 				get clientAddress() {
 					if (!(clientAddressSymbol in request)) {
 						if (args.adapterName) {
@@ -174,6 +167,7 @@ export function createResult(args: CreateResultArgs): SSRResult {
 				params,
 				props,
 				request,
+				url,
 				redirect: args.ssr
 					? (path: string) => {
 							return new Response(null, {
@@ -220,6 +214,24 @@ ${extra}`
 				slots: astroSlots,
 			} as unknown as AstroGlobal;
 
+			Object.defineProperty(Astro, 'canonicalURL', {
+				get: function() {
+					warn(args.logging,
+						'deprecation',
+						`${bold(
+							'Astro.canonicalURL'
+						)} is deprecated! Use \`Astro.url\` instead.
+Example:
+
+---
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
+---
+`
+					);
+					return new URL(this.request.url.pathname, this.site);
+				},
+			});
+
 			Object.defineProperty(Astro, '__renderMarkdown', {
 				// Ensure this API is not exposed to users
 				enumerable: false,
diff --git a/packages/astro/src/core/render/util.ts b/packages/astro/src/core/render/util.ts
index fa370c7c0..2f2c95595 100644
--- a/packages/astro/src/core/render/util.ts
+++ b/packages/astro/src/core/render/util.ts
@@ -2,18 +2,6 @@ import npath from 'path-browserify';
 import type { ModuleNode, ViteDevServer } from 'vite';
 import type { Metadata } from '../../runtime/server/metadata.js';
 
-/** Normalize URL to its canonical form */
-export function createCanonicalURL(url: string, base?: string, paginated?: boolean): URL {
-	let pathname = url.replace(/\/index.html$/, ''); // index.html is not canonical
-	// Only trim the first page's /1 param if Astro's paginated() was used
-	if (paginated) {
-		pathname = pathname.replace(/\/1\/?$/, ''); // neither is a trailing /1/ (impl. detail of collections)
-	}
-	if (!npath.extname(pathname)) pathname = pathname.replace(/(\/+)?$/, '/'); // add trailing slash if there’s no extension
-	pathname = pathname.replace(/\/+/g, '/'); // remove duplicate slashes (URL() won’t)
-	return new URL(pathname, base);
-}
-
 /** Check if a URL is already valid */
 export function isValidURL(url: string): boolean {
 	try {
diff --git a/packages/astro/src/core/request.ts b/packages/astro/src/core/request.ts
index 6f356b068..59d8acae9 100644
--- a/packages/astro/src/core/request.ts
+++ b/packages/astro/src/core/request.ts
@@ -38,16 +38,6 @@ export function createRequest({
 	});
 
 	Object.defineProperties(request, {
-		canonicalURL: {
-			get() {
-				warn(
-					logging,
-					'deprecation',
-					`Astro.request.canonicalURL has been moved to Astro.canonicalURL`
-				);
-				return undefined;
-			},
-		},
 		params: {
 			get() {
 				warn(logging, 'deprecation', `Astro.request.params has been moved to Astro.params`);
diff --git a/packages/astro/src/runtime/server/index.ts b/packages/astro/src/runtime/server/index.ts
index 5cc44b29e..59473798d 100644
--- a/packages/astro/src/runtime/server/index.ts
+++ b/packages/astro/src/runtime/server/index.ts
@@ -516,11 +516,11 @@ function createAstroGlobFn() {
 // Inside of getStaticPaths.
 export function createAstro(
 	filePathname: string,
-	_site: string,
+	_site: string | undefined,
 	projectRootStr: string
 ): AstroGlobalPartial {
-	const site = new URL(_site);
-	const url = new URL(filePathname, site);
+	const site = _site ? new URL(_site) : undefined;
+	const referenceURL = new URL(filePathname, `http://localhost`);
 	const projectRoot = new URL(projectRootStr);
 	return {
 		site,
@@ -528,7 +528,7 @@ export function createAstro(
 		glob: createAstroGlobFn(),
 		// INVESTIGATE is there a use-case for multi args?
 		resolve(...segments: string[]) {
-			let resolved = segments.reduce((u, segment) => new URL(segment, u), url).pathname;
+			let resolved = segments.reduce((u, segment) => new URL(segment, u), referenceURL).pathname;
 			// When inside of project root, remove the leading path so you are
 			// left with only `/src/images/tower.png`
 			if (resolved.startsWith(projectRoot.pathname)) {
diff --git a/packages/astro/src/vite-plugin-astro/compile.ts b/packages/astro/src/vite-plugin-astro/compile.ts
index b37bd0c5f..02c3753c4 100644
--- a/packages/astro/src/vite-plugin-astro/compile.ts
+++ b/packages/astro/src/vite-plugin-astro/compile.ts
@@ -77,9 +77,7 @@ async function compile({
 		// For Windows compat, prepend the module ID with `/@fs`
 		pathname: `/@fs${prependForwardSlash(moduleId)}`,
 		projectRoot: config.root.toString(),
-		site: config.site
-			? new URL(config.base, config.site).toString()
-			: `http://localhost:${config.server.port}/`,
+		site: config.site?.toString(),
 		sourcefile: filename,
 		sourcemap: 'both',
 		internalURL: `/@fs${prependForwardSlash(
diff --git a/packages/astro/test/astro-get-static-paths.test.js b/packages/astro/test/astro-get-static-paths.test.js
index 2c4559d81..c855af042 100644
--- a/packages/astro/test/astro-get-static-paths.test.js
+++ b/packages/astro/test/astro-get-static-paths.test.js
@@ -100,8 +100,8 @@ describe('getStaticPaths - numeric route params', () => {
 
 			const canonical = $('link[rel=canonical]');
 			expect(canonical.attr('href')).to.equal(
-				`https://mysite.dev/posts/${page}/`,
-				`doesn't trim the /${page}/ route param`
+				`https://mysite.dev/posts/${page}`,
+				`doesn't trim the /${page} route param`
 			);
 		}
 	});
diff --git a/packages/astro/test/astro-global.test.js b/packages/astro/test/astro-global.test.js
index a68ae039f..ddd24a953 100644
--- a/packages/astro/test/astro-global.test.js
+++ b/packages/astro/test/astro-global.test.js
@@ -8,7 +8,7 @@ describe('Astro Global', () => {
 	before(async () => {
 		fixture = await loadFixture({
 			root: './fixtures/astro-global/',
-			site: 'https://mysite.dev/',
+			site: 'https://mysite.dev/blog/',
 			base: '/blog',
 		});
 	});
@@ -50,23 +50,6 @@ describe('Astro Global', () => {
 			expect($('#nested-child-pathname').text()).to.equal('/blog/');
 		});
 
-		it('Astro.canonicalURL', async () => {
-			// given a URL, expect the following canonical URL
-			const canonicalURLs = {
-				'/index.html': 'https://mysite.dev/blog/',
-				'/post/post/index.html': 'https://mysite.dev/blog/post/post/',
-				'/posts/1/index.html': 'https://mysite.dev/blog/posts/',
-				'/posts/2/index.html': 'https://mysite.dev/blog/posts/2/',
-			};
-
-			for (const [url, canonicalURL] of Object.entries(canonicalURLs)) {
-				const html = await fixture.readFile(url);
-
-				const $ = cheerio.load(html);
-				expect($('link[rel="canonical"]').attr('href')).to.equal(canonicalURL);
-			}
-		});
-
 		it('Astro.site', async () => {
 			const html = await fixture.readFile('/index.html');
 			const $ = cheerio.load(html);
@@ -134,27 +117,10 @@ describe('Astro Global Defaults', () => {
 			expect($('#nested-child-pathname').text()).to.equal('/');
 		});
 
-		it('Astro.canonicalURL', async () => {
-			// given a URL, expect the following canonical URL
-			const canonicalURLs = {
-				'/index.html': /http:\/\/localhost:\d+\//,
-				'/post/post/index.html': /http:\/\/localhost:\d+\/post\/post\//,
-				'/posts/1/index.html': /http:\/\/localhost:\d+\/posts\//,
-				'/posts/2/index.html': /http:\/\/localhost:\d+\/posts\/2\//,
-			};
-
-			for (const [url, canonicalURL] of Object.entries(canonicalURLs)) {
-				const html = await fixture.readFile(url);
-
-				const $ = cheerio.load(html);
-				expect($('link[rel="canonical"]').attr('href')).to.match(canonicalURL);
-			}
-		});
-
 		it('Astro.site', async () => {
 			const html = await fixture.readFile('/index.html');
 			const $ = cheerio.load(html);
-			expect($('#site').attr('href')).to.match(/http:\/\/localhost:\d+\//);
+			expect($('#site').attr('href')).to.equal(undefined);
 		});
 	});
 });
diff --git a/packages/astro/test/custom-404.test.js b/packages/astro/test/custom-404.test.js
index 099fa5aad..a3294d9b1 100644
--- a/packages/astro/test/custom-404.test.js
+++ b/packages/astro/test/custom-404.test.js
@@ -8,6 +8,7 @@ describe('Custom 404', () => {
 	before(async () => {
 		fixture = await loadFixture({
 			root: './fixtures/custom-404/',
+			site: 'http://example.com',
 		});
 	});
 
@@ -35,7 +36,7 @@ describe('Custom 404', () => {
 			$ = cheerio.load(html);
 
 			expect($('h1').text()).to.equal('Page not found');
-			expect($('p').text()).to.equal('/a/');
+			expect($('p').text()).to.equal('/a');
 		});
 	});
 });
diff --git a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro
index 8d7a0c0c5..8ec05bc7c 100644
--- a/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro
+++ b/packages/astro/test/fixtures/astro-get-static-paths/src/pages/posts/[page].astro
@@ -14,6 +14,7 @@ export async function getStaticPaths() {
 };
 
 const { page } = Astro.params
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html lang="en">
@@ -21,7 +22,7 @@ const { page } = Astro.params
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width" />
 		<title>Posts Page {page}</title>
-		<link rel="canonical" href={Astro.canonicalURL.href}>
+		<link rel="canonical" href={canonicalURL.href}>
 	</head>
 	<body>
 		<h1>Welcome to page {page}</h1>
diff --git a/packages/astro/test/fixtures/astro-global/src/components/Child.astro b/packages/astro/test/fixtures/astro-global/src/components/Child.astro
index 911e5464b..aede72b6f 100644
--- a/packages/astro/test/fixtures/astro-global/src/components/Child.astro
+++ b/packages/astro/test/fixtures/astro-global/src/components/Child.astro
@@ -1,5 +1,5 @@
 ---
 import NestedChild from './NestedChild.astro';
 ---
-<div id="child-pathname">{new URL(Astro.request.url).pathname}</div>
+<div id="child-pathname">{Astro.url.pathname}</div>
 <NestedChild />
diff --git a/packages/astro/test/fixtures/astro-global/src/components/NestedChild.astro b/packages/astro/test/fixtures/astro-global/src/components/NestedChild.astro
index 809a0d68d..b186e9cd1 100644
--- a/packages/astro/test/fixtures/astro-global/src/components/NestedChild.astro
+++ b/packages/astro/test/fixtures/astro-global/src/components/NestedChild.astro
@@ -1 +1 @@
-<div id="nested-child-pathname">{new URL(Astro.request.url).pathname}</div>
+<div id="nested-child-pathname">{Astro.url.pathname}</div>
diff --git a/packages/astro/test/fixtures/astro-global/src/layouts/post.astro b/packages/astro/test/fixtures/astro-global/src/layouts/post.astro
index ba9377278..7ffde0531 100644
--- a/packages/astro/test/fixtures/astro-global/src/layouts/post.astro
+++ b/packages/astro/test/fixtures/astro-global/src/layouts/post.astro
@@ -1,10 +1,11 @@
 ---
 const { content } = Astro.props;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site ?? `http://example.com`);
 ---
 <html>
   <head>
     <title>{content.title}</title>
-    <link rel="canonical" href={Astro.canonicalURL.href}>
+    <link rel="canonical" href={canonicalURL.href}>
   </head>
   <body>
     <slot></slot>
diff --git a/packages/astro/test/fixtures/astro-global/src/pages/index.astro b/packages/astro/test/fixtures/astro-global/src/pages/index.astro
index 6e51e2768..ad6012ce6 100644
--- a/packages/astro/test/fixtures/astro-global/src/pages/index.astro
+++ b/packages/astro/test/fixtures/astro-global/src/pages/index.astro
@@ -1,14 +1,15 @@
 ---
 import Child from '../components/Child.astro';
+const canonicalURL = new URL(Astro.url.pathname, Astro.site ?? `http://example.com`);
 ---
 <html>
 <head>
   <title>Test</title>
-  <link rel="canonical" href={Astro.canonicalURL.href}>
+  <link rel="canonical" href={canonicalURL.href}>
 </head>
 <body>
-  <div id="pathname">{new URL(Astro.request.url).pathname}</div>
-  <div id="searchparams">{JSON.stringify(new URL(Astro.request.url).searchParams)}</div>
+  <div id="pathname">{Astro.url.pathname}</div>
+  <div id="searchparams">{JSON.stringify(Astro.url.searchParams)}</div>
   <a id="site" href={Astro.site}>Home</a>
 
   <Child />
diff --git a/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro b/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro
index ee34156db..0950ebe26 100644
--- a/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro
+++ b/packages/astro/test/fixtures/astro-global/src/pages/posts/[page].astro
@@ -4,7 +4,7 @@ export async function getStaticPaths({paginate}) {
   return paginate(data, {pageSize: 1});
 }
 const { page } = Astro.props;
-const { params, canonicalURL } = Astro;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site ?? `http://example.com`);
 ---
 
 <html>
@@ -13,7 +13,7 @@ const { params, canonicalURL } = Astro;
     <link rel="canonical" href={canonicalURL.href} />
   </head>
   <body>
-    {page.data.map((data) => (
+    {page.data.map((data: any) => (
       <div>
         <h1>{data.frontmatter.title}</h1>
         <a class="post-url" href={data.url}>Read</a>
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro b/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro
index afd2203de..bdff86266 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/index.astro
@@ -1,12 +1,13 @@
 ---
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 <html>
 <head>
   <title>Test</title>
-  <link rel="canonical" href={Astro.canonicalURL.href}>
+  <link rel="canonical" href={canonicalURL.href}>
 </head>
 <body>
-  <div id="pathname">{new URL(Astro.request.url).pathname}</div>
+  <div id="pathname">{Astro.url.pathname}</div>
   <a id="site" href={Astro.site}>Home</a>
 </body>
 </html>
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro
index ba51548a1..49a2f702e 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/[slug]/[page].astro
@@ -11,7 +11,8 @@ export async function getStaticPaths({paginate}) {
   });
 }
 const { page, filter } = Astro.props;
-const { params, canonicalURL} = Astro;
+const { params } = Astro;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html>
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro
index a3efb9b45..c908f1c43 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/named-root-page/[page].astro
@@ -3,8 +3,7 @@ export async function getStaticPaths({paginate}) {
   const data = await Astro.glob('../../post/*.md');
   return paginate(data, {pageSize: 1});
 }
-const { page } = Astro.props;
-const { params, canonicalURL} = Astro;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html>
diff --git a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro
index a3efb9b45..c908f1c43 100644
--- a/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro
+++ b/packages/astro/test/fixtures/astro-pagination/src/pages/posts/optional-root-page/[...page].astro
@@ -3,8 +3,7 @@ export async function getStaticPaths({paginate}) {
   const data = await Astro.glob('../../post/*.md');
   return paginate(data, {pageSize: 1});
 }
-const { page } = Astro.props;
-const { params, canonicalURL} = Astro;
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html>
diff --git a/packages/astro/test/fixtures/custom-404/src/pages/404.astro b/packages/astro/test/fixtures/custom-404/src/pages/404.astro
index 85b800bc9..63d560b0f 100644
--- a/packages/astro/test/fixtures/custom-404/src/pages/404.astro
+++ b/packages/astro/test/fixtures/custom-404/src/pages/404.astro
@@ -1,4 +1,5 @@
 ---
+const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 ---
 
 <html lang="en">
@@ -7,6 +8,6 @@
 </head>
 <body>
   <h1>Page not found</h1>
-	<p>{Astro.canonicalURL.pathname}</p>
+	<p>{canonicalURL.pathname}</p>
 </body>
 </html>
diff --git a/packages/astro/test/fixtures/ssr-request/src/pages/request.astro b/packages/astro/test/fixtures/ssr-request/src/pages/request.astro
index ae7cb0187..63da97027 100644
--- a/packages/astro/test/fixtures/ssr-request/src/pages/request.astro
+++ b/packages/astro/test/fixtures/ssr-request/src/pages/request.astro
@@ -1,5 +1,5 @@
 ---
-const origin = new URL(Astro.request.url).origin;
+const origin = Astro.url.origin;
 ---
 
 <html>