@astrojs/cloudflare 10.4.2 → 11.0.0

package/dist/entrypoints/server.js

@@ -1,4 +1,6 @@
 import { App } from 'astro/app';
+import { setGetEnv } from 'astro/env/setup';
+import { createGetEnv } from '../utils/env.js';
 export function createExports(manifest) {
     const app = new App(manifest);
     const fetch = async (request, env, context) => {
@@ -28,10 +30,14 @@ export function createExports(manifest) {
                 caches: caches,
                 ctx: {
                     waitUntil: (promise) => context.waitUntil(promise),
-                    passThroughOnException: () => context.passThroughOnException(),
+                    // Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions
+                    passThroughOnException: () => {
+                        throw new Error('`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.');
+                    },
                 },
             },
         };
+        setGetEnv(createGetEnv(env));
         const response = await app.render(request, { routeData, locals });
         if (app.setCookieHeaders) {
             for (const setCookieHeader of app.setCookieHeaders(response)) {

package/dist/index.d.ts

@@ -31,7 +31,7 @@ export type Options = {
      * Proxy configuration for the platform.
      */
     platformProxy?: {
-        /** Toggle the proxy. Default `undefined`, which equals to `false`. */
+        /** Toggle the proxy. Default `undefined`, which equals to `true`. */
         enabled?: boolean;
         /** Path to the configuration file. Default `wrangler.toml`. */
         configPath?: string;
@@ -50,7 +50,5 @@ export type Options = {
      * for reference on how these file types are exported
      */
     cloudflareModules?: boolean;
-    /** @deprecated - use `cloudflareModules`, which defaults to true. You can set `cloudflareModuleLoading: false` to disable */
-    wasmModuleImports?: boolean;
 };
 export default function createIntegration(args?: Options): AstroIntegration;

package/dist/index.js

@@ -1,94 +1,66 @@
 import { createReadStream } from 'node:fs';
-import { appendFile, rename, stat, unlink } from 'node:fs/promises';
+import { appendFile, rename, stat } 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';
 import { AstroError } from 'astro/errors';
-import { walk } from 'estree-walker';
-import MagicString from 'magic-string';
 import { getPlatformProxy } from 'wrangler';
 import { cloudflareModuleLoader, } from './utils/cloudflare-module-loader.js';
+import { createGetEnv } from './utils/env.js';
 import { createRoutesFile, getParts } from './utils/generate-routes-json.js';
 import { setImageConfig } from './utils/image-config.js';
-import { mutateDynamicPageImportsInPlace, mutatePageMapInPlace } from './utils/index.js';
-import { NonServerChunkDetector } from './utils/non-server-chunk-detector.js';
+function wrapWithSlashes(path) {
+    return prependForwardSlash(appendForwardSlash(path));
+}
+function setProcessEnv(config, env) {
+    const getEnv = createGetEnv(env);
+    if (config.experimental.env?.schema) {
+        for (const key of Object.keys(config.experimental.env.schema)) {
+            const value = getEnv(key);
+            if (value !== undefined) {
+                process.env[key] = value;
+            }
+        }
+    }
+}
+function createPlatformProxy(platformProxy) {
+    return getPlatformProxy({
+        configPath: platformProxy?.configPath ?? 'wrangler.toml',
+        experimentalJsonConfig: platformProxy?.experimentalJsonConfig ?? false,
+        persist: platformProxy?.persist ?? true,
+    });
+}
 export default function createIntegration(args) {
     let _config;
-    const cloudflareModulePlugin = cloudflareModuleLoader(args?.cloudflareModules ?? args?.wasmModuleImports ?? true);
-    // 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 cloudflareModulePlugin = cloudflareModuleLoader(args?.cloudflareModules ?? true);
     return {
         name: '@astrojs/cloudflare',
         hooks: {
-            'astro:config:setup': ({ command, config, updateConfig, logger }) => {
+            'astro:config:setup': ({ command, config, updateConfig, logger, addWatchFile }) => {
                 updateConfig({
                     build: {
-                        client: new URL(`.${prependForwardSlash(appendForwardSlash(config.base))}`, config.outDir),
+                        client: new URL(`.${wrapWithSlashes(config.base)}`, config.outDir),
                         server: new URL('./_worker.js/', config.outDir),
                         serverEntry: 'index.js',
                         redirects: false,
                     },
                     vite: {
-                        // load .wasm files as WebAssembly modules
                         plugins: [
+                            // https://developers.cloudflare.com/pages/functions/module-support/
+                            // Allows imports of '.wasm', '.bin', and '.txt' file types
                             cloudflareModulePlugin,
-                            chunkAnalyzer.getPlugin(),
-                            {
-                                name: 'dynamic-imports-analyzer',
-                                enforce: 'post',
-                                generateBundle(_, bundle) {
-                                    let astrojsSSRVirtualEntryAST;
-                                    const prerenderImports = [];
-                                    let entryChunk;
-                                    // 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;
-                                        if (chunk.name === '_@astrojs-ssr-virtual-entry') {
-                                            astrojsSSRVirtualEntryAST = this.parse(chunk.code);
-                                            entryChunk = chunk;
-                                            continue;
-                                        }
-                                        const isPrerendered = chunk.dynamicImports.some((entry) => entry.includes('prerender'));
-                                        if (isPrerendered) {
-                                            prerenderImports.push(chunk.fileName);
-                                        }
-                                    }
-                                    if (!astrojsSSRVirtualEntryAST)
-                                        return;
-                                    if (!entryChunk)
-                                        return;
-                                    const s = new MagicString(entryChunk.code);
-                                    const constsToRemove = [];
-                                    walk(astrojsSSRVirtualEntryAST, {
-                                        leave(node) {
-                                            // We are only looking for VariableDeclarations, since both (dynamic imports and pageMap) are declared as constants in the code
-                                            if (node.type !== 'VariableDeclaration')
-                                                return;
-                                            if (!node.declarations[0] ||
-                                                node.declarations[0].type !== 'VariableDeclarator')
-                                                return;
-                                            // This function will remove the dynamic imports from the entrypoint
-                                            mutateDynamicPageImportsInPlace(node, prerenderImports, constsToRemove, s);
-                                            // This function will remove the pageMap entries which are invalid now
-                                            mutatePageMapInPlace(node, constsToRemove, s);
-                                        },
-                                    });
-                                    entryChunk.code = s.toString();
-                                },
-                            },
                         ],
                     },
-                    image: setImageConfig(args?.imageService ?? 'DEFAULT', config.image, command, logger),
+                    image: setImageConfig(args?.imageService ?? 'compile', config.image, command, logger),
                 });
+                addWatchFile(new URL('./wrangler.toml', config.root));
+                addWatchFile(new URL('./wrangler.json', config.root));
             },
             'astro:config:done': ({ setAdapter, config }) => {
-                _config = config;
                 if (config.output === 'static') {
                     throw new AstroError('[@astrojs/cloudflare] `output: "server"` or `output: "hybrid"` is required to use this adapter. Otherwise, this adapter is not necessary to deploy a static site to Cloudflare.');
                 }
+                _config = config;
                 setAdapter({
                     name: '@astrojs/cloudflare',
                     serverEntrypoint: '@astrojs/cloudflare/entrypoints/server.js',
@@ -107,16 +79,14 @@ export default function createIntegration(args) {
                             isSharpCompatible: false,
                             isSquooshCompatible: false,
                         },
+                        envGetSecret: 'experimental',
                     },
                 });
             },
             'astro:server:setup': async ({ server }) => {
-                if (args?.platformProxy?.enabled === true) {
-                    const platformProxy = await getPlatformProxy({
-                        configPath: args.platformProxy.configPath ?? 'wrangler.toml',
-                        experimentalJsonConfig: args.platformProxy.experimentalJsonConfig ?? false,
-                        persist: args.platformProxy.persist ?? true,
-                    });
+                if ((args?.platformProxy?.enabled ?? true) === true) {
+                    const platformProxy = await createPlatformProxy(args?.platformProxy);
+                    setProcessEnv(_config, platformProxy.env);
                     const clientLocalsSymbol = Symbol.for('astro.locals');
                     server.middlewares.use(async function middleware(req, res, next) {
                         Reflect.set(req, clientLocalsSymbol, {
@@ -126,7 +96,10 @@ export default function createIntegration(args) {
                                 caches: platformProxy.caches,
                                 ctx: {
                                     waitUntil: (promise) => platformProxy.ctx.waitUntil(promise),
-                                    passThroughOnException: () => platformProxy.ctx.passThroughOnException(),
+                                    // Currently not available: https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions
+                                    passThroughOnException: () => {
+                                        throw new AstroError('`passThroughOnException` is currently not available in Cloudflare Pages. See https://developers.cloudflare.com/pages/platform/known-issues/#pages-functions.');
+                                    },
                                 },
                             },
                         });
@@ -175,20 +148,6 @@ export default function createIntegration(args) {
                     // @ts-expect-error
                     vite.build.rollupOptions.output.banner ||=
                         'globalThis.process ??= {}; globalThis.process.env ??= {};';
-                    // @ts-expect-error
-                    vite.build.rollupOptions.output.manualChunks = (id) => {
-                        if (id.includes('node_modules')) {
-                            if (id.indexOf('node_modules') !== -1) {
-                                const basic = id.toString().split('node_modules/')[1];
-                                const sub1 = basic.split('/')[0];
-                                if (sub1 !== '.pnpm') {
-                                    return sub1.toString();
-                                }
-                                const name2 = basic.split('/')[1];
-                                return name2.split('@')[name2[0] === '@' ? 1 : 0].toString();
-                            }
-                        }
-                    };
                     vite.build.rollupOptions.external = _config.vite.build?.rollupOptions?.external ?? [];
                     // Cloudflare env is only available per request. This isn't feasible for code that access env vars
                     // in a global way, so we shim their access as `process.env.*`. This is not the recommended way for users to access environment variables. But we'll add this for compatibility for chosen variables. Mainly to support `@astrojs/db`
@@ -208,8 +167,6 @@ export default function createIntegration(args) {
                     vite.build ||= {};
                     vite.build.rollupOptions ||= {};
                     vite.build.rollupOptions.output ||= {};
-                    // @ts-expect-error
-                    vite.build.rollupOptions.output.manualChunks = undefined;
                 }
             },
             'astro:build:done': async ({ pages, routes, dir, logger }) => {
@@ -289,18 +246,6 @@ 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) {
-                    try {
-                        // Chunks are located on `./_worker.js` directory inside of the output directory
-                        await unlink(new URL(`./_worker.js/${chunk}`, _config.outDir));
-                    }
-                    catch (error) {
-                        logger.warn(`Issue while trying to delete unused file from server bundle: ${new URL(`./_worker.js/${chunk}`, _config.outDir).toString()}`);
-                    }
-                }
             },
         },
     };

package/dist/utils/cloudflare-module-loader.js

@@ -51,7 +51,7 @@ export function cloudflareModuleLoader(enabled) {
                 return;
             }
             if (!enabled) {
-                throw new Error(`Cloudflare module loading is experimental. The ${maybeExtension} module cannot be loaded unless you add \`wasmModuleImports: true\` to your astro config.`);
+                throw new Error(`Cloudflare module loading is experimental. The ${maybeExtension} module cannot be loaded unless you add \`cloudflareModules: true\` to your astro config.`);
             }
             const moduleLoader = renderers[moduleType];
             const filePath = id.replace(/\?\w+$/, '');
@@ -126,7 +126,10 @@ export function cloudflareModuleLoader(enabled) {
             for (const chunk of Object.values(bundle)) {
                 const repls = chunk.name && replacementsByChunkName.get(chunk.name);
                 for (const replacement of repls || []) {
-                    replacement.fileName = chunk.fileName;
+                    if (!replacement.fileName) {
+                        replacement.fileName = [];
+                    }
+                    replacement.fileName.push(chunk.fileName);
                 }
             }
         },
@@ -140,11 +143,13 @@ export function cloudflareModuleLoader(enabled) {
                 if (!replacement.fileName) {
                     continue;
                 }
-                const repls = replacementsByFileName.get(replacement.fileName) || [];
-                if (!repls.length) {
-                    replacementsByFileName.set(replacement.fileName, repls);
+                for (const fileName of replacement.fileName) {
+                    const repls = replacementsByFileName.get(fileName) || [];
+                    if (!repls.length) {
+                        replacementsByFileName.set(fileName, repls);
+                    }
+                    repls.push(replacement);
                 }
-                repls.push(replacement);
             }
             for (const [fileName, repls] of replacementsByFileName.entries()) {
                 const filepath = path.join(baseDir, '_worker.js', fileName);

package/dist/utils/env.d.ts

@@ -0,0 +1,2 @@
+import type { GetEnv } from 'astro/env/setup';
+export declare const createGetEnv: (env: Record<string, unknown>) => GetEnv;

package/dist/utils/env.js

@@ -0,0 +1,11 @@
+export const createGetEnv = (env) => (key) => {
+    const v = env[key];
+    if (typeof v === 'undefined' || typeof v === 'string') {
+        return v;
+    }
+    if (typeof v === 'boolean' || typeof v === 'number') {
+        // let astro:env handle the validation and transformation
+        return v.toString();
+    }
+    return undefined;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "10.4.2",
+  "version": "11.0.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -39,10 +39,10 @@
     "wrangler": "^3.39.0"
   },
   "peerDependencies": {
-    "astro": "^4.2.0"
+    "astro": "^4.10.3"
   },
   "devDependencies": {
-    "astro": "^4.10.1",
+    "astro": "^4.10.3",
     "cheerio": "1.0.0-rc.12",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",

package/dist/utils/index.d.ts

@@ -1,8 +0,0 @@
-import type { Node } from 'estree-walker';
-import type MagicString from 'magic-string';
-export declare function mutatePageMapInPlace(node: Extract<Node, {
-    type: 'VariableDeclaration';
-}>, constsToRemove: string[], s: MagicString): void;
-export declare function mutateDynamicPageImportsInPlace(node: Extract<Node, {
-    type: 'VariableDeclaration';
-}>, prerenderImports: string[], constsToRemove: string[], s: MagicString): void;

package/dist/utils/index.js

@@ -1,55 +0,0 @@
-export function mutatePageMapInPlace(node, constsToRemove, s) {
-    const declarator = node.declarations[0];
-    if (declarator.id.type !== 'Identifier')
-        return;
-    if (declarator.id.name !== 'pageMap')
-        return;
-    if (!declarator.init || declarator.init.type !== 'NewExpression')
-        return;
-    if (!declarator.init.arguments[0] || declarator.init.arguments[0].type !== 'ArrayExpression')
-        return;
-    for (const arrayExpression of declarator.init.arguments[0].elements) {
-        if (!arrayExpression || arrayExpression.type !== 'ArrayExpression')
-            continue;
-        if (!arrayExpression.elements[1] || arrayExpression.elements[1].type !== 'Identifier')
-            continue;
-        if (constsToRemove.includes(arrayExpression.elements[1].name)) {
-            // @ts-expect-error - @types/estree seem to be wrong
-            if (arrayExpression.start && arrayExpression.end) {
-                // @ts-expect-error - @types/estree seem to be wrong
-                s.remove(arrayExpression.start, arrayExpression.end);
-                // We need to check if there are any leftover commas, which are not part of the `ArrayExpression` node
-                // @ts-expect-error - @types/estree seem to be wrong
-                const endChar = s.slice(arrayExpression.end, arrayExpression.end + 1);
-                if (endChar.includes(',')) {
-                    // @ts-expect-error - @types/estree seem to be wrong
-                    s.remove(arrayExpression.end, arrayExpression.end + 1);
-                }
-            }
-        }
-    }
-}
-export function mutateDynamicPageImportsInPlace(node, prerenderImports, constsToRemove, s) {
-    const declarator = node.declarations[0];
-    if (declarator.id.type !== 'Identifier')
-        return;
-    if (!declarator.id.name.startsWith('_page'))
-        return;
-    if (!declarator.init || declarator.init.type !== 'ArrowFunctionExpression')
-        return;
-    if (!declarator.init.body || declarator.init.body.type !== 'ImportExpression')
-        return;
-    if (!declarator.init.body.source || declarator.init.body.source.type !== 'Literal')
-        return;
-    const sourceValue = declarator.init.body.source.value;
-    if (typeof sourceValue !== 'string')
-        return;
-    if (prerenderImports.some((importItem) => sourceValue.includes(importItem))) {
-        // @ts-expect-error - @types/estree seem to be wrong
-        if (node.start && node.end) {
-            constsToRemove.push(declarator.id.name);
-            // @ts-expect-error - @types/estree seem to be wrong
-            s.remove(node.start, node.end);
-        }
-    }
-}