update prettier width (#2968)

withastro · Apr 2, 2022 · 1335797 · 1335797
1 parent d63213f
commit 1335797
Show file tree

Hide file tree

Showing 146 changed files with 2,135 additions and 484 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,5 +1,5 @@
 {
-  "printWidth": 180,
+  "printWidth": 100,
   "semi": true,
   "singleQuote": true,
   "tabWidth": 2,

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,4 +1,9 @@
 {
-  "recommendations": ["astro-build.astro-vscode", "esbenp.prettier-vscode", "editorconfig.editorconfig", "dbaeumer.vscode-eslint"],
+  "recommendations": [
+    "astro-build.astro-vscode",
+    "esbenp.prettier-vscode",
+    "editorconfig.editorconfig",
+    "dbaeumer.vscode-eslint"
+  ],
   "unwantedRecommendations": []
 }
diff --git a/examples/blog/src/styles/blog.css b/examples/blog/src/styles/blog.css
@@ -1,8 +1,10 @@
 :root {
-	--font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+	--font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif,
+		Apple Color Emoji, Segoe UI Emoji;
 	--font-body: 'IBM Plex Sans', var(--font-fallback);
-	--font-mono: 'IBM Plex Mono', Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono',
-		'Liberation Mono', 'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
+	--font-mono: 'IBM Plex Mono', Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console',
+		'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono',
+		'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
 
 	--color-white: #fff;
 	--color-black: #000014;

diff --git a/examples/docs/src/components/Header/LanguageSelect.tsx b/examples/docs/src/components/Header/LanguageSelect.tsx
@@ -6,8 +6,19 @@ import { KNOWN_LANGUAGES, langPathRegex } from '../../languages';
 const LanguageSelect: FunctionalComponent<{ lang: string }> = ({ lang }) => {
 	return (
 		<div class="language-select-wrapper">
-			<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 88.6 77.3" height="1.2em" width="1.2em">
-				<path fill="currentColor" d="M61,24.6h7.9l18.7,51.6h-7.7l-5.4-15.5H54.3l-5.6,15.5h-7.2L61,24.6z M72.6,55l-8-22.8L56.3,55H72.6z" />
+			<svg
+				aria-hidden="true"
+				focusable="false"
+				role="img"
+				xmlns="http://www.w3.org/2000/svg"
+				viewBox="0 0 88.6 77.3"
+				height="1.2em"
+				width="1.2em"
+			>
+				<path
+					fill="currentColor"
+					d="M61,24.6h7.9l18.7,51.6h-7.7l-5.4-15.5H54.3l-5.6,15.5h-7.2L61,24.6z M72.6,55l-8-22.8L56.3,55H72.6z"
+				/>
 				<path
 					fill="currentColor"
 					d="M53.6,60.6c-10-4-16-9-22-14c0,0,1.3,1.3,0,0c-6,5-20,13-20,13l-4-6c8-5,10-6,19-13c-2.1-1.9-12-13-13-19h8          c4,9,10,14,10,14c10-8,10-19,10-19h8c0,0-1,13-12,24l0,0c5,5,10,9,19,13L53.6,60.6z M1.6,16.6h56v-8h-23v-7h-9v7h-24V16.6z"

diff --git a/examples/docs/src/components/Header/Search.tsx b/examples/docs/src/components/Header/Search.tsx
@@ -41,7 +41,13 @@ export default function Search() {
 		<>
 			<button type="button" ref={searchButtonRef} onClick={onOpen} className="search-input">
 				<svg width="24" height="24" fill="none">
-					<path d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
+					<path
+						d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z"
+						stroke="currentColor"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					/>
 				</svg>
 				<span>Search</span>
 				<span className="search-hint">

diff --git a/examples/docs/src/components/Header/SidebarToggle.tsx b/examples/docs/src/components/Header/SidebarToggle.tsx
@@ -15,9 +15,26 @@ const MenuToggle: FunctionalComponent = () => {
 	}, [sidebarShown]);
 
 	return (
-		<button type="button" aria-pressed={sidebarShown ? 'true' : 'false'} id="menu-toggle" onClick={() => setSidebarShown(!sidebarShown)}>
-			<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-				<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
+		<button
+			type="button"
+			aria-pressed={sidebarShown ? 'true' : 'false'}
+			id="menu-toggle"
+			onClick={() => setSidebarShown(!sidebarShown)}
+		>
+			<svg
+				xmlns="http://www.w3.org/2000/svg"
+				width="1em"
+				height="1em"
+				fill="none"
+				viewBox="0 0 24 24"
+				stroke="currentColor"
+			>
+				<path
+					stroke-linecap="round"
+					stroke-linejoin="round"
+					stroke-width="2"
+					d="M4 6h16M4 12h16M4 18h16"
+				/>
 			</svg>
 			<span className="sr-only">Toggle sidebar</span>
 		</button>

diff --git a/examples/docs/src/components/RightSidebar/TableOfContents.tsx b/examples/docs/src/components/RightSidebar/TableOfContents.tsx
@@ -33,7 +33,11 @@ const TableOfContents: FunctionalComponent<{ headers: any[] }> = ({ headers = []
 				{headers
 					.filter(({ depth }) => depth > 1 && depth < 4)
 					.map((header) => (
-						<li class={`header-link depth-${header.depth} ${activeId === header.slug ? 'active' : ''}`.trim()}>
+						<li
+							class={`header-link depth-${header.depth} ${
+								activeId === header.slug ? 'active' : ''
+							}`.trim()}
+						>
 							<a href={`#${header.slug}`}>{header.text}</a>
 						</li>
 					))}

diff --git a/examples/docs/src/components/RightSidebar/ThemeToggleButton.tsx b/examples/docs/src/components/RightSidebar/ThemeToggleButton.tsx
@@ -6,14 +6,26 @@ import './ThemeToggleButton.css';
 const themes = ['light', 'dark'];
 
 const icons = [
-	<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="currentColor">
+	<svg
+		xmlns="http://www.w3.org/2000/svg"
+		width="20"
+		height="20"
+		viewBox="0 0 20 20"
+		fill="currentColor"
+	>
 		<path
 			fillRule="evenodd"
 			d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
 			clipRule="evenodd"
 		/>
 	</svg>,
-	<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="currentColor">
+	<svg
+		xmlns="http://www.w3.org/2000/svg"
+		width="20"
+		height="20"
+		viewBox="0 0 20 20"
+		fill="currentColor"
+	>
 		<path d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z" />
 	</svg>,
 ];

diff --git a/examples/docs/src/config.ts b/examples/docs/src/config.ts
@@ -7,7 +7,9 @@ export const SITE = {
 export const OPEN_GRAPH = {
 	image: {
 		src: 'https://github.com/withastro/astro/blob/main/assets/social/banner.jpg?raw=true',
-		alt: 'astro logo on a starry expanse of space,' + ' with a purple saturn-like planet floating in the right foreground',
+		alt:
+			'astro logo on a starry expanse of space,' +
+			' with a purple saturn-like planet floating in the right foreground',
 	},
 	twitter: 'astrodotbuild',
 };

diff --git a/examples/docs/src/styles/theme.css b/examples/docs/src/styles/theme.css
@@ -1,8 +1,10 @@
 :root {
-	--font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+	--font-fallback: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif,
+		Apple Color Emoji, Segoe UI Emoji;
 	--font-body: system-ui, var(--font-fallback);
-	--font-mono: 'IBM Plex Mono', Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono',
-		'Liberation Mono', 'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
+	--font-mono: 'IBM Plex Mono', Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console',
+		'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono',
+		'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
 
 	/*
    * Variables with --color-base prefix define

diff --git a/examples/portfolio/src/components/Nav/index.jsx b/examples/portfolio/src/components/Nav/index.jsx
@@ -24,7 +24,13 @@ function Nav() {
 				</svg>
 			</a>
 			<a className={Styles.social} href="https://dev.to/me">
-				<svg className={Styles.socialicon} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 40" style="enable-background:new 0 0 50 40" xmlSpace="preserve">
+				<svg
+					className={Styles.socialicon}
+					xmlns="http://www.w3.org/2000/svg"
+					viewBox="0 0 50 40"
+					style="enable-background:new 0 0 50 40"
+					xmlSpace="preserve"
+				>
 					<path d="M15.7 15.5c-.4-.3-.7-.4-1.1-.4h-1.7v10.1h1.7c.4 0 .8-.1 1.1-.4.4-.3.6-.7.6-1.3v-6.7c0-.6-.2-1-.6-1.3z" />
 					<path d="M47 0H3C1.3 0 0 1.3 0 3v34c0 1.7 1.3 3 3 3h44c1.7 0 3-1.3 3-3V3c0-1.7-1.3-3-3-3zM19.1 23.5c0 1.3-.4 2.4-1.3 3.2-.8.9-1.9 1.3-3.3 1.3h-4.4V12.3h4.5c1.3 0 2.4.4 3.2 1.3.8.8 1.3 1.9 1.3 3.2v6.7zm9.1-8.4h-5.1v3.6h3.1v2.8h-3.1v3.7h5.1V28h-5.9c-.6 0-1-.2-1.4-.6-.4-.4-.6-.8-.6-1.4V14.2c0-.6.2-1 .6-1.4.4-.4.8-.6 1.4-.6h5.9v2.9zM37.5 26c-.6 1.3-1.3 2-2.2 2-.9 0-1.7-.7-2.2-2l-3.7-13.8h3.1L35.3 23l2.8-10.8h3.1L37.5 26z" />
 				</svg>

diff --git a/examples/ssr/src/api.ts b/examples/ssr/src/api.ts
@@ -21,7 +21,11 @@ function getOrigin(request: Request): string {
 	return new URL(request.url).origin.replace('localhost', '127.0.0.1');
 }
 
-async function get<T>(incomingReq: Request, endpoint: string, cb: (response: Response) => Promise<T>): Promise<T> {
+async function get<T>(
+	incomingReq: Request,
+	endpoint: string,
+	cb: (response: Response) => Promise<T>
+): Promise<T> {
 	const response = await fetch(`${getOrigin(incomingReq)}${endpoint}`, {
 		credentials: 'same-origin',
 	});

diff --git a/examples/starter/src/styles/global.css b/examples/starter/src/styles/global.css
@@ -4,7 +4,8 @@
 }
 
 :root {
-	font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+	font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif,
+		Apple Color Emoji, Segoe UI Emoji;
 	font-size: 1rem;
 	--user-font-scale: 1rem - 16px;
 	font-size: clamp(0.875rem, 0.4626rem + 1.0309vw + var(--user-font-scale), 1.125rem);

diff --git a/examples/starter/src/styles/home.css b/examples/starter/src/styles/home.css
@@ -1,6 +1,7 @@
 :root {
-	--font-mono: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono',
-		'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
+	--font-mono: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter',
+		'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono', 'Nimbus Mono L', Monaco,
+		'Courier New', Courier, monospace;
 	--color-light: #f3f4f6;
 }
 

diff --git a/examples/with-markdown-plugins/astro.config.mjs b/examples/with-markdown-plugins/astro.config.mjs
@@ -6,6 +6,11 @@ export default defineConfig({
 	// Enable Custom Markdown options, plugins, etc.
 	markdown: {
 		remarkPlugins: ['remark-code-titles'],
-		rehypePlugins: [['rehype-autolink-headings', { behavior: 'prepend' }], ['rehype-toc', { headings: ['h2', 'h3'] }], [addClasses, { 'h1,h2,h3': 'title' }], 'rehype-slug'],
+		rehypePlugins: [
+			['rehype-autolink-headings', { behavior: 'prepend' }],
+			['rehype-toc', { headings: ['h2', 'h3'] }],
+			[addClasses, { 'h1,h2,h3': 'title' }],
+			'rehype-slug',
+		],
 	},
 });
diff --git a/examples/with-nanostores/src/styles/global.css b/examples/with-nanostores/src/styles/global.css
@@ -4,7 +4,8 @@
 }
 
 :root {
-	font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+	font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif,
+		Apple Color Emoji, Segoe UI Emoji;
 	font-size: 1rem;
 	--user-font-scale: 1rem - 16px;
 	font-size: clamp(0.875rem, 0.4626rem + 1.0309vw + var(--user-font-scale), 1.125rem);

diff --git a/examples/with-nanostores/src/styles/home.css b/examples/with-nanostores/src/styles/home.css
@@ -1,6 +1,7 @@
 :root {
-	--font-mono: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono',
-		'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
+	--font-mono: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter',
+		'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono', 'Nimbus Mono L', Monaco,
+		'Courier New', Courier, monospace;
 	--color-light: #f3f4f6;
 }
 

diff --git a/packages/astro-prism/internal.mjs b/packages/astro-prism/internal.mjs
@@ -8,7 +8,9 @@ export function addAstro(Prism) {
 		scriptLang = 'typescript';
 	} else {
 		scriptLang = 'javascript';
-		console.warn('Prism TypeScript language not loaded, Astro scripts will be treated as JavaScript.');
+		console.warn(
+			'Prism TypeScript language not loaded, Astro scripts will be treated as JavaScript.'
+		);
 	}
 
 	let script = Prism.util.clone(Prism.languages[scriptLang]);
@@ -38,10 +40,14 @@ export function addAstro(Prism) {
 	spread = re(spread).source;
 
 	Prism.languages.astro = Prism.languages.extend('markup', script);
-	Prism.languages.astro.tag.pattern = re(/<\/?(?:[\w.:-]+(?:<S>+(?:[\w.:$-]+(?:=(?:"(?:\\[^]|[^\\"])*"|'(?:\\[^]|[^\\'])*'|[^\s{'"/>=]+|<BRACES>))?|<SPREAD>))*<S>*\/?)?>/.source);
+	Prism.languages.astro.tag.pattern = re(
+		/<\/?(?:[\w.:-]+(?:<S>+(?:[\w.:$-]+(?:=(?:"(?:\\[^]|[^\\"])*"|'(?:\\[^]|[^\\'])*'|[^\s{'"/>=]+|<BRACES>))?|<SPREAD>))*<S>*\/?)?>/
+			.source
+	);
 
 	Prism.languages.astro.tag.inside['tag'].pattern = /^<\/?[^\s>\/]*/i;
-	Prism.languages.astro.tag.inside['attr-value'].pattern = /=(?!\{)(?:"(?:\\[^]|[^\\"])*"|'(?:\\[^]|[^\\'])*'|[^\s'">]+)/i;
+	Prism.languages.astro.tag.inside['attr-value'].pattern =
+		/=(?!\{)(?:"(?:\\[^]|[^\\"])*"|'(?:\\[^]|[^\\'])*'|[^\s'">]+)/i;
 	Prism.languages.astro.tag.inside['tag'].inside['class-name'] = /^[A-Z]\w*(?:\.[A-Z]\w*)*$/;
 	Prism.languages.astro.tag.inside['comment'] = script['comment'];
 
@@ -109,7 +115,11 @@ export function addAstro(Prism) {
 
 					if (token.content[0].content[0].content === '</') {
 						// Closing tag
-						if (openedTags.length > 0 && openedTags[openedTags.length - 1].tagName === stringifyToken(token.content[0].content[1])) {
+						if (
+							openedTags.length > 0 &&
+							openedTags[openedTags.length - 1].tagName ===
+								stringifyToken(token.content[0].content[1])
+						) {
 							// Pop matching opening tag
 							openedTags.pop();
 						}
@@ -127,7 +137,12 @@ export function addAstro(Prism) {
 				} else if (openedTags.length > 0 && token.type === 'punctuation' && token.content === '{') {
 					// Here we might have entered a Astro context inside a tag
 					openedTags[openedTags.length - 1].openedBraces++;
-				} else if (openedTags.length > 0 && openedTags[openedTags.length - 1].openedBraces > 0 && token.type === 'punctuation' && token.content === '}') {
+				} else if (
+					openedTags.length > 0 &&
+					openedTags[openedTags.length - 1].openedBraces > 0 &&
+					token.type === 'punctuation' &&
+					token.content === '}'
+				) {
 					// Here we might have left a Astro context inside a tag
 					openedTags[openedTags.length - 1].openedBraces--;
 				} else {
@@ -141,7 +156,10 @@ export function addAstro(Prism) {
 					let plainText = stringifyToken(token);
 
 					// And merge text with adjacent text
-					if (i < tokens.length - 1 && (typeof tokens[i + 1] === 'string' || tokens[i + 1].type === 'plain-text')) {
+					if (
+						i < tokens.length - 1 &&
+						(typeof tokens[i + 1] === 'string' || tokens[i + 1].type === 'plain-text')
+					) {
 						plainText += stringifyToken(tokens[i + 1]);
 						tokens.splice(i + 1, 1);
 					}

diff --git a/packages/astro/astro.js b/packages/astro/astro.js
@@ -9,15 +9,19 @@
 
 const CI_INSTRUCTIONS = {
 	NETLIFY: 'https://docs.netlify.com/configure-builds/manage-dependencies/#node-js-and-javascript',
-	GITHUB_ACTIONS: 'https://docs.github.com/en/actions/guides/building-and-testing-nodejs#specifying-the-nodejs-version',
+	GITHUB_ACTIONS:
+		'https://docs.github.com/en/actions/guides/building-and-testing-nodejs#specifying-the-nodejs-version',
 	VERCEL: 'https://vercel.com/docs/runtimes#official-runtimes/node-js/node-js-version',
 };
 
 /** `astro *` */
 async function main() {
 	// Check for ESM support.
 	// Load the "supports-esm" package in an way that works in both ESM & CJS.
-	let supportsESM = typeof require !== 'undefined' ? require('supports-esm') : (await import('supports-esm')).default;
+	let supportsESM =
+		typeof require !== 'undefined'
+			? require('supports-esm')
+			: (await import('supports-esm')).default;
 
 	// Check for CJS->ESM named export support.
 	// "path-to-regexp" is a real-world package that we depend on, that only
@@ -79,7 +83,9 @@ Please upgrade Node.js to a supported version: "${engines}"\n`);
 				break;
 			}
 		}
-		console.log(`${ci.name} CI Environment Detected!\nAdditional steps may be needed to set your Node.js version:`);
+		console.log(
+			`${ci.name} CI Environment Detected!\nAdditional steps may be needed to set your Node.js version:`
+		);
 		console.log(`Documentation: https://docs.astro.build/guides/deploy`);
 		if (CI_INSTRUCTIONS[platform]) {
 			console.log(`${ci.name} Documentation: ${CI_INSTRUCTIONS[platform]}`);