diff options
| -rw-r--r-- | .changeset/red-worms-occur.md | 5 | ||||
| -rw-r--r-- | packages/integrations/image/src/index.ts | 13 | ||||
| -rw-r--r-- | packages/integrations/image/src/loaders/squoosh.ts | 5 | ||||
| -rw-r--r-- | packages/integrations/image/src/vendor/squoosh/image-pool.ts | 3 | ||||
| -rw-r--r-- | packages/integrations/image/src/vite-plugin-astro-image.ts | 21 |
5 files changed, 8 insertions, 39 deletions
diff --git a/.changeset/red-worms-occur.md b/.changeset/red-worms-occur.md new file mode 100644 index 000000000..39d036c05 --- /dev/null +++ b/.changeset/red-worms-occur.md @@ -0,0 +1,5 @@ +--- +'@astrojs/image': patch +--- + +Fixes regression with local builds diff --git a/packages/integrations/image/src/index.ts b/packages/integrations/image/src/index.ts index 60e5e1679..e3770d5e9 100644 --- a/packages/integrations/image/src/index.ts +++ b/packages/integrations/image/src/index.ts @@ -11,12 +11,6 @@ export { getPicture } from './lib/get-picture.js'; const PKG_NAME = '@astrojs/image'; const ROUTE_PATTERN = '/_image'; -const UNSUPPORTED_ADAPTERS = new Set([ - '@astrojs/cloudflare', - '@astrojs/deno', - '@astrojs/netlify/edge-functions', - '@astrojs/vercel/edge', -]); interface BuildConfig { client: URL; @@ -106,13 +100,6 @@ export default function integration(options: IntegrationOptions = {}): AstroInte _buildConfig = config.build; }, 'astro:build:start': ({ buildConfig }) => { - const adapterName = _config.adapter?.name; - if (adapterName && UNSUPPORTED_ADAPTERS.has(adapterName)) { - throw new Error( - `@astrojs/image is not supported with the ${adapterName} adapter. Please choose a Node.js compatible adapter.` - ); - } - // Backwards compat if (needsBuildConfig) { _buildConfig = buildConfig; diff --git a/packages/integrations/image/src/loaders/squoosh.ts b/packages/integrations/image/src/loaders/squoosh.ts index 5d71cdb7f..87d6e26ec 100644 --- a/packages/integrations/image/src/loaders/squoosh.ts +++ b/packages/integrations/image/src/loaders/squoosh.ts @@ -3,12 +3,11 @@ import { red } from 'kleur/colors'; import { error } from '../utils/logger.js'; import { metadata } from '../utils/metadata.js'; import { isRemoteImage } from '../utils/paths.js'; +import { processBuffer } from '../vendor/squoosh/image-pool.js'; import type { Operation } from '../vendor/squoosh/image.js'; import type { OutputFormat, TransformOptions } from './index.js'; import { BaseSSRService } from './index.js'; -const imagePoolModulePromise = import('../vendor/squoosh/image-pool.js'); - class SquooshService extends BaseSSRService { async processAvif(image: any, transform: TransformOptions) { const encodeOptions = transform.quality @@ -113,7 +112,7 @@ class SquooshService extends BaseSSRService { }); throw new Error(`Unknown image output: "${transform.format}" used for ${transform.src}`); } - const { processBuffer } = await imagePoolModulePromise; + const data = await processBuffer(inputBuffer, operations, transform.format, transform.quality); return { diff --git a/packages/integrations/image/src/vendor/squoosh/image-pool.ts b/packages/integrations/image/src/vendor/squoosh/image-pool.ts index e19215397..d29245fb4 100644 --- a/packages/integrations/image/src/vendor/squoosh/image-pool.ts +++ b/packages/integrations/image/src/vendor/squoosh/image-pool.ts @@ -1,6 +1,5 @@ import { isMainThread } from 'node:worker_threads'; import { cpus } from 'os'; -import { fileURLToPath } from 'url'; import type { OutputFormat } from '../../loaders/index.js'; import execOnce from '../../utils/execOnce.js'; import WorkerPool from '../../utils/workerPool.js'; @@ -13,7 +12,7 @@ const getWorker = execOnce( // There will be at most 7 workers needed since each worker will take // at least 1 operation type. Math.max(1, Math.min(cpus().length - 1, 7)), - fileURLToPath(import.meta.url) + './node_modules/@astrojs/image/dist/vendor/squoosh/image-pool.js' ); } ) diff --git a/packages/integrations/image/src/vite-plugin-astro-image.ts b/packages/integrations/image/src/vite-plugin-astro-image.ts index 1381ecde1..04f230341 100644 --- a/packages/integrations/image/src/vite-plugin-astro-image.ts +++ b/packages/integrations/image/src/vite-plugin-astro-image.ts @@ -113,27 +113,6 @@ export function createPlugin(config: AstroConfig, options: Required<IntegrationO return next(); }); }, - outputOptions(outputOptions) { - if (resolvedConfig.build.ssr) { - // Build the image-pool chunk to the top-level and not inside of a chunks/ - // folder. This is because the wasm is built at the top-level and this makes - // it accessible from the pool worker. - const chunkFileNames = outputOptions.chunkFileNames; - outputOptions.chunkFileNames = (chunk) => { - for (const name of Object.keys(chunk.modules)) { - if (name.endsWith('vendor/squoosh/image-pool.js')) { - return '[name].[hash].mjs'; - } - } - - if (typeof chunkFileNames === 'function') { - return chunkFileNames.call(this, chunk); - } - - return chunkFileNames!; - }; - } - }, async renderChunk(code) { const assetUrlRE = /__ASTRO_IMAGE_ASSET__([a-z\d]{8})__(?:_(.*?)__)?/g; |