Merge remote-tracking branch 'origin/master' into custom-builds-rc-me…

…rgestyle

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## 1.15.1
+
+- ### Features
+
+  - **Add config option to switch usage model to unbound - [ObsidianMinor], [pull/1837]**
+
+    [obsidianminor]: https://github.com/ObsidianMinor
+    [pull/1837]: https://github.com/cloudflare/wrangler/pull/1837
+
+- ### Fixes
+
+  - **fix: remove unused import of WasmMainTemplatePlugin - [jasikpark], [pull/1802]**
+
+    This should improve #1721. https://github.com/cloudflare/wrangler/issues/1721#issuecomment-791974664
+
+    [jasikpark]: https://github.com/jasikpark
+    [pull/1802]: https://github.com/cloudflare/wrangler/pull/1802
+
+  - **Hot fix for error message helper not working - [Electroid], [pull/1847]**
+
+    The JSON is pretty printed, which means it contains a space.
+
+    [electroid]: https://github.com/Electroid
+    [pull/1847]: https://github.com/cloudflare/wrangler/pull/1847
+
+  - **Revert "Print line and column numbers for exception thrown (#1645)" - [Electroid], [pull/1835]**
+
+    This reverts commit 74a89f7c383bc22758cbe55096ce3016c5c319d7.
+
+    Closes #1826
+
+    This commit is causing `wrangler dev` to not show uncaught exceptions. Reverting `chrome-devtools-rs` was also necessary.
+
+    [electroid]: https://github.com/Electroid
+    [pull/1835]: https://github.com/cloudflare/wrangler/pull/1835
+
 ## 1.15.0
 
 - ### Fixes

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wrangler"
-version = "1.15.0-custom-builds-rc.2"
+version = "1.15.1"
 authors = ["The Wrangler Team <[email protected]>", "Avery Harnish <[email protected]>", "Ashley Lewis <[email protected]>", "Ashley Williams <[email protected]>", "Nat Davidson <[email protected]>", "Steve Manuel <[email protected]>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
@@ -15,7 +15,7 @@ atty = "0.2.14"
 base64 = "0.13.0"
 billboard = "0.1.0"
 binary-install = "0.0.3-alpha.1"
-chrome-devtools-rs = "0.0.0-alpha.2"
+chrome-devtools-rs = { version = "=0.0.0-alpha.1", features = ["color"] }
 chrono = "0.4.19"
 clap = "2.33.3"
 cloudflare = "0.6.6"

npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/wrangler",
-  "version": "1.15.0-custom-builds-rc.2",
+  "version": "1.15.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "main": "binary.js",
   "scripts": {