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

[ci] format

Browse source
This commit is contained in:
tony-sull 2022-08-30 21:12:45 +00:00 committed by fredkbot
parent 00c605ce35
commit 6f1fbd8be0
16 changed files with 80 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,8 @@
import type { AstroConfig } from 'astro';
import { bgGreen, black, cyan, dim, green } from 'kleur/colors'; import { bgGreen, black, cyan, dim, green } from 'kleur/colors';
import fs from 'node:fs/promises'; import fs from 'node:fs/promises';
import path from 'node:path'; import path from 'node:path';
import { fileURLToPath } from 'node:url'; import { fileURLToPath } from 'node:url';
import type { AstroConfig } from 'astro';
import type { SSRImageService, TransformOptions } from '../loaders/index.js'; import type { SSRImageService, TransformOptions } from '../loaders/index.js';
import { loadLocalImage, loadRemoteImage } from '../utils/images.js'; import { loadLocalImage, loadRemoteImage } from '../utils/images.js';
import { debug, info, LoggerLevel, warn } from '../utils/logger.js'; import { debug, info, LoggerLevel, warn } from '../utils/logger.js';

4
packages/integrations/image/src/endpoint.ts
View file

@ -8,7 +8,7 @@ import { isRemoteImage } from './utils/paths.js';
async function loadRemoteImage(src: URL) { async function loadRemoteImage(src: URL) {
try { try {
const res = await fetch(src); const res = await fetch(src);
if (!res.ok) { if (!res.ok) {
return undefined; return undefined;
} }
@ -50,4 +50,4 @@ export const get: APIRoute = async ({ request }) => {
} catch (err: unknown) { } catch (err: unknown) {
return new Response(`Server Error: ${err}`, { status: 500 }); return new Response(`Server Error: ${err}`, { status: 500 });
} }
} };

8
packages/integrations/image/src/index.ts
View file

@ -1,9 +1,9 @@
import type { AstroConfig, AstroIntegration } from 'astro'; import type { AstroConfig, AstroIntegration } from 'astro';
import { createPlugin } from './vite-plugin-astro-image.js';
import { ssgBuild } from './build/ssg.js'; import { ssgBuild } from './build/ssg.js';
import type { ImageService, TransformOptions } from './loaders/index.js'; import type { ImageService, TransformOptions } from './loaders/index.js';
import type { LoggerLevel } from './utils/logger.js'; import type { LoggerLevel } from './utils/logger.js';
import { joinPaths, prependForwardSlash, propsToFilename } from './utils/paths.js'; import { joinPaths, prependForwardSlash, propsToFilename } from './utils/paths.js';
import { createPlugin } from './vite-plugin-astro-image.js';
export { getImage } from './lib/get-image.js'; export { getImage } from './lib/get-image.js';
export { getPicture } from './lib/get-picture.js'; export { getPicture } from './lib/get-picture.js';
@ -111,7 +111,7 @@ export default function integration(options: IntegrationOptions = {}): AstroInte
}); });
} }
} }
} },
} },
} };
} }

6
packages/integrations/image/src/lib/get-image.ts
View file

@ -1,7 +1,7 @@
/// <reference types="astro/astro-jsx" /> /// <reference types="astro/astro-jsx" />
import type { ImageService, OutputFormat, TransformOptions } from '../loaders/index.js';
import { isSSRService, parseAspectRatio } from '../loaders/index.js'; import { isSSRService, parseAspectRatio } from '../loaders/index.js';
import sharp from '../loaders/sharp.js'; import sharp from '../loaders/sharp.js';
import type { ImageService, OutputFormat, TransformOptions } from '../loaders/index.js';
import { isRemoteImage } from '../utils/paths.js'; import { isRemoteImage } from '../utils/paths.js';
import type { ImageMetadata } from '../vite-plugin-astro-image.js'; import type { ImageMetadata } from '../vite-plugin-astro-image.js';
@ -95,7 +95,7 @@ async function resolveTransform(input: GetImageTransform): Promise<TransformOpti
* @param transform @type {TransformOptions} The transformations requested for the optimized image. * @param transform @type {TransformOptions} The transformations requested for the optimized image.
* @returns @type {ImageAttributes} The HTML attributes to be included on the built `<img />` element. * @returns @type {ImageAttributes} The HTML attributes to be included on the built `<img />` element.
*/ */
export async function getImage( export async function getImage(
transform: GetImageTransform transform: GetImageTransform
): Promise<astroHTML.JSX.ImgHTMLAttributes> { ): Promise<astroHTML.JSX.ImgHTMLAttributes> {
if (!transform.src) { if (!transform.src) {
@ -151,6 +151,6 @@ async function resolveTransform(input: GetImageTransform): Promise<TransformOpti
return { return {
...attributes, ...attributes,
src src,
}; };
} }

3
packages/integrations/image/src/lib/get-picture.ts
View file

@ -1,8 +1,7 @@
/// <reference types="astro/astro-jsx" /> /// <reference types="astro/astro-jsx" />
import mime from 'mime'; import mime from 'mime';
import { extname } from 'node:path'; import { extname } from 'node:path';
import { OutputFormat, TransformOptions } from '../loaders/index.js'; import { OutputFormat, parseAspectRatio, TransformOptions } from '../loaders/index.js';
import { parseAspectRatio } from '../loaders/index.js';
import { ImageMetadata } from '../vite-plugin-astro-image.js'; import { ImageMetadata } from '../vite-plugin-astro-image.js';
import { getImage } from './get-image.js'; import { getImage } from './get-image.js';

69
packages/integrations/image/src/utils/etag.ts
View file

@ -7,45 +7,38 @@
* Simplified, optimized and add modified for 52 bit, which provides a larger hash space * Simplified, optimized and add modified for 52 bit, which provides a larger hash space
* and still making use of Javascript's 53-bit integer space. * and still making use of Javascript's 53-bit integer space.
*/ */
export const fnv1a52 = (str: string) => { export const fnv1a52 = (str: string) => {
const len = str.length const len = str.length;
let i = 0, let i = 0,
t0 = 0, t0 = 0,
v0 = 0x2325, v0 = 0x2325,
t1 = 0, t1 = 0,
v1 = 0x8422, v1 = 0x8422,
t2 = 0, t2 = 0,
v2 = 0x9ce4, v2 = 0x9ce4,
t3 = 0, t3 = 0,
v3 = 0xcbf2 v3 = 0xcbf2;
while (i < len) { while (i < len) {
v0 ^= str.charCodeAt(i++) v0 ^= str.charCodeAt(i++);
t0 = v0 * 435 t0 = v0 * 435;
t1 = v1 * 435 t1 = v1 * 435;
t2 = v2 * 435 t2 = v2 * 435;
t3 = v3 * 435 t3 = v3 * 435;
t2 += v0 << 8 t2 += v0 << 8;
t3 += v1 << 8 t3 += v1 << 8;
t1 += t0 >>> 16 t1 += t0 >>> 16;
v0 = t0 & 65535 v0 = t0 & 65535;
t2 += t1 >>> 16 t2 += t1 >>> 16;
v1 = t1 & 65535 v1 = t1 & 65535;
v3 = (t3 + (t2 >>> 16)) & 65535 v3 = (t3 + (t2 >>> 16)) & 65535;
v2 = t2 & 65535 v2 = t2 & 65535;
} }
return ( return (v3 & 15) * 281474976710656 + v2 * 4294967296 + v1 * 65536 + (v0 ^ (v3 >> 4));
(v3 & 15) * 281474976710656 + };
v2 * 4294967296 +
v1 * 65536 +
(v0 ^ (v3 >> 4))
)
}
export const etag = (payload: string, weak = false) => { export const etag = (payload: string, weak = false) => {
const prefix = weak ? 'W/"' : '"' const prefix = weak ? 'W/"' : '"';
return ( return prefix + fnv1a52(payload).toString(36) + payload.length.toString(36) + '"';
prefix + fnv1a52(payload).toString(36) + payload.length.toString(36) + '"' };
)
}

4
packages/integrations/image/src/utils/paths.ts
View file

@ -1,5 +1,5 @@
import { OutputFormat, TransformOptions } from "../loaders/index.js"; import { OutputFormat, TransformOptions } from '../loaders/index.js';
import { shorthash } from "./shorthash.js"; import { shorthash } from './shorthash.js';
export function isRemoteImage(src: string) { export function isRemoteImage(src: string) {
return /^http(s?):\/\//.test(src); return /^http(s?):\/\//.test(src);

12
packages/integrations/image/src/vite-plugin-astro-image.ts
View file

@ -1,11 +1,9 @@
import { basename, extname, join } from 'node:path';
import fs from 'node:fs/promises';
import path from 'node:path';
import { Readable } from 'node:stream';
import { fileURLToPath, pathToFileURL } from 'node:url';
import type { AstroConfig } from 'astro'; import type { AstroConfig } from 'astro';
import MagicString from 'magic-string'; import MagicString from 'magic-string';
import type { PluginContext } from 'rollup'; import fs from 'node:fs/promises';
import path, { basename, extname, join } from 'node:path';
import { Readable } from 'node:stream';
import { fileURLToPath, pathToFileURL } from 'node:url';
import slash from 'slash'; import slash from 'slash';
import type { Plugin, ResolvedConfig } from 'vite'; import type { Plugin, ResolvedConfig } from 'vite';
import type { IntegrationOptions } from './index.js'; import type { IntegrationOptions } from './index.js';
@ -132,6 +130,6 @@ export function createPlugin(config: AstroConfig, options: Required<IntegrationO
} else { } else {
return null; return null;
} }
} },
}; };
} }

28
packages/integrations/image/test/image-ssg.test.js
View file

@ -8,12 +8,12 @@ describe('SSG images - dev', function () {
let fixture; let fixture;
let devServer; let devServer;
let $; let $;
before(async () => { before(async () => {
fixture = await loadFixture({ root: './fixtures/basic-image/' }); fixture = await loadFixture({ root: './fixtures/basic-image/' });
devServer = await fixture.startDevServer(); devServer = await fixture.startDevServer();
const html = await fixture.fetch('/').then((res) => res.text()); const html = await fixture.fetch('/').then((res) => res.text());
$ = cheerio.load(html); $ = cheerio.load(html);
}); });
after(async () => { after(async () => {
@ -68,7 +68,9 @@ describe('SSG images - dev', function () {
expect(searchParams.get('f')).to.equal('webp'); expect(searchParams.get('f')).to.equal('webp');
expect(searchParams.get('w')).to.equal('544'); expect(searchParams.get('w')).to.equal('544');
expect(searchParams.get('h')).to.equal('184'); expect(searchParams.get('h')).to.equal('184');
expect(searchParams.get('href')).to.equal('https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'); expect(searchParams.get('href')).to.equal(
'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'
);
}); });
}); });
@ -95,12 +97,12 @@ describe('SSG images with subpath - dev', function () {
let fixture; let fixture;
let devServer; let devServer;
let $; let $;
before(async () => { before(async () => {
fixture = await loadFixture({ root: './fixtures/basic-image/', base: '/docs' }); fixture = await loadFixture({ root: './fixtures/basic-image/', base: '/docs' });
devServer = await fixture.startDevServer(); devServer = await fixture.startDevServer();
const html = await fixture.fetch('/docs/').then((res) => res.text()); const html = await fixture.fetch('/docs/').then((res) => res.text());
$ = cheerio.load(html); $ = cheerio.load(html);
}); });
after(async () => { after(async () => {
@ -155,7 +157,9 @@ describe('SSG images with subpath - dev', function () {
expect(searchParams.get('f')).to.equal('webp'); expect(searchParams.get('f')).to.equal('webp');
expect(searchParams.get('w')).to.equal('544'); expect(searchParams.get('w')).to.equal('544');
expect(searchParams.get('h')).to.equal('184'); expect(searchParams.get('h')).to.equal('184');
expect(searchParams.get('href')).to.equal('https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'); expect(searchParams.get('href')).to.equal(
'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'
);
}); });
}); });
@ -235,9 +239,7 @@ describe('SSG images - build', function () {
it('includes <img> attributes', () => { it('includes <img> attributes', () => {
const image = $('#google'); const image = $('#google');
expect(image.attr('src')).to.equal( expect(image.attr('src')).to.equal(`/googlelogo_color_272x92dp_${HASH}.webp`);
`/googlelogo_color_272x92dp_${HASH}.webp`
);
expect(image.attr('width')).to.equal('544'); expect(image.attr('width')).to.equal('544');
expect(image.attr('height')).to.equal('184'); expect(image.attr('height')).to.equal('184');
}); });
@ -331,9 +333,7 @@ describe('SSG images with subpath - build', function () {
it('includes <img> attributes', () => { it('includes <img> attributes', () => {
const image = $('#google'); const image = $('#google');
expect(image.attr('src')).to.equal( expect(image.attr('src')).to.equal(`/docs/googlelogo_color_272x92dp_${HASH}.webp`);
`/docs/googlelogo_color_272x92dp_${HASH}.webp`
);
expect(image.attr('width')).to.equal('544'); expect(image.attr('width')).to.equal('544');
expect(image.attr('height')).to.equal('184'); expect(image.attr('height')).to.equal('184');
}); });

8
packages/integrations/image/test/image-ssr-build.test.js
View file

@ -10,7 +10,7 @@ describe('SSR images - build', function () {
fixture = await loadFixture({ fixture = await loadFixture({
root: './fixtures/basic-image/', root: './fixtures/basic-image/',
adapter: testAdapter({ streaming: false }), adapter: testAdapter({ streaming: false }),
output: 'server' output: 'server',
}); });
await fixture.build(); await fixture.build();
}); });
@ -154,7 +154,7 @@ describe('SSR images with subpath - build', function () {
root: './fixtures/basic-image/', root: './fixtures/basic-image/',
adapter: testAdapter({ streaming: false }), adapter: testAdapter({ streaming: false }),
output: 'server', output: 'server',
base: '/docs' base: '/docs',
}); });
await fixture.build(); await fixture.build();
}); });
@ -232,7 +232,9 @@ describe('SSR images with subpath - build', function () {
expect(searchParams.get('f')).to.equal('webp'); expect(searchParams.get('f')).to.equal('webp');
expect(searchParams.get('w')).to.equal('544'); expect(searchParams.get('w')).to.equal('544');
expect(searchParams.get('h')).to.equal('184'); expect(searchParams.get('h')).to.equal('184');
expect(searchParams.get('href')).to.equal('https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'); expect(searchParams.get('href')).to.equal(
'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'
);
}); });
it('keeps remote image query params', async () => { it('keeps remote image query params', async () => {

2
packages/integrations/image/test/image-ssr-dev.test.js
View file

@ -147,7 +147,7 @@ describe('SSR images with subpath - dev', function () {
root: './fixtures/basic-image/', root: './fixtures/basic-image/',
adapter: testAdapter(), adapter: testAdapter(),
output: 'server', output: 'server',
base: '/docs' base: '/docs',
}); });
devServer = await fixture.startDevServer(); devServer = await fixture.startDevServer();

8
packages/integrations/image/test/picture-ssg.test.js
View file

@ -95,7 +95,9 @@ describe('SSG pictures - dev', function () {
expect(searchParams.get('f')).to.equal('png'); expect(searchParams.get('f')).to.equal('png');
expect(searchParams.get('w')).to.equal('544'); expect(searchParams.get('w')).to.equal('544');
expect(searchParams.get('h')).to.equal('184'); expect(searchParams.get('h')).to.equal('184');
expect(searchParams.get('href')).to.equal('https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'); expect(searchParams.get('href')).to.equal(
'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'
);
expect(image.attr('alt')).to.equal('Google logo'); expect(image.attr('alt')).to.equal('Google logo');
}); });
}); });
@ -217,7 +219,9 @@ describe('SSG pictures with subpath - dev', function () {
expect(searchParams.get('f')).to.equal('png'); expect(searchParams.get('f')).to.equal('png');
expect(searchParams.get('w')).to.equal('544'); expect(searchParams.get('w')).to.equal('544');
expect(searchParams.get('h')).to.equal('184'); expect(searchParams.get('h')).to.equal('184');
expect(searchParams.get('href')).to.equal('https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'); expect(searchParams.get('href')).to.equal(
'https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png'
);
expect(image.attr('alt')).to.equal('Google logo'); expect(image.attr('alt')).to.equal('Google logo');
}); });
}); });

2
packages/integrations/image/test/picture-ssr-build.test.js
View file

@ -192,7 +192,7 @@ describe('SSR pictures with subpath - build', function () {
root: './fixtures/basic-picture/', root: './fixtures/basic-picture/',
adapter: testAdapter(), adapter: testAdapter(),
output: 'server', output: 'server',
base: '/docs' base: '/docs',
}); });
await fixture.build(); await fixture.build();
}); });

2
packages/integrations/image/test/picture-ssr-dev.test.js
View file

@ -165,7 +165,7 @@ describe('SSR pictures with subpath - dev', function () {
root: './fixtures/basic-picture/', root: './fixtures/basic-picture/',
adapter: testAdapter(), adapter: testAdapter(),
output: 'server', output: 'server',
base: '/docs' base: '/docs',
}); });
devServer = await fixture.startDevServer(); devServer = await fixture.startDevServer();

4
packages/integrations/image/test/rotation.test.js
View file

@ -39,7 +39,7 @@ describe('Image rotation', function () {
'/Landscape_5.6d88c17f_ZtLntP.jpg', '/Landscape_5.6d88c17f_ZtLntP.jpg',
'/Landscape_6.1a88f6d8_Z1Pl4xy.jpg', '/Landscape_6.1a88f6d8_Z1Pl4xy.jpg',
'/Landscape_7.cb1008c2_Z1JYr40.jpg', '/Landscape_7.cb1008c2_Z1JYr40.jpg',
'/Landscape_8.3d2837d2_1xTOBN.jpg' '/Landscape_8.3d2837d2_1xTOBN.jpg',
]; ];
it('includes <img> attributes', () => { it('includes <img> attributes', () => {
@ -73,7 +73,7 @@ describe('Image rotation', function () {
'/Portrait_5.b3b6cc6f_Z23Ek26.jpg', '/Portrait_5.b3b6cc6f_Z23Ek26.jpg',
'/Portrait_6.94e06390_ak2Ek.jpg', '/Portrait_6.94e06390_ak2Ek.jpg',
'/Portrait_7.9ffdecfe_Z1S4klG.jpg', '/Portrait_7.9ffdecfe_Z1S4klG.jpg',
'/Portrait_8.9d01343d_2dak03.jpg' '/Portrait_8.9d01343d_2dak03.jpg',
]; ];
it('includes <img> attributes', () => { it('includes <img> attributes', () => {

4
packages/integrations/image/test/with-mdx.test.js
View file

@ -61,9 +61,7 @@ describe('Images in MDX - build', function () {
it('includes <img> attributes', () => { it('includes <img> attributes', () => {
const image = $('#google'); const image = $('#google');
expect(image.attr('src')).to.equal( expect(image.attr('src')).to.equal(`/googlelogo_color_272x92dp_${HASH}.webp`);
`/googlelogo_color_272x92dp_${HASH}.webp`
);
expect(image.attr('width')).to.equal('544'); expect(image.attr('width')).to.equal('544');
expect(image.attr('height')).to.equal('184'); expect(image.attr('height')).to.equal('184');
}); });