wrangler 0.0.0-ece06ea → 0.0.0-ecfbb0c

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,62 @@
-## 🤠 wrangler
+<h1 align="center"> ⛅️ wrangler </h1>
+<section align="center" id="shieldio-badges">
+<a href="https://www.npmjs.com/package/wrangler"><img alt="npm"  src="https://img.shields.io/npm/dw/wrangler?style=flat-square"></a>
+<img alt="GitHub contributors" src="https://img.shields.io/github/contributors/cloudflare/wrangler2?style=flat-square">
+<img alt="GitHub commit activity (branch)" src="https://img.shields.io/github/commit-activity/w/cloudflare/wrangler2/main?style=flat-square">
+<a href="https://discord.gg/CloudflareDev"><img alt="Discord" src="https://img.shields.io/discord/595317990191398933?color=%23F48120&style=flat-square"></a>
+</section>
 
-`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 +64,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,36 +1,134 @@
 #!/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";
 
-async function main() {
-  if (semiver(process.versions.node, MIN_NODE_VERSION) < 0) {
-    // Note Volta and nvm are also recommended in the official docs:
-    // https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
-    console.error(
-      `Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}.
+let wranglerProcess;
+
+/**
+ * Executes ../wrangler-dist/cli.js
+ */
+function runWrangler() {
+	if (semiver(process.versions.node, MIN_NODE_VERSION) < 0) {
+		// Note Volta and nvm are also recommended in the official docs:
+		// https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
+		console.error(
+			`Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}.
 You should use the latest Node.js version if possible, as Cloudflare Workers use a very up-to-date version of V8.
 Consider using a Node.js version manager such as https://volta.sh/ or https://github.com/nvm-sh/nvm.`
-    );
-    process.exitCode = 1;
-    return;
-  }
-
-  spawn(
-    process.execPath,
-    [
-      "--no-warnings",
-      "--experimental-vm-modules",
-      ...process.execArgv,
-      join(__dirname, "../wrangler-dist/cli.js"),
-      ...process.argv.slice(2),
-    ],
-    { stdio: "inherit" }
-  ).on("exit", (code) =>
-    process.exit(code === undefined || code === null ? 0 : code)
-  );
+		);
+		process.exitCode = 1;
+		return;
+	}
+
+	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;
+	}
+
+	return spawn(
+		process.execPath,
+		[
+			"--no-warnings",
+			"--experimental-vm-modules",
+			...process.execArgv,
+			path.join(__dirname, "../wrangler-dist/cli.js"),
+			...process.argv.slice(2),
+		],
+		{
+			stdio: "inherit",
+			env: {
+				...process.env,
+				NODE_EXTRA_CA_CERTS: pathToCACerts,
+			},
+		}
+	).on("exit", (code) =>
+		process.exit(code === undefined || code === null ? 0 : code)
+	);
+}
+
+/**
+ * Runs a locally-installed version of wrangler, delegating from this version.
+ * @throws {MODULE_NOT_FOUND} if there isn't a locally installed version of wrangler.
+ */
+function runDelegatedWrangler() {
+	const packageJsonPath = require.resolve("wrangler/package.json", {
+		paths: [process.cwd()],
+	});
+	const {
+		bin: { wrangler: binaryPath },
+		version,
+	} = JSON.parse(fs.readFileSync(packageJsonPath));
+	const resolvedBinaryPath = path.resolve(packageJsonPath, "..", binaryPath);
+
+	console.log(
+		`Delegating to locally-installed version of wrangler @ v${version}`
+	);
+	// this call to `spawn` is simpler because the delegated version will do all
+	// of the other work.
+	return spawn(
+		process.execPath,
+		[resolvedBinaryPath, ...process.argv.slice(2)],
+		{
+			stdio: "inherit",
+		}
+	).on("exit", (code) =>
+		process.exit(code === undefined || code === null ? 0 : code)
+	);
 }
 
+/**
+ * Indicates if this invocation of `wrangler` should delegate
+ * to a locally-installed version.
+ */
+function shouldDelegate() {
+	try {
+		// `require.resolve` will throw if it can't find
+		// a locally-installed version of `wrangler`
+		const delegatedPackageJson = require.resolve("wrangler/package.json", {
+			paths: [process.cwd()],
+		});
+		const thisPackageJson = path.resolve(__dirname, "..", "package.json");
+		// if it's the same path, then we're already a local install -- no need to delegate
+		return thisPackageJson !== delegatedPackageJson;
+	} catch (e) {
+		// there's no local version to delegate to -- `require.resolve` threw
+		return false;
+	}
+}
+
+async function main() {
+	wranglerProcess = shouldDelegate() ? runDelegatedWrangler() : runWrangler();
+}
+
+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";