[repro] Fix resolveFit contain/scale-down padding regression (upstream #14714)

.changeset/fix-images-binding-fit-gravity-background.md

@@ -0,0 +1,5 @@
+---
+"miniflare": patch
+---
+
+Fix the local Images binding transform (`env.IMAGES.input(...).transform(...)`) ignoring `fit`, `gravity`, and `background`. The resize call previously hardcoded sharp's `fit: "contain"` for every transform, which letterboxes the output with black bars regardless of what was requested. `fit`, `gravity`, and `background` are now forwarded to sharp using the same resolution logic already used for `cf.image` fetch subrequests, and an unspecified `fit` now matches production's non-padding default instead of always letterboxing.

.oxfmtrc.jsonc

@@ -58,6 +58,7 @@
 		"fixtures/interactive-dev-tests/src/startup-error.ts",
 		"packages/vite-plugin-cloudflare/playground/**/*.d.ts",
 		"fixtures/**/worker-configuration.d.ts",
+		"packages/**/worker-configuration.d.ts",
 		"packages/local-explorer-ui/src/routeTree.gen.ts",
 		"packages/local-explorer-ui/src/api/generated",
 	],

.oxlintrc.jsonc

@@ -206,12 +206,5 @@
 				"workers-sdk/no-wrangler-named-imports": "error",
 			},
 		},
-		// TODO: Remove the following override.
-		{
-			"files": ["packages/vite-plugin-cloudflare/**"],
-			"rules": {
-				"@typescript-eslint/no-deprecated": "off",
-			},
-		},
 	],
 }

fixtures/container-app/package.json

@@ -8,13 +8,17 @@
 		"dev": "wrangler dev",
 		"dev:registry": "wrangler dev -c ./wrangler.registry.jsonc",
 		"start": "wrangler dev",
-		"start:registry": "wrangler dev -c ./wrangler.registry.jsonc"
+		"start:registry": "wrangler dev -c ./wrangler.registry.jsonc",
+		"test:ci": "vitest run",
+		"type:tests": "tsc -p ./tests/tsconfig.json"
 	},
 	"devDependencies": {
 		"@cloudflare/workers-tsconfig": "workspace:*",
 		"@cloudflare/workers-types": "catalog:default",
+		"@types/node": "catalog:default",
 		"ts-dedent": "^2.2.0",
 		"typescript": "catalog:default",
+		"vitest": "catalog:default",
 		"wrangler": "workspace:*"
 	}
 }

fixtures/container-app/tests/container.test.ts

@@ -0,0 +1,60 @@
+import { execSync } from "child_process";
+import { afterAll, beforeAll, describe, test, vi } from "vitest";
+import { createTestHarness } from "wrangler";
+
+const isCINonLinux = process.platform !== "linux" && process.env.CI === "true";
+
+function isDockerRunning() {
+	try {
+		execSync("docker ps", { stdio: "ignore" });
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+/** Indicates whether the test is being run locally (not in CI) AND docker is currently not running on the system */
+const isLocalWithoutDockerRunning =
+	process.env.CI !== "true" && !isDockerRunning();
+
+if (isLocalWithoutDockerRunning) {
+	console.warn(
+		"The tests are running locally but there is no docker instance running on the system, skipping containers tests"
+	);
+}
+
+describe.skipIf(
+	isCINonLinux ||
+		// If the tests are being run locally and docker is not running we just skip this test
+		isLocalWithoutDockerRunning
+)("container app", () => {
+	const server = createTestHarness({
+		workers: [{ configPath: "./wrangler.jsonc" }],
+	});
+
+	beforeAll(async () => {
+		await server.listen();
+	});
+
+	afterAll(async () => {
+		await server.close();
+	});
+
+	test("starts and fetches from the container", async ({ expect }) => {
+		const statusResponse = await server.fetch("/status");
+		expect(await statusResponse.json()).toBe(false);
+
+		const startResponse = await server.fetch("/start");
+		expect(await startResponse.text()).toBe("Container create request sent...");
+
+		await vi.waitFor(
+			async () => {
+				const fetchResponse = await server.fetch("/fetch");
+				expect(await fetchResponse.text()).toBe(
+					"Hello World! Have an env var! I'm an env var!"
+				);
+			},
+			{ interval: 500, timeout: 30_000 }
+		);
+	});
+});

fixtures/container-app/tests/tsconfig.json

@@ -0,0 +1,10 @@
+{
+	"extends": "@cloudflare/workers-tsconfig/tsconfig.json",
+	"compilerOptions": {
+		"module": "esnext",
+		"noEmit": true,
+		"types": ["node"]
+	},
+	"include": ["./**/*.ts"],
+	"exclude": []
+}

fixtures/container-app/vitest.config.mts

@@ -0,0 +1,12 @@
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
+
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {
+			include: ["tests/**/*.test.ts"],
+			retry: 0,
+		},
+	})
+);

fixtures/experimental-new-config/cloudflare.config.ts

@@ -1,6 +1,14 @@
-import { bindings, defineWorker } from "wrangler/experimental-config";
+import {
+	bindings,
+	defineSettings,
+	defineWorker,
+} from "wrangler/experimental-config";
 import * as entrypoint from "./src/index.ts" with { type: "cf-worker" };
 
+export const settings = defineSettings({
+	complianceRegion: "public",
+});
+
 export default defineWorker((ctx) => ({
 	name: "experimental-new-config",
 	entrypoint,

fixtures/get-platform-proxy-remote-bindings/tests/index.test.ts

@@ -259,6 +259,8 @@ if (auth) {
 				).toMatchInlineSnapshot(`
 					"X [ERROR] A request to the Cloudflare API (/accounts/NOT a valid account id/workers/subdomain/edge-preview) failed.
 
+					  Could not route to /client/v4/accounts/NOT%20a%20valid%20account%20id/workers/subdomain/edge-preview, perhaps your object identifier is invalid? [code: 7003]
+
 					"
 				`);
 			});

fixtures/unsafe-external-plugin/package.json

@@ -14,6 +14,6 @@
 		"esbuild": "catalog:default",
 		"miniflare": "workspace:*",
 		"tsx": "^3.12.8",
-		"zod": "3.22.3"
+		"zod": "catalog:default"
 	}
 }

fixtures/vitest-pool-workers-examples/durable-objects/src/index.ts

@@ -48,10 +48,6 @@ export class Counter extends DurableObject {
 		this.#webSocketMessages.push(value);
 		ws.send(value);
 	}
-
-	webSocketClose() {}
-
-	webSocketError() {}
 }
 
 export class SQLiteDurableObject extends DurableObject {

packages/autoconfig/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @cloudflare/autoconfig
 
+## 0.2.0
+
+### Minor Changes
+
+- [#14595](https://github.com/cloudflare/workers-sdk/pull/14595) [`2b390d7`](https://github.com/cloudflare/workers-sdk/commit/2b390d7831ff27aa13cdf05aa8e11e4c0086f924) Thanks [@colinhacks](https://github.com/colinhacks)! - Recognise nub as a package manager
+
+  wrangler now detects nub — from its `npm_config_user_agent` and an installed `nub` binary — and autoconfig detects nub projects by their `nub.lock`, alongside npm, pnpm, yarn, and bun.
+
+### Patch Changes
+
+- [#14534](https://github.com/cloudflare/workers-sdk/pull/14534) [`a330170`](https://github.com/cloudflare/workers-sdk/commit/a330170e8dfbe481a99597b3e07c1438e20f5ebb) Thanks [@petebacondarwin](https://github.com/petebacondarwin)! - Preserve existing Nuxt `modules` when configuring a project for Cloudflare
+
+  Configuring an existing Nuxt project whose `nuxt.config.ts` already declares a `modules` array previously overwrote that array when adding `nitro-cloudflare-dev`, dropping modules such as `@nuxt/ui`. Existing entries are now retained and the Cloudflare module is appended instead.
+
+- Updated dependencies [[`2b390d7`](https://github.com/cloudflare/workers-sdk/commit/2b390d7831ff27aa13cdf05aa8e11e4c0086f924), [`a6c214f`](https://github.com/cloudflare/workers-sdk/commit/a6c214fb311215b1ed09b273171b7995033fb7d7)]:
+  - @cloudflare/workers-utils@0.28.0
+  - @cloudflare/cli-shared-helpers@0.1.16
+
+## 0.1.6
+
+### Patch Changes
+
+- Updated dependencies [[`8cd805d`](https://github.com/cloudflare/workers-sdk/commit/8cd805db2f9901cba52d574b385577bafd595cb5)]:
+  - @cloudflare/cli-shared-helpers@0.1.15
+  - @cloudflare/workers-utils@0.27.0
+
 ## 0.1.5
 
 ### Patch Changes

packages/autoconfig/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cloudflare/autoconfig",
-	"version": "0.1.5",
+	"version": "0.2.0",
 	"description": "Framework autoconfig detection and configuration for Cloudflare Workers",
 	"license": "MIT OR Apache-2.0",
 	"repository": {

packages/autoconfig/src/details/framework-detection.ts

@@ -4,6 +4,7 @@ import {
 	BunPackageManager,
 	FatalError,
 	NpmPackageManager,
+	NubPackageManager,
 	PnpmPackageManager,
 	UserError,
 	YarnPackageManager,
@@ -82,7 +83,10 @@ export async function detectFramework(
 
 	// Convert the package manager detected by @netlify/build-info to our PackageManager type.
 	// This is populated after getBuildSettings() runs, which triggers the full detection chain.
-	const packageManager = convertDetectedPackageManager(project.packageManager);
+	const packageManager = convertDetectedPackageManager(
+		project.packageManager,
+		projectPath
+	);
 
 	const lockFileExists = packageManager.lockFiles.some((lockFile) =>
 		existsSync(join(projectPath, lockFile))
@@ -145,11 +149,20 @@ export async function detectFramework(
  * Falls back to npm if no package manager was detected.
  *
  * @param pkgManager The package manager detected by @netlify/build-info (from project.packageManager)
+ * @param projectPath Path to the project root, used to detect nub via its lock file
  * @returns A PackageManager object compatible with wrangler's package manager utilities
  */
 function convertDetectedPackageManager(
-	pkgManager: { name: string } | null
+	pkgManager: { name: string } | null,
+	projectPath: string
 ): PackageManager {
+	// TODO: Remove this nub.lock check once netlify/build#7124 is merged and
+	// released, after which @netlify/build-info recognises nub directly.
+	// https://github.com/netlify/build/pull/7124
+	if (existsSync(join(projectPath, "nub.lock"))) {
+		return NubPackageManager;
+	}
+
 	if (!pkgManager) {
 		return NpmPackageManager;
 	}