Merge pull request #1798 from cloudflare/1.14.1

Revert default installer location change and release 1.14.1

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.14.1
+
+- ### Fixes
+
+  - **revert default install location change - [xortive], [pull/1798]**
+
+    In 1.14.0, we changed the default install location from `~/.wrangler` to `node_modules`,
+    to allow `npx wrangler` to use the pinned version in a project's dependencies. It seems that
+    this is causing issues, so we're rolling it back in favor of having folks who want this behavior,
+    to specify a the install location in the `config` section of package.json. We'll document this soon.
+
+    [xortive]: https://github.com/xortive
+    [pull/1798]: https://github.com/cloudflare/wrangler/pull/1798
+
 ## 1.14.0
 
 - ### Features

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wrangler"
-version = "1.14.0"
+version = "1.14.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"

RELEASE_CHECKLIST.md

@@ -43,14 +43,21 @@ Most of your comments will be about the changelog. Once the PR is finalized and
 
 1. If you made changes, squash or fixup all changes into a single commit.
 1. Run `git push` and wait for CI to pass.
+## Merge
+
+1. Hit the big green Merge button on the release PR.
+1. `git checkout master` and `git pull --rebase origin master`
 
 ### Tag and build release
 
 This part of the release process is handled by GitHub Actions, and our binaries are distributed as GitHub Releases. When you push a version tag, it kicks off an action that creates a new GitHub release for that tag, builds release binaries and attaches them to the release.
 
-1. Once ready to merge, tag the commit by running either `git tag -a v#.#.# -m #.#.#` (release), or `git tag -a v#.#.#-rc.# -m #.#.#` (release candidate)
+1. After pulling `master` in the step above, tag the commit by running either `git tag -a v#.#.# -m #.#.#` (release), or `git tag -a v#.#.#-rc.# -m #.#.#` (release candidate)
 1. Run `git push --tags`.
 1. Wait for CI to pass.
+1. If CI fails, delete the tag locally and remotely
+1. Fix whatever caused the CI failure
+1. Re-tag the healthy commit, and wait for CI to pass again.
 
 ### Edit the release
 
@@ -74,11 +81,6 @@ After CI builds the release binaries and they appear on the [releases page](http
 
    The new release candidate should then include updated testing instructions with a small changelog at the top to get folks who installed the old release candidate up to speed.
 
-## Publish
-
-1. Hit the big green Merge button on the release PR.
-1. `git checkout master` and `git pull --rebase origin master`
-
 ### Publish to crates.io (full release only)
 
 **IMPORTANT: This step is the hardest to fix if you mess it up. Do not run this step for Release Candidates**.

npm/binary.js

@@ -38,7 +38,7 @@ const getBinary = () => {
   const customPath =
     process.env.WRANGLER_INSTALL_PATH ||
     process.env.npm_config_wrangler_install_path;
-  const installDirectory = join(customPath || __dirname, "wrangler");
+  const installDirectory = join(customPath || os.homedir(), ".wrangler");
   return new Binary(url, { name: "wrangler", installDirectory });
 };
 

npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudflare/wrangler",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "main": "binary.js",
   "scripts": {