wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/dialogs.tsx

@@ -1,163 +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): Promise<boolean> {
-	return new Promise((resolve) => {
-		const { unmount } = render(
-			<Confirm
-				text={text}
-				onConfirm={(answer: boolean) => {
-					unmount();
-					resolve(answer);
-				}}
-			/>
-		);
-	});
-}
-
-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.
-		Edits 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/pages/build.tsx

@@ -1,238 +0,0 @@
-import { writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
-import { FatalError } from "../errors";
-import { logger } from "../logger";
-import * as metrics from "../metrics";
-import { toUrlPath } from "../paths";
-import { isInPagesCI } from "./constants";
-import {
-	EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR,
-	FunctionsNoRoutesError,
-	getFunctionsNoRoutesWarning,
-} from "./errors";
-import { buildPlugin } from "./functions/buildPlugin";
-import { buildWorker } from "./functions/buildWorker";
-import { generateConfigFromFileTree } from "./functions/filepath-routing";
-import { writeRoutesModule } from "./functions/routes";
-import { convertRoutesToRoutesJSONSpec } from "./functions/routes-transformation";
-import { pagesBetaWarning, RUNNING_BUILDERS } from "./utils";
-import type { Config } from "./functions/routes";
-import type { YargsOptionsToInterface } from "./types";
-import type { Argv } from "yargs";
-
-type PagesBuildArgs = YargsOptionsToInterface<typeof Options>;
-
-export function Options(yargs: Argv) {
-	return yargs
-		.positional("directory", {
-			type: "string",
-			default: "functions",
-			description: "The directory of Pages Functions",
-		})
-		.options({
-			outfile: {
-				type: "string",
-				default: "_worker.js",
-				description: "The location of the output Worker script",
-			},
-			"output-config-path": {
-				type: "string",
-				description: "The location for the output config file",
-			},
-			"output-routes-path": {
-				type: "string",
-				description: "The location for the output _routes.json file",
-			},
-			minify: {
-				type: "boolean",
-				default: false,
-				description: "Minify the output Worker script",
-			},
-			sourcemap: {
-				type: "boolean",
-				default: false,
-				description: "Generate a sourcemap for the output Worker script",
-			},
-			"fallback-service": {
-				type: "string",
-				default: "ASSETS",
-				description:
-					"The service to fallback to at the end of the `next` chain. Setting to '' will fallback to the global `fetch`.",
-			},
-			watch: {
-				type: "boolean",
-				default: false,
-				description:
-					"Watch for changes to the functions and automatically rebuild the Worker script",
-			},
-			plugin: {
-				type: "boolean",
-				default: false,
-				description: "Build a plugin rather than a Worker script",
-			},
-			"build-output-directory": {
-				type: "string",
-				description: "The directory to output static assets to",
-			},
-			"node-compat": {
-				describe: "Enable node.js compatibility",
-				default: false,
-				type: "boolean",
-				hidden: true,
-			},
-		})
-		.epilogue(pagesBetaWarning);
-}
-
-export const Handler = async ({
-	directory,
-	outfile,
-	outputConfigPath,
-	outputRoutesPath: routesOutputPath,
-	minify,
-	sourcemap,
-	fallbackService,
-	watch,
-	plugin,
-	buildOutputDirectory,
-	nodeCompat,
-}: PagesBuildArgs) => {
-	if (!isInPagesCI) {
-		// Beta message for `wrangler pages <commands>` usage
-		logger.log(pagesBetaWarning);
-	}
-
-	if (nodeCompat) {
-		console.warn(
-			"Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
-		);
-	}
-
-	buildOutputDirectory ??= dirname(outfile);
-	try {
-		await buildFunctions({
-			outfile,
-			outputConfigPath,
-			functionsDirectory: directory,
-			minify,
-			sourcemap,
-			fallbackService,
-			watch,
-			plugin,
-			buildOutputDirectory,
-			nodeCompat,
-			routesOutputPath,
-		});
-	} catch (e) {
-		if (e instanceof FunctionsNoRoutesError) {
-			throw new FatalError(
-				getFunctionsNoRoutesWarning(directory),
-				EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR
-			);
-		} else {
-			throw e;
-		}
-	}
-	await metrics.sendMetricsEvent("build pages functions");
-};
-
-/**
- * Builds a Functions worker based on the functions directory, with filepath and handler based routing.
- * @throws FunctionsNoRoutesError when there are no routes found in the functions directory
- */
-export async function buildFunctions({
-	outfile,
-	outputConfigPath,
-	functionsDirectory,
-	minify = false,
-	sourcemap = false,
-	fallbackService = "ASSETS",
-	watch = false,
-	onEnd,
-	plugin = false,
-	buildOutputDirectory,
-	routesOutputPath,
-	nodeCompat,
-}: Partial<
-	Pick<
-		PagesBuildArgs,
-		| "outputConfigPath"
-		| "minify"
-		| "sourcemap"
-		| "fallbackService"
-		| "watch"
-		| "plugin"
-		| "buildOutputDirectory"
-		| "nodeCompat"
-	>
-> & {
-	functionsDirectory: string;
-	onEnd?: () => void;
-	outfile: Required<PagesBuildArgs>["outfile"];
-	routesOutputPath?: PagesBuildArgs["outputRoutesPath"];
-}) {
-	RUNNING_BUILDERS.forEach(
-		(runningBuilder) => runningBuilder.stop && runningBuilder.stop()
-	);
-
-	const routesModule = join(tmpdir(), `./functionsRoutes-${Math.random()}.mjs`);
-	const baseURL = toUrlPath("/");
-
-	const config: Config = await generateConfigFromFileTree({
-		baseDir: functionsDirectory,
-		baseURL,
-	});
-
-	if (!config.routes || config.routes.length === 0) {
-		throw new FunctionsNoRoutesError(
-			`Failed to find any routes while compiling Functions in: ${functionsDirectory}`
-		);
-	}
-
-	if (routesOutputPath) {
-		const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
-		writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
-	}
-
-	if (outputConfigPath) {
-		writeFileSync(
-			outputConfigPath,
-			JSON.stringify({ ...config, baseURL }, null, 2)
-		);
-	}
-
-	await writeRoutesModule({
-		config,
-		srcDir: functionsDirectory,
-		outfile: routesModule,
-	});
-
-	if (plugin) {
-		RUNNING_BUILDERS.push(
-			await buildPlugin({
-				routesModule,
-				outfile,
-				minify,
-				sourcemap,
-				watch,
-				nodeCompat,
-				onEnd,
-			})
-		);
-	} else {
-		RUNNING_BUILDERS.push(
-			await buildWorker({
-				routesModule,
-				outfile,
-				minify,
-				sourcemap,
-				fallbackService,
-				watch,
-				onEnd,
-				buildOutputDirectory,
-				nodeCompat,
-			})
-		);
-	}
-}

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",
-});

package/templates/experimental-local-cache-stubs.js

@@ -1,27 +0,0 @@
-// `workerd` currently throws on any use of the Cache API. Workers Sites
-// requires the Cache API to function though, so stub it out to no-ops, like in
-// regular `wrangler dev`.
-
-class Cache {
-	async put(req, res) {}
-
-	async match(req, options) {}
-
-	async delete(req, options) {
-		return false;
-	}
-}
-
-class CacheStorage {
-	#cache = new Cache();
-
-	get default() {
-		return this.#cache;
-	}
-
-	async open(cacheName) {
-		return this.#cache;
-	}
-}
-
-globalThis.caches = new CacheStorage();