Skip to content

fix(web): bundle p-retry into dist/web browser build - #1835

Open
edenbuilds wants to merge 1 commit into
googleapis:mainfrom
edenbuilds:fix/web-bundle-p-retry-1330
Open

edenbuilds wants to merge 1 commit into
googleapis:mainfrom
edenbuilds:fix/web-bundle-p-retry-1330

Conversation

@edenbuilds

Copy link
Copy Markdown

Summary

  • Web Rollup target now uses @rollup/plugin-node-resolve and no longer marks p-retry as external, so dist/web/index.mjs has no bare "p-retry" specifier.
  • Node/CJS builds unchanged (still externalize p-retry).

Test plan

  • Published dist/web/index.mjs contains from 'p-retry'; bundling with p-retry inlined removes that bare import.
  • Rollup web config: external excludes p-retry; plugins include node-resolve.

Fixes #1330

@google-cla

google-cla Bot commented Aug 6, 2026

Copy link
Copy Markdown

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@edenbuilds
edenbuilds force-pushed the fix/web-bundle-p-retry-1330 branch from a7c3a41 to 60083da Compare August 7, 2026 18:38
@edenbuilds

Copy link
Copy Markdown
Author

I have read the CLA Document and I hereby sign the CLA

@Varun-S10

Copy link
Copy Markdown

Hi @edenbuilds, Thank you for your patience. It looks like this branch is currently out-of-date with the base branch. Could you please update the branch to bring it up to date? This will allow us to complete our verification.

@Varun-S10 Varun-S10 self-assigned this Aug 31, 2026
@Varun-S10 Varun-S10 added the status:awaiting user response issues requiring a response from the user label Aug 31, 2026
@edenbuilds

Copy link
Copy Markdown
Author

Updated the branch to current main in 3d2ab2e8 without rewriting history. The refresh exposed that current p-retry@4 is CommonJS, so I added @rollup/plugin-commonjs to the web-only plugin chain alongside node-resolve. The full package build now passes; dist/web/index.mjs contains no bare p-retry import, imports successfully as a standalone module (165 exports), and git diff --check passes.

@edenbuilds
edenbuilds force-pushed the fix/web-bundle-p-retry-1330 branch from adde65f to aee1cf5 Compare August 31, 2026 13:47
@edenbuilds

Copy link
Copy Markdown
Author

CLA follow-up: the signed agreement is now recognized and cla/google passes. The prior failure came from one stale merge commit attributed to a different GitHub identity/email; I collapsed the already-verified tree onto current main as the single edenbuilds commit aee1cf54. The code diff is unchanged; the full build passes and the standalone web artifact still imports with no bare p-retry specifier.

@Varun-S10 Varun-S10 removed the status:awaiting user response issues requiring a response from the user label Sep 1, 2026
@Varun-S10

Copy link
Copy Markdown

Hi @edenbuilds, Thank you for your contribution. We have checked the code changes. I will escalate this to the team, and the PR will be reviewed. Thank you for your patience and understanding.

@edenbuilds

edenbuilds commented Sep 1, 2026 •

Copy link
Copy Markdown
Author

Thanks @Varun-S10. I have refreshed the branch through current main (7fe15a61, including the 2.20.0 release) and re-verified it locally:

  • npm run lint
  • npm run unit-test — 695 specs, 0 failures
  • npm run build
  • confirmed dist/web/index.mjs has no external p-retry import and loads successfully with 165 exports

The verified update is pushed at 911c427c and is ready for maintainer review.

@edenbuilds
edenbuilds force-pushed the fix/web-bundle-p-retry-1330 branch from b182366 to 911c427 Compare September 1, 2026 18:37
@edenbuilds

Copy link
Copy Markdown
Author

Refreshed the branch onto current upstream main in non-rewriting merge commit bf30075. The PR diff remains limited to bundling p-retry for the web build; GitHub now reports the branch as mergeable, with maintainer review/check completion still outstanding.

@edenbuilds

Copy link
Copy Markdown
Author

Follow-up on the remaining CLA gate: the current cla/google output accepts edenbuilds, but rejects merge commit bf3007507706051f969f6595daf7f1ae500f77e2 because GitHub attributes its author to omkar1work. That September 21 base-refresh commit reintroduced the identity mismatch; the current failure is not a code or build failure.

Could the team advise whether the existing CLA can cover that historical author identity, or whether you need a branch-history correction? I have left the published history intact.

Resolve and inline p-retry for the web target, including its CommonJS package shape, while leaving Node targets externalized.

Fixes googleapis#1330
@edenbuilds
edenbuilds force-pushed the fix/web-bundle-p-retry-1330 branch from bf30075 to d98680a Compare September 27, 2026 06:10
@edenbuilds

Copy link
Copy Markdown
Author

Squashed the branch into a single commit authored as edenbuilds, so cla/google now passes. The code is unchanged (same tree as the previous head).

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Web build ships bare p-retry import, breaks in browsers

2 participants