wrangler 0.0.0-dcd3c582 → 0.0.0-dcdc8803

package/README.md

@@ -6,6 +6,8 @@
 <a href="https://discord.gg/CloudflareDev"><img alt="Discord" src="https://img.shields.io/discord/595317990191398933?color=%23F48120&style=flat-square"></a>
 </section>
 
+> 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-legacy.
+
 `wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
 
 ## Quick Start
@@ -15,8 +17,8 @@
 echo "export default { fetch() { return new Response('hello world') } }" > index.js
 # try it out
 npx wrangler dev index.js
-# and then deploy it
-npx wrangler deploy index.js --name my-worker
+# and then publish it
+npx wrangler publish index.js --name my-worker
 # visit https://my-worker.<your workers subdomain>.workers.dev
 ```
 
@@ -24,10 +26,10 @@ npx wrangler deploy index.js --name my-worker
 
 ```bash
 # Generate a new project
-npx wrangler init my-worker --no-delegate-c3
+npx wrangler init my-worker
 # try it out
 cd my-worker && npm run start
-# and then deploy it
+# and then publish it
 npm run deploy
 ```
 
@@ -41,15 +43,15 @@ $ npm install wrangler --save-dev
 
 Wrangler is configured via a `wrangler.toml` file in the project root. When utilizing the `wrangler init` command, a `wrangler.toml` file will be created for you.
 
-Example:
+example:
 
 ```toml
-name = "my-worker"
 main = "./src/index.ts" # init w/ TypeScript
-compatibility_date = "YYYY-MM-DD"
+name = "my-worker"
+compatibility_date = "YYY-MM-DD"
 ```
 
-For more detailed information about configuration, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/configuration/).
+for more detailed information about configuration, see the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration)
 
 ## Commands
 
@@ -61,11 +63,11 @@ Creates a Worker project. For details on configuration keys and values, refer to
 
 Start a local development server, with live reloading and devtools.
 
-### `wrangler deploy`
+### `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/wrangler/commands/).
+For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/commands).
 
 ## Pages
 

package/bin/wrangler.js

@@ -76,14 +76,83 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 			if (process.send) {
 				process.send(message);
 			}
-		})
-		.on("disconnect", () => {
-			if (process.disconnect) {
-				process.disconnect();
+		});
+}
+
+/**
+ * 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);
+
+	// Make sure the user knows we're delegating to a different installation
+	const currentPackageJsonPath = path.resolve(__dirname, "..", "package.json");
+	const currentPackage = JSON.parse(fs.readFileSync(currentPackageJsonPath));
+	const argv = process.argv.slice(2).join(" ");
+	console.log(
+		`Delegating to locally-installed wrangler@${version} over global wrangler@${currentPackage.version}...
+Run \`npx wrangler ${argv}\` to use the local version directly.
+`
+	);
+
+	// 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", "inherit", "inherit", "ipc"],
+		}
+	)
+		.on("exit", (code) =>
+			process.exit(code === undefined || code === null ? 0 : code)
+		)
+		.on("message", (message) => {
+			if (process.send) {
+				process.send(message);
 			}
 		});
 }
 
+/**
+ * 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 && wranglerProcess.kill();
+});
+process.on("SIGTERM", () => {
+	wranglerProcess && wranglerProcess.kill();
+});
+
 // semiver implementation via https://github.com/lukeed/semiver/blob/ae7eebe6053c96be63032b14fb0b68e2553fcac4/src/index.js
 
 /**
@@ -116,12 +185,4 @@ function semiver(a, b, bool) {
 
 // end semiver implementation
 
-if (module === require.main) {
-	wranglerProcess = runWrangler();
-	process.on("SIGINT", () => {
-		wranglerProcess && wranglerProcess.kill();
-	});
-	process.on("SIGTERM", () => {
-		wranglerProcess && wranglerProcess.kill();
-	});
-}
+void main();

package/import_meta_url.js

@@ -0,0 +1,3 @@
+// as per https://github.com/evanw/esbuild/issues/1492
+// to make some libs work
+export const import_meta_url = require("url").pathToFileURL(__filename);

package/miniflare-config-stubs/package.empty.json

@@ -0,0 +1 @@
+{}