wrangler 2.12.2 → 2.12.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.12.2",
+	"version": "2.12.3",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -63,9 +63,10 @@
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "npm run assert-git-version && jest --silent=false --verbose=true --forceExit",
+		"test": "npm run assert-git-version && jest",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
-		"test:ci": "npm run test -- --verbose=true --coverage"
+		"test:ci": "npm run test -- --coverage",
+		"test:debug": "npm run test -- --silent=false --verbose=true"
 	},
 	"jest": {
 		"coverageReporters": [

package/src/__tests__/d1/execute.test.ts

@@ -1,9 +1,11 @@
+import { mockConsoleMethods } from "../helpers/mock-console";
 import { useMockIsTTY } from "../helpers/mock-istty";
 import { runInTempDir } from "../helpers/run-in-tmp";
 import { runWrangler } from "../helpers/run-wrangler";
 import writeWranglerToml from "../helpers/write-wrangler-toml";
 
 describe("execute", () => {
+	mockConsoleMethods();
 	runInTempDir();
 	const { setIsTTY } = useMockIsTTY();
 

package/src/__tests__/d1/migrate.test.ts

@@ -1,6 +1,7 @@
 import { cwd } from "process";
 import { reinitialiseAuthTokens } from "../../user";
 import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
+import { mockConsoleMethods } from "../helpers/mock-console";
 import { useMockIsTTY } from "../helpers/mock-istty";
 import { runInTempDir } from "../helpers/run-in-tmp";
 import { runWrangler } from "../helpers/run-wrangler";
@@ -8,6 +9,7 @@ import writeWranglerToml from "../helpers/write-wrangler-toml";
 
 describe("migrate", () => {
 	runInTempDir();
+	mockConsoleMethods();
 	const { setIsTTY } = useMockIsTTY();
 
 	describe("create", () => {

package/src/__tests__/delete.test.ts

@@ -31,6 +31,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "Successfully deleted my-script",
 		  "warn": "",
 		}
@@ -51,6 +52,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "Successfully deleted test-name",
 		  "warn": "",
 		}
@@ -64,6 +66,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "--dry-run: exiting now.",
 		  "warn": "",
 		}
@@ -82,6 +85,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "",
 		  "warn": "",
 		}
@@ -126,6 +130,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
 		Successfully deleted my-script",
 		  "warn": "",
@@ -202,6 +207,7 @@ describe("delete", () => {
 		Object {
 		  "debug": "",
 		  "err": "",
+		  "info": "",
 		  "out": "🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets\\"
 		🌀 Deleted asset namespace for Workers Site \\"__my-script-workers_sites_assets_preview\\"
 		Successfully deleted my-script",

package/src/__tests__/dev.test.tsx

@@ -635,7 +635,7 @@ describe("wrangler dev", () => {
 		it("should run a custom build before starting `dev`", async () => {
 			writeWranglerToml({
 				build: {
-					command: `node -e "console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
+					command: `node -e "4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
 				},
 			});
 
@@ -648,12 +648,12 @@ describe("wrangler dev", () => {
 			// and the command would pass through
 			expect((Dev as jest.Mock).mock.calls[0][0].build).toEqual({
 				command:
-					"node -e \"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\"",
+					"node -e \"4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\"",
 				cwd: undefined,
 				watch_dir: "src",
 			});
 			expect(std.out).toMatchInlineSnapshot(
-				`"Running custom build: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\""`
+				`"Running custom build: node -e \\"4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\""`
 			);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -663,7 +663,7 @@ describe("wrangler dev", () => {
 			it("should run a custom build of multiple steps combined by && before starting `dev`", async () => {
 				writeWranglerToml({
 					build: {
-						command: `echo "custom build" && echo "export default { fetch(){ return new Response(123) } }" > index.js`,
+						command: `echo "export default { fetch(){ return new Response(123) } }" > index.js`,
 					},
 				});
 
@@ -675,7 +675,7 @@ describe("wrangler dev", () => {
 		        `);
 
 				expect(std.out).toMatchInlineSnapshot(
-					`"Running custom build: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js"`
+					`"Running custom build: echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js"`
 				);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -686,27 +686,27 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				build: {
-					command: `node -e "console.log('custom build');"`,
+					command: `node -e "4+4;"`,
 				},
 			});
 
 			await expect(runWrangler("dev")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-						              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
-						              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
-					            `);
+			"The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"4+4;\\".
+			The \`main\` property in wrangler.toml should point to the file generated by the custom build."
+		`);
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Running custom build: node -e \\"console.log('custom build');\\"
+			"Running custom build: node -e \\"4+4;\\"
 
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
-		      `);
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`
-			        "X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			"X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"4+4;\\".
 
-			          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
+			  The \`main\` property in wrangler.toml should point to the file generated by the custom build.
 
-			        "
-		      `);
+			"
+		`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
 
@@ -894,6 +894,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -911,6 +912,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -928,6 +930,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -948,6 +951,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1209,6 +1213,7 @@ describe("wrangler dev", () => {
 			  "err": "X [ERROR] Not enough arguments following: site
 
 			",
+			  "info": "",
 			  "out": "
 			wrangler dev [script]
 
@@ -1343,15 +1348,16 @@ describe("wrangler dev", () => {
 
 			await runWrangler('dev --assets "./assets"');
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
-
-			        ",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+
+			",
+			}
+		`);
 		});
 
 		it("should warn if config.assets is used", async () => {
@@ -1364,17 +1370,18 @@ describe("wrangler dev", () => {
 
 			await runWrangler("dev");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"assets\\" fields are experimental and may change or break at any time.
+			    - \\"assets\\" fields are experimental and may change or break at any time.
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 	});
 
@@ -1383,15 +1390,16 @@ describe("wrangler dev", () => {
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev index.js --inspect");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "",
-			          "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
-
-			        ",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
+
+			",
+			}
+		`);
 		});
 
 		it("should default to true, without a warning", async () => {
@@ -1402,6 +1410,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1416,6 +1425,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
 
@@ -1432,6 +1442,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1447,6 +1458,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "",
 			}
@@ -1460,6 +1472,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "▲ [WARNING] Passing --inspect is unnecessary, now you can always connect to devtools.
 
@@ -1516,23 +1529,24 @@ describe("wrangler dev", () => {
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev index.js");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Your worker has access to the following bindings:
-			        - Services:
-			          - WorkerA: A
-			          - WorkerB: B - staging",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Your worker has access to the following bindings:
+			- Services:
+			  - WorkerA: A
+			  - WorkerB: B - staging",
+			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"services\\" fields are experimental and may change or break at any time.
+			    - \\"services\\" fields are experimental and may change or break at any time.
 
 
-			        ▲ [WARNING] This worker is bound to live services: WorkerA (A), WorkerB (B@staging)
+			▲ [WARNING] This worker is bound to live services: WorkerA (A), WorkerB (B@staging)
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should mask vars that were overriden in .dev.vars", async () => {
@@ -1555,6 +1569,7 @@ describe("wrangler dev", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Using vars defined in .dev.vars
 			Your worker has access to the following bindings:
 			- Vars:

package/src/__tests__/helpers/mock-console.ts

@@ -8,6 +8,7 @@ import { logger } from "../../logger";
 
 let debugSpy: jest.SpyInstance,
 	logSpy: jest.SpyInstance,
+	infoSpy: jest.SpyInstance,
 	errorSpy: jest.SpyInstance,
 	warnSpy: jest.SpyInstance;
 
@@ -18,6 +19,9 @@ const std = {
 	get out() {
 		return normalizeOutput(logSpy);
 	},
+	get info() {
+		return normalizeOutput(infoSpy);
+	},
 	get err() {
 		return normalizeOutput(errorSpy);
 	},
@@ -47,12 +51,14 @@ export function mockConsoleMethods() {
 		logger.columns = 100;
 		debugSpy = jest.spyOn(console, "debug").mockImplementation();
 		logSpy = jest.spyOn(console, "log").mockImplementation();
+		infoSpy = jest.spyOn(console, "info").mockImplementation();
 		errorSpy = jest.spyOn(console, "error").mockImplementation();
 		warnSpy = jest.spyOn(console, "warn").mockImplementation();
 	});
 	afterEach(() => {
 		debugSpy.mockRestore();
 		logSpy.mockRestore();
+		infoSpy.mockRestore();
 		errorSpy.mockRestore();
 		warnSpy.mockRestore();
 	});

package/src/__tests__/helpers/worker-scripts/parent-worker.js

@@ -2,7 +2,10 @@ export default {
 	async fetch(req, env) {
 		const resp = await env.CHILD.fetch(req);
 		const text = await resp.text();
-		console.log("text: ", text);
+		// TODO: we should capture console logs when running `dev` programmatically
+		// (and locally) and expose it on the DevWorker object instead of allowing
+		// the log to appear in the output of the test runner.
+		// console.log("text: ", text);
 		return new Response(`Parent worker sees: ${text}`);
 	},
 };