refactor: move projectRoot computation to config validation #7415

petebacondarwin · 2024-12-02T22:05:26Z

A refactor to move the projectRoot field to config (from entry) so that it can be used more flexibly.

We are looking to provide a way for build tools to provide their own deployment config file (instead of the user's Wrangler config file). To find this alternative config file it will be helpful to know what the project root is before we need to compute the entry path (since that latter might depend upon the config).

changeset-bot · 2024-12-02T22:05:31Z

⚠️ No Changeset found

Latest commit: 94bcfcd

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

github-actions · 2024-12-02T22:10:48Z

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/12136193054/npm-package-wrangler-7415

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

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

Or you can use npx with this latest build directly:

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

Additional artifacts:

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

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

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

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

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

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-workers-editor-shared-7415

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-workers-shared-7415

npm install https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/12136193054/npm-package-cloudflare-workflows-shared-7415

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

wrangler@3.91.0 includes the following runtime dependencies:

Package	Constraint	Resolved
`miniflare`	workspace:*	3.20241106.1
`workerd`	1.20241106.1	1.20241106.1
`workerd --version`	1.20241106.1	2024-11-06

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

penalosa · 2024-12-03T10:32:20Z

packages/wrangler/src/deployment-bundle/entry.ts

 	} else if (entryPoint) {
-		paths = resolveEntryWithEntryPoint(entryPoint, config.configPath);
+		paths = resolveEntryWithEntryPoint(entryPoint, config.projectRoot);


I'm not sure why this isn't a type error, but I think the return value here is used further down, and should probably be changed to config.projectRoot as well:

89: const projectRoot = paths.projectRoot ?? process.cwd();

Oops I missed that one.
It is not a type error it is just redundant further down.

penalosa · 2024-12-03T10:36:32Z

packages/wrangler/src/versions/upload.ts

@@ -69,7 +69,6 @@ type Props = {
 	dryRun: boolean | undefined;
 	noBundle: boolean | undefined;
 	keepVars: boolean | undefined;


Unrelated to this PR, but it looks like these props could do with some cleanup... They seem to take both config.rules and config as separate values?

So in the call site for versionsUpload() there is rules: getRules(config), which does som additional validation of deprecated rules options. That function is used in various places.

I think that whole function can be removed in Wrangler V4, since the deprecated fields might be removed?

* add telemetry commands * changeset * fix and test dates * update changeset * add global/project status * default true * remove changeset * update wrangler telemetry status feat: add `wrangler metrics` as an alias for `wrangler telemetry` (#7284) * add metrics alias * tests * use each to test alias feat: send metrics for command start/complete/error (#7267) * stop collecting userId in telemetry Co-authored-by: emily-shen <emily-shen@users.noreply.github.com> * implement telemetry collection * infer errorType based on the constructor name * implement common event properties * log common event properties Co-authored-by: Edmund Hung <me@edmund.dev> * respect metric enabled/disabled * remove dispatcher.identify * include SPARROW_SOURCE_KEY in PR pre-release build * fix tests * ensure debug log covers the request failed message * replace SPARROW_SOURCE_KEY regardless whethe env exists --------- Co-authored-by: Edmund Hung <edmund@cloudflare.com> Co-authored-by: emily-shen <emily-shen@users.noreply.github.com> Co-authored-by: Edmund Hung <me@edmund.dev> fix nested properties (#7300) feat: add banner to indicate when telemetry is on (#7302) * add banner * abort if telemetry disable * basic sendNewEvent tests * banner tests * settle promises before exiting * remove unnecessary banner logic * just check if version is different feat: add some more properties to telemetry events (#7320) * isCI and isNonInteractive * add argsUsed and argsCombination * don't include args if value is false * redact arg values if string * lint * isNonInteractive -> isInteractive cleanup defineCommand test duration log metrics request failure add draft telemetry.md add node and os versions don't send wrangler metrics from c3 if disabled don't send c3 metrics from wrangler init add config type add more comments to send-event move types out of send-event.ts add comment about applyBeforeValidation normalize into camelcase refactor telemetry command update tests and some comments normalise all args pr feedback update telemetry.md use useragent to get package manager make sendEvent/sendNewEvent sync rename sendEvent and sendNewEvent fix lock file remove flushPromises changeset fail silently feat(wrangler): make resources identifier optional if x-provision flag is enabled (#7377) Fix wrangler module import under npm monorepos (#7130) * Update import resolution for files and package exports In an npm workspace environment, wrangler will now be able to successfully resolve package exports. Previously, wrangler would only be able to resolve modules in a relative `node_modules` directory and not workspace root `node_modules` directory. * Use esbuild plugin chore(wrangler): fix type errors with experimental flags (#7391) refactor(wrangler): Explicitely pick node compat plugins for each mode (#7387) * refactor: cleanup & simplify * refactor(wrangler): Explicitely pick node compat plugins for each mode * Update packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts Co-authored-by: Pete Bacon Darwin <pete@bacondarwin.com> * fixup! renamed vars (review feedback) * fixup! format --------- Co-authored-by: Pete Bacon Darwin <pete@bacondarwin.com> fix: error in angular c3 template (#7342) * fixed: related to issues-7341 AngularAppEngine class does not have .render, instead it should be .handle method * added: changeset * Tidy up changeset * fix Angular template - add a preview script so that it gets included in CI test - remove unnecessary --`experimnental-local` CLI arg - add missing `xhr2` dependency --------- Co-authored-by: Peter Bacon Darwin <pbacondarwin@cloudflare.com> [C3] Bump create-qwik from 1.10.0 to 1.11.0 in /packages/create-cloudflare/src/frameworks (#7359) * [C3] Bump create-qwik in /packages/create-cloudflare/src/frameworks Bumps [create-qwik](https://github.com/QwikDev/qwik/tree/HEAD/packages/create-qwik) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/QwikDev/qwik/releases) - [Changelog](https://github.com/QwikDev/qwik/blob/create-qwik@1.11.0/packages/create-qwik/CHANGELOG.md) - [Commits](https://github.com/QwikDev/qwik/commits/create-qwik@1.11.0/packages/create-qwik) --- updated-dependencies: - dependency-name: create-qwik dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore: update dependencies of "create-cloudflare" package The following dependency versions have been updated: | Dependency | From | To | | ----------- | ------ | ------ | | create-qwik | 1.10.0 | 1.11.0 | --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Wrangler automated PR updater <wrangler@cloudflare.com> Remove await from user Worker fetch in router-worker (#7410) fix: update Angular experimental Workers + Assets template (#7409) * fix: update Angular experimental Workers + Assets template * ci: enable tests on experimental Workers + Assets C3 templates fix: update queues max_batch_timeout in miniflare (#7399) * update timeout limit * changeset * test * remove only Co-authored-by: Carmen Popoviciu <cpopoviciu@cloudflare.com> --------- Co-authored-by: Carmen Popoviciu <cpopoviciu@cloudflare.com> refactor: move projectRoot computation to config validation (#7415) move telemetry.md out of src fixups tiody up readRawConfig Rename serve_directly to experimental_serve_directly (#7429) chore(deps): bump the workerd-and-workers-types group across 1 directory with 2 updates (#7418) Updates `workerd` from 1.20241106.1 to 1.20241202.2 Version Packages (#7358) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> ci: don't watch for changes on the workers-shared test:ci job (#7420) refactor: remove missed redundant computation of `projectRoot` (#7421) * refactor: remove missed redundant computation of `projectRoot` * test: do not watch test files in workflow fixture test jobs feat(wrangler): add inherit bindings support (#7385) * feat(wrangler): add inherit bindings support * add test * add changeset * rename file to bindings Relax type on `observability.enabled` (#7436) fix: C3 experimental template for Solid now uses correct preset (#7343) fix: allow the asset directory to be omitted in Wrangler config for commands that don't need it (#7426) fix: C3 experimental template for Nuxt now uses correct preset (#7332) * fix: C3 experimental template for Nuxt now uses correct preset * test: remove quarantine from Nuxt experimental template using the github browser merge is always a bad idea fix e2e

…7415)" This reverts commit 4f1a46e.

* fix up import-npm package lock * Revert "refactor: remove missed redundant computation of `projectRoot` (#7421)" This reverts commit bea6558. * Revert "refactor: move projectRoot computation to config validation (#7415)" This reverts commit 4f1a46e. * Do not watch workflow tests in `test:ci` jobs * add e2e test to prevent tmp directory regression

petebacondarwin force-pushed the pbd/refactor-pass-around-project-directory branch from 73b1fe9 to 9d271e9 Compare December 2, 2024 22:07

petebacondarwin force-pushed the pbd/refactor-pass-around-project-directory branch from 9d271e9 to bc40775 Compare December 3, 2024 08:54

refactor: move projectRoot computation to config validation

94bcfcd

petebacondarwin force-pushed the pbd/refactor-pass-around-project-directory branch from bc40775 to 94bcfcd Compare December 3, 2024 08:58

petebacondarwin added the skip-pr-description-validation Skip validation of the required PR description format label Dec 3, 2024

petebacondarwin marked this pull request as ready for review December 3, 2024 09:11

petebacondarwin requested review from a team as code owners December 3, 2024 09:11

penalosa approved these changes Dec 3, 2024

View reviewed changes

petebacondarwin merged commit 4f1a46e into main Dec 3, 2024
36 of 37 checks passed

petebacondarwin deleted the pbd/refactor-pass-around-project-directory branch December 3, 2024 10:43

petebacondarwin mentioned this pull request Dec 3, 2024

refactor: remove missed redundant computation of projectRoot #7421

Merged

penalosa mentioned this pull request Dec 4, 2024

Fix Pages tmp dir location #7441

Closed

9 tasks

petebacondarwin mentioned this pull request Dec 4, 2024

🐛 BUG: Latest wrangler causing a ton of hot reloads because it's putting the .wrangler/tmp directory inside /functions #7440

Closed

petebacondarwin added a commit that referenced this pull request Dec 4, 2024

Revert "refactor: move projectRoot computation to config validation (#…

742779c

…7415)" This reverts commit 4f1a46e.

petebacondarwin mentioned this pull request Dec 4, 2024

Pbd/revert-project-root-refactoring #7446

Merged

9 tasks

petebacondarwin added a commit that referenced this pull request Dec 4, 2024

Revert "refactor: move projectRoot computation to config validation (#…

e751cd7

…7415)" This reverts commit 4f1a46e.

petebacondarwin added a commit that referenced this pull request Dec 4, 2024

Revert "refactor: move projectRoot computation to config validation (#…

c862267

…7415)" This reverts commit 4f1a46e.

workers-devprod mentioned this pull request Dec 4, 2024

Version Packages #7439

Merged

maretol mentioned this pull request Dec 9, 2024

Bump the dependencies group across 4 directories with 3 updates maretol/maretol-base#194

Merged

penalosa pushed a commit that referenced this pull request Jan 10, 2025

refactor: move projectRoot computation to config validation (#7415)

f1c9232

renovate bot mentioned this pull request Feb 4, 2025

Update Cloudflare patdx/xbox-store-viewer#8

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: move projectRoot computation to config validation #7415

refactor: move projectRoot computation to config validation #7415

petebacondarwin commented Dec 2, 2024 •

edited

Loading

changeset-bot bot commented Dec 2, 2024 •

edited

Loading

github-actions bot commented Dec 2, 2024 •

edited

Loading

penalosa Dec 3, 2024

petebacondarwin Dec 3, 2024

penalosa Dec 3, 2024

petebacondarwin Dec 3, 2024

refactor: move projectRoot computation to config validation #7415

refactor: move projectRoot computation to config validation #7415

Conversation

petebacondarwin commented Dec 2, 2024 • edited Loading

changeset-bot bot commented Dec 2, 2024 • edited Loading

⚠️ No Changeset found

github-actions bot commented Dec 2, 2024 • edited Loading

penalosa Dec 3, 2024

Choose a reason for hiding this comment

petebacondarwin Dec 3, 2024

Choose a reason for hiding this comment

penalosa Dec 3, 2024

Choose a reason for hiding this comment

petebacondarwin Dec 3, 2024

Choose a reason for hiding this comment

petebacondarwin commented Dec 2, 2024 •

edited

Loading

changeset-bot bot commented Dec 2, 2024 •

edited

Loading

github-actions bot commented Dec 2, 2024 •

edited

Loading