wrangler 2.0.25 → 2.0.26

package/miniflare-dist/index.mjs

@@ -5277,6 +5277,14 @@ async function generateAssetsFetch(directory, log) {
         return deconstructedResponse;
       }
     } else if (hasFileExtension(assetName)) {
+      if (asset = getAsset(assetName + ".html")) {
+        deconstructedResponse.body = serveAsset(asset);
+        deconstructedResponse.headers.set(
+          "Content-Type",
+          (0, import_mime.getType)(asset) || "application/octet-stream"
+        );
+        return deconstructedResponse;
+      }
       notFound();
       return deconstructedResponse;
     }
@@ -5409,10 +5417,14 @@ async function main() {
         namespace.get = (id) => {
           const stub = new DurableObjectStub(factory, id);
           stub.fetch = (...reqArgs) => {
-            const url = `http://${host}${port ? `:${port}` : ""}`;
+            const requestFromArgs = new MiniflareRequest(...reqArgs);
+            const url = new URL(requestFromArgs.url);
+            url.host = host;
+            if (port !== void 0)
+              url.port = port.toString();
             const request = new MiniflareRequest(
-              url,
-              new MiniflareRequest(...reqArgs)
+              url.toString(),
+              requestFromArgs
             );
             request.headers.set("x-miniflare-durable-object-name", name);
             request.headers.set("x-miniflare-durable-object-id", id.toString());

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.25",
+	"version": "2.0.26",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -52,11 +52,11 @@
 		"build": "npm run clean && npm run bundle && npm run emit-types",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
 		"check:type": "tsc",
-		"clean": "rm -rf wrangler-dist miniflare-dist emitted-types",
+		"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 && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
+		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
 		"test": "jest --silent=false --verbose=true",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
 		"test:ci": "npm run test -- --verbose=true --coverage"

package/src/__tests__/helpers/mock-cfetch.ts

@@ -183,6 +183,7 @@ export function unsetAllMocks() {
 
 const kvGetMocks = new Map<string, string | Buffer>();
 const r2GetMocks = new Map<string, string | undefined>();
+const dashScriptMocks = new Map<string, string | undefined>();
 
 /**
  * @mocked typeof fetchKVGetValue
@@ -260,4 +261,36 @@ export function setMockFetchR2Objects({
 export function unsetSpecialMockFns() {
 	kvGetMocks.clear();
 	r2GetMocks.clear();
+	dashScriptMocks.clear();
+}
+
+/**
+ * @mocked typeof fetchDashScript
+ * multipart/form-data is the response for modules and raw text for the Script endpoint.
+ */
+export async function mockFetchDashScript(resource: string): Promise<string> {
+	if (dashScriptMocks.has(resource)) {
+		const value = dashScriptMocks.get(resource) ?? "";
+
+		return value;
+	}
+	throw new Error(`no mock found for \`init from-dash\` - ${resource}`);
+}
+
+/**
+ * Mock setter for usage within test blocks, companion helper to `mockFetchDashScript`
+ */
+export function setMockFetchDashScript({
+	accountId,
+	fromDashScriptName,
+	mockResponse,
+}: {
+	accountId: string;
+	fromDashScriptName: string;
+	mockResponse?: string;
+}) {
+	dashScriptMocks.set(
+		`/accounts/${accountId}/workers/scripts/${fromDashScriptName}`,
+		mockResponse
+	);
 }