From 0cd971caf2290bf1aa80810ef237df2ce1f065f0 Mon Sep 17 00:00:00 2001
From: Joshua Johnson <jspspike@gmail.com>
Date: Tue, 21 Feb 2023 13:36:17 -0600
Subject: [PATCH] 1.21.0 (#2351)

Co-authored-by: jjohnson <jjohnson@cloudflare.com>
---
 CHANGELOG.md                 | 48 ++++++++++++++++++++++++++++++++++++
 Cargo.lock                   |  2 +-
 Cargo.toml                   |  2 +-
 changelog-generator/index.js |  4 +--
 npm/npm-shrinkwrap.json      |  4 +--
 npm/package.json             |  2 +-
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be4034954..2d46755e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,53 @@
 # Changelog
 
+## 1.21.0
+
+- ### Maintenance
+
+  - **Add deprecation badge to Cargo.toml - [caass], [pull/2332]**
+
+    [caass]: https://github.com/caass
+    [pull/2332]: https://github.com/cloudflare/wrangler-legacy/pull/2332
+
+  - **Add deprecation message on install Wrangler1 - [JacobMGEvans], [pull/2315] [pull/2314]**
+
+    Additional efforts in deprecation of Wrangler 1
+
+    [jacobmgevans]: https://github.com/JacobMGEvans
+    [pull/2315]: https://github.com/cloudflare/wrangler-legacy/pull/2315
+
+  - **Mark as deprecated and redirect to Workers SDK in README - [mrbbot], [pull/2348]**
+
+    [mrbbot]: https://github.com/mrbbot
+    [pull/2348]: https://github.com/cloudflare/wrangler-legacy/pull/2348
+
+  - **Suggest Wrangler 2 if `wrangler -V` fails - [mrbbot], [pull/2342]**
+
+    [mrbbot]: https://github.com/mrbbot
+    [pull/2342]: https://github.com/cloudflare/wrangler-legacy/pull/2342
+
+  - **Update path-slash to v0.2.1 - [rhysd], [pull/2311]**
+ 
+    [rhysd]: https://github.com/rhysd
+    [pull/2311]: https://github.com/cloudflare/wrangler-legacy/pull/2311
+
+  - **Update README.md - [rozenmd], [pull/2306]**
+
+    [rozenmd]: https://github.com/rozenmd
+    [pull/2306]: https://github.com/cloudflare/wrangler-legacy/pull/2306
+
+  - **Update URLs for Wrangler v1/v2 GitHub repos - [penalosa], [pull/2347]** 
+
+    [penalosa]: https://github.com/penalosa
+    [pull/2347]: https://github.com/cloudflare/wrangler-legacy/pull/2347
+
+  - **Upgrade minimatch - [penalosa], [pull/2349]**
+
+    Resolve `npm audit` for https://github.com/advisories/GHSA-f8q6-p94x-37v3. Closes https://github.com/cloudflare/wrangler-legacy/issues/2326
+
+    [penalosa]: https://github.com/penalosa
+    [pull/2349]: https://github.com/cloudflare/wrangler-legacy/pull/2349
+
 ## 1.20.0
 
 - ### Maintenance
diff --git a/Cargo.lock b/Cargo.lock
index 45439ed47..63fe81415 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3170,7 +3170,7 @@ dependencies = [
 
 [[package]]
 name = "wrangler"
-version = "1.20.0"
+version = "1.21.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
diff --git a/Cargo.toml b/Cargo.toml
index 71f762b19..d2e357e8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wrangler"
-version = "1.20.0"
+version = "1.21.0"
 authors = ["The Wrangler Team <wrangler@cloudflare.com>"]
 edition = "2018"
 license = "MIT/Apache-2.0"
diff --git a/changelog-generator/index.js b/changelog-generator/index.js
index 91ce33272..92dddaff6 100644
--- a/changelog-generator/index.js
+++ b/changelog-generator/index.js
@@ -124,7 +124,7 @@ const getMergedPRs = async (octokit, owner, repo, since) => {
   // TODO: The script doesn't handle pagination. If we merge more than 100 pull requests between
   // releases then this becomes a problem. But if we wait that long, we're doing something wrong :)
   let res = await octokit.search.issuesAndPullRequests({
-    q: `repo:cloudflare/wrangler is:pr base:master merged:>=${since} sort:updated-desc`,
+    q: `repo:cloudflare/wrangler-legacy is:pr base:master merged:>=${since} sort:updated-desc`,
   });
 
   console.log(res.url);
@@ -147,7 +147,7 @@ const getClosedIssues = async (octokit, owner, repo, since) => {
   // TODO: The script doesn't handle pagination. If we close more than 100 issues between
   // releases then this becomes a problem. But if we wait that long, we're doing something wrong :)
   let res = await octokit.search.issuesAndPullRequests({
-    q: `repo:cloudflare/wrangler is:issue is:closed closed:>=${since} sort:updated-desc`,
+    q: `repo:cloudflare/wrangler-legacy is:issue is:closed closed:>=${since} sort:updated-desc`,
   });
 
   console.log(res.url);
diff --git a/npm/npm-shrinkwrap.json b/npm/npm-shrinkwrap.json
index 8552e560f..2be13c992 100644
--- a/npm/npm-shrinkwrap.json
+++ b/npm/npm-shrinkwrap.json
@@ -1,12 +1,12 @@
 {
   "name": "@cloudflare/wrangler",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@cloudflare/wrangler",
-      "version": "1.20.0",
+      "version": "1.21.0",
       "hasInstallScript": true,
       "license": "MIT OR Apache-2.0",
       "dependencies": {
diff --git a/npm/package.json b/npm/package.json
index 57b84603c..f04a9ffe7 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/wrangler",
-  "version": "1.20.0",
+  "version": "1.21.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "main": "binary.js",
   "scripts": {