wrangler 2.6.2 → 2.7.0

package/src/__tests__/dialogs.test.tsx

@@ -1,40 +0,0 @@
-jest.unmock("../dialogs");
-import { fromDashMessagePrompt } from "../dialogs";
-import { CI } from "../is-ci";
-
-describe("fromDashMessagePrompt", () => {
-	it("should return undefined in CI when last deployed from api", async () => {
-		//in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(true);
-		const result = await fromDashMessagePrompt("api");
-		expect(result).toBe(undefined);
-	});
-
-	it("should return undefined in CI when last deployed from wrangler", async () => {
-		//in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(true);
-		const result = await fromDashMessagePrompt("wrangler");
-		expect(result).toBe(undefined);
-	});
-
-	it("should return true in CI when last deployed from dash", async () => {
-		//in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(true);
-		const result = await fromDashMessagePrompt("dash");
-		expect(result).toBe(true);
-	});
-
-	it("should return undefined when last deployed from api", async () => {
-		//not in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(false);
-		const result = await fromDashMessagePrompt("api");
-		expect(result).toBe(undefined);
-	});
-
-	it("should return undefined when last deployed from wrangler", async () => {
-		//not in CI
-		jest.spyOn(CI, "isCI").mockReturnValue(false);
-		const result = await fromDashMessagePrompt("wrangler");
-		expect(result).toBe(undefined);
-	});
-});

package/src/dialogs.tsx

@@ -1,168 +0,0 @@
-import chalk from "chalk";
-import { Box, Text, useInput, render } from "ink";
-import SelectInput from "ink-select-input";
-import TextInput from "ink-text-input";
-import * as React from "react";
-import { useState } from "react";
-
-import { CI } from "./is-ci";
-import isInteractive from "./is-interactive";
-import { logger } from "./logger";
-
-type ConfirmProps = {
-	text: string;
-	onConfirm: (answer: boolean) => void;
-};
-function Confirm(props: ConfirmProps) {
-	useInput((input: string, key) => {
-		if (input === "y" || key.return === true) {
-			props.onConfirm(true);
-		} else if (input === "n") {
-			props.onConfirm(false);
-		} else {
-			logger.warn("Unrecognised input:", input);
-		}
-	});
-	return (
-		<Box>
-			<Text>
-				{props.text} ({chalk.bold("y")}/n)
-			</Text>
-		</Box>
-	);
-}
-
-export function confirm(
-	text: string,
-	beforeConfirm?: JSX.Element
-): Promise<boolean> {
-	return new Promise((resolve) => {
-		const { unmount } = render(
-			<Box flexDirection="column">
-				{beforeConfirm}
-				<Confirm
-					text={text}
-					onConfirm={(answer: boolean) => {
-						unmount();
-						resolve(answer);
-					}}
-				/>
-			</Box>
-		);
-	});
-}
-
-type PromptProps = {
-	text: string;
-	defaultValue?: string;
-	type?: "text" | "password";
-	onSubmit: (text: string) => void;
-};
-
-function Prompt(props: PromptProps) {
-	const [value, setValue] = useState(props.defaultValue || "");
-
-	return (
-		<Box>
-			<Text>{props.text} </Text>
-			<Box>
-				<TextInput
-					mask={props.type === "password" ? "*" : undefined}
-					value={value}
-					onChange={setValue}
-					onSubmit={props.onSubmit}
-				/>
-			</Box>
-		</Box>
-	);
-}
-
-export async function prompt(
-	text: string,
-	type: "text" | "password" = "text",
-	defaultValue?: string
-): Promise<string> {
-	return new Promise((resolve) => {
-		const { unmount } = render(
-			<Prompt
-				text={text}
-				defaultValue={defaultValue}
-				type={type}
-				onSubmit={(inputText) => {
-					unmount();
-					resolve(inputText);
-				}}
-			/>
-		);
-	});
-}
-
-type SelectOption = {
-	value: string;
-	label: string;
-};
-
-type SelectProps = {
-	text: string;
-	options: SelectOption[];
-	initialIndex: number;
-	onSelect: (value: string) => void;
-};
-
-function Select(props: SelectProps) {
-	return (
-		<Box flexDirection="column">
-			<Text>{props.text}</Text>
-			<SelectInput
-				initialIndex={props.initialIndex}
-				items={props.options}
-				onSelect={async (selected) => {
-					props.onSelect(selected.value);
-				}}
-			/>
-		</Box>
-	);
-}
-
-export function select(
-	text: string,
-	options: SelectOption[],
-	initialIndex: number
-): Promise<string> {
-	return new Promise((resolve) => {
-		const { unmount } = render(
-			<Select
-				text={text}
-				options={options}
-				initialIndex={initialIndex}
-				onSelect={(option: string) => {
-					unmount();
-					resolve(option);
-				}}
-			/>
-		);
-	});
-}
-
-export function logDim(msg: string) {
-	console.log(chalk.gray(msg));
-}
-
-export async function fromDashMessagePrompt(
-	deploySource: "dash" | "wrangler" | "api"
-): Promise<boolean | void> {
-	if (deploySource === "dash") {
-		logger.warn(
-			`You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.\nEdits that have been made via the dashboard will be overridden by your local code and config.`
-		);
-
-		if (!isInteractive() || CI.isCI()) return true;
-
-		return await confirm("Would you like to continue?");
-	}
-}
-export async function tailDOLogPrompt(): Promise<boolean | void> {
-	if (!isInteractive() || CI.isCI()) return true;
-
-	return await confirm("Would you like to continue?");
-}

package/src/environment-variables.ts

@@ -1,50 +0,0 @@
-import { logger } from "./logger";
-
-type VariableNames =
-	| "CLOUDFLARE_ACCOUNT_ID"
-	| "CLOUDFLARE_API_TOKEN"
-	| "CLOUDFLARE_API_KEY"
-	| "CLOUDFLARE_EMAIL"
-	| "WRANGLER_SEND_METRICS"
-	| "CLOUDFLARE_API_BASE_URL"
-	| "WRANGLER_LOG";
-
-type DeprecatedNames =
-	| "CF_ACCOUNT_ID"
-	| "CF_API_TOKEN"
-	| "CF_API_KEY"
-	| "CF_EMAIL"
-	| "CF_API_BASE_URL";
-/**
- * Create a function used to access an environment variable.
- *
- * This is not memoized to allow us to change the value at runtime, such as in testing.
- * A warning is shown if the client is using a deprecated version - but only once.
- */
-export function getEnvironmentVariableFactory({
-	variableName,
-	deprecatedName,
-	defaultValue,
-}: {
-	variableName: VariableNames;
-	deprecatedName?: DeprecatedNames;
-	defaultValue?: string;
-}) {
-	let hasWarned = false;
-	return () => {
-		if (process.env[variableName]) {
-			return process.env[variableName];
-		} else if (deprecatedName && process.env[deprecatedName]) {
-			if (!hasWarned) {
-				// Only show the warning once.
-				hasWarned = true;
-				logger.warn(
-					`Using "${deprecatedName}" environment variable. This is deprecated. Please use "${variableName}", instead.`
-				);
-			}
-			return process.env[deprecatedName];
-		} else {
-			return defaultValue;
-		}
-	};
-}

package/src/user/env-vars.ts

@@ -1,46 +0,0 @@
-import { getEnvironmentVariableFactory } from "../environment-variables";
-
-export type ApiCredentials =
-	| {
-			apiToken: string;
-	  }
-	| {
-			authKey: string;
-			authEmail: string;
-	  };
-
-const getCloudflareAPITokenFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_API_TOKEN",
-	deprecatedName: "CF_API_TOKEN",
-});
-const getCloudflareGlobalAuthKeyFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_API_KEY",
-	deprecatedName: "CF_API_KEY",
-});
-const getCloudflareGlobalAuthEmailFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_EMAIL",
-	deprecatedName: "CF_EMAIL",
-});
-
-/**
- * Try to read an API token or Global Auth from the environment.
- */
-export function getAuthFromEnv(): ApiCredentials | undefined {
-	const globalApiKey = getCloudflareGlobalAuthKeyFromEnv();
-	const globalApiEmail = getCloudflareGlobalAuthEmailFromEnv();
-	const apiToken = getCloudflareAPITokenFromEnv();
-
-	if (globalApiKey && globalApiEmail) {
-		return { authKey: globalApiKey, authEmail: globalApiEmail };
-	} else if (apiToken) {
-		return { apiToken };
-	}
-}
-
-/**
- * Try to read the account ID from the environment.
- */
-export const getCloudflareAccountIdFromEnv = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_ACCOUNT_ID",
-	deprecatedName: "CF_ACCOUNT_ID",
-});