[pages] Update `pages functions build` to include config #5353

penalosa · 2024-03-22T03:55:06Z

What this PR solves / how to test

Updates wrangler pages functions build to support including values from wrangler.toml in the Functions upload. Additionally, support two properties that will be set in CI—--build-metadata-path and --project-directory.

Fixes DEVX-1177 & DEVX-1175

Author has addressed the following

Tests
- TODO (before merge)
- Included
- Not necessary because:
Changeset (Changeset guidelines)
- TODO (before merge)
- Included
- Not necessary because:
Public documentation
- TODO (before merge)
- Cloudflare docs PR(s): https://github.com/cloudflare/cloudflare-docs/pull/...
- Not necessary because: Not ready yet

changeset-bot · 2024-03-22T03:55:09Z

🦋 Changeset detected

Latest commit: a2541ee

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

This PR includes changesets to release 2 packages

Name	Type
wrangler	Minor
@cloudflare/vitest-pool-workers	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

github-actions · 2024-03-22T04:02:44Z

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/8421253010/npm-package-wrangler-5353

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

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

Or you can use npx with this latest build directly:

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

Additional artifacts:

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

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

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

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

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

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

[email protected] includes the following runtime dependencies:

Package	Constraint	Resolved
`miniflare`	workspace:*	3.20240320.0
`workerd`	1.20240320.1	1.20240320.1
`workerd --version`	1.20240320.1	2024-03-20

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

codecov · 2024-03-25T10:27:06Z

Codecov Report

Attention: Patch coverage is 92.72727% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 72.45%. Comparing base (7d160c7) to head (a2541ee).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5353      +/-   ##
==========================================
+ Coverage   72.29%   72.45%   +0.16%     
==========================================
  Files         318      318              
  Lines       16458    16505      +47     
  Branches     4201     4230      +29     
==========================================
+ Hits        11898    11959      +61     
+ Misses       4560     4546      -14

Files	Coverage Δ
...ler/src/api/pages/create-worker-bundle-contents.ts	`100.00% <100.00%> (ø)`
packages/wrangler/src/api/pages/deploy.tsx	`87.12% <ø> (ø)`
packages/wrangler/src/pages/build.ts	`70.79% <86.20%> (+3.38%)`	⬆️

... and 9 files with indirect coverage changes

mrbbot

Looks good! ✅ Some very minor comments. 👍

fixtures/pages-functions-app/wrangler.toml

packages/wrangler/src/pages/build.ts

packages/wrangler/src/api/pages/deploy.tsx

.changeset/swift-pears-carry.md

packages/wrangler/src/api/pages/create-worker-bundle-contents.ts

petebacondarwin · 2024-03-25T10:13:27Z

packages/wrangler/src/api/pages/create-worker-bundle-contents.ts

 	const metadata = JSON.parse(workerBundleFormData.get("metadata") as string);

-	/**
-	 * Pages doesn't need the metadata bindings returned by
-	 * `createWorkerBundleFormData`. Let's strip them out and return only
-	 * the contents we need
-	 */
-	workerBundleFormData.set(
-		"metadata",
-		JSON.stringify({ main_module: metadata.main_module })
-	);
+	workerBundleFormData.set("metadata", JSON.stringify(metadata));


I think these lines are no longer needed. They were only here because we were trying to strip out the bindings from the metadata.

In fact perhaps this whole function is redundant now?

I've modified this function to strip out the empty bindings key from the metadata if no config has been found

packages/wrangler/src/api/pages/deploy.tsx

packages/wrangler/src/pages/build.ts

fixtures/pages-functions-app/wrangler.toml

petebacondarwin · 2024-03-25T10:37:14Z

According to the JIRA ticket we also need to support a --pages-environment=production|preview arg?

Co-authored-by: Pete Bacon Darwin <[email protected]>

penalosa · 2024-03-25T11:40:43Z

According to the JIRA ticket we also need to support a --pages-environment=production|preview arg?

I've updated the JIRA ticket—for consistency with build-env this is now passed as an environment variable (PAGES_ENVIRONMENT).

packages/wrangler/src/api/pages/create-worker-bundle-contents.ts

penalosa force-pushed the penalosa/pages-config-download branch from 3af8b05 to b5deb07 Compare March 22, 2024 15:28

Base automatically changed from penalosa/pages-config-download to main March 25, 2024 09:40

penalosa force-pushed the penalosa/functions-build branch from 6cdeaef to 4ac26c3 Compare March 25, 2024 09:47

penalosa added 2 commits March 25, 2024 09:48

Support pages functions build

8757dbc

fix build

bfefb7f

penalosa force-pushed the penalosa/functions-build branch from 4ac26c3 to bfefb7f Compare March 25, 2024 09:48

petebacondarwin added the ldw-exempt PRs marked with this label can be included in releases during LDW. label Mar 25, 2024

rebase

3f0e298

penalosa marked this pull request as ready for review March 25, 2024 10:04

penalosa requested review from a team as code owners March 25, 2024 10:04

penalosa added 2 commits March 25, 2024 10:06

Create swift-pears-carry.md

d3932e6

fix tests

287a2a6

mrbbot approved these changes Mar 25, 2024

View reviewed changes

petebacondarwin reviewed Mar 25, 2024

View reviewed changes

penalosa and others added 5 commits March 25, 2024 11:20

Add test and fix output dir

0c29ae4

Delete accidentally added config file

5a85e22

Update .changeset/swift-pears-carry.md

aadb19a

Co-authored-by: Pete Bacon Darwin <[email protected]>

Simplify maybeReadPagesConfig nesting

f640072

Remove unnecessary "utf8"

37d3b5f

fix format

fbd7bca

penalosa requested a review from petebacondarwin March 25, 2024 11:47

hard fail -> soft fail on invalid config file

28b1161

CarmenPopoviciu reviewed Mar 25, 2024

View reviewed changes

packages/wrangler/src/api/pages/create-worker-bundle-contents.ts Outdated Show resolved Hide resolved

CarmenPopoviciu approved these changes Mar 25, 2024

View reviewed changes

Remove logpush

a2541ee

penalosa merged commit 3be826f into main Mar 25, 2024

penalosa deleted the penalosa/functions-build branch March 25, 2024 18:59

workers-devprod mentioned this pull request Mar 25, 2024

Version Packages #5358

Merged

[pages] Update pages functions build to include config #5353

[pages] Update pages functions build to include config #5353

Uh oh!

Conversation

penalosa commented Mar 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR solves / how to test

Author has addressed the following

Uh oh!

changeset-bot bot commented Mar 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions bot commented Mar 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mrbbot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petebacondarwin Mar 25, 2024

Choose a reason for hiding this comment

Uh oh!

petebacondarwin Mar 25, 2024

Choose a reason for hiding this comment

Uh oh!

penalosa Mar 25, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petebacondarwin commented Mar 25, 2024

Uh oh!

penalosa commented Mar 25, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

[pages] Update `pages functions build` to include config #5353

[pages] Update `pages functions build` to include config #5353

penalosa commented Mar 22, 2024 •

edited

Loading

changeset-bot bot commented Mar 22, 2024 •

edited

Loading

github-actions bot commented Mar 22, 2024 •

edited

Loading

codecov bot commented Mar 25, 2024 •

edited

Loading