@astrojs/cloudflare 10.0.3 → 10.2.0

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import type { AstroIntegration } from 'astro';
 export type { Runtime } from './entrypoints/server.js';
 export type Options = {
     /** Options for handling images. */
-    imageService?: 'passthrough' | 'cloudflare' | 'compile';
+    imageService?: 'passthrough' | 'cloudflare' | 'compile' | 'custom';
     /** Configuration for `_routes.json` generation. A _routes.json file controls when your Function is invoked. This file will include three different properties:
      *
      * - version: Defines the version of the schema. Currently there is only one version of the schema (version 1), however, we may add more in the future and aim to be backwards compatible.

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createReadStream } from 'node:fs';
-import { appendFile, rename, stat } from 'node:fs/promises';
+import { appendFile, rename, stat, unlink } from 'node:fs/promises';
 import { createInterface } from 'node:readline/promises';
 import { appendForwardSlash, prependForwardSlash, removeLeadingForwardSlash, } from '@astrojs/internal-helpers/path';
 import { createRedirectsFromAstroRoutes } from '@astrojs/underscore-redirects';
@@ -7,9 +7,15 @@ import { AstroError } from 'astro/errors';
 import { getPlatformProxy } from 'wrangler';
 import { createRoutesFile, getParts } from './utils/generate-routes-json.js';
 import { setImageConfig } from './utils/image-config.js';
+import { NonServerChunkDetector } from './utils/non-server-chunk-detector.js';
 import { wasmModuleLoader } from './utils/wasm-module-loader.js';
 export default function createIntegration(args) {
     let _config;
+    // Initialize the unused chunk analyzer as a shared state between hooks.
+    // The analyzer is used on earlier hooks to collect information about used hooks on a Vite plugin
+    // and then later after the full build to clean up unused chunks, so it has to be shared between them.
+    const chunkAnalyzer = new NonServerChunkDetector();
+    const prerenderImports = [];
     return {
         name: '@astrojs/cloudflare',
         hooks: {
@@ -27,6 +33,51 @@ export default function createIntegration(args) {
                             wasmModuleLoader({
                                 disabled: !args?.wasmModuleImports,
                             }),
+                            chunkAnalyzer.getPlugin(),
+                            {
+                                name: 'dynamic-imports-analyzer',
+                                enforce: 'post',
+                                generateBundle(_, bundle) {
+                                    // Find all pages (ignore the ssr entrypoint) which are prerendered based on the dynamic imports of the prerender chunk
+                                    for (const chunk of Object.values(bundle)) {
+                                        if (chunk.type !== 'chunk')
+                                            continue;
+                                        const isPrerendered = chunk.dynamicImports.some((entry) => entry.includes('prerender') && chunk.name !== '_@astrojs-ssr-virtual-entry');
+                                        if (isPrerendered) {
+                                            prerenderImports.push([chunk.facadeModuleId ?? '', chunk.fileName]);
+                                        }
+                                    }
+                                    const entryChunk = bundle['index.js'];
+                                    if (entryChunk &&
+                                        entryChunk.type === 'chunk' &&
+                                        entryChunk.name === '_@astrojs-ssr-virtual-entry') {
+                                        // Update dynamicImports information, so that there are no imports listed which we remove later
+                                        entryChunk.dynamicImports = entryChunk.dynamicImports.filter((entry) => !prerenderImports.map((e) => e[1]).includes(entry));
+                                        // Clean the ssr entry file from prerendered imporst, since Astro adds them, which it shouldn't. But this is a current limitation in core, because the prerender meta info gets added later in the chain
+                                        for (const page of prerenderImports) {
+                                            // Find the dynamic import inside of the ssr entry file, which get generated by Astro: https://github.com/withastro/astro/blob/08cdd0919d3249a762822e4bba9e0c5d3966916c/packages/astro/src/core/build/plugins/plugin-ssr.ts#L56
+                                            const importRegex = new RegExp(`^const (_page\\d) = \\(\\) => import\\('.\\/${page[1]}'\\);$\\n`, 'gm');
+                                            let pageId;
+                                            const matches = entryChunk.code.matchAll(importRegex);
+                                            for (const match of matches) {
+                                                if (match[1]) {
+                                                    pageId = match[1];
+                                                }
+                                            }
+                                            const pageSource = page[0].split(':')[1].replace('@_@', '.');
+                                            entryChunk.code = entryChunk.code.replace(importRegex, '');
+                                            if (pageId) {
+                                                // Find the page in the pageMap of the ssr entry file, which get generated by Astro: https://github.com/withastro/astro/blob/08cdd0919d3249a762822e4bba9e0c5d3966916c/packages/astro/src/core/build/plugins/plugin-ssr.ts#L65
+                                                const arrayRegex = new RegExp(`\\["${pageSource}", ?${pageId}\\],?`, 'gm');
+                                                entryChunk.code = entryChunk.code.replace(arrayRegex, '');
+                                            }
+                                        }
+                                    }
+                                    else {
+                                        // We don't want to handle this case, since it will always occur for the client build.
+                                    }
+                                },
+                            },
                         ],
                     },
                     image: setImageConfig(args?.imageService ?? 'DEFAULT', config.image, command, logger),
@@ -217,6 +268,13 @@ export default function createIntegration(args) {
                         logger.error('Failed to write _redirects file');
                     }
                 }
+                // Get chunks from the bundle that are not needed on the server and delete them
+                // Those modules are build only for prerendering routes.
+                const chunksToDelete = chunkAnalyzer.getNonServerChunks();
+                for (const chunk of chunksToDelete) {
+                    // Chunks are located on `./_worker.js` directory inside of the output directory
+                    await unlink(new URL(`./_worker.js/${chunk}`, _config.outDir));
+                }
             },
         },
     };

package/dist/utils/image-config.js

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

package/dist/utils/non-server-chunk-detector.d.ts

@@ -0,0 +1,14 @@
+import type { Plugin } from 'vite';
+/**
+ * A Vite bundle analyzer that identifies chunks that are not used for server rendering.
+ *
+ * The chunks injected by Astro for prerendering are flagged as non-server chunks.
+ * Any chunks that is only used by a non-server chunk are also flagged as non-server chunks.
+ * This continues transitively until all non-server chunks are found.
+ */
+export declare class NonServerChunkDetector {
+    private nonServerChunks?;
+    getPlugin(): Plugin;
+    private processBundle;
+    getNonServerChunks(): string[];
+}

package/dist/utils/non-server-chunk-detector.js

@@ -0,0 +1,66 @@
+/**
+ * A Vite bundle analyzer that identifies chunks that are not used for server rendering.
+ *
+ * The chunks injected by Astro for prerendering are flagged as non-server chunks.
+ * Any chunks that is only used by a non-server chunk are also flagged as non-server chunks.
+ * This continues transitively until all non-server chunks are found.
+ */
+export class NonServerChunkDetector {
+    nonServerChunks;
+    getPlugin() {
+        return {
+            name: 'non-server-chunk-detector',
+            generateBundle: (_, bundle) => {
+                this.processBundle(bundle);
+            },
+        };
+    }
+    processBundle(bundle) {
+        const chunkNamesToFiles = new Map();
+        const entryChunks = [];
+        const chunkToDependencies = new Map();
+        for (const chunk of Object.values(bundle)) {
+            if (chunk.type !== 'chunk')
+                continue;
+            // Construct a mapping from a chunk name to its file name
+            chunkNamesToFiles.set(chunk.name, chunk.fileName);
+            // Construct a mapping from a chunk file to all the modules it imports
+            chunkToDependencies.set(chunk.fileName, [...chunk.imports, ...chunk.dynamicImports]);
+            if (chunk.isEntry) {
+                // Entry chunks should always be kept around since they are to be imported by the runtime
+                entryChunks.push(chunk.fileName);
+            }
+        }
+        const chunkDecisions = new Map();
+        for (const entry of entryChunks) {
+            // Entry chunks are used on the server
+            chunkDecisions.set(entry, true);
+        }
+        for (const chunk of ['prerender', 'prerender@_@astro']) {
+            // Prerender chunks are not used on the server
+            const fileName = chunkNamesToFiles.get(chunk);
+            if (fileName) {
+                chunkDecisions.set(fileName, false);
+            }
+        }
+        // Start a stack of chunks that are used on the server
+        const chunksToWalk = [...entryChunks];
+        // Iterate over the chunks, traversing the transitive dependencies of the chunks used on the server
+        for (let chunk = chunksToWalk.pop(); chunk; chunk = chunksToWalk.pop()) {
+            for (const dep of chunkToDependencies.get(chunk) ?? []) {
+                // Skip dependencies already flagged, dependencies may be repeated and/or circular
+                if (chunkDecisions.has(dep))
+                    continue;
+                // A dependency of a module used on the server is also used on the server
+                chunkDecisions.set(dep, true);
+                // Add the dependency to the stack so its own dependencies are also flagged
+                chunksToWalk.push(dep);
+            }
+        }
+        // Any chunk not flagged as used on the server is a non-server chunk
+        this.nonServerChunks = Array.from(chunkToDependencies.keys()).filter((chunk) => !chunkDecisions.get(chunk));
+    }
+    getNonServerChunks() {
+        return this.nonServerChunks ?? [];
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "10.0.3",
+  "version": "10.2.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -28,11 +28,11 @@
     "dist"
   ],
   "dependencies": {
-    "@astrojs/underscore-redirects": "^0.3.3",
     "@astrojs/internal-helpers": "0.3.0",
+    "@astrojs/underscore-redirects": "^0.3.3",
     "@cloudflare/workers-types": "^4.20240320.1",
-    "miniflare": "^3.20240320.0",
     "esbuild": "^0.19.5",
+    "miniflare": "^3.20240320.0",
     "tiny-glob": "^0.2.9",
     "wrangler": "^3.39.0"
   },
@@ -40,11 +40,13 @@
     "astro": "^4.2.0"
   },
   "devDependencies": {
+    "astro": "^4.5.8",
+    "cheerio": "1.0.0-rc.12",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
+    "rollup": "^4.14.0",
     "strip-ansi": "^7.1.0",
-    "astro": "^4.5.8",
-    "cheerio": "1.0.0-rc.12",
+    "vite": "^5.2.6",
     "@astrojs/test-utils": "0.0.1",
     "astro-scripts": "0.0.14"
   },