wrangler 0.0.0-e30d1013 → 0.0.0-e3136f935

package/package.json

@@ -1,193 +1,198 @@
 {
-	"name": "wrangler",
-	"version": "0.0.0-e30d1013",
-	"description": "Command-line interface for all things Cloudflare Workers",
-	"keywords": [
-		"wrangler",
-		"cloudflare",
-		"workers",
-		"cloudflare workers",
-		"edge",
-		"compute",
-		"serverless",
-		"serverless application",
-		"serverless module",
-		"wasm",
-		"web",
-		"assembly",
-		"webassembly",
-		"rust",
-		"emscripten",
-		"typescript",
-		"graphql",
-		"router",
-		"http",
-		"cli"
-	],
-	"homepage": "https://github.com/cloudflare/wrangler2#readme",
-	"bugs": {
-		"url": "https://github.com/cloudflare/wrangler2/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/cloudflare/wrangler2.git",
-		"directory": "packages/wrangler"
-	},
-	"license": "MIT OR Apache-2.0",
-	"author": "wrangler@cloudflare.com",
-	"main": "wrangler-dist/cli.js",
-	"types": "wrangler-dist/cli.d.ts",
-	"bin": {
-		"wrangler": "./bin/wrangler.js",
-		"wrangler2": "./bin/wrangler.js"
-	},
-	"files": [
-		"src",
-		"bin",
-		"miniflare-config-stubs",
-		"miniflare-dist",
-		"wrangler-dist",
-		"templates",
-		"vendor",
-		"import_meta_url.js",
-		"kv-asset-handler.js",
-		"Cloudflare_CA.pem"
-	],
-	"scripts": {
-		"assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
-		"build": "npm run clean && npm run bundle && npm run emit-types",
-		"bundle": "node -r esbuild-register scripts/bundle.ts",
-		"check:type": "tsc",
-		"clean": "rimraf wrangler-dist miniflare-dist emitted-types",
-		"dev": "npm run clean && concurrently -c black,blue --kill-others-on-fail false 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
-		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
-		"prepublishOnly": "SOURCEMAPS=false npm run build",
-		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
-		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
-		"test:ci": "npm run test -- --verbose=true --coverage"
-	},
-	"jest": {
-		"coverageReporters": [
-			"json",
-			"html",
-			"text",
-			"cobertura"
-		],
-		"moduleNameMapper": {
-			"clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
-			"miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
-		},
-		"restoreMocks": true,
-		"setupFilesAfterEnv": [
-			"<rootDir>/src/__tests__/jest.setup.ts"
-		],
-		"testRegex": ".*.(test|spec)\\.[jt]sx?$",
-		"testTimeout": 30000,
-		"transform": {
-			"^.+\\.c?(t|j)sx?$": [
-				"esbuild-jest",
-				{
-					"sourcemap": true
-				}
-			]
-		},
-		"transformIgnorePatterns": [
-			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|npx-import)"
-		]
-	},
-	"dependencies": {
-		"@cloudflare/kv-asset-handler": "^0.2.0",
-		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
-		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.10.0",
-		"@miniflare/d1": "2.10.0",
-		"@miniflare/durable-objects": "2.10.0",
-		"blake3-wasm": "^2.1.5",
-		"chokidar": "^3.5.3",
-		"esbuild": "0.14.51",
-		"miniflare": "2.10.0",
-		"nanoid": "^3.3.3",
-		"path-to-regexp": "^6.2.0",
-		"selfsigned": "^2.0.1",
-		"source-map": "^0.7.4",
-		"xxhash-wasm": "^1.0.1"
-	},
-	"devDependencies": {
-		"@cloudflare/types": "^6.18.4",
-		"@databases/split-sql-query": "^1.0.3",
-		"@databases/sql": "^3.2.0",
-		"@iarna/toml": "^3.0.0",
-		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "^3.0.0-next.5",
-		"@types/better-sqlite3": "^7.6.0",
-		"@types/busboy": "^1.5.0",
-		"@types/command-exists": "^1.2.0",
-		"@types/express": "^4.17.13",
-		"@types/glob-to-regexp": "0.4.1",
-		"@types/javascript-time-ago": "^2.0.3",
-		"@types/mime": "^2.0.3",
-		"@types/prompts": "^2.0.14",
-		"@types/react": "^17.0.37",
-		"@types/serve-static": "^1.13.10",
-		"@types/signal-exit": "^3.0.1",
-		"@types/supports-color": "^8.1.1",
-		"@types/ws": "^8.5.3",
-		"@types/yargs": "^17.0.10",
-		"@webcontainer/env": "^1.0.1",
-		"body-parser": "^1.20.0",
-		"clipboardy": "^3.0.0",
-		"cmd-shim": "^4.1.0",
-		"command-exists": "^1.2.9",
-		"concurrently": "^7.2.2",
-		"devtools-protocol": "^0.0.955664",
-		"dotenv": "^16.0.0",
-		"execa": "^6.1.0",
-		"express": "^4.18.1",
-		"finalhandler": "^1.2.0",
-		"find-up": "^6.3.0",
-		"get-port": "^6.1.2",
-		"glob-to-regexp": "0.4.1",
-		"http-terminator": "^3.2.0",
-		"ignore": "^5.2.0",
-		"ink": "^3.2.0",
-		"ink-select-input": "^4.2.1",
-		"ink-spinner": "^4.0.3",
-		"ink-table": "^3.0.0",
-		"ink-testing-library": "^2.1.0",
-		"ink-text-input": "^4.0.3",
-		"is-ci": "^3.0.1",
-		"javascript-time-ago": "^2.5.4",
-		"jest-fetch-mock": "^3.0.3",
-		"jest-websocket-mock": "^2.3.0",
-		"mime": "^3.0.0",
-		"minimatch": "^5.1.0",
-		"msw": "^0.47.1",
-		"npx-import": "^1.1.3",
-		"open": "^8.4.0",
-		"p-queue": "^7.2.0",
-		"pretty-bytes": "^6.0.0",
-		"prompts": "^2.4.2",
-		"react": "^17.0.2",
-		"react-error-boundary": "^3.1.4",
-		"remove-accents-esm": "^0.0.1",
-		"semiver": "^1.1.0",
-		"serve-static": "^1.15.0",
-		"signal-exit": "^3.0.7",
-		"supports-color": "^9.2.2",
-		"timeago.js": "^4.0.2",
-		"tmp-promise": "^3.0.3",
-		"ts-dedent": "^2.2.0",
-		"undici": "^5.11.0",
-		"update-check": "^1.5.4",
-		"ws": "^8.5.0",
-		"xdg-app-paths": "^7.3.0",
-		"yargs": "^17.4.1"
-	},
-	"optionalDependencies": {
-		"fsevents": "~2.3.2"
-	},
-	"engines": {
-		"node": ">=16.13.0"
-	}
-}
+  "name": "wrangler",
+  "version": "0.0.0-e3136f935",
+  "description": "Command-line interface for all things Cloudflare Workers",
+  "keywords": [
+    "wrangler",
+    "cloudflare",
+    "workers",
+    "cloudflare workers",
+    "edge",
+    "compute",
+    "serverless",
+    "serverless application",
+    "serverless module",
+    "wasm",
+    "web",
+    "assembly",
+    "webassembly",
+    "rust",
+    "emscripten",
+    "typescript",
+    "graphql",
+    "router",
+    "http",
+    "cli"
+  ],
+  "homepage": "https://github.com/cloudflare/workers-sdk#readme",
+  "bugs": {
+    "url": "https://github.com/cloudflare/workers-sdk/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cloudflare/workers-sdk.git",
+    "directory": "packages/wrangler"
+  },
+  "license": "MIT OR Apache-2.0",
+  "author": "wrangler@cloudflare.com",
+  "main": "wrangler-dist/cli.js",
+  "types": "wrangler-dist/cli.d.ts",
+  "bin": {
+    "wrangler": "./bin/wrangler.js",
+    "wrangler2": "./bin/wrangler.js"
+  },
+  "files": [
+    "bin",
+    "miniflare-dist",
+    "wrangler-dist",
+    "templates",
+    "kv-asset-handler.js",
+    "config-schema.json"
+  ],
+  "dependencies": {
+    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+    "blake3-wasm": "^2.1.5",
+    "chokidar": "^3.5.3",
+    "date-fns": "^3.6.0",
+    "esbuild": "0.17.19",
+    "nanoid": "^3.3.3",
+    "path-to-regexp": "^6.3.0",
+    "resolve": "^1.22.8",
+    "resolve.exports": "^2.0.2",
+    "selfsigned": "^2.0.1",
+    "source-map": "^0.6.1",
+    "unenv": "npm:unenv-nightly@2.0.0-1726478054.1e87097",
+    "workerd": "1.20240909.0",
+    "xxhash-wasm": "^1.0.1",
+    "@cloudflare/kv-asset-handler": "0.3.4",
+    "@cloudflare/workers-shared": "0.0.0-e3136f935",
+    "miniflare": "0.0.0-e3136f935"
+  },
+  "devDependencies": {
+    "@cloudflare/types": "^6.18.4",
+    "@cloudflare/workers-types": "^4.20240909.0",
+    "@cspotcode/source-map-support": "0.8.1",
+    "@iarna/toml": "^3.0.0",
+    "@microsoft/api-extractor": "^7.47.0",
+    "@sentry/node": "^7.86.0",
+    "@sentry/types": "^7.86.0",
+    "@sentry/utils": "^7.86.0",
+    "@types/body-parser": "^1.19.2",
+    "@types/command-exists": "^1.2.0",
+    "@types/express": "^4.17.13",
+    "@types/glob-to-regexp": "^0.4.1",
+    "@types/is-ci": "^3.0.0",
+    "@types/javascript-time-ago": "^2.0.3",
+    "@types/mime": "^3.0.4",
+    "@types/minimatch": "^5.1.2",
+    "@types/prompts": "^2.0.14",
+    "@types/react": "^18.3.3",
+    "@types/resolve": "^1.20.6",
+    "@types/serve-static": "^1.13.10",
+    "@types/shell-quote": "^1.7.2",
+    "@types/signal-exit": "^3.0.1",
+    "@types/supports-color": "^8.1.1",
+    "@types/ws": "^8.5.7",
+    "@types/yargs": "^17.0.22",
+    "@vitest/ui": "^1.6.0",
+    "@webcontainer/env": "^1.1.0",
+    "body-parser": "^1.20.0",
+    "chalk": "^5.2.0",
+    "cli-table3": "^0.6.3",
+    "clipboardy": "^3.0.0",
+    "cmd-shim": "^4.1.0",
+    "command-exists": "^1.2.9",
+    "concurrently": "^8.2.2",
+    "devtools-protocol": "^0.0.1182435",
+    "dotenv": "^16.0.0",
+    "es-module-lexer": "^1.3.0",
+    "execa": "^6.1.0",
+    "express": "^4.18.1",
+    "find-up": "^6.3.0",
+    "get-port": "^7.0.0",
+    "glob-to-regexp": "^0.4.1",
+    "http-terminator": "^3.2.0",
+    "https-proxy-agent": "7.0.2",
+    "ignore": "^5.2.0",
+    "ink": "^3.2.0",
+    "ink-select-input": "^4.2.1",
+    "ink-spinner": "^4.0.3",
+    "ink-table": "^3.0.0",
+    "is-ci": "^3.0.1",
+    "javascript-time-ago": "^2.5.4",
+    "md5-file": "5.0.0",
+    "mime": "^3.0.0",
+    "minimatch": "^5.1.0",
+    "mock-socket": "^9.3.1",
+    "msw": "^2.3.0",
+    "open": "^8.4.0",
+    "p-queue": "^7.2.0",
+    "patch-console": "^1.0.0",
+    "pretty-bytes": "^6.0.0",
+    "prompts": "^2.4.2",
+    "ps-list": "^8.1.1",
+    "react": "^18.3.1",
+    "react-error-boundary": "^3.1.4",
+    "semiver": "^1.1.0",
+    "serve-static": "^1.15.0",
+    "shell-quote": "^1.8.1",
+    "shellac": "^0.8.0",
+    "signal-exit": "^3.0.7",
+    "strip-ansi": "^7.1.0",
+    "supports-color": "^9.2.2",
+    "timeago.js": "^4.0.2",
+    "ts-dedent": "^2.2.0",
+    "ts-json-schema-generator": "^1.5.0",
+    "undici": "^5.28.4",
+    "update-check": "^1.5.4",
+    "vitest": "~2.1.1",
+    "vitest-websocket-mock": "^0.3.0",
+    "ws": "^8.17.1",
+    "xdg-app-paths": "^8.3.0",
+    "yargs": "^17.7.2",
+    "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/eslint-config-worker": "1.1.0",
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/pages-shared": "^0.11.58"
+  },
+  "peerDependencies": {
+    "@cloudflare/workers-types": "^4.20240909.0"
+  },
+  "peerDependenciesMeta": {
+    "@cloudflare/workers-types": {
+      "optional": true
+    }
+  },
+  "optionalDependencies": {
+    "fsevents": "~2.3.2"
+  },
+  "engines": {
+    "node": ">=16.17.0"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "workers-sdk": {
+    "prerelease": true
+  },
+  "scripts": {
+    "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
+    "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types && pnpm run generate-json-schema",
+    "bundle": "node -r esbuild-register scripts/bundle.ts",
+    "check:lint": "eslint . --max-warnings=0",
+    "check:type": "tsc",
+    "clean": "rimraf wrangler-dist miniflare-dist emitted-types",
+    "dev": "pnpm run clean && concurrently -c black,blue --kill-others-on-fail false \"pnpm run bundle --watch\" \"pnpm run check:type --watch --preserveWatchOutput\"",
+    "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
+    "generate-json-schema": "pnpm exec ts-json-schema-generator --no-type-check --path src/config/config.ts --type RawConfig --out config-schema.json",
+    "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
+    "test": "pnpm run assert-git-version && vitest",
+    "test:ci": "pnpm run test run",
+    "test:debug": "pnpm run test --silent=false --verbose=true",
+    "test:e2e": "vitest -c ./e2e/vitest.config.mts",
+    "test:watch": "pnpm run test --testTimeout=50000 --watch",
+    "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
+  }
+}

package/templates/__tests__/tsconfig-sanity.ts

@@ -0,0 +1,12 @@
+// `@types/node` should be included
+Buffer.from("test");
+
+// `@types/jest` should be included
+test("test");
+
+// @ts-expect-error `@cloudflare/workers-types` should NOT be included
+const _handler: ExportedHandler = {};
+// @ts-expect-error `@cloudflare/workers-types` should NOT be included
+new HTMLRewriter();
+
+export {};

package/templates/__tests__/tsconfig.json

@@ -0,0 +1,8 @@
+{
+	"extends": "@cloudflare/workers-tsconfig/tsconfig.json",
+	"compilerOptions": {
+		"types": ["node", "jest"]
+	},
+	"include": ["**/*.ts"],
+	"exclude": []
+}

package/templates/checked-fetch.js

@@ -1,17 +1,30 @@
 const urls = new Set();
 
-export function checkedFetch(request, init) {
-	const url = new URL(
-		(typeof request === "string" ? new Request(request, init) : request).url
-	);
+function checkURL(request, init) {
+	const url =
+		request instanceof URL
+			? request
+			: new URL(
+					(typeof request === "string"
+						? new Request(request, init)
+						: request
+					).url
+				);
 	if (url.port && url.port !== "443" && url.protocol === "https:") {
 		if (!urls.has(url.toString())) {
 			urls.add(url.toString());
 			console.warn(
 				`WARNING: known issue with \`fetch()\` requests to custom HTTPS ports in published Workers:\n` +
-					` - ${url.toString()} - the custom port will be ignored when the Worker is published using the \`wrangler publish\` command.\n`
+					` - ${url.toString()} - the custom port will be ignored when the Worker is published using the \`wrangler deploy\` command.\n`
 			);
 		}
 	}
-	return globalThis.fetch(request, init);
 }
+
+globalThis.fetch = new Proxy(globalThis.fetch, {
+	apply(target, thisArg, argArray) {
+		const [request, init] = argArray;
+		checkURL(request, init);
+		return Reflect.apply(target, thisArg, argArray);
+	},
+});

package/templates/facade.d.ts

@@ -0,0 +1,19 @@
+declare module "__ENTRY_POINT__" {
+	import { Middleware } from "./middleware/common";
+	import { WorkerEntrypoint } from "cloudflare:workers";
+
+	export type WorkerEntrypointConstructor = typeof WorkerEntrypoint;
+
+	const worker: ExportedHandler | WorkerEntrypointConstructor;
+	export default worker;
+	export const __INTERNAL_WRANGLER_MIDDLEWARE__: Middleware[];
+}
+
+declare module "__KV_ASSET_HANDLER__" {
+	export * from "@cloudflare/kv-asset-handler";
+}
+
+declare module "__STATIC_CONTENT_MANIFEST" {
+	const manifest: string;
+	export default manifest;
+}

package/templates/gitignore

@@ -166,6 +166,5 @@ dist
 .yarn/install-state.gz
 .pnp.\*
 
-# wrangler project
-
-.dev.vars
+.wrangler
+.DS_Store

package/templates/init-tests/test-jest-new-worker.js

@@ -4,11 +4,9 @@ describe("Worker", () => {
 	let worker;
 
 	beforeAll(async () => {
-		worker = await unstable_dev(
-			"src/index.js",
-			{},
-			{ disableExperimentalWarning: true }
-		);
+		worker = await unstable_dev("src/index.js", {
+			experimental: { disableExperimentalWarning: true },
+		});
 	});
 
 	afterAll(async () => {

package/templates/init-tests/test-vitest-new-worker.js

@@ -1,15 +1,13 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { unstable_dev } from "wrangler";
-import { describe, expect, it, beforeAll, afterAll } from "vitest";
 
 describe("Worker", () => {
 	let worker;
 
 	beforeAll(async () => {
-		worker = await unstable_dev(
-			"src/index.js",
-			{},
-			{ disableExperimentalWarning: true }
-		);
+		worker = await unstable_dev("src/index.js", {
+			experimental: { disableExperimentalWarning: true },
+		});
 	});
 
 	afterAll(async () => {

package/templates/init-tests/test-vitest-new-worker.ts

@@ -0,0 +1,25 @@
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { unstable_dev } from "wrangler";
+import type { UnstableDevWorker } from "wrangler";
+
+describe("Worker", () => {
+	let worker: UnstableDevWorker;
+
+	beforeAll(async () => {
+		worker = await unstable_dev("src/index.ts", {
+			experimental: { disableExperimentalWarning: true },
+		});
+	});
+
+	afterAll(async () => {
+		await worker.stop();
+	});
+
+	it("should return Hello World", async () => {
+		const resp = await worker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+	});
+});

package/templates/middleware/common.ts

@@ -5,13 +5,18 @@ export type Dispatcher = (
 	init: { cron?: string }
 ) => Awaitable<void>;
 
+export type IncomingRequest = Request<
+	unknown,
+	IncomingRequestCfProperties<unknown>
+>;
+
 export interface MiddlewareContext {
 	dispatch: Dispatcher;
-	next(request: Request, env: any): Awaitable<Response>;
+	next(request: IncomingRequest, env: any): Awaitable<Response>;
 }
 
 export type Middleware = (
-	request: Request,
+	request: IncomingRequest,
 	env: any,
 	ctx: ExecutionContext,
 	middlewareCtx: MiddlewareContext
@@ -32,7 +37,7 @@ export function __facade_registerInternal__(
 }
 
 function __facade_invokeChain__(
-	request: Request,
+	request: IncomingRequest,
 	env: any,
 	ctx: ExecutionContext,
 	dispatch: Dispatcher,
@@ -49,7 +54,7 @@ function __facade_invokeChain__(
 }
 
 export function __facade_invoke__(
-	request: Request,
+	request: IncomingRequest,
 	env: any,
 	ctx: ExecutionContext,
 	dispatch: Dispatcher,