wrangler 0.0.0-e7cf0caa → 0.0.0-e81b1611

package/README.md

@@ -6,8 +6,6 @@
 <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
@@ -17,8 +15,8 @@
 echo "export default { fetch() { return new Response('hello world') } }" > index.js
 # try it out
 npx wrangler dev index.js
-# and then publish it
-npx wrangler publish index.js --name my-worker
+# and then deploy it
+npx wrangler deploy index.js --name my-worker
 # visit https://my-worker.<your workers subdomain>.workers.dev
 ```
 
@@ -26,10 +24,10 @@ npx wrangler publish index.js --name my-worker
 
 ```bash
 # Generate a new project
-npx wrangler init my-worker
+npx wrangler init my-worker --no-delegate-c3
 # try it out
 cd my-worker && npm run start
-# and then publish it
+# and then deploy it
 npm run deploy
 ```
 
@@ -43,15 +41,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
-main = "./src/index.ts" # init w/ TypeScript
 name = "my-worker"
-compatibility_date = "YYY-MM-DD"
+main = "./src/index.ts" # init w/ TypeScript
+compatibility_date = "YYYY-MM-DD"
 ```
 
-for more detailed information about configuration, see the [documentation](https://developers.cloudflare.com/workers/cli-wrangler/configuration)
+For more detailed information about configuration, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/configuration/).
 
 ## Commands
 
@@ -63,11 +61,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 publish`
+### `wrangler deploy`
 
 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).
+For more commands and options, refer to the [documentation](https://developers.cloudflare.com/workers/wrangler/commands/).
 
 ## Pages
 

package/bin/wrangler.js

@@ -79,80 +79,6 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
 		});
 }
 
-/**
- * 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
 
 /**
@@ -185,4 +111,12 @@ function semiver(a, b, bool) {
 
 // end semiver implementation
 
-void main();
+if (module === require.main) {
+	wranglerProcess = runWrangler();
+	process.on("SIGINT", () => {
+		wranglerProcess && wranglerProcess.kill();
+	});
+	process.on("SIGTERM", () => {
+		wranglerProcess && wranglerProcess.kill();
+	});
+}

package/package.json

@@ -1,200 +1,210 @@
 {
-	"name": "wrangler",
-	"version": "0.0.0-e7cf0caa",
-	"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": [
-		"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": "node -r esbuild-register scripts/tsc-all.ts",
-		"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",
-		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
-		"test:ci": "npm run test -- --coverage",
-		"test:debug": "npm run test -- --silent=false --verbose=true",
-		"test:e2e": "vitest --no-threads ./e2e"
-	},
-	"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": "src/__tests__/.*\\.(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.13.0",
-		"@miniflare/d1": "2.13.0",
-		"@miniflare/durable-objects": "2.13.0",
-		"blake3-wasm": "^2.1.5",
-		"chokidar": "^3.5.3",
-		"esbuild": "0.16.3",
-		"miniflare": "2.13.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",
-		"@cloudflare/workers-types": "^4.20221111.1",
-		"@iarna/toml": "^3.0.0",
-		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "3.0.0-next.12",
-		"@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",
-		"chalk": "^2.4.2",
-		"cli-table3": "^0.6.3",
-		"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.49.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",
-		"shellac": "^0.7.3",
-		"signal-exit": "^3.0.7",
-		"strip-ansi": "^7.0.1",
-		"supports-color": "^9.2.2",
-		"timeago.js": "^4.0.2",
-		"tmp-promise": "^3.0.3",
-		"ts-dedent": "^2.2.0",
-		"undici": "5.20.0",
-		"update-check": "^1.5.4",
-		"vitest": "^0.29.2",
-		"ws": "^8.5.0",
-		"xdg-app-paths": "^7.3.0",
-		"yargs": "^17.4.1",
-		"yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz"
-	},
-	"optionalDependencies": {
-		"fsevents": "~2.3.2"
-	},
-	"engines": {
-		"node": ">=16.13.0"
-	}
-}
+  "name": "wrangler",
+  "version": "0.0.0-e81b1611",
+  "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",
+    "Cloudflare_CA.pem"
+  ],
+  "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": "src/__tests__/.*\\.(test|spec)\\.[jt]sx?$",
+    "testTimeout": 50000,
+    "transform": {
+      "^.+\\.c?(t|j)sx?$": [
+        "esbuild-jest",
+        {
+          "sourcemap": true
+        }
+      ]
+    },
+    "transformIgnorePatterns": [
+      "node_modules/.pnpm/(?!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)"
+    ],
+    "snapshotFormat": {
+      "escapeString": true,
+      "printBasicPrototype": true
+    }
+  },
+  "dependencies": {
+    "@cloudflare/kv-asset-handler": "^0.2.0",
+    "@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",
+    "esbuild": "0.17.19",
+    "miniflare": "3.20231016.0",
+    "nanoid": "^3.3.3",
+    "path-to-regexp": "^6.2.0",
+    "selfsigned": "^2.0.1",
+    "source-map": "0.6.1",
+    "source-map-support": "0.5.21",
+    "xxhash-wasm": "^1.0.1"
+  },
+  "devDependencies": {
+    "@cloudflare/eslint-config-worker": "*",
+    "@cloudflare/types": "^6.18.4",
+    "@cloudflare/workers-types": "^4.20230914.0",
+    "@iarna/toml": "^3.0.0",
+    "@microsoft/api-extractor": "^7.28.3",
+    "@types/body-parser": "^1.19.2",
+    "@types/busboy": "^1.5.0",
+    "@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/jest": "^29.5.5",
+    "@types/mime": "^2.0.3",
+    "@types/minimatch": "^5.1.2",
+    "@types/prompts": "^2.0.14",
+    "@types/react": "^17.0.37",
+    "@types/serve-static": "^1.13.10",
+    "@types/shell-quote": "^1.7.2",
+    "@types/signal-exit": "^3.0.1",
+    "@types/source-map-support": "^0.5.7",
+    "@types/supports-color": "^8.1.1",
+    "@types/ws": "^8.5.3",
+    "@types/yargs": "^17.0.10",
+    "@webcontainer/env": "^1.1.0",
+    "body-parser": "^1.20.0",
+    "chalk": "^2.4.2",
+    "cli-table3": "^0.6.3",
+    "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",
+    "esbuild-jest": "0.5.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": "^29.7.0",
+    "jest-fetch-mock": "^3.0.3",
+    "jest-websocket-mock": "^2.5.0",
+    "mime": "^3.0.0",
+    "minimatch": "^5.1.0",
+    "msw": "^0.49.1",
+    "npx-import": "^1.1.3",
+    "open": "^8.4.0",
+    "p-queue": "^7.2.0",
+    "patch-console": "^1.0.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",
+    "shell-quote": "^1.8.1",
+    "shellac": "^0.8.0",
+    "signal-exit": "^3.0.7",
+    "strip-ansi": "^7.0.1",
+    "supports-color": "^9.2.2",
+    "timeago.js": "^4.0.2",
+    "tmp-promise": "^3.0.3",
+    "ts-dedent": "^2.2.0",
+    "undici": "5.20.0",
+    "update-check": "^1.5.4",
+    "vitest": "^0.34.4",
+    "ws": "^8.5.0",
+    "xdg-app-paths": "^8.3.0",
+    "yargs": "^17.7.2",
+    "yoga-layout": "file:../../vendor/yoga-layout-2.0.0-beta.1.tgz",
+    "@cloudflare/pages-shared": "^0.10.1",
+    "@cloudflare/workers-tsconfig": "0.0.0"
+  },
+  "optionalDependencies": {
+    "fsevents": "~2.3.2"
+  },
+  "engines": {
+    "node": ">=16.13.0"
+  },
+  "scripts": {
+    "assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
+    "build": "pnpm run clean && pnpm run bundle && pnpm run emit-types",
+    "bundle": "node -r esbuild-register scripts/bundle.ts",
+    "check:lint": "eslint .",
+    "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",
+    "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
+    "test": "pnpm run assert-git-version && jest",
+    "test:ci": "pnpm run test --coverage",
+    "test:debug": "pnpm run test --silent=false --verbose=true",
+    "test:e2e": "vitest --test-timeout 240000 --single-thread --dir ./e2e run",
+    "test:watch": "pnpm run test --runInBand --testTimeout=50000 --watch",
+    "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
+  }
+}

package/templates/__tests__/tsconfig.json

@@ -1,5 +1,5 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": "@cloudflare/workers-tsconfig/tsconfig.json",
 	"compilerOptions": {
 		"types": ["node", "jest"]
 	},

package/templates/checked-fetch.js

@@ -1,6 +1,6 @@
 const urls = new Set();
 
-export function checkedFetch(request, init) {
+function checkURL(request, init) {
 	const url =
 		request instanceof URL
 			? request
@@ -15,9 +15,16 @@ export function checkedFetch(request, init) {
 			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

@@ -1,6 +1,9 @@
 declare module "__ENTRY_POINT__" {
 	import type { Middleware } from "./middleware/common";
-	const worker: ExportedHandler & { middleware?: Middleware[] };
+	const worker: ExportedHandler & {
+		middleware?: Middleware[];
+		envWrappers: ((env: Record<string, unknown>) => Record<string, unknown>)[];
+	};
 	export default worker;
 }