Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make function serialization work on typescript 4 and 5 #15761

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

julienp
Copy link
Contributor

@julienp julienp commented Mar 22, 2024

Description

Builds on top of #15753

Fixes #15735

There are a couple breaking changes in the typescript API that we use in sdk/nodejs/runtime/closure/rewriteSuper.ts. This PR adds a shim that is used to bridge the differences and versions the snapshots where needed.

This does not make typescript a peer dependency yet. Instead the tests force a specific version to be used via yarn resolutions.

Checklist

  • I have run make tidy to update any new dependencies
  • I have run make lint to verify my code passes the lint check
    • I have formatted my code using gofumpt
  • I have added tests that prove my fix is effective or that my feature works
  • I have run make changelog and committed the changelog/pending/<file> documenting my change
  • Yes, there are changes in this PR that warrants bumping the Pulumi Cloud API version

@pulumi-bot
Copy link
Contributor

pulumi-bot commented Mar 22, 2024

Changelog

[uncommitted] (2024-03-27)

Features

  • [sdk/nodejs] Make function serialization work with typescript 4 and 5
    #15761

@julienp julienp force-pushed the julienp/reorganize-closure-tests branch from b0bf480 to cafa450 Compare March 22, 2024 18:19
@julienp julienp force-pushed the julienp/closures-on-ts4-and-5 branch from 3235592 to 052b12a Compare March 25, 2024 09:41
@julienp julienp added the ci/test Test CI pipelines on this PR label Mar 25, 2024
@@ -1,13 +1,17 @@
exports.handler = __f0;

var __deploymentOnlyModule = {};
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes here are due to export * compiling slightly different in 3.9 and later.

@julienp julienp force-pushed the julienp/closures-on-ts4-and-5 branch from f919e1e to e45ca6c Compare March 25, 2024 09:54
@julienp julienp force-pushed the julienp/reorganize-closure-tests branch 5 times, most recently from 6ac40d4 to e138f20 Compare March 25, 2024 12:36
@julienp julienp force-pushed the julienp/closures-on-ts4-and-5 branch from e45ca6c to 09f1405 Compare March 25, 2024 13:01
with({ __awaiter: __f0, f: __f, this: undefined, arguments: undefined }) {

return function /*f*/(_a) {
return __awaiter(this, arguments, void 0, function* ({ whatever }) { });
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Before 5.2 the arguments were not passed into __awaiter microsoft/TypeScript#56296

// This test validates that the typescript version used by the closure tests
// is the same as the one used by the pulumi package and that we are testing
// what we think we are testing ...
it(`resolve to the correct typescript version within the pulumi package`,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Turns out I was running the tests for a while where we had node_modules/typescript at the expected version, but also node_modules/@pulumi/pulumi/node_modules/typescript on 3.8.3 ... This seems somewhat easy to break, so this tests ensures we have the correct test setup.

@julienp julienp marked this pull request as ready for review March 25, 2024 13:48
@julienp julienp requested a review from a team as a code owner March 25, 2024 13:48
Base automatically changed from julienp/reorganize-closure-tests to master March 25, 2024 14:01
@julienp julienp force-pushed the julienp/closures-on-ts4-and-5 branch from 09f1405 to c287c32 Compare March 25, 2024 14:11
Copy link
Member

@justinvp justinvp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

Choose a reason for hiding this comment

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

I noticed integration is misspelled in the filename.

@julienp julienp force-pushed the julienp/closures-on-ts4-and-5 branch from c287c32 to 199e3ea Compare March 27, 2024 09:23
@julienp julienp force-pushed the julienp/closures-on-ts4-and-5 branch from 199e3ea to 3e7c264 Compare March 27, 2024 09:29
@julienp julienp enabled auto-merge March 27, 2024 09:44
@julienp julienp added this pull request to the merge queue Mar 27, 2024
Merged via the queue into master with commit dd1d860 Mar 27, 2024
92 checks passed
@julienp julienp deleted the julienp/closures-on-ts4-and-5 branch March 27, 2024 10:50
@justinvp justinvp mentioned this pull request Mar 27, 2024
github-merge-queue bot pushed a commit that referenced this pull request Mar 28, 2024
Tentative changelog:

### Features

- [docs] Implement constructor syntax examples for every resource in
typescript, python, csharp and go
  [#15624](#15624)

- [docs] Implement YAML constructor syntax examples in the docs
  [#15791](#15791)

- [engine] Send output values with property dependency information to
transform functions
  [#15637](#15637)

- [engine] Add a --continue-on-error flag to pulumi destroy
  [#15727](#15727)

- [sdk/go] Make `property.Map` keyed by `string` not `MapKey`
  [#15767](#15767)

- [sdk/nodejs] Make function serialization work with typescript 4 and 5
  [#15761](#15761)

- [sdk/python] Improve the error message when depends_on is passed
objects of the wrong type
  [#15737](#15737)


### Bug Fixes

- [auto/{go,nodejs,python}] Make sure to read complete lines before
trying to deserialize them as engine events
  [#15778](#15778)

- [cli/plugin] Fix installing local language plugins on Windows
  [#15715](#15715)

- [engine] Don't delete stack outputs on failed deployments
  [#15754](#15754)

- [engine] Fix a panic when updating provider version in a run using
--target
  [#15716](#15716)

- [engine] Handle that Assets & Archives can be returned from providers
without content.
  [#15736](#15736)

- [engine] Fix the engine trying to delete a protected resource caught
in a replace chain
  [#15776](#15776)

- [sdkgen/docs] Add missing newline for `Coming soon!`
  [#15783](#15783)

- [programgen/dotnet] Fix generated code for a list of resources used in
resource option DependsOn
  [#15773](#15773)

- [programgen/{dotnet,go}] Fixes emitted code for object expressions
assigned to properties of type Any
  [#15770](#15770)

- [sdk/go] Fix lookup of plugin and program dependencies when using Go
workspaces
  [#15743](#15743)

- [sdk/nodejs] Export automation.tag.TagMap type
  [#15774](#15774)

- [sdk/python] Wait only for pending outputs in the Python SDK, not all
pending asyncio tasks
  [#15744](#15744)


### Miscellaneous

- [sdk/nodejs] Reorganize function serialization tests
  [#15753](#15753)

- [sdk/nodejs] Move mockpackage tests to closure integration tests
  [#15757](#15757)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/test Test CI pipelines on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ensure function serialization works with a range of TypeScript version
3 participants