michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: update prettier to 3.0 (#7957)

Browse source
This commit is contained in:
Emanuele Stoppa 2023-08-08 13:01:38 +01:00 committed by GitHub
parent 7bd1b86f85
commit 0f1e9d8361
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 53 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.prettierrc.cjs
View file

@ -6,7 +6,7 @@ module.exports = {
tabWidth: 2, tabWidth: 2,
trailingComma: 'es5', trailingComma: 'es5',
useTabs: true, useTabs: true,
plugins: ['./node_modules/prettier-plugin-astro'], plugins: ['prettier-plugin-astro'],
overrides: [ overrides: [
{ {
files: ['.*', '*.json', '*.md', '*.toml', '*.yml'], files: ['.*', '*.json', '*.md', '*.toml', '*.yml'],

2
examples/blog/src/content/blog/markdown-style-guide.md
View file

@ -58,7 +58,7 @@ The blockquote element represents content that is quoted from another source, op
## Code Blocks ## Code Blocks
```html ```html
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />

6
package.json
View file

@ -14,7 +14,7 @@
"dev": "turbo run dev --concurrency=40 --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"", "dev": "turbo run dev --concurrency=40 --parallel --filter=astro --filter=create-astro --filter=\"@astrojs/*\" --filter=\"@benchmark/*\"",
"format": "pnpm run format:code", "format": "pnpm run format:code",
"format:ci": "pnpm run format:imports && pnpm run format:code", "format:ci": "pnpm run format:imports && pnpm run format:code",
"format:code": "prettier -w . --cache --plugin-search-dir=.", "format:code": "prettier -w . --cache",
"format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json", "format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json",
"test": "turbo run test --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"", "test": "turbo run test --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"",
"test:match": "cd packages/astro && pnpm run test:match", "test:match": "cd packages/astro && pnpm run test:match",
@ -88,8 +88,8 @@
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"only-allow": "^1.1.1", "only-allow": "^1.1.1",
"organize-imports-cli": "^0.10.0", "organize-imports-cli": "^0.10.0",
"prettier": "^2.8.8", "prettier": "^3.0.1",
"prettier-plugin-astro": "^0.10.0", "prettier-plugin-astro": "^0.11.0",
"tiny-glob": "^0.2.9", "tiny-glob": "^0.2.9",
"turbo": "^1.10.3", "turbo": "^1.10.3",
"typescript": "~5.1.6" "typescript": "~5.1.6"

2
packages/astro/astro-jsx.d.ts vendored
View file

@ -9,6 +9,8 @@
* Adapted from React’s TypeScript definition from DefinitelyTyped. * Adapted from React’s TypeScript definition from DefinitelyTyped.
* @see https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react/index.d.ts * @see https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react/index.d.ts
*/ */
// BUG! Prettier 3.0 removes `declare`: https://github.com/prettier/prettier/issues/15207
// prettier-ignore
declare namespace astroHTML.JSX { declare namespace astroHTML.JSX {
export type Child = Node | Node[] | string | number | boolean | null | undefined | unknown; export type Child = Node | Node[] | string | number | boolean | null | undefined | unknown;
export type Children = Child | Child[]; export type Children = Child | Child[];

12
packages/astro/content-types.template.d.ts vendored
View file

@ -44,7 +44,7 @@ declare module 'astro:content' {
import('astro/zod').ZodLiteral<'tiff'>, import('astro/zod').ZodLiteral<'tiff'>,
import('astro/zod').ZodLiteral<'webp'>, import('astro/zod').ZodLiteral<'webp'>,
import('astro/zod').ZodLiteral<'gif'>, import('astro/zod').ZodLiteral<'gif'>,
import('astro/zod').ZodLiteral<'svg'> import('astro/zod').ZodLiteral<'svg'>,
] ]
>; >;
}>; }>;
@ -87,7 +87,7 @@ declare module 'astro:content' {
export function getEntryBySlug< export function getEntryBySlug<
C extends keyof ContentEntryMap, C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {}) E extends ValidContentEntrySlug<C> | (string & {}),
>( >(
collection: C, collection: C,
// Note that this has to accept a regular string too, for SSR // Note that this has to accept a regular string too, for SSR
@ -112,7 +112,7 @@ declare module 'astro:content' {
export function getEntry< export function getEntry<
C extends keyof ContentEntryMap, C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {}) E extends ValidContentEntrySlug<C> | (string & {}),
>(entry: { >(entry: {
collection: C; collection: C;
slug: E; slug: E;
@ -121,7 +121,7 @@ declare module 'astro:content' {
: Promise<CollectionEntry<C> | undefined>; : Promise<CollectionEntry<C> | undefined>;
export function getEntry< export function getEntry<
C extends keyof DataEntryMap, C extends keyof DataEntryMap,
E extends keyof DataEntryMap[C] | (string & {}) E extends keyof DataEntryMap[C] | (string & {}),
>(entry: { >(entry: {
collection: C; collection: C;
id: E; id: E;
@ -130,7 +130,7 @@ declare module 'astro:content' {
: Promise<CollectionEntry<C> | undefined>; : Promise<CollectionEntry<C> | undefined>;
export function getEntry< export function getEntry<
C extends keyof ContentEntryMap, C extends keyof ContentEntryMap,
E extends ValidContentEntrySlug<C> | (string & {}) E extends ValidContentEntrySlug<C> | (string & {}),
>( >(
collection: C, collection: C,
slug: E slug: E
@ -139,7 +139,7 @@ declare module 'astro:content' {
: Promise<CollectionEntry<C> | undefined>; : Promise<CollectionEntry<C> | undefined>;
export function getEntry< export function getEntry<
C extends keyof DataEntryMap, C extends keyof DataEntryMap,
E extends keyof DataEntryMap[C] | (string & {}) E extends keyof DataEntryMap[C] | (string & {}),
>( >(
collection: C, collection: C,
id: E id: E

2
packages/astro/src/@types/astro.ts
View file

@ -1916,7 +1916,7 @@ export interface SSRLoadedRenderer extends AstroRenderer {
export type HookParameters< export type HookParameters<
Hook extends keyof AstroIntegration['hooks'], Hook extends keyof AstroIntegration['hooks'],
Fn = AstroIntegration['hooks'][Hook] Fn = AstroIntegration['hooks'][Hook],
> = Fn extends (...args: any) => any ? Parameters<Fn>[0] : never; > = Fn extends (...args: any) => any ? Parameters<Fn>[0] : never;
export interface AstroIntegration { export interface AstroIntegration {

2
packages/astro/src/vite-plugin-head/index.ts
View file

@ -16,7 +16,7 @@ export default function configHeadVitePlugin(): vite.Plugin {
function propagateMetadata< function propagateMetadata<
P extends keyof PluginMetadata['astro'], P extends keyof PluginMetadata['astro'],
V extends PluginMetadata['astro'][P] V extends PluginMetadata['astro'][P],
>( >(
this: { getModuleInfo(id: string): ModuleInfo | null }, this: { getModuleInfo(id: string): ModuleInfo | null },
id: string, id: string,

18
packages/integrations/image/README.md
View file

@ -130,14 +130,14 @@ import heroImage from '../assets/hero.png';
// optimized image, keeping the original width, height, and image format // optimized image, keeping the original width, height, and image format
<Image src={heroImage} alt="descriptive text" /> <Image src={heroImage} alt="descriptive text" />
// specify multiple sizes for responsive images or art direction // specify multiple sizes for responsive images or art direction
<Picture <Picture
src={heroImage} src={heroImage}
widths={[200, 400, 800]} widths={[200, 400, 800]}
sizes="(max-width: 800px) 100vw, 800px" sizes="(max-width: 800px) 100vw, 800px"
alt="descriptive text" alt="descriptive text"
/> />
--- ---
``` ```
The included image transformers support resizing images and encoding them to different image formats. Third-party image services will be able to add support for custom transformations as well (ex: `blur`, `filter`, `rotate`, etc). The included image transformers support resizing images and encoding them to different image formats. Third-party image services will be able to add support for custom transformations as well (ex: `blur`, `filter`, `rotate`, etc).
@ -566,16 +566,16 @@ import heroImage from '../assets/hero.png';
// optimized image, keeping the original width, height, and image format // optimized image, keeping the original width, height, and image format
<Image src={heroImage} alt="descriptive text" /> <Image src={heroImage} alt="descriptive text" />
// height will be recalculated to match the original aspect ratio // height will be recalculated to match the original aspect ratio
<Image src={heroImage} width={300} alt="descriptive text" /> <Image src={heroImage} width={300} alt="descriptive text" />
// cropping to a specific width and height // cropping to a specific width and height
<Image src={heroImage} width={300} height={600} alt="descriptive text" /> <Image src={heroImage} width={300} height={600} alt="descriptive text" />
// cropping to a specific aspect ratio and converting to an avif format // cropping to a specific aspect ratio and converting to an avif format
<Image src={heroImage} width={300} aspectRatio="16:9" format="avif" alt="descriptive text" /> <Image src={heroImage} width={300} aspectRatio="16:9" format="avif" alt="descriptive text" />
// image imports can also be inlined directly // image imports can also be inlined directly
<Image src={import('../assets/hero.png')} alt="descriptive text" /> <Image src={import('../assets/hero.png')} alt="descriptive text" />
``` ```
@ -612,7 +612,7 @@ const imageUrl = 'https://astro.build/assets/press/full-logo-dark.png';
// cropping to a specific width and height // cropping to a specific width and height
<Image src={imageUrl} width={750} height={250} format="avif" alt="descriptive text" /> <Image src={imageUrl} width={750} height={250} format="avif" alt="descriptive text" />
// height will be recalculated to match the aspect ratio // height will be recalculated to match the aspect ratio
<Image src={imageUrl} width={750} aspectRatio={16 / 9} format="avif" alt="descriptive text" /> <Image src={imageUrl} width={750} aspectRatio={16 / 9} format="avif" alt="descriptive text" />
``` ```
@ -641,7 +641,7 @@ const imageUrl =
alt="descriptive text" alt="descriptive text"
/> />
// Remote image (aspect ratio is required) // Remote image (aspect ratio is required)
<Picture <Picture
src={imageUrl} src={imageUrl}
widths={[200, 400, 800]} widths={[200, 400, 800]}
@ -650,7 +650,7 @@ const imageUrl =
alt="descriptive text" alt="descriptive text"
/> />
// Inlined imports are supported // Inlined imports are supported
<Picture <Picture
src={import('../assets/hero.png')} src={import('../assets/hero.png')}
widths={[200, 400, 800]} widths={[200, 400, 800]}

2
packages/integrations/image/src/build/ssg.ts
View file

@ -127,7 +127,7 @@ export async function ssgBuild({
async function processStaticImage([src, transformsMap]: [ async function processStaticImage([src, transformsMap]: [
string, string,
Map<string, TransformOptions> Map<string, TransformOptions>,
]): Promise<void> { ]): Promise<void> {
let inputFile: string | undefined = undefined; let inputFile: string | undefined = undefined;
let inputBuffer: Buffer | undefined = undefined; let inputBuffer: Buffer | undefined = undefined;

6
packages/integrations/node/src/response-iterator.ts
View file

@ -120,7 +120,7 @@ function nodeStreamIterator<T>(stream: NodeReadableStream): AsyncIterableIterato
| IteratorResult<T, boolean | undefined> | IteratorResult<T, boolean | undefined>
| PromiseLike<IteratorResult<T, boolean | undefined>> | PromiseLike<IteratorResult<T, boolean | undefined>>
) => void, ) => void,
(reason?: any) => void (reason?: any) => void,
][] = []; ][] = [];
function onData(chunk: any) { function onData(chunk: any) {
@ -200,9 +200,7 @@ function asyncIterator<T>(source: AsyncIterableIterator<T>): AsyncIterableIterat
}; };
} }
export function responseIterator<T>( export function responseIterator<T>(response: Response | Buffer): AsyncIterableIterator<T> {
response: Response | Buffer
): AsyncIterableIterator<T> {
let body: unknown = response; let body: unknown = response;
if (isNodeResponse(response)) body = response.body; if (isNodeResponse(response)) body = response.body;

2
packages/integrations/node/src/types.ts
View file

@ -21,7 +21,7 @@ export type RequestHandlerParams = [
req: IncomingMessage, req: IncomingMessage,
res: ServerResponse, res: ServerResponse,
next?: (err?: unknown) => void, next?: (err?: unknown) => void,
locals?: object locals?: object,
]; ];
export type ErrorHandlerParams = [unknown, ...RequestHandlerParams]; export type ErrorHandlerParams = [unknown, ...RequestHandlerParams];

44
pnpm-lock.yaml
View file

@ -47,7 +47,7 @@ importers:
version: 2.6.0 version: 2.6.0
eslint-plugin-prettier: eslint-plugin-prettier:
specifier: ^4.2.1 specifier: ^4.2.1
version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.43.0)(prettier@2.8.8) version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.43.0)(prettier@3.0.1)
only-allow: only-allow:
specifier: ^1.1.1 specifier: ^1.1.1
version: 1.1.1 version: 1.1.1
@ -55,11 +55,11 @@ importers:
specifier: ^0.10.0 specifier: ^0.10.0
version: 0.10.0 version: 0.10.0
prettier: prettier:
specifier: ^2.8.8 specifier: ^3.0.1
version: 2.8.8 version: 3.0.1
prettier-plugin-astro: prettier-plugin-astro:
specifier: ^0.10.0 specifier: ^0.11.0
version: 0.10.0 version: 0.11.0
tiny-glob: tiny-glob:
specifier: ^0.2.9 specifier: ^0.2.9
version: 0.2.9 version: 0.2.9
@ -650,7 +650,7 @@ importers:
devDependencies: devDependencies:
'@astrojs/check': '@astrojs/check':
specifier: ^0.1.0 specifier: ^0.1.0
version: 0.1.0(prettier-plugin-astro@0.10.0)(prettier@2.8.8)(typescript@5.1.6) version: 0.1.0(prettier-plugin-astro@0.11.0)(prettier@3.0.1)(typescript@5.1.6)
'@playwright/test': '@playwright/test':
specifier: ^1.29.2 specifier: ^1.29.2
version: 1.29.2 version: 1.29.2
@ -5360,13 +5360,13 @@ packages:
lite-youtube-embed: 0.2.0 lite-youtube-embed: 0.2.0
dev: false dev: false
/@astrojs/check@0.1.0(prettier-plugin-astro@0.10.0)(prettier@2.8.8)(typescript@5.1.6): /@astrojs/check@0.1.0(prettier-plugin-astro@0.11.0)(prettier@3.0.1)(typescript@5.1.6):
resolution: {integrity: sha512-tgjq+Vehgv0dwdsRlT4ai3QgT3etn8W5C4E4dvQ0Xe9ccwjKdMTWmpty5exfBtHLLAAOvwe5/OkYQsQ9OyKoVw==} resolution: {integrity: sha512-tgjq+Vehgv0dwdsRlT4ai3QgT3etn8W5C4E4dvQ0Xe9ccwjKdMTWmpty5exfBtHLLAAOvwe5/OkYQsQ9OyKoVw==}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
typescript: ^5.0.0 typescript: ^5.0.0
dependencies: dependencies:
'@astrojs/language-server': 2.2.0(prettier-plugin-astro@0.10.0)(prettier@2.8.8)(typescript@5.1.6) '@astrojs/language-server': 2.2.0(prettier-plugin-astro@0.11.0)(prettier@3.0.1)(typescript@5.1.6)
chokidar: 3.5.3 chokidar: 3.5.3
fast-glob: 3.3.1 fast-glob: 3.3.1
kleur: 4.1.5 kleur: 4.1.5
@ -5420,7 +5420,7 @@ packages:
vscode-uri: 3.0.7 vscode-uri: 3.0.7
dev: false dev: false
/@astrojs/language-server@2.2.0(prettier-plugin-astro@0.10.0)(prettier@2.8.8)(typescript@5.1.6): /@astrojs/language-server@2.2.0(prettier-plugin-astro@0.11.0)(prettier@3.0.1)(typescript@5.1.6):
resolution: {integrity: sha512-zyEumkwcep3pGyMpcEJFEn96jV6pEg3CUtjehnT9KseDFqf+gPYTbw5nwOpN9uXIJ/E5bAxhqpkr3J2LCQHRrg==} resolution: {integrity: sha512-zyEumkwcep3pGyMpcEJFEn96jV6pEg3CUtjehnT9KseDFqf+gPYTbw5nwOpN9uXIJ/E5bAxhqpkr3J2LCQHRrg==}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@ -5442,12 +5442,12 @@ packages:
'@volar/typescript': 1.10.0 '@volar/typescript': 1.10.0
fast-glob: 3.3.1 fast-glob: 3.3.1
muggle-string: 0.3.1 muggle-string: 0.3.1
prettier: 2.8.8 prettier: 3.0.1
prettier-plugin-astro: 0.10.0 prettier-plugin-astro: 0.11.0
volar-service-css: 0.0.11(@volar/language-service@1.10.0) volar-service-css: 0.0.11(@volar/language-service@1.10.0)
volar-service-emmet: 0.0.11(@volar/language-service@1.10.0) volar-service-emmet: 0.0.11(@volar/language-service@1.10.0)
volar-service-html: 0.0.11(@volar/language-service@1.10.0) volar-service-html: 0.0.11(@volar/language-service@1.10.0)
volar-service-prettier: 0.0.11(@volar/language-service@1.10.0)(prettier@2.8.8) volar-service-prettier: 0.0.11(@volar/language-service@1.10.0)(prettier@3.0.1)
volar-service-typescript: 0.0.11(@volar/language-service@1.10.0)(@volar/typescript@1.10.0) volar-service-typescript: 0.0.11(@volar/language-service@1.10.0)(@volar/typescript@1.10.0)
volar-service-typescript-twoslash-queries: 0.0.11(@volar/language-service@1.10.0) volar-service-typescript-twoslash-queries: 0.0.11(@volar/language-service@1.10.0)
vscode-html-languageservice: 5.0.6 vscode-html-languageservice: 5.0.6
@ -11646,7 +11646,7 @@ packages:
engines: {node: '>=4.0.0'} engines: {node: '>=4.0.0'}
dev: true dev: true
/eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.43.0)(prettier@2.8.8): /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.43.0)(prettier@3.0.1):
resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
engines: {node: '>=12.0.0'} engines: {node: '>=12.0.0'}
peerDependencies: peerDependencies:
@ -11659,7 +11659,7 @@ packages:
dependencies: dependencies:
eslint: 8.43.0 eslint: 8.43.0
eslint-config-prettier: 8.8.0(eslint@8.43.0) eslint-config-prettier: 8.8.0(eslint@8.43.0)
prettier: 2.8.8 prettier: 3.0.1
prettier-linter-helpers: 1.0.0 prettier-linter-helpers: 1.0.0
dev: true dev: true
@ -15600,12 +15600,12 @@ packages:
fast-diff: 1.2.0 fast-diff: 1.2.0
dev: true dev: true
/prettier-plugin-astro@0.10.0: /prettier-plugin-astro@0.11.0:
resolution: {integrity: sha512-dPzop0gKZyVGpTDQmfy+e7FKXC9JT3mlpfYA2diOVz+Ui+QR1U4G/s+OesKl2Hib2JJOtAYJs/l+ovgT0ljlFA==} resolution: {integrity: sha512-rl2hJ4Kty/aEfGjk3i4JS+bpng9MjgvwqLRNzeb9NqYhqKoWNwOR39cIJXFjU1vR3zYOPnwWNRMelKb0orunYA==}
engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'} engines: {node: ^14.15.0 || >=16.0.0, pnpm: '>=7.14.0'}
dependencies: dependencies:
'@astrojs/compiler': 1.8.1 '@astrojs/compiler': 1.8.1
prettier: 2.8.8 prettier: 3.0.1
sass-formatter: 0.7.6 sass-formatter: 0.7.6
dev: true dev: true
@ -15624,6 +15624,12 @@ packages:
engines: {node: '>=10.13.0'} engines: {node: '>=10.13.0'}
hasBin: true hasBin: true
/prettier@3.0.1:
resolution: {integrity: sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==}
engines: {node: '>=14'}
hasBin: true
dev: true
/pretty-bytes@5.6.0: /pretty-bytes@5.6.0:
resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
engines: {node: '>=6'} engines: {node: '>=6'}
@ -18029,7 +18035,7 @@ packages:
vscode-uri: 3.0.7 vscode-uri: 3.0.7
dev: true dev: true
/volar-service-prettier@0.0.11(@volar/language-service@1.10.0)(prettier@2.8.8): /volar-service-prettier@0.0.11(@volar/language-service@1.10.0)(prettier@3.0.1):
resolution: {integrity: sha512-A4vEU5BUitNNAySb+t/fCjEoL01uYUkoe/Fe5UxR3JJbdgr2nTeXb5IlW90/1vzmnTKZznadJV4i1SoAf2CRbg==} resolution: {integrity: sha512-A4vEU5BUitNNAySb+t/fCjEoL01uYUkoe/Fe5UxR3JJbdgr2nTeXb5IlW90/1vzmnTKZznadJV4i1SoAf2CRbg==}
peerDependencies: peerDependencies:
'@volar/language-service': ~1.10.0 '@volar/language-service': ~1.10.0
@ -18041,7 +18047,7 @@ packages:
optional: true optional: true
dependencies: dependencies:
'@volar/language-service': 1.10.0 '@volar/language-service': 1.10.0
prettier: 2.8.8 prettier: 3.0.1
dev: true dev: true
/volar-service-typescript-twoslash-queries@0.0.11(@volar/language-service@1.10.0): /volar-service-typescript-twoslash-queries@0.0.11(@volar/language-service@1.10.0):