Skip to content

Merge to private-preview#2769

Closed
jar-stripe wants to merge 5 commits into
private-previewfrom
jar/merge-node-private-preview
Closed

Merge to private-preview#2769
jar-stripe wants to merge 5 commits into
private-previewfrom
jar/merge-node-private-preview

Conversation

@jar-stripe

Copy link
Copy Markdown
Contributor

Why?

Routine merge of master changes into the private-preview release channel.

What?

Merged master into private-preview using sdk-codegen's automerge tooling (tools/automerge/node-private-preview.yaml). All conflicts were resolved automatically (generated code chunks merged).

See Also

jar-stripe and others added 4 commits June 24, 2026 04:49
…2765)

* fix: regenerate types for CJS companion namespace access at all depths

Regenerated from stripe/sdk-codegen#3768 which fixes:
- Resource sub-types (e.g. Stripe.Price.Recurring) now accessible in CJS
- Nested resource types (e.g. Stripe.Billing.Alert.Status) now accessible
  in both CJS and ESM
- Deep params namespaces (e.g. AccountCreateParams.BusinessProfile.AnnualRevenue)
  now accessible in CJS

Fixes #2683

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* test: add regression tests for nested namespace type access

Adds type assertions for patterns that were previously broken in CJS
(and some in ESM too):
- Resource sub-types: Stripe.Price.Recurring, Stripe.Customer.InvoiceSettings
- Deep resource sub-types: Stripe.Subscription.BillingMode.Type
- Nested resource sub-types: Stripe.Billing.Alert.Status,
  Stripe.Terminal.Configuration.Tipping, Stripe.Apps.Secret.Scope
- Deep params: Stripe.AccountCreateParams.BusinessProfile.AnnualRevenue

Added to both testProjects/types/ (ESM) and testProjects/types-cjs-node16/
(CJS) so both declaration files are covered.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

* test: add namespace regression tests to types-cjs project

Same coverage as types/ and types-cjs-node16/ — covers
module: commonjs / moduleResolution: node resolution mode.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
#2766)

* alias Stripe as Stripe_ and updated manual code, regenerated from spec

* missed some renames
fix: use --loglevel error instead of silent for format step

--loglevel silent swallows all prettier output, including parse errors.
Switching to --loglevel error still suppresses the normal "reformatted N
files" chatter but surfaces actual failures (e.g. merge markers, syntax
errors in generated code).


Committed-By-Agent: claude

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Committed-By-Agent: claude

# Conflicts:
#	src/resources/Billing/Alerts.ts
#	src/resources/Billing/CreditBalanceSummary.ts
#	src/resources/Billing/CreditBalanceTransactions.ts
#	src/resources/Billing/CreditGrants.ts
#	src/resources/Checkout/Sessions.ts
#	src/resources/FinancialConnections/Accounts.ts
#	src/resources/FinancialConnections/Sessions.ts
#	src/resources/Identity/VerificationReports.ts
#	src/resources/Identity/VerificationSessions.ts
#	src/resources/Issuing/Authorizations.ts
#	src/resources/Issuing/Cardholders.ts
#	src/resources/Issuing/Cards.ts
#	src/resources/Issuing/Disputes.ts
#	src/resources/Issuing/Tokens.ts
#	src/resources/Issuing/Transactions.ts
#	src/resources/Radar/PaymentEvaluations.ts
#	src/resources/Radar/index.ts
#	src/resources/Tax/CalculationLineItems.ts
#	src/resources/Tax/Calculations.ts
#	src/resources/Tax/Registrations.ts
#	src/resources/Tax/TransactionLineItems.ts
#	src/resources/Tax/Transactions.ts
#	src/resources/Terminal/Configurations.ts
#	src/resources/Terminal/Readers.ts
#	src/resources/TestHelpers/index.ts
#	src/resources/Treasury/FinancialAccountFeatures.ts
#	src/resources/Treasury/OutboundTransfers.ts
#	src/resources/Treasury/ReceivedCredits.ts
#	src/resources/Treasury/ReceivedDebits.ts
#	src/resources/V2/Commerce/ProductCatalogImports.ts
#	src/resources/V2/Core/AccountLinks.ts
#	src/resources/V2/Core/AccountPersons.ts
#	src/resources/V2/Core/Accounts.ts
#	src/resources/V2/Core/Events.ts
#	src/stripe.cjs.node.ts
@jar-stripe jar-stripe requested a review from a team as a code owner June 24, 2026 20:47
@jar-stripe jar-stripe requested review from xavdid and removed request for a team June 24, 2026 20:47
@jar-stripe jar-stripe enabled auto-merge June 24, 2026 20:47

@xavdid xavdid left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

content doesn't match #2757, so maybe we should hold off

@jar-stripe jar-stripe closed this Jun 24, 2026
auto-merge was automatically disabled June 24, 2026 21:41

Pull request was closed

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.

2 participants