@astrojs/cloudflare 6.2.0 → 6.2.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/cloudflare:build: cache hit, replaying output c680bf8c85b2bd20
-@astrojs/cloudflare:build: 
-@astrojs/cloudflare:build: > @astrojs/cloudflare@6.2.0 build /home/runner/work/astro/astro/packages/integrations/cloudflare
-@astrojs/cloudflare:build: > astro-scripts build "src/**/*.ts" && tsc
-@astrojs/cloudflare:build: 
+@astrojs/cloudflare:build: cache hit, replaying output 627ca52425ee75b5
+@astrojs/cloudflare:build: 
+@astrojs/cloudflare:build: > @astrojs/cloudflare@6.2.2 build /home/runner/work/astro/astro/packages/integrations/cloudflare
+@astrojs/cloudflare:build: > astro-scripts build "src/**/*.ts" && tsc
+@astrojs/cloudflare:build: 

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @astrojs/cloudflare
 
+## 6.2.2
+
+### Patch Changes
+
+- [#6550](https://github.com/withastro/astro/pull/6550) [`2c829fdf6`](https://github.com/withastro/astro/commit/2c829fdf65bcb91485837c9cfb5a3b453c6fccc7) Thanks [@RichiCoder1](https://github.com/RichiCoder1)! - fix `config.base` trimming logic for cloudflare integration `_routes.json` generation
+
+- Updated dependencies [[`04dddd783`](https://github.com/withastro/astro/commit/04dddd783da3235aa9ed523d2856adf86b792b5f), [`ea9b3dd72`](https://github.com/withastro/astro/commit/ea9b3dd72b98b3f5a542ca24a275f673faa6c7c5), [`bf024cb34`](https://github.com/withastro/astro/commit/bf024cb3429c5929d98378108230bc946a376b17), [`22955b895`](https://github.com/withastro/astro/commit/22955b895ce4343e282355db64b3a5c1415f3944), [`f413446a8`](https://github.com/withastro/astro/commit/f413446a859e497395b3612e44d1540cc6b9dad7), [`90e5f87d0`](https://github.com/withastro/astro/commit/90e5f87d03215a833bb6ac91f9548670a25ce659), [`388190102`](https://github.com/withastro/astro/commit/3881901028cbb586f5a4de1b4953e2d6730458ab), [`035c0c4df`](https://github.com/withastro/astro/commit/035c0c4df2a623bcc2f2a1cb9e490df35fa29adc), [`f112c12b1`](https://github.com/withastro/astro/commit/f112c12b15dfbb278d66699f54809674dd1bded0), [`689884251`](https://github.com/withastro/astro/commit/68988425119255382f94c983796574050006f003), [`fa132e35c`](https://github.com/withastro/astro/commit/fa132e35c23f2cfe368fd0a7239584a2bc5c4f12), [`f5fddafc2`](https://github.com/withastro/astro/commit/f5fddafc248bb1ef57b7349bfecc25539ae2b5ea), [`283734525`](https://github.com/withastro/astro/commit/28373452503bc6ca88221ffd39a5590e015e4d71), [`66858f1f2`](https://github.com/withastro/astro/commit/66858f1f238a0edf6ded2b0f693bc738785d5aa3), [`6c465e958`](https://github.com/withastro/astro/commit/6c465e958e088ff55e5b895e67c64c0dfd4277a6)]:
+  - astro@2.1.4
+
+## 6.2.1
+
+### Patch Changes
+
+- [#6531](https://github.com/withastro/astro/pull/6531) [`4ddf34893`](https://github.com/withastro/astro/commit/4ddf3489384ed53f25df190a3478da44bd38600e) Thanks [@matthewp](https://github.com/matthewp)! - Remove false-positive warnings from Cloudflare's build.
+
+  Cloudflare includes warnings when it bundles the already-built output from astro.build. Those warnings are mostly due to `"sideEffects": false` packages that are included in the Vite built output because they are marked as external. Rollup will remove unused imports from these packages but will not remove the actual import, causing the false-positive warning.
+
+- [#6473](https://github.com/withastro/astro/pull/6473) [`1c3e8f6c3`](https://github.com/withastro/astro/commit/1c3e8f6c3b839087aa51de2e2fb665cd907f2847) Thanks [@RichiCoder1](https://github.com/RichiCoder1)! - fix automatic routes generation not respecting config.base
+
+- [#6494](https://github.com/withastro/astro/pull/6494) [`a13e9d7e3`](https://github.com/withastro/astro/commit/a13e9d7e33baccf51e7d4815f99b481ad174bc57) Thanks [@Yan-Thomas](https://github.com/Yan-Thomas)! - Consistency improvements to several package descriptions
+
+- Updated dependencies [[`acf78c5e2`](https://github.com/withastro/astro/commit/acf78c5e271ec3d4f589782078e2a2044cc1c391), [`04e624d06`](https://github.com/withastro/astro/commit/04e624d062c6ce385f6293afba26f3942c2290c6), [`cc90d7219`](https://github.com/withastro/astro/commit/cc90d72197e1139195e9545105b9a1d339f38e1b), [`a9a6ae298`](https://github.com/withastro/astro/commit/a9a6ae29812339ea00f3b9afd3de09bd9d3733a9), [`6a7cf0712`](https://github.com/withastro/astro/commit/6a7cf0712da23e2c095f4bc4f2512e618bceb38e), [`bfd67ea74`](https://github.com/withastro/astro/commit/bfd67ea749dbc6ffa7c9a671fcc48bea6c04a075), [`f6eddffa0`](https://github.com/withastro/astro/commit/f6eddffa0414d54767e9f9e1ee5a936b8a20146b), [`c63874090`](https://github.com/withastro/astro/commit/c6387409062f1d7c2afc93319748ad57086837c5), [`d637d1ea5`](https://github.com/withastro/astro/commit/d637d1ea5b347b9c724adc895c9006c696ac8fc8), [`637f9bc72`](https://github.com/withastro/astro/commit/637f9bc728ea7d56fc82a862d761385f0dcd9528), [`77a046e88`](https://github.com/withastro/astro/commit/77a046e886c370b737208574b6934f5a1cf2b177)]:
+  - astro@2.1.3
+
 ## 6.2.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import type { AstroAdapter, AstroIntegration } from 'astro';
-declare type Options = {
+type Options = {
     mode: 'directory' | 'advanced';
 };
 export declare function getAdapter(isModeDirectory: boolean): AstroAdapter;

package/dist/index.js

@@ -82,6 +82,9 @@ function createIntegration(args) {
           minify: true,
           banner: {
             js: SHIM
+          },
+          logOverride: {
+            "ignored-bare-import": "silent"
           }
         });
         await fs.promises.rename(buildPath, finalBuildUrl);
@@ -106,7 +109,12 @@ function createIntegration(args) {
             filesOnly: true
           })).filter((file) => cloudflareSpecialFiles.indexOf(file) < 0).map((file) => `/${file}`);
           for (let page of pages) {
-            staticPathList.push(prependForwardSlash(page.pathname));
+            let pagePath = prependForwardSlash(page.pathname);
+            if (_config.base !== "/") {
+              const base = _config.base.endsWith("/") ? _config.base.slice(0, -1) : _config.base;
+              pagePath = `${base}${pagePath}`;
+            }
+            staticPathList.push(pagePath);
           }
           const redirectsExists = await fs.promises.stat(new URL("./_redirects", _config.outDir)).then((stat) => stat.isFile()).catch(() => false);
           if (redirectsExists) {

package/dist/runtime.d.ts

@@ -1,10 +1,10 @@
-export declare type WorkerRuntime<T = unknown> = {
+export type WorkerRuntime<T = unknown> = {
     name: 'cloudflare';
     env: T;
     waitUntil(promise: Promise<any>): void;
     passThroughOnException(): void;
 };
-export declare type PagesRuntime<T = unknown, U = unknown> = {
+export type PagesRuntime<T = unknown, U = unknown> = {
     name: 'cloudflare';
     env: T;
     functionPath: string;

package/dist/server.advanced.d.ts

@@ -1,5 +1,5 @@
 import type { SSRManifest } from 'astro';
-declare type Env = {
+type Env = {
     ASSETS: {
         fetch: (req: Request) => Promise<Response>;
     };

package/dist/util.js

@@ -5,6 +5,7 @@ function getProcessEnvProxy() {
     {
       get: (target, prop) => {
         console.warn(
+          // NOTE: \0 prevents Vite replacement
           `Unable to access \`import.meta\0.env.${prop.toString()}\` on initialization as the Cloudflare platform only provides the environment variables per request. Please move the environment variable access inside a function that's only called after a request has been received.`
         );
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
-  "description": "Deploy your site to cloudflare workers or cloudflare pages",
-  "version": "6.2.0",
+  "description": "Deploy your site to Cloudflare Workers/Pages",
+  "version": "6.2.2",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -28,14 +28,14 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "esbuild": "^0.15.18",
+    "esbuild": "^0.17.12",
     "tiny-glob": "^0.2.9"
   },
   "peerDependencies": {
-    "astro": "^2.1.0"
+    "astro": "^2.1.4"
   },
   "devDependencies": {
-    "astro": "2.1.0",
+    "astro": "2.1.4",
     "astro-scripts": "0.0.14",
     "chai": "^4.3.6",
     "cheerio": "^1.0.0-rc.11",

package/src/index.ts

@@ -107,6 +107,9 @@ export default function createIntegration(args?: Options): AstroIntegration {
 					banner: {
 						js: SHIM,
 					},
+					logOverride: {
+						'ignored-bare-import': 'silent',
+					},
 				});
 
 				// Rename to worker.js
@@ -150,7 +153,12 @@ export default function createIntegration(args?: Options): AstroIntegration {
 						.map((file: string) => `/${file}`);
 
 					for (let page of pages) {
-						staticPathList.push(prependForwardSlash(page.pathname));
+						let pagePath = prependForwardSlash(page.pathname);
+						if (_config.base !== '/') {
+							const base = _config.base.endsWith('/') ? _config.base.slice(0, -1) : _config.base;
+							pagePath = `${base}${pagePath}`;
+						}
+						staticPathList.push(pagePath);
 					}
 
 					const redirectsExists = await fs.promises