wrangler 2.1.14 → 2.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.1.14",
+	"version": "2.1.15",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -160,6 +160,7 @@
 		"jest-fetch-mock": "^3.0.3",
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
+		"minimatch": "^5.1.0",
 		"msw": "^0.47.1",
 		"npx-import": "^1.1.3",
 		"open": "^8.4.0",

package/src/__tests__/pages.test.ts

@@ -1905,6 +1905,116 @@ and that at least one include rule is provided.
 		      `);
 		});
 
+		it("should avoid uploading some files", async () => {
+			mkdirSync("some_dir/node_modules", { recursive: true });
+			mkdirSync("some_dir/functions", { recursive: true });
+
+			writeFileSync("logo.png", "foobar");
+			writeFileSync("some_dir/functions/foo.js", "func");
+			writeFileSync("some_dir/_headers", "headersfile");
+
+			writeFileSync("_headers", "headersfile");
+			writeFileSync("_redirects", "redirectsfile");
+			writeFileSync("_worker.js", "workerfile");
+			writeFileSync("_routes.json", "routesfile");
+			mkdirSync(".git");
+			writeFileSync(".git/foo", "gitfile");
+			writeFileSync("some_dir/node_modules/some_package", "nodefile");
+			mkdirSync("functions");
+			writeFileSync("functions/foo.js", "func");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: [
+								"2082190357cfd3617ccfe04f340c6247",
+								"95dedb64e6d4940fc2e0f11f711cc2f4",
+								"09a79777abda8ccc8bdd51dd3ff8e9e9",
+							],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+
+				return createFetchResult(null, true);
+			});
+
+			assertLater(() => {
+				expect(requests.length).toBe(3);
+
+				expect(requests[0].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				let body = JSON.parse(
+					requests[0].body as string
+				) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "95dedb64e6d4940fc2e0f11f711cc2f4",
+						value: Buffer.from("headersfile").toString("base64"),
+						metadata: {
+							contentType: "application/octet-stream",
+						},
+						base64: true,
+					},
+				]);
+
+				expect(requests[1].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				body = JSON.parse(requests[1].body as string) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "2082190357cfd3617ccfe04f340c6247",
+						value: Buffer.from("foobar").toString("base64"),
+						metadata: {
+							contentType: "image/png",
+						},
+						base64: true,
+					},
+				]);
+
+				expect(requests[2].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				body = JSON.parse(requests[2].body as string) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
+						value: Buffer.from("func").toString("base64"),
+						metadata: {
+							contentType: "application/javascript",
+						},
+						base64: true,
+					},
+				]);
+			});
+
+			await runWrangler("pages project upload .");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 3 files (TIMINGS)
+
+			        ✨ Upload complete!"
+		      `);
+		});
+
 		it("should retry uploads", async () => {
 			writeFileSync("logo.txt", "foobar");
 

package/src/is-interactive.ts

@@ -4,6 +4,10 @@
  * or you're piping values from / to another process, etc
  */
 export default function isInteractive(): boolean {
+	if (process.env.CF_PAGES === "1") {
+		return false;
+	}
+
 	try {
 		return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 	} catch {

package/src/pages/constants.ts

@@ -1,5 +1,7 @@
 import { version as wranglerVersion } from "../../package.json";
 
+export const MAX_ASSET_COUNT = 20_000;
+export const MAX_ASSET_SIZE = 25 * 1024 * 1024;
 export const PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 export const MAX_BUCKET_SIZE = 50 * 1024 * 1024;
 export const MAX_BUCKET_FILE_COUNT = 5000;

package/src/pages/upload.tsx

@@ -3,13 +3,17 @@ import { dirname, join, relative, resolve, sep } from "node:path";
 import { render, Text } from "ink";
 import Spinner from "ink-spinner";
 import { getType } from "mime";
+import { Minimatch } from "minimatch";
 import PQueue from "p-queue";
 import prettyBytes from "pretty-bytes";
 import React from "react";
 import { fetchResult } from "../cfetch";
 import { FatalError } from "../errors";
+import isInteractive from "../is-interactive";
 import { logger } from "../logger";
 import {
+	MAX_ASSET_COUNT,
+	MAX_ASSET_SIZE,
 	BULK_UPLOAD_CONCURRENCY,
 	MAX_BUCKET_FILE_COUNT,
 	MAX_BUCKET_SIZE,
@@ -96,10 +100,11 @@ export const upload = async (
 		"_redirects",
 		"_headers",
 		"_routes.json",
-		".DS_Store",
-		"node_modules",
-		".git",
-	];
+		"functions",
+		"**/.DS_Store",
+		"**/node_modules",
+		"**/.git",
+	].map((pattern) => new Minimatch(pattern));
 
 	const directory = resolve(args.directory);
 
@@ -121,10 +126,13 @@ export const upload = async (
 		await Promise.all(
 			files.map(async (file) => {
 				const filepath = join(dir, file);
+				const relativeFilepath = relative(startingDir, filepath);
 				const filestat = await stat(filepath);
 
-				if (IGNORE_LIST.includes(file)) {
-					return;
+				for (const minimatch of IGNORE_LIST) {
+					if (minimatch.match(relativeFilepath)) {
+						return;
+					}
 				}
 
 				if (filestat.isSymbolicLink()) {
@@ -134,12 +142,12 @@ export const upload = async (
 				if (filestat.isDirectory()) {
 					fileMap = await walk(filepath, fileMap, startingDir);
 				} else {
-					const name = relative(startingDir, filepath).split(sep).join("/");
+					const name = relativeFilepath.split(sep).join("/");
 
-					if (filestat.size > 25 * 1024 * 1024) {
+					if (filestat.size > MAX_ASSET_SIZE) {
 						throw new FatalError(
 							`Error: Pages only supports files up to ${prettyBytes(
-								25 * 1024 * 1024
+								MAX_ASSET_SIZE
 							)} in size\n${name} is ${prettyBytes(filestat.size)} in size`,
 							1
 						);
@@ -161,9 +169,9 @@ export const upload = async (
 
 	const fileMap = await walk(directory);
 
-	if (fileMap.size > 20000) {
+	if (fileMap.size > MAX_ASSET_COUNT) {
 		throw new FatalError(
-			`Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`,
+			`Error: Pages only supports up to ${MAX_ASSET_COUNT.toLocaleString()} files in a deployment. Ensure you have specified your build output directory correctly.`,
 			1
 		);
 	}
@@ -309,7 +317,9 @@ export const upload = async (
 				(error) => {
 					return Promise.reject(
 						new FatalError(
-							"Failed to upload files. Please try again.",
+							`Failed to upload files. Please try again. Error: ${JSON.stringify(
+								error
+							)})`,
 							error.code || 1
 						)
 					);
@@ -390,7 +400,7 @@ function Progress({ done, total }: { done: number; total: number }) {
 	return (
 		<>
 			<Text>
-				<Spinner type="earth" />
+				{isInteractive() ? <Spinner type="earth" /> : null}
 				{` Uploading... (${done}/${total})\n`}
 			</Text>
 		</>

package/templates/pages-template-plugin.ts

@@ -19,6 +19,7 @@ type EventContext<Env, P extends string, Data> = {
 	request: Request;
 	functionPath: string;
 	waitUntil: (promise: Promise<unknown>) => void;
+	passThroughOnException: () => void;
 	next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
 	env: Env & { ASSETS: { fetch: typeof fetch } };
 	params: Params<P>;
@@ -29,6 +30,7 @@ type EventPluginContext<Env, P extends string, Data, PluginArgs> = {
 	request: Request;
 	functionPath: string;
 	waitUntil: (promise: Promise<unknown>) => void;
+	passThroughOnException: () => void;
 	next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
 	env: Env & { ASSETS: { fetch: typeof fetch } };
 	params: Params<P>;
@@ -146,6 +148,8 @@ export default function (pluginArgs) {
 					pluginArgs,
 					env,
 					waitUntil: workerContext.waitUntil.bind(workerContext),
+					passThroughOnException:
+						workerContext.passThroughOnException.bind(workerContext),
 				};
 
 				const response = await handler(context);

package/templates/pages-template-worker.ts

@@ -19,6 +19,7 @@ type EventContext<Env, P extends string, Data> = {
 	request: Request;
 	functionPath: string;
 	waitUntil: (promise: Promise<unknown>) => void;
+	passThroughOnException: () => void;
 	next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
 	env: Env & { ASSETS: { fetch: typeof fetch } };
 	params: Params<P>;
@@ -53,6 +54,7 @@ type FetchEnv = {
 
 type WorkerContext = {
 	waitUntil: (promise: Promise<unknown>) => void;
+	passThroughOnException: () => void;
 };
 
 function* executeRequest(request: Request) {
@@ -111,9 +113,16 @@ function* executeRequest(request: Request) {
 }
 
 export default {
-	async fetch(request: Request, env: FetchEnv, workerContext: WorkerContext) {
+	async fetch(
+		originalRequest: Request,
+		env: FetchEnv,
+		workerContext: WorkerContext
+	) {
+		let request = originalRequest;
 		const handlerIterator = executeRequest(request);
 		const data = {}; // arbitrary data the user can set between functions
+		let isFailOpen = false;
+
 		const next = async (input?: RequestInfo, init?: RequestInit) => {
 			if (input !== undefined) {
 				let url = input;
@@ -135,6 +144,9 @@ export default {
 					data,
 					env,
 					waitUntil: workerContext.waitUntil.bind(workerContext),
+					passThroughOnException: () => {
+						isFailOpen = true;
+					},
 				};
 
 				const response = await handler(context);
@@ -156,9 +168,14 @@ export default {
 		};
 
 		try {
-			return next();
-		} catch (err) {
-			return new Response("Internal Error", { status: 500 });
+			return await next();
+		} catch (error) {
+			if (isFailOpen) {
+				const response = await env[__FALLBACK_SERVICE__].fetch(request);
+				return cloneResponse(response);
+			}
+
+			throw error;
 		}
 	},
 };

package/wrangler-dist/cli.js

@@ -80868,7 +80868,7 @@ var require_minimatch = __commonJS({
   "../../node_modules/minimatch/minimatch.js"(exports2, module2) {
     init_import_meta_url();
     module2.exports = minimatch;
-    minimatch.Minimatch = Minimatch;
+    minimatch.Minimatch = Minimatch2;
     var path36 = function() {
       try {
         return require("path");
@@ -80878,7 +80878,7 @@ var require_minimatch = __commonJS({
       sep: "/"
     };
     minimatch.sep = path36.sep;
-    var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {};
+    var GLOBSTAR = minimatch.GLOBSTAR = Minimatch2.GLOBSTAR = {};
     var expand = require_brace_expansion();
     var plTypes = {
       "!": { open: "(?:(?!(?:", close: "))[^/]*?)" },
@@ -80925,7 +80925,7 @@ var require_minimatch = __commonJS({
       var m = function minimatch2(p, pattern, options) {
         return orig(p, pattern, ext(def, options));
       };
-      m.Minimatch = function Minimatch2(pattern, options) {
+      m.Minimatch = function Minimatch3(pattern, options) {
         return new orig.Minimatch(pattern, ext(def, options));
       };
       m.Minimatch.defaults = function defaults(options) {
@@ -80948,7 +80948,7 @@ var require_minimatch = __commonJS({
       };
       return m;
     };
-    Minimatch.defaults = function(def) {
+    Minimatch2.defaults = function(def) {
       return minimatch.defaults(def).Minimatch;
     };
     function minimatch(p, pattern, options) {
@@ -80958,11 +80958,11 @@ var require_minimatch = __commonJS({
       if (!options.nocomment && pattern.charAt(0) === "#") {
         return false;
       }
-      return new Minimatch(pattern, options).match(p);
+      return new Minimatch2(pattern, options).match(p);
     }
-    function Minimatch(pattern, options) {
-      if (!(this instanceof Minimatch)) {
-        return new Minimatch(pattern, options);
+    function Minimatch2(pattern, options) {
+      if (!(this instanceof Minimatch2)) {
+        return new Minimatch2(pattern, options);
       }
       assertValidPattern(pattern);
       if (!options)
@@ -80981,9 +80981,9 @@ var require_minimatch = __commonJS({
       this.partial = !!options.partial;
       this.make();
     }
-    Minimatch.prototype.debug = function() {
+    Minimatch2.prototype.debug = function() {
     };
-    Minimatch.prototype.make = make;
+    Minimatch2.prototype.make = make;
     function make() {
       var pattern = this.pattern;
       var options = this.options;
@@ -81016,7 +81016,7 @@ var require_minimatch = __commonJS({
       this.debug(this.pattern, set);
       this.set = set;
     }
-    Minimatch.prototype.parseNegate = parseNegate;
+    Minimatch2.prototype.parseNegate = parseNegate;
     function parseNegate() {
       var pattern = this.pattern;
       var negate = false;
@@ -81035,10 +81035,10 @@ var require_minimatch = __commonJS({
     minimatch.braceExpand = function(pattern, options) {
       return braceExpand(pattern, options);
     };
-    Minimatch.prototype.braceExpand = braceExpand;
+    Minimatch2.prototype.braceExpand = braceExpand;
     function braceExpand(pattern, options) {
       if (!options) {
-        if (this instanceof Minimatch) {
+        if (this instanceof Minimatch2) {
           options = this.options;
         } else {
           options = {};
@@ -81060,7 +81060,7 @@ var require_minimatch = __commonJS({
         throw new TypeError("pattern is too long");
       }
     };
-    Minimatch.prototype.parse = parse2;
+    Minimatch2.prototype.parse = parse2;
     var SUBPARSE = {};
     function parse2(pattern, isSub) {
       assertValidPattern(pattern);
@@ -81295,9 +81295,9 @@ var require_minimatch = __commonJS({
       return regExp;
     }
     minimatch.makeRe = function(pattern, options) {
-      return new Minimatch(pattern, options || {}).makeRe();
+      return new Minimatch2(pattern, options || {}).makeRe();
     };
-    Minimatch.prototype.makeRe = makeRe;
+    Minimatch2.prototype.makeRe = makeRe;
     function makeRe() {
       if (this.regexp || this.regexp === false)
         return this.regexp;
@@ -81326,7 +81326,7 @@ var require_minimatch = __commonJS({
     }
     minimatch.match = function(list, pattern, options) {
       options = options || {};
-      var mm = new Minimatch(pattern, options);
+      var mm = new Minimatch2(pattern, options);
       list = list.filter(function(f) {
         return mm.match(f);
       });
@@ -81335,7 +81335,7 @@ var require_minimatch = __commonJS({
       }
       return list;
     };
-    Minimatch.prototype.match = function match(f, partial) {
+    Minimatch2.prototype.match = function match(f, partial) {
       if (typeof partial === "undefined")
         partial = this.partial;
       this.debug("match", f, this.pattern);
@@ -81377,7 +81377,7 @@ var require_minimatch = __commonJS({
         return false;
       return this.negate;
     };
-    Minimatch.prototype.matchOne = function(file, pattern, partial) {
+    Minimatch2.prototype.matchOne = function(file, pattern, partial) {
       var options = this.options;
       this.debug(
         "matchOne",
@@ -81542,7 +81542,7 @@ var require_common = __commonJS({
     var path36 = require("path");
     var minimatch = require_minimatch();
     var isAbsolute = require_path_is_absolute();
-    var Minimatch = minimatch.Minimatch;
+    var Minimatch2 = minimatch.Minimatch;
     function alphasort(a, b) {
       return a.localeCompare(b, "en");
     }
@@ -81558,10 +81558,10 @@ var require_common = __commonJS({
       var gmatcher = null;
       if (pattern.slice(-3) === "/**") {
         var gpattern = pattern.replace(/(\/\*\*)+$/, "");
-        gmatcher = new Minimatch(gpattern, { dot: true });
+        gmatcher = new Minimatch2(gpattern, { dot: true });
       }
       return {
-        matcher: new Minimatch(pattern, { dot: true }),
+        matcher: new Minimatch2(pattern, { dot: true }),
         gmatcher
       };
     }
@@ -81617,7 +81617,7 @@ var require_common = __commonJS({
       self2.nomount = !!options.nomount;
       options.nonegate = true;
       options.nocomment = true;
-      self2.minimatch = new Minimatch(pattern, options);
+      self2.minimatch = new Minimatch2(pattern, options);
       self2.options = self2.minimatch.options;
     }
     function finish(self2) {
@@ -81726,7 +81726,7 @@ var require_sync = __commonJS({
     globSync.GlobSync = GlobSync;
     var rp = require_fs();
     var minimatch = require_minimatch();
-    var Minimatch = minimatch.Minimatch;
+    var Minimatch2 = minimatch.Minimatch;
     var Glob = require_glob().Glob;
     var util3 = require("util");
     var path36 = require("path");
@@ -82202,7 +82202,7 @@ var require_glob = __commonJS({
     module2.exports = glob;
     var rp = require_fs();
     var minimatch = require_minimatch();
-    var Minimatch = minimatch.Minimatch;
+    var Minimatch2 = minimatch.Minimatch;
     var inherits = require_inherits();
     var EE = require("events").EventEmitter;
     var path36 = require("path");
@@ -133191,6 +133191,710 @@ var require_mime2 = __commonJS({
   }
 });
 
+// node_modules/minimatch/lib/path.js
+var require_path = __commonJS({
+  "node_modules/minimatch/lib/path.js"(exports2, module2) {
+    init_import_meta_url();
+    var isWindows2 = typeof process === "object" && process && process.platform === "win32";
+    module2.exports = isWindows2 ? { sep: "\\" } : { sep: "/" };
+  }
+});
+
+// node_modules/brace-expansion/index.js
+var require_brace_expansion2 = __commonJS({
+  "node_modules/brace-expansion/index.js"(exports2, module2) {
+    init_import_meta_url();
+    var balanced = require_balanced_match();
+    module2.exports = expandTop;
+    var escSlash = "\0SLASH" + Math.random() + "\0";
+    var escOpen = "\0OPEN" + Math.random() + "\0";
+    var escClose = "\0CLOSE" + Math.random() + "\0";
+    var escComma = "\0COMMA" + Math.random() + "\0";
+    var escPeriod = "\0PERIOD" + Math.random() + "\0";
+    function numeric(str) {
+      return parseInt(str, 10) == str ? parseInt(str, 10) : str.charCodeAt(0);
+    }
+    function escapeBraces(str) {
+      return str.split("\\\\").join(escSlash).split("\\{").join(escOpen).split("\\}").join(escClose).split("\\,").join(escComma).split("\\.").join(escPeriod);
+    }
+    function unescapeBraces(str) {
+      return str.split(escSlash).join("\\").split(escOpen).join("{").split(escClose).join("}").split(escComma).join(",").split(escPeriod).join(".");
+    }
+    function parseCommaParts(str) {
+      if (!str)
+        return [""];
+      var parts = [];
+      var m = balanced("{", "}", str);
+      if (!m)
+        return str.split(",");
+      var pre = m.pre;
+      var body = m.body;
+      var post = m.post;
+      var p = pre.split(",");
+      p[p.length - 1] += "{" + body + "}";
+      var postParts = parseCommaParts(post);
+      if (post.length) {
+        p[p.length - 1] += postParts.shift();
+        p.push.apply(p, postParts);
+      }
+      parts.push.apply(parts, p);
+      return parts;
+    }
+    function expandTop(str) {
+      if (!str)
+        return [];
+      if (str.substr(0, 2) === "{}") {
+        str = "\\{\\}" + str.substr(2);
+      }
+      return expand(escapeBraces(str), true).map(unescapeBraces);
+    }
+    function embrace(str) {
+      return "{" + str + "}";
+    }
+    function isPadded(el) {
+      return /^-?0\d/.test(el);
+    }
+    function lte(i2, y) {
+      return i2 <= y;
+    }
+    function gte(i2, y) {
+      return i2 >= y;
+    }
+    function expand(str, isTop) {
+      var expansions = [];
+      var m = balanced("{", "}", str);
+      if (!m)
+        return [str];
+      var pre = m.pre;
+      var post = m.post.length ? expand(m.post, false) : [""];
+      if (/\$$/.test(m.pre)) {
+        for (var k = 0; k < post.length; k++) {
+          var expansion = pre + "{" + m.body + "}" + post[k];
+          expansions.push(expansion);
+        }
+      } else {
+        var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
+        var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
+        var isSequence = isNumericSequence || isAlphaSequence;
+        var isOptions = m.body.indexOf(",") >= 0;
+        if (!isSequence && !isOptions) {
+          if (m.post.match(/,.*\}/)) {
+            str = m.pre + "{" + m.body + escClose + m.post;
+            return expand(str);
+          }
+          return [str];
+        }
+        var n;
+        if (isSequence) {
+          n = m.body.split(/\.\./);
+        } else {
+          n = parseCommaParts(m.body);
+          if (n.length === 1) {
+            n = expand(n[0], false).map(embrace);
+            if (n.length === 1) {
+              return post.map(function(p) {
+                return m.pre + n[0] + p;
+              });
+            }
+          }
+        }
+        var N;
+        if (isSequence) {
+          var x = numeric(n[0]);
+          var y = numeric(n[1]);
+          var width = Math.max(n[0].length, n[1].length);
+          var incr = n.length == 3 ? Math.abs(numeric(n[2])) : 1;
+          var test = lte;
+          var reverse = y < x;
+          if (reverse) {
+            incr *= -1;
+            test = gte;
+          }
+          var pad = n.some(isPadded);
+          N = [];
+          for (var i2 = x; test(i2, y); i2 += incr) {
+            var c;
+            if (isAlphaSequence) {
+              c = String.fromCharCode(i2);
+              if (c === "\\")
+                c = "";
+            } else {
+              c = String(i2);
+              if (pad) {
+                var need = width - c.length;
+                if (need > 0) {
+                  var z = new Array(need + 1).join("0");
+                  if (i2 < 0)
+                    c = "-" + z + c.slice(1);
+                  else
+                    c = z + c;
+                }
+              }
+            }
+            N.push(c);
+          }
+        } else {
+          N = [];
+          for (var j = 0; j < n.length; j++) {
+            N.push.apply(N, expand(n[j], false));
+          }
+        }
+        for (var j = 0; j < N.length; j++) {
+          for (var k = 0; k < post.length; k++) {
+            var expansion = pre + N[j] + post[k];
+            if (!isTop || isSequence || expansion)
+              expansions.push(expansion);
+          }
+        }
+      }
+      return expansions;
+    }
+  }
+});
+
+// node_modules/minimatch/minimatch.js
+var require_minimatch2 = __commonJS({
+  "node_modules/minimatch/minimatch.js"(exports2, module2) {
+    init_import_meta_url();
+    var minimatch = module2.exports = (p, pattern, options = {}) => {
+      assertValidPattern(pattern);
+      if (!options.nocomment && pattern.charAt(0) === "#") {
+        return false;
+      }
+      return new Minimatch2(pattern, options).match(p);
+    };
+    module2.exports = minimatch;
+    var path36 = require_path();
+    minimatch.sep = path36.sep;
+    var GLOBSTAR = Symbol("globstar **");
+    minimatch.GLOBSTAR = GLOBSTAR;
+    var expand = require_brace_expansion2();
+    var plTypes = {
+      "!": { open: "(?:(?!(?:", close: "))[^/]*?)" },
+      "?": { open: "(?:", close: ")?" },
+      "+": { open: "(?:", close: ")+" },
+      "*": { open: "(?:", close: ")*" },
+      "@": { open: "(?:", close: ")" }
+    };
+    var qmark = "[^/]";
+    var star = qmark + "*?";
+    var twoStarDot = "(?:(?!(?:\\/|^)(?:\\.{1,2})($|\\/)).)*?";
+    var twoStarNoDot = "(?:(?!(?:\\/|^)\\.).)*?";
+    var charSet = (s) => s.split("").reduce((set, c) => {
+      set[c] = true;
+      return set;
+    }, {});
+    var reSpecials = charSet("().*{}+?[]^$\\!");
+    var addPatternStartSet = charSet("[.(");
+    var slashSplit = /\/+/;
+    minimatch.filter = (pattern, options = {}) => (p, i2, list) => minimatch(p, pattern, options);
+    var ext = (a, b = {}) => {
+      const t2 = {};
+      Object.keys(a).forEach((k) => t2[k] = a[k]);
+      Object.keys(b).forEach((k) => t2[k] = b[k]);
+      return t2;
+    };
+    minimatch.defaults = (def) => {
+      if (!def || typeof def !== "object" || !Object.keys(def).length) {
+        return minimatch;
+      }
+      const orig = minimatch;
+      const m = (p, pattern, options) => orig(p, pattern, ext(def, options));
+      m.Minimatch = class Minimatch extends orig.Minimatch {
+        constructor(pattern, options) {
+          super(pattern, ext(def, options));
+        }
+      };
+      m.Minimatch.defaults = (options) => orig.defaults(ext(def, options)).Minimatch;
+      m.filter = (pattern, options) => orig.filter(pattern, ext(def, options));
+      m.defaults = (options) => orig.defaults(ext(def, options));
+      m.makeRe = (pattern, options) => orig.makeRe(pattern, ext(def, options));
+      m.braceExpand = (pattern, options) => orig.braceExpand(pattern, ext(def, options));
+      m.match = (list, pattern, options) => orig.match(list, pattern, ext(def, options));
+      return m;
+    };
+    minimatch.braceExpand = (pattern, options) => braceExpand(pattern, options);
+    var braceExpand = (pattern, options = {}) => {
+      assertValidPattern(pattern);
+      if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
+        return [pattern];
+      }
+      return expand(pattern);
+    };
+    var MAX_PATTERN_LENGTH = 1024 * 64;
+    var assertValidPattern = (pattern) => {
+      if (typeof pattern !== "string") {
+        throw new TypeError("invalid pattern");
+      }
+      if (pattern.length > MAX_PATTERN_LENGTH) {
+        throw new TypeError("pattern is too long");
+      }
+    };
+    var SUBPARSE = Symbol("subparse");
+    minimatch.makeRe = (pattern, options) => new Minimatch2(pattern, options || {}).makeRe();
+    minimatch.match = (list, pattern, options = {}) => {
+      const mm = new Minimatch2(pattern, options);
+      list = list.filter((f) => mm.match(f));
+      if (mm.options.nonull && !list.length) {
+        list.push(pattern);
+      }
+      return list;
+    };
+    var globUnescape = (s) => s.replace(/\\(.)/g, "$1");
+    var regExpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+    var Minimatch2 = class {
+      constructor(pattern, options) {
+        assertValidPattern(pattern);
+        if (!options)
+          options = {};
+        this.options = options;
+        this.set = [];
+        this.pattern = pattern;
+        this.windowsPathsNoEscape = !!options.windowsPathsNoEscape || options.allowWindowsEscape === false;
+        if (this.windowsPathsNoEscape) {
+          this.pattern = this.pattern.replace(/\\/g, "/");
+        }
+        this.regexp = null;
+        this.negate = false;
+        this.comment = false;
+        this.empty = false;
+        this.partial = !!options.partial;
+        this.make();
+      }
+      debug() {
+      }
+      make() {
+        const pattern = this.pattern;
+        const options = this.options;
+        if (!options.nocomment && pattern.charAt(0) === "#") {
+          this.comment = true;
+          return;
+        }
+        if (!pattern) {
+          this.empty = true;
+          return;
+        }
+        this.parseNegate();
+        let set = this.globSet = this.braceExpand();
+        if (options.debug)
+          this.debug = (...args) => console.error(...args);
+        this.debug(this.pattern, set);
+        set = this.globParts = set.map((s) => s.split(slashSplit));
+        this.debug(this.pattern, set);
+        set = set.map((s, si2, set2) => s.map(this.parse, this));
+        this.debug(this.pattern, set);
+        set = set.filter((s) => s.indexOf(false) === -1);
+        this.debug(this.pattern, set);
+        this.set = set;
+      }
+      parseNegate() {
+        if (this.options.nonegate)
+          return;
+        const pattern = this.pattern;
+        let negate = false;
+        let negateOffset = 0;
+        for (let i2 = 0; i2 < pattern.length && pattern.charAt(i2) === "!"; i2++) {
+          negate = !negate;
+          negateOffset++;
+        }
+        if (negateOffset)
+          this.pattern = pattern.substr(negateOffset);
+        this.negate = negate;
+      }
+      matchOne(file, pattern, partial) {
+        var options = this.options;
+        this.debug(
+          "matchOne",
+          { "this": this, file, pattern }
+        );
+        this.debug("matchOne", file.length, pattern.length);
+        for (var fi = 0, pi = 0, fl = file.length, pl2 = pattern.length; fi < fl && pi < pl2; fi++, pi++) {
+          this.debug("matchOne loop");
+          var p = pattern[pi];
+          var f = file[fi];
+          this.debug(pattern, p, f);
+          if (p === false)
+            return false;
+          if (p === GLOBSTAR) {
+            this.debug("GLOBSTAR", [pattern, p, f]);
+            var fr2 = fi;
+            var pr = pi + 1;
+            if (pr === pl2) {
+              this.debug("** at the end");
+              for (; fi < fl; fi++) {
+                if (file[fi] === "." || file[fi] === ".." || !options.dot && file[fi].charAt(0) === ".")
+                  return false;
+              }
+              return true;
+            }
+            while (fr2 < fl) {
+              var swallowee = file[fr2];
+              this.debug("\nglobstar while", file, fr2, pattern, pr, swallowee);
+              if (this.matchOne(file.slice(fr2), pattern.slice(pr), partial)) {
+                this.debug("globstar found match!", fr2, fl, swallowee);
+                return true;
+              } else {
+                if (swallowee === "." || swallowee === ".." || !options.dot && swallowee.charAt(0) === ".") {
+                  this.debug("dot detected!", file, fr2, pattern, pr);
+                  break;
+                }
+                this.debug("globstar swallow a segment, and continue");
+                fr2++;
+              }
+            }
+            if (partial) {
+              this.debug("\n>>> no match, partial?", file, fr2, pattern, pr);
+              if (fr2 === fl)
+                return true;
+            }
+            return false;
+          }
+          var hit;
+          if (typeof p === "string") {
+            hit = f === p;
+            this.debug("string match", p, f, hit);
+          } else {
+            hit = f.match(p);
+            this.debug("pattern match", p, f, hit);
+          }
+          if (!hit)
+            return false;
+        }
+        if (fi === fl && pi === pl2) {
+          return true;
+        } else if (fi === fl) {
+          return partial;
+        } else if (pi === pl2) {
+          return fi === fl - 1 && file[fi] === "";
+        }
+        throw new Error("wtf?");
+      }
+      braceExpand() {
+        return braceExpand(this.pattern, this.options);
+      }
+      parse(pattern, isSub) {
+        assertValidPattern(pattern);
+        const options = this.options;
+        if (pattern === "**") {
+          if (!options.noglobstar)
+            return GLOBSTAR;
+          else
+            pattern = "*";
+        }
+        if (pattern === "")
+          return "";
+        let re = "";
+        let hasMagic = !!options.nocase;
+        let escaping = false;
+        const patternListStack = [];
+        const negativeLists = [];
+        let stateChar;
+        let inClass = false;
+        let reClassStart = -1;
+        let classStart = -1;
+        let cs2;
+        let pl2;
+        let sp;
+        const patternStart = pattern.charAt(0) === "." ? "" : options.dot ? "(?!(?:^|\\/)\\.{1,2}(?:$|\\/))" : "(?!\\.)";
+        const clearStateChar = () => {
+          if (stateChar) {
+            switch (stateChar) {
+              case "*":
+                re += star;
+                hasMagic = true;
+                break;
+              case "?":
+                re += qmark;
+                hasMagic = true;
+                break;
+              default:
+                re += "\\" + stateChar;
+                break;
+            }
+            this.debug("clearStateChar %j %j", stateChar, re);
+            stateChar = false;
+          }
+        };
+        for (let i2 = 0, c; i2 < pattern.length && (c = pattern.charAt(i2)); i2++) {
+          this.debug("%s	%s %s %j", pattern, i2, re, c);
+          if (escaping) {
+            if (c === "/") {
+              return false;
+            }
+            if (reSpecials[c]) {
+              re += "\\";
+            }
+            re += c;
+            escaping = false;
+            continue;
+          }
+          switch (c) {
+            case "/": {
+              return false;
+            }
+            case "\\":
+              clearStateChar();
+              escaping = true;
+              continue;
+            case "?":
+            case "*":
+            case "+":
+            case "@":
+            case "!":
+              this.debug("%s	%s %s %j <-- stateChar", pattern, i2, re, c);
+              if (inClass) {
+                this.debug("  in class");
+                if (c === "!" && i2 === classStart + 1)
+                  c = "^";
+                re += c;
+                continue;
+              }
+              this.debug("call clearStateChar %j", stateChar);
+              clearStateChar();
+              stateChar = c;
+              if (options.noext)
+                clearStateChar();
+              continue;
+            case "(":
+              if (inClass) {
+                re += "(";
+                continue;
+              }
+              if (!stateChar) {
+                re += "\\(";
+                continue;
+              }
+              patternListStack.push({
+                type: stateChar,
+                start: i2 - 1,
+                reStart: re.length,
+                open: plTypes[stateChar].open,
+                close: plTypes[stateChar].close
+              });
+              re += stateChar === "!" ? "(?:(?!(?:" : "(?:";
+              this.debug("plType %j %j", stateChar, re);
+              stateChar = false;
+              continue;
+            case ")":
+              if (inClass || !patternListStack.length) {
+                re += "\\)";
+                continue;
+              }
+              clearStateChar();
+              hasMagic = true;
+              pl2 = patternListStack.pop();
+              re += pl2.close;
+              if (pl2.type === "!") {
+                negativeLists.push(pl2);
+              }
+              pl2.reEnd = re.length;
+              continue;
+            case "|":
+              if (inClass || !patternListStack.length) {
+                re += "\\|";
+                continue;
+              }
+              clearStateChar();
+              re += "|";
+              continue;
+            case "[":
+              clearStateChar();
+              if (inClass) {
+                re += "\\" + c;
+                continue;
+              }
+              inClass = true;
+              classStart = i2;
+              reClassStart = re.length;
+              re += c;
+              continue;
+            case "]":
+              if (i2 === classStart + 1 || !inClass) {
+                re += "\\" + c;
+                continue;
+              }
+              cs2 = pattern.substring(classStart + 1, i2);
+              try {
+                RegExp("[" + cs2 + "]");
+              } catch (er) {
+                sp = this.parse(cs2, SUBPARSE);
+                re = re.substr(0, reClassStart) + "\\[" + sp[0] + "\\]";
+                hasMagic = hasMagic || sp[1];
+                inClass = false;
+                continue;
+              }
+              hasMagic = true;
+              inClass = false;
+              re += c;
+              continue;
+            default:
+              clearStateChar();
+              if (reSpecials[c] && !(c === "^" && inClass)) {
+                re += "\\";
+              }
+              re += c;
+              break;
+          }
+        }
+        if (inClass) {
+          cs2 = pattern.substr(classStart + 1);
+          sp = this.parse(cs2, SUBPARSE);
+          re = re.substr(0, reClassStart) + "\\[" + sp[0];
+          hasMagic = hasMagic || sp[1];
+        }
+        for (pl2 = patternListStack.pop(); pl2; pl2 = patternListStack.pop()) {
+          let tail;
+          tail = re.slice(pl2.reStart + pl2.open.length);
+          this.debug("setting tail", re, pl2);
+          tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, (_2, $1, $2) => {
+            if (!$2) {
+              $2 = "\\";
+            }
+            return $1 + $1 + $2 + "|";
+          });
+          this.debug("tail=%j\n   %s", tail, tail, pl2, re);
+          const t2 = pl2.type === "*" ? star : pl2.type === "?" ? qmark : "\\" + pl2.type;
+          hasMagic = true;
+          re = re.slice(0, pl2.reStart) + t2 + "\\(" + tail;
+        }
+        clearStateChar();
+        if (escaping) {
+          re += "\\\\";
+        }
+        const addPatternStart = addPatternStartSet[re.charAt(0)];
+        for (let n = negativeLists.length - 1; n > -1; n--) {
+          const nl = negativeLists[n];
+          const nlBefore = re.slice(0, nl.reStart);
+          const nlFirst = re.slice(nl.reStart, nl.reEnd - 8);
+          let nlAfter = re.slice(nl.reEnd);
+          const nlLast = re.slice(nl.reEnd - 8, nl.reEnd) + nlAfter;
+          const openParensBefore = nlBefore.split("(").length - 1;
+          let cleanAfter = nlAfter;
+          for (let i2 = 0; i2 < openParensBefore; i2++) {
+            cleanAfter = cleanAfter.replace(/\)[+*?]?/, "");
+          }
+          nlAfter = cleanAfter;
+          const dollar = nlAfter === "" && isSub !== SUBPARSE ? "$" : "";
+          re = nlBefore + nlFirst + nlAfter + dollar + nlLast;
+        }
+        if (re !== "" && hasMagic) {
+          re = "(?=.)" + re;
+        }
+        if (addPatternStart) {
+          re = patternStart + re;
+        }
+        if (isSub === SUBPARSE) {
+          return [re, hasMagic];
+        }
+        if (!hasMagic) {
+          return globUnescape(pattern);
+        }
+        const flags = options.nocase ? "i" : "";
+        try {
+          return Object.assign(new RegExp("^" + re + "$", flags), {
+            _glob: pattern,
+            _src: re
+          });
+        } catch (er) {
+          return new RegExp("$.");
+        }
+      }
+      makeRe() {
+        if (this.regexp || this.regexp === false)
+          return this.regexp;
+        const set = this.set;
+        if (!set.length) {
+          this.regexp = false;
+          return this.regexp;
+        }
+        const options = this.options;
+        const twoStar = options.noglobstar ? star : options.dot ? twoStarDot : twoStarNoDot;
+        const flags = options.nocase ? "i" : "";
+        let re = set.map((pattern) => {
+          pattern = pattern.map(
+            (p) => typeof p === "string" ? regExpEscape(p) : p === GLOBSTAR ? GLOBSTAR : p._src
+          ).reduce((set2, p) => {
+            if (!(set2[set2.length - 1] === GLOBSTAR && p === GLOBSTAR)) {
+              set2.push(p);
+            }
+            return set2;
+          }, []);
+          pattern.forEach((p, i2) => {
+            if (p !== GLOBSTAR || pattern[i2 - 1] === GLOBSTAR) {
+              return;
+            }
+            if (i2 === 0) {
+              if (pattern.length > 1) {
+                pattern[i2 + 1] = "(?:\\/|" + twoStar + "\\/)?" + pattern[i2 + 1];
+              } else {
+                pattern[i2] = twoStar;
+              }
+            } else if (i2 === pattern.length - 1) {
+              pattern[i2 - 1] += "(?:\\/|" + twoStar + ")?";
+            } else {
+              pattern[i2 - 1] += "(?:\\/|\\/" + twoStar + "\\/)" + pattern[i2 + 1];
+              pattern[i2 + 1] = GLOBSTAR;
+            }
+          });
+          return pattern.filter((p) => p !== GLOBSTAR).join("/");
+        }).join("|");
+        re = "^(?:" + re + ")$";
+        if (this.negate)
+          re = "^(?!" + re + ").*$";
+        try {
+          this.regexp = new RegExp(re, flags);
+        } catch (ex) {
+          this.regexp = false;
+        }
+        return this.regexp;
+      }
+      match(f, partial = this.partial) {
+        this.debug("match", f, this.pattern);
+        if (this.comment)
+          return false;
+        if (this.empty)
+          return f === "";
+        if (f === "/" && partial)
+          return true;
+        const options = this.options;
+        if (path36.sep !== "/") {
+          f = f.split(path36.sep).join("/");
+        }
+        f = f.split(slashSplit);
+        this.debug(this.pattern, "split", f);
+        const set = this.set;
+        this.debug(this.pattern, "set", set);
+        let filename;
+        for (let i2 = f.length - 1; i2 >= 0; i2--) {
+          filename = f[i2];
+          if (filename)
+            break;
+        }
+        for (let i2 = 0; i2 < set.length; i2++) {
+          const pattern = set[i2];
+          let file = f;
+          if (options.matchBase && pattern.length === 1) {
+            file = [filename];
+          }
+          const hit = this.matchOne(file, pattern, partial);
+          if (hit) {
+            if (options.flipNegate)
+              return true;
+            return !this.negate;
+          }
+        }
+        if (options.flipNegate)
+          return false;
+        return this.negate;
+      }
+      static defaults(def) {
+        return minimatch.defaults(def).Minimatch;
+      }
+    };
+    minimatch.Minimatch = Minimatch2;
+  }
+});
+
 // ../../node_modules/eventemitter3/index.js
 var require_eventemitter3 = __commonJS({
   "../../node_modules/eventemitter3/index.js"(exports2, module2) {
@@ -140329,7 +141033,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.1.14";
+var version = "2.1.15";
 var package_default = {
   name: "wrangler",
   version,
@@ -140492,6 +141196,7 @@ var package_default = {
     "jest-fetch-mock": "^3.0.3",
     "jest-websocket-mock": "^2.3.0",
     mime: "^3.0.0",
+    minimatch: "^5.1.0",
     msw: "^0.47.1",
     "npx-import": "^1.1.3",
     open: "^8.4.0",
@@ -142467,6 +143172,9 @@ var CI = {
 // src/is-interactive.ts
 init_import_meta_url();
 function isInteractive() {
+  if (process.env.CF_PAGES === "1") {
+    return false;
+  }
   try {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
   } catch {
@@ -154933,6 +155641,8 @@ var import_node_path29 = require("node:path");
 
 // src/pages/constants.ts
 init_import_meta_url();
+var MAX_ASSET_COUNT = 2e4;
+var MAX_ASSET_SIZE = 25 * 1024 * 1024;
 var PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 var MAX_BUCKET_SIZE = 50 * 1024 * 1024;
 var MAX_BUCKET_FILE_COUNT = 5e3;
@@ -156768,6 +157478,7 @@ var import_node_path33 = require("node:path");
 var import_ink12 = __toESM(require_build2());
 var import_ink_spinner = __toESM(require_build5());
 var import_mime = __toESM(require_mime2());
+var import_minimatch = __toESM(require_minimatch2());
 
 // ../../node_modules/p-queue/dist/index.js
 init_import_meta_url();
@@ -157250,19 +157961,23 @@ var upload = async (args) => {
     "_redirects",
     "_headers",
     "_routes.json",
-    ".DS_Store",
-    "node_modules",
-    ".git"
-  ];
+    "functions",
+    "**/.DS_Store",
+    "**/node_modules",
+    "**/.git"
+  ].map((pattern) => new import_minimatch.Minimatch(pattern));
   const directory = (0, import_node_path33.resolve)(args.directory);
   const walk = async (dir, fileMap2 = /* @__PURE__ */ new Map(), startingDir = dir) => {
     const files2 = await (0, import_promises14.readdir)(dir);
     await Promise.all(
       files2.map(async (file) => {
         const filepath = (0, import_node_path33.join)(dir, file);
+        const relativeFilepath = (0, import_node_path33.relative)(startingDir, filepath);
         const filestat = await (0, import_promises14.stat)(filepath);
-        if (IGNORE_LIST.includes(file)) {
-          return;
+        for (const minimatch of IGNORE_LIST) {
+          if (minimatch.match(relativeFilepath)) {
+            return;
+          }
         }
         if (filestat.isSymbolicLink()) {
           return;
@@ -157270,11 +157985,11 @@ var upload = async (args) => {
         if (filestat.isDirectory()) {
           fileMap2 = await walk(filepath, fileMap2, startingDir);
         } else {
-          const name = (0, import_node_path33.relative)(startingDir, filepath).split(import_node_path33.sep).join("/");
-          if (filestat.size > 25 * 1024 * 1024) {
+          const name = relativeFilepath.split(import_node_path33.sep).join("/");
+          if (filestat.size > MAX_ASSET_SIZE) {
             throw new FatalError(
               `Error: Pages only supports files up to ${prettyBytes(
-                25 * 1024 * 1024
+                MAX_ASSET_SIZE
               )} in size
 ${name} is ${prettyBytes(filestat.size)} in size`,
               1
@@ -157292,9 +158007,9 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
     return fileMap2;
   };
   const fileMap = await walk(directory);
-  if (fileMap.size > 2e4) {
+  if (fileMap.size > MAX_ASSET_COUNT) {
     throw new FatalError(
-      `Error: Pages only supports up to 20,000 files in a deployment. Ensure you have specified your build output directory correctly.`,
+      `Error: Pages only supports up to ${MAX_ASSET_COUNT.toLocaleString()} files in a deployment. Ensure you have specified your build output directory correctly.`,
       1
     );
   }
@@ -157412,7 +158127,9 @@ ${name} is ${prettyBytes(filestat.size)} in size`,
         (error) => {
           return Promise.reject(
             new FatalError(
-              "Failed to upload files. Please try again.",
+              `Failed to upload files. Please try again. Error: ${JSON.stringify(
+                error
+              )})`,
               error.code || 1
             )
           );
@@ -157476,9 +158193,9 @@ function formatTime(duration) {
   return `(${(duration / 1e3).toFixed(2)} sec)`;
 }
 function Progress({ done, total }) {
-  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(import_ink12.Text, null, /* @__PURE__ */ import_react16.default.createElement(import_ink_spinner.default, {
+  return /* @__PURE__ */ import_react16.default.createElement(import_react16.default.Fragment, null, /* @__PURE__ */ import_react16.default.createElement(import_ink12.Text, null, isInteractive() ? /* @__PURE__ */ import_react16.default.createElement(import_ink_spinner.default, {
     type: "earth"
-  }), ` Uploading... (${done}/${total})
+  }) : null, ` Uploading... (${done}/${total})
 `));
 }