@astrojs/cloudflare 8.0.2 → 9.0.0

package/dist/entrypoints/image-endpoint.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/entrypoints/image-endpoint.js

@@ -0,0 +1 @@
+export {};

package/dist/entrypoints/server.advanced.js

@@ -26,7 +26,7 @@ export function createExports(manifest) {
                 caches: caches,
             },
         };
-        const response = await app.render(request, routeData, locals);
+        const response = await app.render(request, { routeData, locals });
         if (app.setCookieHeaders) {
             for (const setCookieHeader of app.setCookieHeaders(response)) {
                 response.headers.append('Set-Cookie', setCookieHeader);

package/dist/entrypoints/server.directory.js

@@ -28,7 +28,7 @@ export function createExports(manifest) {
                 caches: caches,
             },
         };
-        const response = await app.render(request, routeData, locals);
+        const response = await app.render(request, { routeData, locals });
         if (app.setCookieHeaders) {
             for (const setCookieHeader of app.setCookieHeaders(response)) {
                 response.headers.append('Set-Cookie', setCookieHeader);

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export type { DirectoryRuntime } from './entrypoints/server.directory.js';
 export type Options = {
     mode?: 'directory' | 'advanced';
     functionPerRoute?: boolean;
-    imageService?: 'passthrough' | 'cloudflare';
+    imageService?: 'passthrough' | 'cloudflare' | 'compile';
     /** Configure automatic `routes.json` generation */
     routes?: {
         /** Strategy for generating `include` and `exclude` patterns

package/dist/index.js

@@ -12,6 +12,7 @@ import { prepareImageConfig } from './utils/image-config.js';
 import { getLocalRuntime, getRuntimeConfig } from './utils/local-runtime.js';
 import { prependForwardSlash } from './utils/prependForwardSlash.js';
 import { rewriteWasmImportPath } from './utils/rewriteWasmImportPath.js';
+import { patchSharpBundle } from './utils/sharpBundlePatch.js';
 import { wasmModuleLoader } from './utils/wasm-module-loader.js';
 export default function createIntegration(args) {
     let _config;
@@ -153,7 +154,14 @@ export default function createIntegration(args) {
                         const pagesDirname = relative(fileURLToPath(_buildConfig.server), pathsGroup[0]).split(sep)[0];
                         const absolutePagesDirname = fileURLToPath(new URL(pagesDirname, _buildConfig.server));
                         const urlWithinFunctions = new URL(relative(absolutePagesDirname, pathsGroup[0]), functionsUrl);
+                        const esbuildPlugins = [];
+                        if (args?.imageService === 'compile') {
+                            esbuildPlugins.push(patchSharpBundle());
+                        }
                         const relativePathToAssets = relative(dirname(fileURLToPath(urlWithinFunctions)), fileURLToPath(assetsUrl));
+                        if (args?.wasmModuleImports) {
+                            esbuildPlugins.push(rewriteWasmImportPath({ relativePathToAssets }));
+                        }
                         await esbuild.build({
                             target: 'es2022',
                             platform: 'browser',
@@ -188,9 +196,7 @@ export default function createIntegration(args) {
                             logOverride: {
                                 'ignored-bare-import': 'silent',
                             },
-                            plugins: !args?.wasmModuleImports
-                                ? []
-                                : [rewriteWasmImportPath({ relativePathToAssets })],
+                            plugins: esbuildPlugins,
                         });
                     }
                     const outputFiles = await glob('**/*', {
@@ -228,6 +234,17 @@ export default function createIntegration(args) {
                     const buildPath = fileURLToPath(entryUrl);
                     // A URL for the final build path after renaming
                     const finalBuildUrl = pathToFileURL(buildPath.replace(/\.mjs$/, '.js'));
+                    const esbuildPlugins = [];
+                    if (args?.imageService === 'compile') {
+                        esbuildPlugins.push(patchSharpBundle());
+                    }
+                    if (args?.wasmModuleImports) {
+                        esbuildPlugins.push(rewriteWasmImportPath({
+                            relativePathToAssets: isModeDirectory
+                                ? relative(fileURLToPath(functionsUrl), fileURLToPath(assetsUrl))
+                                : relative(fileURLToPath(_buildConfig.client), fileURLToPath(assetsUrl)),
+                        }));
+                    }
                     await esbuild.build({
                         target: 'es2022',
                         platform: 'browser',
@@ -261,15 +278,7 @@ export default function createIntegration(args) {
                         logOverride: {
                             'ignored-bare-import': 'silent',
                         },
-                        plugins: !args?.wasmModuleImports
-                            ? []
-                            : [
-                                rewriteWasmImportPath({
-                                    relativePathToAssets: isModeDirectory
-                                        ? relative(fileURLToPath(functionsUrl), fileURLToPath(assetsUrl))
-                                        : relative(fileURLToPath(_buildConfig.client), fileURLToPath(assetsUrl)),
-                                }),
-                            ],
+                        plugins: esbuildPlugins,
                     });
                     // Rename to worker.js
                     await fs.promises.rename(buildPath, finalBuildUrl);
@@ -408,21 +417,39 @@ export default function createIntegration(args) {
                             include: ['/*'],
                             exclude: deduplicatePatterns(staticPathList.concat(args?.routes?.exclude ?? [])),
                         };
-                    const includeStrategyLength = includeStrategy
-                        ? includeStrategy.include.length + includeStrategy.exclude.length
-                        : Infinity;
-                    const excludeStrategyLength = excludeStrategy
-                        ? excludeStrategy.include.length + excludeStrategy.exclude.length
-                        : Infinity;
-                    const winningStrategy = notFoundIsSSR
-                        ? excludeStrategy
-                        : includeStrategyLength <= excludeStrategyLength
-                            ? includeStrategy
-                            : excludeStrategy;
-                    await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
-                        version: 1,
-                        ...winningStrategy,
-                    }, null, 2));
+                    switch (args?.routes?.strategy) {
+                        case 'include':
+                            await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
+                                version: 1,
+                                ...includeStrategy,
+                            }, null, 2));
+                            break;
+                        case 'exclude':
+                            await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
+                                version: 1,
+                                ...excludeStrategy,
+                            }, null, 2));
+                            break;
+                        default:
+                            {
+                                const includeStrategyLength = includeStrategy
+                                    ? includeStrategy.include.length + includeStrategy.exclude.length
+                                    : Infinity;
+                                const excludeStrategyLength = excludeStrategy
+                                    ? excludeStrategy.include.length + excludeStrategy.exclude.length
+                                    : Infinity;
+                                const winningStrategy = notFoundIsSSR
+                                    ? excludeStrategy
+                                    : includeStrategyLength <= excludeStrategyLength
+                                        ? includeStrategy
+                                        : excludeStrategy;
+                                await fs.promises.writeFile(new URL('./_routes.json', _config.outDir), JSON.stringify({
+                                    version: 1,
+                                    ...winningStrategy,
+                                }, null, 2));
+                            }
+                            break;
+                    }
                 }
             },
         },

package/dist/utils/deduplicatePatterns.js

@@ -9,15 +9,17 @@ export function deduplicatePatterns(patterns) {
     const openPatterns = [];
     // A value in the set may only occur once; it is unique in the set's collection.
     // ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
-    return [...new Set(patterns)]
+    const uniquePatterns = [...new Set(patterns)];
+    for (const pattern of uniquePatterns) {
+        if (pattern.endsWith('*')) {
+            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '[^*\n]*$')}`));
+        }
+    }
+    return uniquePatterns
         .sort((a, b) => a.length - b.length)
         .filter((pattern) => {
-        if (openPatterns.some((p) => p.test(pattern))) {
+        if (openPatterns.some((p) => p.test(pattern)))
             return false;
-        }
-        if (pattern.endsWith('*')) {
-            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '.*')}`));
-        }
         return true;
     });
 }

package/dist/utils/image-config.js

@@ -10,6 +10,12 @@ export function prepareImageConfig(service, config, command, logger) {
                     ? sharpImageService()
                     : { entrypoint: '@astrojs/cloudflare/image-service' },
             };
+        case 'compile':
+            return {
+                ...config,
+                service: sharpImageService(),
+                endpoint: command === 'dev' ? undefined : '@astrojs/cloudflare/image-endpoint',
+            };
         default:
             if (config.service.entrypoint === 'astro/assets/services/sharp' ||
                 config.service.entrypoint === 'astro/assets/services/squoosh') {