wrangler 0.0.0-fe5dcfd → 0.0.0-fea87cf

package/Cloudflare_CA.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC6zCCAkygAwIBAgIUI7b68p0pPrCBoW4ptlyvVcPItscwCgYIKoZIzj0EAwQw
+gY0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
+YW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9DbG91ZGZsYXJlLCBJbmMxNzA1BgNVBAMT
+LkNsb3VkZmxhcmUgZm9yIFRlYW1zIEVDQyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+HhcNMjAwMjA0MTYwNTAwWhcNMjUwMjAyMTYwNTAwWjCBjTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGDAW
+BgNVBAoTD0Nsb3VkZmxhcmUsIEluYzE3MDUGA1UEAxMuQ2xvdWRmbGFyZSBmb3Ig
+VGVhbXMgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0eTCBmzAQBgcqhkjOPQIBBgUr
+gQQAIwOBhgAEAVdXsX8tpA9NAQeEQalvUIcVaFNDvGsR69ysZxOraRWNGHLfq1mi
+P6o3wtmtx/C2OXG01Cw7UFJbKl5MEDxnT2KoAdFSynSJOF2NDoe5LoZHbUW+yR3X
+FDl+MF6JzZ590VLGo6dPBf06UsXbH7PvHH2XKtFt8bBXVNMa5a21RdmpD0Pho0Uw
+QzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBAjAdBgNVHQ4EFgQU
+YBcQng1AEMMNteuRDAMG0/vgFe0wCgYIKoZIzj0EAwQDgYwAMIGIAkIBQU5OTA2h
+YqmFk8paan5ezHVLcmcucsfYw4L/wmeEjCkczRmCVNm6L86LjhWU0v0wER0e+lHO
+3efvjbsu8gIGSagCQgEBnyYMP9gwg8l96QnQ1khFA1ljFlnqc2XgJHDSaAJC0gdz
++NV3JMeWaD2Rb32jc9r6/a7xY0u0ByqxBQ1OQ0dt7A==
+-----END CERTIFICATE-----

package/README.md

@@ -1,47 +1,56 @@
-## 🤠 wrangler
+## ⛅️ wrangler
 
-`wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
-
-[(Read the full stack week launch blog post.)](https://blog.cloudflare.com/wrangler-v2-beta/)
+> This package is for wrangler v2.x, released first in May 2022. If you're looking for v1.x of the `@cloudflare/wrangler` package, visit https://www.npmjs.com/package/@cloudflare/wrangler / https://github.com/cloudflare/wrangler.
 
-**DISCLAIMER**: This is a work in progress, and is NOT recommended for use in production. We are opening this preview for feedback from the community, and to openly share our [roadmap](https://github.com/cloudflare/wrangler2/issues/12) for the future. As such, expect APIs and documentation to change before the end of the preview.
-
-Further, we will NOT do a general release until we are both feature complete, and have a full backward compatibility and incremental migration plan in place. For more details, follow the [parent roadmap issue](https://github.com/cloudflare/wrangler2/issues/12).
+`wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
 
 ## Quick Start
 
 ```bash
 # Make a javascript file
-$ echo "export default { fetch() { return new Response('hello world') } }" > index.js
+echo "export default { fetch() { return new Response('hello world') } }" > index.js
 # try it out
-$ npx wrangler@beta dev index.js
+npx wrangler dev index.js
 # and then publish it
-$ npx wrangler@beta publish index.js --name my-worker
+npx wrangler publish index.js --name my-worker
 # visit https://my-worker.<your workers subdomain>.workers.dev
 ```
 
+## Create a Project
+
+```bash
+# Generate a new project
+npx wrangler init my-worker
+# try it out
+cd my-worker && npm run start
+# and then publish it
+npm run deploy
+```
+
 ## Installation:
 
 ```bash
-$ npm install wrangler@beta
+$ npm install wrangler --save-dev
 ```
 
 ## Commands
 
 ### `wrangler init [name]`
 
-Creates a `wrangler.toml` configuration file. For more details on the configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration).
+Creates a Worker project. For details on configuration keys and values, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration).
 
-### `wrangler dev [script]`
+### `wrangler dev`
 
 Start a local development server, with live reloading and devtools.
 
-### `wrangler publish [script] --name [name]`
+### `wrangler publish`
 
 Publish the given script to the worldwide Cloudflare network.
 
 For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/commands).
 
+## Pages
+
 ### `wrangler pages dev [directory] [-- command]`
 
 Either serves a static build asset directory, or proxies itself in front of a command.
@@ -49,3 +58,7 @@ Either serves a static build asset directory, or proxies itself in front of a co
 Builds and runs functions from a `./functions` directory or uses a `_worker.js` file inside the static build asset directory.
 
 For more commands and options, refer to the [documentation](https://developers.cloudflare.com/pages/platform/functions#develop-and-preview-locally) or run `wrangler pages dev --help`.
+
+## Documentation
+
+For the latest Wrangler documentation, [click here](https://6b05b6e1.cloudflare-docs-7ou.pages.dev/workers/wrangler/).

package/bin/wrangler.js

@@ -1,10 +1,14 @@
 #!/usr/bin/env node
 const { spawn } = require("child_process");
-const { join } = require("path");
+const path = require("path");
+const fs = require("fs");
+const os = require("os");
 const semiver = require("semiver");
 
 const MIN_NODE_VERSION = "16.7.0";
 
+let wranglerProcess;
+
 async function main() {
   if (semiver(process.versions.node, MIN_NODE_VERSION) < 0) {
     // Note Volta and nvm are also recommended in the official docs:
@@ -18,19 +22,59 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
     return;
   }
 
-  spawn(
+  let pathToCACerts = process.env.NODE_EXTRA_CA_CERTS;
+  if (pathToCACerts) {
+    // TODO:
+    // - should we log a warning here?
+    // - maybe we can generate a certificate that concatenates with ours?
+    //
+    //  I do think it'll be rare that someone wants to add a cert AND
+    //  use cloudflare WARP, but let's wait till the situation actually
+    //  arises before we do anything about it
+  } else {
+    const osTempDir = os.tmpdir();
+    const certDir = path.join(osTempDir, "wrangler-cert");
+    const certPath = path.join(certDir, "Cloudflare_CA.pem");
+    // copy cert to the system temp dir if needed
+    if (!fs.existsSync(certPath)) {
+      fs.mkdirSync(certDir, { recursive: true });
+      fs.writeFileSync(
+        certPath,
+        fs.readFileSync(path.join(__dirname, "../Cloudflare_CA.pem"), "utf-8")
+      );
+    }
+    pathToCACerts = certPath;
+  }
+
+  wranglerProcess = spawn(
     process.execPath,
     [
+      ...(semiver(process.versions.node, "18.0.0") >= 0
+        ? ["--no-experimental-fetch"] // TODO: remove this when https://github.com/cloudflare/wrangler2/issues/834 is properly fixed
+        : []),
       "--no-warnings",
       "--experimental-vm-modules",
       ...process.execArgv,
-      join(__dirname, "../wrangler-dist/cli.js"),
+      path.join(__dirname, "../wrangler-dist/cli.js"),
       ...process.argv.slice(2),
     ],
-    { stdio: "inherit" }
+    {
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        NODE_EXTRA_CA_CERTS: pathToCACerts,
+      },
+    }
   ).on("exit", (code) =>
     process.exit(code === undefined || code === null ? 0 : code)
   );
 }
 
+process.on("SIGINT", () => {
+  wranglerProcess.kill();
+});
+process.on("SIGTERM", () => {
+  wranglerProcess.kill();
+});
+
 void main();

package/kv-asset-handler.js

@@ -0,0 +1 @@
+export * from "@cloudflare/kv-asset-handler";