DRAFT chore: match dependency versions across the repo #5795

threepointone · 2024-05-09T14:50:08Z

This isn't ready for review yet, but putting it up for CI to have a look.

tl;dr: makes it so we never use different versions of a package anywhere in the repo. No functional changes.

Installs @manypkg/cli (https://github.com/Thinkmill/manypkg)
Run manypkg check which returns a list of all the mismatched dependencies
Manually fix each dependency failure
Run manypkg fix to fix any extra failures (like unordered dependencies in package.jsons)
Run pnpm check, pnpm test, pnpm prettify and fix any failures from them
Added check:repo npm task that runs manypkg check, and added it to npm run check so it runs in CI

Notes:

The most confusing part: when running tests, wrangler/../deploy.tsts.ts and wrangler/../pages/deploy.test.ts fail (on macos and ubuntu respectively). Of note, it appears like runInTmpDir() fails to apply itself, so the tests run in the source directory, and fail expectations. Been fighting this for a week and I can't figure out why or how, yet.
These packages hanf when running test:ci on my machine (with node@16.17.1):
- additional-modules
- interactive-dev-tests
- pages-d1-shim
- pages-workerjs-directory
- type-generation-fixture
- worker-app
Running tests appears to leave orphaned workerd process
I added /templates/* to workspaces and gave it the same treatment, but removed it from workspaces. We'll revisit that folder in the future, I don't want to slow down the builds atm.

changeset-bot · 2024-05-09T14:50:12Z

🦋 Changeset detected

Latest commit: 4ac1066

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 14 packages

Name	Type
edge-preview-authenticated-proxy	Patch
playground-preview-worker	Patch
@cloudflare/prerelease-registry	Patch
@cloudflare/vitest-pool-workers	Patch
workers-playground	Patch
create-cloudflare	Patch
@cloudflare/kv-asset-handler	Patch
turbo-r2-archive	Patch
format-errors	Patch
@cloudflare/pages-shared	Patch
workers.new	Patch
@cloudflare/quick-edit	Patch
miniflare	Patch
wrangler	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

fixtures/type-generation/tests/type-generation.file-comment.test.ts

threepointone · 2024-05-09T14:54:12Z

packages/cli/interactive.ts

@@ -563,7 +560,7 @@ export const spinner = (
 	// const frames = ["㊂", "㊀", "㊁"];

 	const frameRate = 120;
-	let loop: NodeJS.Timer | null = null;
+	let loop: ReturnType<typeof setInterval> | null = null;


types for timers are a mess across runtimes. This is a cleaner cross runtime compatible way of setting the type. I'm a fan of this format.

threepointone · 2024-05-09T14:57:03Z

packages/miniflare/types/streams.d.ts

@@ -11,7 +11,7 @@ declare module "stream/web" {
 	}

 	interface ReadableStreamBYOBReader {
-		readonly closed: Promise<void>;
+		readonly closed: Promise<undefined>;


updating typescript made this a little more strict (I think), so I had to fix this here

threepointone · 2024-05-09T14:57:42Z

packages/vitest-pool-workers/src/pool/index.ts

@@ -508,6 +508,7 @@ function buildProjectMiniflareOptions(
 		return {
 			...SHARED_MINIFLARE_OPTIONS,
 			unsafeModuleFallbackService: moduleFallbackService,
+			// @ts-expect-error SUNILFIX


this is failing typecheck, will fix before landing

threepointone · 2024-05-09T14:57:47Z

packages/vitest-pool-workers/src/pool/index.ts

@@ -528,6 +529,7 @@ function buildProjectMiniflareOptions(
 		return {
 			...SHARED_MINIFLARE_OPTIONS,
 			unsafeModuleFallbackService: moduleFallbackService,
+			// @ts-expect-error SUNILFIX


this is failing typecheck, will fix before landing

github-actions · 2024-05-09T16:34:06Z

A wrangler prerelease is available for testing. You can install this latest build in your project with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-wrangler-5795

You can reference the automatically updated head of this PR with:

npm install --save-dev https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/prs/5795/npm-package-wrangler-5795

Or you can use npx with this latest build directly:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-wrangler-5795 dev path/to/script.js

Additional artifacts:

npx https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-create-cloudflare-5795 --no-auto-update

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-cloudflare-kv-asset-handler-5795

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-miniflare-5795

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-cloudflare-pages-shared-5795

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/9064764843/npm-package-cloudflare-vitest-pool-workers-5795

Note that these links will no longer work once the GitHub Actions artifact expires.

wrangler@3.55.0 includes the following runtime dependencies:

Package	Constraint	Resolved
`miniflare`	workspace:*	3.20240419.1
`workerd`	1.20240419.0	1.20240419.0
`workerd --version`	1.20240419.0	2024-04-19

Please ensure constraints are pinned, and miniflare/workerd minor versions match.

threepointone · 2024-05-10T08:47:49Z

packages/miniflare/scripts/build.mjs

@@ -186,8 +187,10 @@ async function buildPackage() {
 			"esbuild",
 		],
 		plugins: [embedWorkersPlugin],
-		logLevel: watch ? "info" : "warning",
-		watch,
+		logLevel: "warning",


disabled watch mode here because we updated esbuild and it didn't have the same api. I'll being it back later.

threepointone · 2024-05-10T08:49:24Z

packages/wrangler/src/__tests__/pages/project-upload.test.ts

- *
- * So this helper removes these message from the snapshots to keep them consistent.
- */
-export function normalizeProgressSteps(str: string): string {


exporting this function and reusing it elsewhere was causing this suite to be run twice, so I extracted it into its own helper.

threepointone · 2024-05-10T08:50:17Z

packages/wrangler/src/__tests__/pages/secret.test.ts

@@ -22,16 +25,6 @@ function createFetchResult(result: unknown, success = true) {
 	};
 }

-export function mockGetMemberships(


just like nomralize-progress-steps, importing this function was causing this suite to be run twice. we already had this helper in /helpers/mock-oauth-flow, so I replaced it with that

threepointone · 2024-05-10T08:51:05Z

packages/wrangler/src/__tests__/secret.test.ts

@@ -27,16 +30,6 @@ function createFetchResult(result: unknown, success = true) {
 	};
 }

-export function mockGetMemberships(


we should write a lint rule that prevents exports from .test.ts/.spec.ts files

threepointone · 2024-05-10T08:54:43Z

packages/wrangler/package.json

@@ -180,21 +179,21 @@
 		"patch-console": "^1.0.0",
 		"pretty-bytes": "^6.0.0",
 		"prompts": "^2.4.2",
-		"react": "^17.0.2",
+		"react": "^18.3.1",


this is a major update

tl;dr: makes it so we never use different versions of a package anywhere in the repo. No functional changes. - Installs @manypkg/cli (https://github.com/Thinkmill/manypkg) - Run `manypkg check` which returns a list of all the mismatched dependencies - Manually fix each dependency failure - Run `manypkg fix` to fix any extra failures (like unordered dependencies in `package.json`s) - Run `pnpm check`, `pnpm test`, `pnpm prettify` and fix any failures from them - Added `check:repo` npm task that runs `manypkg check`, and added it to `npm run check` so it runs in CI

threepointone commented May 9, 2024

View reviewed changes

threepointone marked this pull request as ready for review May 9, 2024 15:31

threepointone requested review from a team as code owners May 9, 2024 15:31

threepointone force-pushed the normalize-dependencies branch from 83588dc to e028a75 Compare May 9, 2024 15:57

threepointone force-pushed the normalize-dependencies branch 4 times, most recently from 5812a50 to 4a890f7 Compare May 10, 2024 08:38

threepointone commented May 10, 2024

View reviewed changes

threepointone force-pushed the normalize-dependencies branch 12 times, most recently from 164d9e3 to 7f83edf Compare May 10, 2024 16:26

threepointone force-pushed the normalize-dependencies branch 4 times, most recently from ba85b02 to ccee1e1 Compare May 10, 2024 23:05

threepointone mentioned this pull request May 10, 2024

chore: run prettify #5804

Closed

threepointone force-pushed the normalize-dependencies branch 9 times, most recently from b03b0de to 1c8d057 Compare May 13, 2024 13:47

threepointone added 2 commits May 13, 2024 14:50

chore: run prettify

0391d7d

chore: run prettify

e5d9298

threepointone force-pushed the normalize-dependencies branch 3 times, most recently from 505539a to edf168f Compare May 13, 2024 14:19

threepointone force-pushed the normalize-dependencies branch from edf168f to 4ac1066 Compare May 13, 2024 14:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DRAFT chore: match dependency versions across the repo #5795

DRAFT chore: match dependency versions across the repo #5795

threepointone commented May 9, 2024 •

edited

changeset-bot bot commented May 9, 2024 •

edited

threepointone May 9, 2024

threepointone May 9, 2024

threepointone May 9, 2024

threepointone May 9, 2024

github-actions bot commented May 9, 2024 •

edited

threepointone May 10, 2024

threepointone May 10, 2024

threepointone May 10, 2024

threepointone May 10, 2024

threepointone May 10, 2024

DRAFT chore: match dependency versions across the repo #5795

Are you sure you want to change the base?

DRAFT chore: match dependency versions across the repo #5795

Conversation

threepointone commented May 9, 2024 • edited

changeset-bot bot commented May 9, 2024 • edited

🦋 Changeset detected

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented May 9, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

threepointone commented May 9, 2024 •

edited

changeset-bot bot commented May 9, 2024 •

edited

github-actions bot commented May 9, 2024 •

edited