From 225168f851d411de3ec4e9c4208bfdcdbd8a1087 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:27:08 +0000 Subject: [PATCH 01/18] chore(deps): Update black requirement from ~=24.3 to ~=24.4 in /packages/@jsii/python-runtime (#4483) Updates the requirements on [black](https://github.com/psf/black) to permit the latest version.
Release notes

Sourced from black's releases.

24.4.0

Stable style

Preview style

Integrations

Changelog

Sourced from black's changelog.

24.4.0

Stable style

Preview style

Integrations

24.3.0

Highlights

This release is a milestone: it fixes Black's first CVE security vulnerability. If you run Black on untrusted input, or if you habitually put thousands of leading tab characters in your docstrings, you are strongly encouraged to upgrade immediately to fix CVE-2024-21503.

This release also fixes a bug in Black's AST safety check that allowed Black to make incorrect changes to certain f-strings that are valid in Python 3.12 and higher.

Stable style

Performance

Documentation

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index b4bb4d076e..f7d678ab3d 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -1,4 +1,4 @@ -black~=24.3 +black~=24.4 mypy==1.9.0 pip~=24.0 pytest~=8.1 From cfbe97461bd0080087250b9cab95013297413584 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 13:13:34 +0000 Subject: [PATCH 02/18] chore(deps): Bump xunit.runner.visualstudio from 2.5.7 to 2.5.8 in /packages/@jsii/dotnet-runtime/src (#4480) Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.7 to 2.5.8.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=xunit.runner.visualstudio&package-manager=nuget&previous-version=2.5.7&new-version=2.5.8)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index c9453bc8de..8734a5c25b 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -13,7 +13,7 @@ - + From 9fe1bd528ef835164a0cd1a1c3a995409db31873 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 14:21:18 +0000 Subject: [PATCH 03/18] chore(deps): Update setuptools requirement from ~=69.2.0 to ~=69.5.1 in /packages/@jsii/python-runtime (#4482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the requirements on [setuptools](https://github.com/pypa/setuptools) to permit the latest version.
Changelog

Sourced from setuptools's changelog.

v69.5.1

No significant changes.

v69.4.2

Bugfixes

v69.5.0

Features

  • Refresh unpinned vendored dependencies. (#4253)
  • Updated vendored packaging to version 24.0. (#4301)

v69.4.1

No significant changes.

v69.3.1

Bugfixes

  • Remove attempt to canonicalize the version. It's already canonical enough. (#4302)

v69.4.0

Features

  • pypa/distutils#213#4298)

v69.3.0

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index f7d678ab3d..feb1a71cf6 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -3,7 +3,7 @@ mypy==1.9.0 pip~=24.0 pytest~=8.1 pytest-mypy~=0.10 -setuptools~=69.2.0 +setuptools~=69.5.1 types-python-dateutil~=2.9 wheel~=0.43 From c2a19a5ec7169a4d07aad0504afee3bf29adb0eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:11:45 +0000 Subject: [PATCH 04/18] chore(deps): Bump xunit from 2.7.0 to 2.7.1 in /packages/@jsii/dotnet-runtime/src (#4481) Bumps [xunit](https://github.com/xunit/xunit) from 2.7.0 to 2.7.1.
Commits
  • 62d5db6 v2.7.1
  • e3c980f #2913: Assert.Equivalent behaves incorrectly with decimal values (v2)
  • 57af1d9 Copy/paste error
  • 9f97a28 #2503: Attempt to shield against exceptions which throw in their properties (v2)
  • f69013b #2903: Add ArgumentFormatter aliases for nint and nuint (v2)
  • e074b6a Copy missing assertion test change
  • 3f1891d Unit tests for #2900 (v2)
  • 9f7e7e7 Use separate projects for x86 builds instead of alternate configuration
  • 4b2b9fa Add hidden overloads for binary compatibility for ConfigReader and friends
  • c10b7a2 Fix for #2892: Timeout async guard inappropriately triggers with F# (v2)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=xunit&package-manager=nuget&previous-version=2.7.0&new-version=2.7.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index 8734a5c25b..e8512a8786 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -12,7 +12,7 @@ - + From 19117be65eefd593f140287a36dfea5ae0f98582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 12:19:02 +0000 Subject: [PATCH 05/18] chore(deps-dev): Update mkdocs-material requirement from ~=9.5.17 to ~=9.5.18 in /gh-pages (#4485) Updates the requirements on [mkdocs-material](https://github.com/squidfunk/mkdocs-material) to permit the latest version.
Release notes

Sourced from mkdocs-material's releases.

mkdocs-material-9.5.18

  • Refactored tooltips implementation to fix positioning issues
  • Fixed #7044: Rendering glitch when hovering contributor avatar in Chrome
  • Fixed #7043: Highlighted lines in code blocks cutoff on mobile
  • Fixed #6910: Incorrect position of tooltip for page status in sidebar
  • Fixed #6760: Incorrect position and overly long tooltip in tables
  • Fixed #6488: Incorrect position and cutoff tooltip in content tabs
Changelog

Sourced from mkdocs-material's changelog.

mkdocs-material-9.5.18 (2024-04-16)

  • Refactored tooltips implementation to fix positioning issues
  • Fixed #7044: Rendering glitch when hovering contributor avatar in Chrome
  • Fixed #7043: Highlighted lines in code blocks cutoff on mobile
  • Fixed #6910: Incorrect position of tooltip for page status in sidebar
  • Fixed #6760: Incorrect position and overly long tooltip in tables
  • Fixed #6488: Incorrect position and cutoff tooltip in content tabs

mkdocs-material-9.5.17+insiders-4.53.6 (2024-04-05)

  • Ensure working directory is set for projects when using projects plugin
  • Fixed #6970: Incorrect relative paths in git submodules with projects plugin

mkdocs-material-9.5.17+insiders-4.53.5 (2024-04-02)

  • Fixed social plugin crashing when no colors are specified in palettes

mkdocs-material-9.5.17 (2024-04-02)

  • Updated Serbian translations
  • Fixed #7003: Confusing keyboard interaction for palette toggle
  • Fixed #7001: Blog posts now show time by default (9.5.16 regression)
  • Fixed edge case in backport of social plugin font loading logic

mkdocs-material-9.5.16+insiders-4.53.4 (2024-03-31)

  • Fixed #6973: Escaping issue in tags extra files deprecation helper

mkdocs-material-9.5.16 (2024-03-31)

  • Updated Russian translations
  • Improved error handling and reporting in social plugin
  • Improved error handling and reporting in privacy plugin
  • Fixed blog plugin not allowing to use time in format strings
  • Fixed #6983: Social plugin crashes because of Google Fonts API change

mkdocs-material-9.5.15+insiders-4.53.3 (2024-03-23)

  • Added support for font variants in social plugin
  • Improved resilience of font resolution in social plugin
  • Fixed tag listing sometimes not being auto-populated
  • Fixed tag listing scope not being correctly resolved
  • Fixed #6941: Meta plugin adding duplicate entries
  • Fixed #6928: Social plugin crashes for some fonts

mkdocs-material-9.5.15 (2024-03-23)

  • Reverted fix for transparent iframes (9.5.14)
  • Fixed #6929: Interference of social plugin and auto dark mode

... (truncated)

Commits
  • 3b592ab Prepare 9.5.18 release
  • f028004 Merge pull request #7045 from squidfunk/refactor/tooltip-positioning
  • 29658ed Merge branch 'master' into refactor/tooltip-positioning
  • 851e5bb Fixed rendering glitch when hovering contributor avatar
  • 599193e Fixed overly long tooltips
  • e15518c Refactored tooltips
  • 4eb1a43 Added missing CSS for highlight fix
  • 5707773 Updated dependencies
  • 9d33f8a Fixed highlighted lines in code blocks being cutoff on mobile
  • cd08611 Updated dependencies
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- gh-pages/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index ca4d421ba3..66d4b21c41 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ mkdocs~=1.5.3 mkdocs-awesome-pages-plugin~=2.9.2 -mkdocs-material~=9.5.17 +mkdocs-material~=9.5.18 mkdocs-git-revision-date-plugin~=0.3.2 From 466ed561a76183c157bef124312ffeb1b2a3b20e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 13:04:53 +0000 Subject: [PATCH 06/18] chore(deps-dev): Update mkdocs requirement from ~=1.5.3 to ~=1.6.0 in /gh-pages (#4484) Updates the requirements on [mkdocs](https://github.com/mkdocs/mkdocs) to permit the latest version.
Release notes

Sourced from mkdocs's releases.

1.6.0

Local preview

  • mkdocs serve no longer locks up the browser when more than 5 tabs are open. This is achieved by closing the polling connection whenever a tab becomes inactive. Background tabs will no longer auto-reload either - that will instead happen as soon the tab is opened again. Context: #3391

  • New flag serve --open to open the site in a browser.
    After the first build is finished, this flag will cause the default OS Web browser to be opened at the home page of the local site.
    Context: #3500

Drafts

[!warning] Changed from version 1.5:

The exclude_docs config was split up into two separate concepts.

The exclude_docs config no longer has any special behavior for mkdocs serve - it now always completely excludes the listed documents from the site.

If you wish to use the "drafts" functionality like the exclude_docs key used to do in MkDocs 1.5, please switch to the new config key draft_docs.

See documentation.

Other changes:

  • Reduce warning levels when a "draft" page has a link to a non-existent file. Context: #3449

Update to deduction of page titles

MkDocs 1.5 had a change in behavior in deducing the page titles from the first heading. Unfortunately this could cause unescaped HTML tags or entities to appear in edge cases.

Now tags are always fully sanitized from the title. Though it still remains the case that Page.title is expected to contain HTML entities and is passed directly to the themes.

Images (notably, emojis in some extensions) get preserved in the title only through their alt attribute's value.

Context: #3564, #3578

Themes

  • Built-in themes now also support Polish language (#3613)

"readthedocs" theme

  • Fix: "readthedocs" theme can now correctly handle deeply nested nav configurations (over 2 levels deep), without confusedly expanding all sections and jumping around vertically. (#3464)

  • Fix: "readthedocs" theme now shows a link to the repository (with a generic logo) even when isn't one of the 3 known hosters. (#3435)

  • "readthedocs" theme now also has translation for the word "theme" in the footer that mistakenly always remained in English. (#3613, #3625)

"mkdocs" theme

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- gh-pages/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index 66d4b21c41..76cd11b773 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ -mkdocs~=1.5.3 +mkdocs~=1.6.0 mkdocs-awesome-pages-plugin~=2.9.2 mkdocs-material~=9.5.18 mkdocs-git-revision-date-plugin~=0.3.2 From 9edbf46c40121eeecf1c0cd89f1ded5083520c99 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 10:58:02 +0000 Subject: [PATCH 07/18] chore(deps): Bump tar from 6.2.0 to 6.2.1 (#4478) Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=tar&package-manager=npm_and_yarn&previous-version=6.2.0&new-version=6.2.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/aws/jsii/network/alerts).
--- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 210344317a..08650fb0ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8573,9 +8573,9 @@ tar@6.1.11: yallist "^4.0.0" tar@^6.1.0, tar@^6.1.11, tar@^6.1.2, tar@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" From 3fee431ca29bfb0a08bf913f752b3b93fb945b59 Mon Sep 17 00:00:00 2001 From: Rico Hermans Date: Thu, 25 Apr 2024 11:44:23 +0200 Subject: [PATCH 08/18] chore: bump mkdocs-material (#4488) The most recent Dependabot update updated `mkdocs` in such a way that our dependencies are now incompatible. Bumping `mkdocs-material` as well seems to solve it. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- gh-pages/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index 76cd11b773..f2f73cd661 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ mkdocs~=1.6.0 mkdocs-awesome-pages-plugin~=2.9.2 -mkdocs-material~=9.5.18 +mkdocs-material~=9.5.19 mkdocs-git-revision-date-plugin~=0.3.2 From 699366db4df0179aaf1aec151d28e0cea6c2edba Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Thu, 25 Apr 2024 14:49:28 +0100 Subject: [PATCH 09/18] feat: node22 support (#4489) https://nodejs.org/en/blog/announcements/v22-release-announce superchain: Changes how node is installed from [nodesource](https://github.com/nodesource/distributions), due to the following change. This also required updating the nodesource repo key. >Package Changes: DEB and RPM packages are now available under the nodistro codename. We no longer package the installer coupled to specific versions. This means you can install Node.js on almost any distro that meets the minimum requirements. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- .github/workflows/docker-images.yml | 2 +- .github/workflows/main.yml | 7 ++ CONTRIBUTING.md | 4 +- gh-pages/partials/node-support-table.md | 4 +- packages/@jsii/check-node/src/constants.ts | 1 + superchain/Dockerfile | 10 +-- superchain/README.md | 45 ++++++------- superchain/gpg/nodesource.asc | 75 ++++++++-------------- 8 files changed, 67 insertions(+), 81 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 8889085150..2407668c7b 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -24,7 +24,7 @@ jobs: debian: - 'bullseye' # 11 - 'bookworm' # 12 - node: ['18', '20'] + node: ['18', '20', '22'] exclude: # We publish bullseye only with Node >= 20 - debian: 'bullseye' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3dd7100c73..6b38607590 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -231,6 +231,13 @@ jobs: node: '20' # EOL 2026-04-30 os: ubuntu-latest python: '3.8' + - title: 'Node 22' + java: '8' + dotnet: '6.0.x' + go: '1.18' + node: '22' # EOL 2027-04-30 + os: ubuntu-latest + python: '3.8' # Test alternate .NETs - title: '.NET 7.0' java: '8' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 21b3a0eab6..3f55bb9d6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ The following tools need to be installed to develop on JSII locally. We recommen using the docker image from the above section, but if you wish to, you can install in your development environment. -- [Node `14.6.0`] or later +- [Node `18.0.0`] or later - [Yarn `1.19.1`] or later - An OpenJDK-8 distribution (e.g: [Oracle's OpenJDK8], [Amazon Corretto 8]) + [`maven >= 3.0.5`](https://maven.apache.org) @@ -52,7 +52,7 @@ in your development environment. + *Recommended:* [`twine`](https://pypi.org/project/twine/) - [Go] `1.18` or newer -[Node `14.6.0`]: https://nodejs.org/download/release/v14.6.0/ +[Node `18.0.0`]: https://nodejs.org/download/release/latest-v18.x/ [Yarn `1.19.1`]: https://yarnpkg.com/en/docs/install [Oracle's OpenJDK8]: http://openjdk.java.net/install/ [Amazon Corretto 8]: https://aws.amazon.com/corretto/ diff --git a/gh-pages/partials/node-support-table.md b/gh-pages/partials/node-support-table.md index 6a34ef6184..e5174279a3 100644 --- a/gh-pages/partials/node-support-table.md +++ b/gh-pages/partials/node-support-table.md @@ -2,9 +2,9 @@ | Release | Status | End-of-Life | | --------- | ---------------------------- | ------------ | - | `^14.6.0` | :white_check_mark: Supported | `2023-04-30` | - | `^16.3.0` | :white_check_mark: Supported | `2024-09-11` | | `^18.0.0` | :white_check_mark: Supported | `2025-04-30` | + | `^20.0.0` | :white_check_mark: Supported | `2026-04-30` | + | `^22.0.0` | :white_check_mark: Supported | `2027-04-30` | ??? question "Status Definitions" - **:white_check_mark: Supported**: Long Term Support (LTS) releases (those with an even major version) are diff --git a/packages/@jsii/check-node/src/constants.ts b/packages/@jsii/check-node/src/constants.ts index 2ead106ac9..d569bdf2bb 100644 --- a/packages/@jsii/check-node/src/constants.ts +++ b/packages/@jsii/check-node/src/constants.ts @@ -50,6 +50,7 @@ export class NodeRelease { new NodeRelease(18, { endOfLife: new Date('2025-04-30') }), new NodeRelease(20, { endOfLife: new Date('2026-04-30') }), new NodeRelease(21, { endOfLife: new Date('2024-06-01'), untested: true }), + new NodeRelease(22, { endOfLife: new Date('2027-04-30') }), // Future (planned releases) ]; diff --git a/superchain/Dockerfile b/superchain/Dockerfile index 281e498606..e18324db64 100644 --- a/superchain/Dockerfile +++ b/superchain/Dockerfile @@ -239,12 +239,12 @@ ARG NODE_MAJOR_VERSION="18" COPY superchain/gpg/nodesource.asc /tmp/nodesource.asc COPY superchain/gpg/yarn.asc /tmp/yarn.asc RUN apt-key add /tmp/nodesource.asc && rm /tmp/nodesource.asc \ - && echo "deb https://deb.nodesource.com/node_${NODE_MAJOR_VERSION}.x ${DEBIAN_VERSION} main" \ - > /etc/apt/sources.list.d/nodesource.list \ - # Reduce priority of the "standard" nodejs package, so that the one from nodesource is always preferred... + && echo "deb https://deb.nodesource.com/node_${NODE_MAJOR_VERSION}.x nodistro main" \ + > /etc/apt/sources.list.d/nodesource.list \ + # Increase priority of the nodesource package && echo "Package: nodejs" > /etc/apt/preferences.d/nodejs \ - && echo 'Pin: origin "deb.debian.org"' >> /etc/apt/preferences.d/nodejs \ - && echo "Pin-Priority: 50" >> /etc/apt/preferences.d/nodejs \ + && echo 'Pin: origin deb.nodesource.com"' >> /etc/apt/preferences.d/nodejs \ + && echo "Pin-Priority: 600" >> /etc/apt/preferences.d/nodejs \ && apt-key add /tmp/yarn.asc && rm /tmp/yarn.asc \ && echo "deb https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarnpkg.list \ && apt-get update \ diff --git a/superchain/README.md b/superchain/README.md index 2a1e7db58f..f21153e9dc 100644 --- a/superchain/README.md +++ b/superchain/README.md @@ -17,15 +17,15 @@ public.ecr.aws/jsii/superchain:1-bullseye-slim ## Included Language SDKs -| SDK | Version | -| ------------ | ---------------------------------------- | -| `OpenJDK 20` | Amazon Corretto `>= 20.0.2` | -| `.NET SDK` | `>= 6.0.14` | -| `mono` | `>= 6.12.0.200` | -| `Javascript` | see [NodeJS and NPM](#nodejs-and-npm) | -| `PowerShell` | `pwsh >= 7.2.16` | -| `Python 3` | see [Python'](#python) | -| `Go` | `go >= 1.18` | +| SDK | Version | +| ------------ | ------------------------------------- | +| `OpenJDK 20` | Amazon Corretto `>= 20.0.2` | +| `.NET SDK` | `>= 6.0.14` | +| `mono` | `>= 6.12.0.200` | +| `Javascript` | see [NodeJS and NPM](#nodejs-and-npm) | +| `PowerShell` | `pwsh >= 7.2.16` | +| `Python 3` | see [Python'](#python) | +| `Go` | `go >= 1.18` | ## Image tags @@ -39,9 +39,10 @@ public.ecr.aws/jsii/superchain:-(-node)(-nightly) - `` is the base image tag, currently supported base images are - `bookworm-slim` - `bullseye-slim` -- `` is the major version of node contained in the image - - `18` corresponds to node 18.x, this is the default - - `20` corresponds to node 20.x +- `` is the major version of Node.js contained in the image + - `18` corresponds to Node.js 18.x, this is the default + - `20` corresponds to Node.js 20.x + - `22` corresponds to Node.js 22.x - `-nightly` images are released from the `HEAD` of the [`aws/jsii`][jsii] repository and should typically not be used for production workloads @@ -82,11 +83,11 @@ public.ecr.aws/jsii/superchain:1-bullseye-slim-node20 We will stop publishing images for Node versions that are EOL. -| Debian | Node versions | -| ----------------------------| -----------------| -| `bookworm-slim` | `20` | -| `bullseye-slim` | `20`, `18` | -| `buster-slim` (deprecated) | `18`, `16`, `14` | +| Debian | Node versions | +| -------------------------- | ---------------- | +| `bookworm-slim` | `20` | +| `bullseye-slim` | `20`, `18` | +| `buster-slim` (deprecated) | `18`, `16`, `14` | If you are building this image from source, you can control the Node version with the `NODE_MAJOR_VERSION` build argument: @@ -100,11 +101,11 @@ jsii$ docker build [...] --build-arg NODE_MAJOR_VERSION=16 The image includes the most recent Python version available for the respecitve Debian distribution. A complete list can be viewed on the [Debian website](https://wiki.debian.org/Python#Supported_Python_Versions). -| Debian | Python version | -| ----------------------------| ---------------| -| `bookworm-slim` | `3.11` | -| `bullseye-slim` | `3.9` | -| `buster-slim` (deprecated) | `3.7` | +| Debian | Python version | +| -------------------------- | -------------- | +| `bookworm-slim` | `3.11` | +| `bullseye-slim` | `3.9` | +| `buster-slim` (deprecated) | `3.7` | ## Included Tools & Utilities diff --git a/superchain/gpg/nodesource.asc b/superchain/gpg/nodesource.asc index 1dc1d1016b..b7637b89f6 100644 --- a/superchain/gpg/nodesource.asc +++ b/superchain/gpg/nodesource.asc @@ -1,52 +1,29 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 -Comment: GPGTools - https://gpgtools.org -mQINBFObJLYBEADkFW8HMjsoYRJQ4nCYC/6Eh0yLWHWfCh+/9ZSIj4w/pOe2V6V+ -W6DHY3kK3a+2bxrax9EqKe7uxkSKf95gfns+I9+R+RJfRpb1qvljURr54y35IZgs -fMG22Np+TmM2RLgdFCZa18h0+RbH9i0b+ZrB9XPZmLb/h9ou7SowGqQ3wwOtT3Vy -qmif0A2GCcjFTqWW6TXaY8eZJ9BCEqW3k/0Cjw7K/mSy/utxYiUIvZNKgaG/P8U7 -89QyvxeRxAf93YFAVzMXhoKxu12IuH4VnSwAfb8gQyxKRyiGOUwk0YoBPpqRnMmD -Dl7SdmY3oQHEJzBelTMjTM8AjbB9mWoPBX5G8t4u47/FZ6PgdfmRg9hsKXhkLJc7 -C1btblOHNgDx19fzASWX+xOjZiKpP6MkEEzq1bilUFul6RDtxkTWsTa5TGixgCB/ -G2fK8I9JL/yQhDc6OGY9mjPOxMb5PgUlT8ox3v8wt25erWj9z30QoEBwfSg4tzLc -Jq6N/iepQemNfo6Is+TG+JzI6vhXjlsBm/Xmz0ZiFPPObAH/vGCY5I6886vXQ7ft -qWHYHT8jz/R4tigMGC+tvZ/kcmYBsLCCI5uSEP6JJRQQhHrCvOX0UaytItfsQfLm -EYRd2F72o1yGh3yvWWfDIBXRmaBuIGXGpajC0JyBGSOWb9UxMNZY/2LJEwARAQAB -tB9Ob2RlU291cmNlIDxncGdAbm9kZXNvdXJjZS5jb20+iQI4BBMBAgAiBQJTmyS2 -AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAWVaCraFdigHTmD/9OKhUy -jJ+h8gMRg6ri5EQxOExccSRU0i7UHktecSs0DVC4lZG9AOzBe+Q36cym5Z1di6JQ -kHl69q3zBdV3KTW+H1pdmnZlebYGz8paG9iQ/wS9gpnSeEyx0Enyi167Bzm0O4A1 -GK0prkLnz/yROHHEfHjsTgMvFwAnf9uaxwWgE1d1RitIWgJpAnp1DZ5O0uVlsPPm -XAhuBJ32mU8S5BezPTuJJICwBlLYECGb1Y65Cil4OALU7T7sbUqfLCuaRKxuPtcU -VnJ6/qiyPygvKZWhV6Od0Yxlyed1kftMJyYoL8kPHfeHJ+vIyt0s7cropfiwXoka -1iJB5nKyt/eqMnPQ9aRpqkm9ABS/r7AauMA/9RALudQRHBdWIzfIg0Mlqb52yyTI -IgQJHNGNX1T3z1XgZhI+Vi8SLFFSh8x9FeUZC6YJu0VXXj5iz+eZmk/nYjUt4Mtc -pVsVYIB7oIDIbImODm8ggsgrIzqxOzQVP1zsCGek5U6QFc9GYrQ+Wv3/fG8hfkDn -xXLww0OGaEQxfodm8cLFZ5b8JaG3+Yxfe7JkNclwvRimvlAjqIiW5OK0vvfHco+Y -gANhQrlMnTx//IdZssaxvYytSHpPZTYw+qPEjbBJOLpoLrz8ZafN1uekpAqQjffI -AOqW9SdIzq/kSHgl0bzWbPJPw86XzzftewjKNbkCDQRTmyS2ARAAxSSdQi+WpPQZ -fOflkx9sYJa0cWzLl2w++FQnZ1Pn5F09D/kPMNh4qOsyvXWlekaV/SseDZtVziHJ -Km6V8TBG3flmFlC3DWQfNNFwn5+pWSB8WHG4bTA5RyYEEYfpbekMtdoWW/Ro8Kmh -41nuxZDSuBJhDeFIp0ccnN2Lp1o6XfIeDYPegyEPSSZqrudfqLrSZhStDlJgXjea -JjW6UP6txPtYaaila9/Hn6vF87AQ5bR2dEWB/xRJzgNwRiax7KSU0xca6xAuf+TD -xCjZ5pp2JwdCjquXLTmUnbIZ9LGV54UZ/MeiG8yVu6pxbiGnXo4Ekbk6xgi1ewLi -vGmz4QRfVklV0dba3Zj0fRozfZ22qUHxCfDM7ad0eBXMFmHiN8hg3IUHTO+UdlX/ -aH3gADFAvSVDv0v8t6dGc6XE9Dr7mGEFnQMHO4zhM1HaS2Nh0TiL2tFLttLbfG5o -QlxCfXX9/nasj3K9qnlEg9G3+4T7lpdPmZRRe1O8cHCI5imVg6cLIiBLPO16e0fK -yHIgYswLdrJFfaHNYM/SWJxHpX795zn+iCwyvZSlLfH9mlegOeVmj9cyhN/VOmS3 -QRhlYXoA2z7WZTNoC6iAIlyIpMTcZr+ntaGVtFOLS6fwdBqDXjmSQu66mDKwU5Ek -fNlbyrpzZMyFCDWEYo4AIR/18aGZBYUAEQEAAYkCHwQYAQIACQUCU5sktgIbDAAK -CRAWVaCraFdigIPQEACcYh8rR19wMZZ/hgYv5so6Y1HcJNARuzmffQKozS/rxqec -0xM3wceL1AIMuGhlXFeGd0wRv/RVzeZjnTGwhN1DnCDy1I66hUTgehONsfVanuP1 -PZKoL38EAxsMzdYgkYH6T9a4wJH/IPt+uuFTFFy3o8TKMvKaJk98+Jsp2X/QuNxh -qpcIGaVbtQ1bn7m+k5Qe/fz+bFuUeXPivafLLlGc6KbdgMvSW9EVMO7yBy/2JE15 -ZJgl7lXKLQ31VQPAHT3an5IV2C/ie12eEqZWlnCiHV/wT+zhOkSpWdrheWfBT+ac -hR4jDH80AS3F8jo3byQATJb3RoCYUCVc3u1ouhNZa5yLgYZ/iZkpk5gKjxHPudFb -DdWjbGflN9k17VCf4Z9yAb9QMqHzHwIGXrb7ryFcuROMCLLVUp07PrTrRxnO9A/4 -xxECi0l/BzNxeU1gK88hEaNjIfviPR/h6Gq6KOcNKZ8rVFdwFpjbvwHMQBWhrqfu -G3KaePvbnObKHXpfIKoAM7X2qfO+IFnLGTPyhFTcrl6vZBTMZTfZiC1XDQLuGUnd -sckuXINIU3DFWzZGr0QrqkuE/jyr7FXeUJj9B7cLo+s/TXo+RaVfi3kOc9BoxIvy -/qiNGs/TKy2/Ujqp/affmIMoMXSozKmga81JSwkADO1JMgUy6dApXz9kP4EE3g== -=CLGF +mQENBFdDN1ABCADaNd/I3j3tn40deQNgz7hB2NvT+syXe6k4ZmdiEcOfBvFrkS8B +hNS67t93etHsxEy7E0qwsZH32bKazMqe9zDwoa3aVImryjh6SHC9lMtW27JPHFeM +Srkt9YmH1WMwWcRO6eSY9B3PpazquhnvbammLuUojXRIxkDroy6Fw4UKmUNSRr32 +9Ej87jRoR1B2/57Kfp2Y4+vFGGzSvh3AFQpBHq51qsNHALU6+8PjLfIt+5TPvaWR +TB+kAZnQZkaIQM2nr1n3oj6ak2RATY/+kjLizgFWzgEfbCrbsyq68UoY5FPBnu4Z +E3iDZpaIqwKr0seUC7iA1xM5eHi5kty1oB7HABEBAAG0Ik5Tb2xpZCA8bnNvbGlk +LWdwZ0Bub2Rlc291cmNlLmNvbT6JATgEEwECACIFAldDN1ACGwMGCwkIBwMCBhUI +AgkKCwQWAgMBAh4BAheAAAoJEC9ZtfmbG+C0y7wH/i4xnab36dtrYW7RZwL8i6Sc +NjMx4j9+U1kr/F6YtqWd+JwCbBdar5zRghxPcYEq/qf7MbgAYcs1eSOuTOb7n7+o +xUwdH2iCtHhKh3Jr2mRw1ks7BbFZPB5KmkxHaEBfLT4d+I91ZuUdPXJ+0SXs9gzk +Dbz65Uhoz3W03aiF8HeL5JNARZFMbHHNVL05U1sTGTCOtu+1c/33f3TulQ/XZ3Y4 +hwGCpLe0Tv7g7Lp3iLMZMWYPEa0a7S4u8he5IEJQLd8bE8jltcQvrdr3Fm8kI2Jg +BJmUmX4PSfhuTCFaR/yeCt3UoW883bs9LfbTzIx9DJGpRIu8Y0IL3b4sj/GoZVq5 +AQ0EV0M3UAEIAKrTaC62ayzqOIPa7nS90BHHck4Z33a2tZF/uof38xNOiyWGhT8u +JeFoTTHn5SQq5Ftyu4K3K2fbbpuu/APQF05AaljzVkDGNMW4pSkgOasdysj831cu +ssrHX2RYS22wg80k6C/Hwmh5F45faEuNxsV+bPx7oPUrt5n6GMx84vEP3i1+FDBi +0pt/B/QnDFBXki1BGvJ35f5NwDefK8VaInxXP3ZN/WIbtn5dqxppkV/YkO7GiJlp +Jlju9rf3kKUIQzKQWxFsbCAPIHoWv7rH9RSxgDithXtG6Yg5R1aeBbJaPNXL9wpJ +YBJbiMjkAFaz4B95FOqZm3r7oHugiCGsHX0AEQEAAYkBHwQYAQIACQUCV0M3UAIb +DAAKCRAvWbX5mxvgtE/OB/0VN88DR3Y3fuqy7lq/dthkn7Dqm9YXdorZl3L152eE +IF882aG8FE3qZdaLGjQO4oShAyNWmRfSGuoH0XERXAI9n0r8m4mDMxE6rtP7tHet +y/5M8x3CTyuMgx5GLDaEUvBusnTD+/v/fBMwRK/cZ9du5PSG4R50rtst+oYyC2ao +x4I2SgjtF/cY7bECsZDplzatN3gv34PkcdIg8SLHAVlL4N5tzumDeizRspcSyoy2 +K2+hwKU4C4+dekLLTg8rjnRROvplV2KtaEk6rxKtIRFDCoQng8wfJuIMrDNKvqZw +FRGt7cbvW5MCnuH8MhItOl9Uxp1wHp6gtav/h8Gp6MBa +=MARt -----END PGP PUBLIC KEY BLOCK----- From cba0a899910382b618160c6433b1cb5b3c711cdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:07:22 +0000 Subject: [PATCH 10/18] chore(deps-dev): Bump mypy from 1.9.0 to 1.10.0 in /packages/jsii-pacmak/test/generated-code (#4490) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [mypy](https://github.com/python/mypy) from 1.9.0 to 1.10.0.
Changelog

Sourced from mypy's changelog.

Mypy Release Notes

Next release

Mypy 1.10

We’ve just uploaded mypy 1.10 to the Python Package Index (PyPI). Mypy is a static type checker for Python. This release includes new features, performance improvements and bug fixes. You can install it as follows:

python3 -m pip install -U mypy

You can read the full documentation for this release on Read the Docs.

Support TypeIs (PEP 742)

Mypy now supports TypeIs (PEP 742), which allows functions to narrow the type of a value, similar to isinstance(). Unlike TypeGuard, TypeIs can narrow in both the if and else branches of an if statement:

from typing_extensions import TypeIs

def is_str(s: object) -> TypeIs[str]:
return isinstance(s, str)


def f(o: str | int) -> None:
if is_str(o):
# Type of o is 'str'
...
else:
# Type of o is 'int'
...

TypeIs will be added to the typing module in Python 3.13, but it can be used on earlier Python versions by importing it from typing_extensions.

This feature was contributed by Jelle Zijlstra (PR 16898).

Support TypeVar Defaults (PEP 696)

PEP 696 adds support for type parameter defaults. Example:

from typing import Generic
from typing_extensions import TypeVar

</tr></table>

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.9.0&new-version=1.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/jsii-pacmak/test/generated-code/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsii-pacmak/test/generated-code/requirements-dev.txt b/packages/jsii-pacmak/test/generated-code/requirements-dev.txt index 7acf1f915e..cb450ef45c 100644 --- a/packages/jsii-pacmak/test/generated-code/requirements-dev.txt +++ b/packages/jsii-pacmak/test/generated-code/requirements-dev.txt @@ -1,2 +1,2 @@ -mypy==1.9.0 +mypy==1.10.0 pip==24.0 # required to use --config-settings From cdb47e4e148522ca17a28187b514673046a3f1a3 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Fri, 26 Apr 2024 09:32:37 +0100 Subject: [PATCH 11/18] fix(pacmak): jsii-pacmak uses incompatible version of jsii-rosetta (#4487) Fixes #4098 Previously jsii-pacmak depended on jsii-rosetta 1.x. This is problematic if a different version of the jsii compiler was used, because it introduced different versions of TypeScript into the project. With this PR, the dependency is changed to a peer dependency. Thus allowing any compatible version jsii-rosetta to be used. BREAKING CHANGE: jsii-pacmak now has a peer dependency on jsii-rosetta. Please ensure a version of jsii-rosetta matching your version of jsii is available. Most package managers install peer dependencies automatically and no change is required. However users of yarn v1 or npm v3 to v6 must install jsii-rosetta manually. --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- .github/workflows/main.yml | 43 ++++++++++++++++--- gh-pages/content/overview/toolchain.md | 27 ++++++------ .../user-guides/language-support/index.md | 2 +- packages/jsii-pacmak/.eslintrc.yaml | 9 ++++ packages/jsii-pacmak/bin/jsii-pacmak.ts | 1 - packages/jsii-pacmak/lib/builder.ts | 4 +- packages/jsii-pacmak/lib/index.ts | 8 ++-- .../lib/suppress-jsii-upgrade-prompts.ts | 2 - packages/jsii-pacmak/lib/target.ts | 6 +-- .../lib/targets/dotnet/dotnetdocgenerator.ts | 6 +-- .../lib/targets/dotnet/dotnetgenerator.ts | 6 +-- packages/jsii-pacmak/lib/targets/go.ts | 6 +-- .../lib/targets/go/documentation.ts | 4 +- packages/jsii-pacmak/lib/targets/java.ts | 6 +-- packages/jsii-pacmak/lib/targets/python.ts | 4 +- packages/jsii-pacmak/package.json | 5 ++- packages/jsii-pacmak/test/targets/go.test.ts | 4 +- packages/jsii-reflect/lib/class.ts | 2 +- scripts/align-version.js | 9 +++- 19 files changed, 98 insertions(+), 56 deletions(-) delete mode 100644 packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b38607590..d3a3f0f1b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -427,9 +427,17 @@ jobs: auto-push: true pacmak-integration-test: - name: Integration test (jsii-pacmak) runs-on: ubuntu-latest needs: create-release-package + strategy: + fail-fast: false + matrix: + rosetta: + # this will be the 1.x-dev version build in this repo + - ./jsii-rosetta.tgz + - 5.2.x + - 5.3.x + - 5.4.x steps: # Check out the code - name: Download Artifact @@ -463,19 +471,42 @@ jobs: run: sudo apt install -y python3-venv # Show time! - name: Prepare Work Tree + # 1) Move the locally build version of jsii-rosetta somewhere else + # 2) Remove @jsii/integ-test because it messed up version dependencies and is not needed + # 3) Install aws-cdk-lib, and all locally build packages minus jsii-rosetta & @jsii/integ-test, + # and the specific version of jsii-rosetta + # This ensures we are running jsii-pacmak with the correct peer-dependency + # 4) Print the jsii-rosetta version for confirmation run: |- - npm install --no-save aws-cdk-lib@2 constructs@10 \ - ${{ runner.temp }}/release-package/js/*.tgz \ - ${{ runner.temp }}/release-package/private/*.tgz + mv ${{ runner.temp }}/release-package/js/jsii-rosetta.tgz ./jsii-rosetta.tgz + rm ${{ runner.temp }}/release-package/private/@jsii-integ-test.tgz + npm install --no-save --omit=dev \ + aws-cdk-lib@2 \ + constructs@10 \ + ${{ runner.temp }}/release-package/js/*.tgz \ + ${{ runner.temp }}/release-package/private/*.tgz \ + jsii-rosetta@${{ matrix.rosetta }} + - name: Display jsii-rosetta version + run: npx jsii-rosetta --version - name: Run jsii-pacmak on aws-cdk-lib env: NODE_OPTIONS: --max-old-space-size=6144 # We run with --no-parallel to avoid running out of memory... run: |- ./node_modules/.bin/jsii-pacmak --no-parallel ./node_modules/aws-cdk-lib - # Upload artifact (we'll tar it up to save time) + # Upload artifact only on main and for latest rosetta - name: 'Upload Artifact: integtest_aws-cdk-lib' - uses: actions/upload-artifact@v3 + if: github.ref == 'ref/head/main' && matrix.rosetta == '5.4.x' + uses: actions/upload-artifact@v4 with: name: integtest_aws-cdk-lib path: ./node_modules/aws-cdk-lib/dist/ + + pacmak-integration-test-ok: + name: Integration test (jsii-pacmak) + runs-on: ubuntu-latest + needs: pacmak-integration-test + steps: + - name: OK + # This is just a join target to simplify branch protection setup + run: echo OK diff --git a/gh-pages/content/overview/toolchain.md b/gh-pages/content/overview/toolchain.md index 62b2b17d78..aa4ca6cdef 100644 --- a/gh-pages/content/overview/toolchain.md +++ b/gh-pages/content/overview/toolchain.md @@ -5,19 +5,19 @@ !!! info We are considering creating an "umbrella entrypoint" to make it easier to consume. -| Name | Release | Stability | Description | -| --------------- | ------- | -------------- | --------------------------------------------------------------------- | -| [jsii1] | `1.x` | [Maintenance] | Compiles TypeScript to jsii module (TypeScript 3.9 Syntax) | -| [jsii] | `5.0.x` | GA | Compiles TypeScript to jsii module (TypeScript 5.0 Syntax) | -| [jsii-pacmak] | `1.x` | GA | Creates ready-to-publish language-specific packages from jsii modules | -| [jsii-reflect] | `1.x` | GA | Strong-typed reflection library for jsii type systems | -| [jsii-diff] | `1.x` | GA | API backwards compatibility checker | -| [jsii-rosetta1] | `1.x` | [Maintenance] | Transpile code snippets (in docs) from TypeScript to jsii languages | -| [jsii-rosetta] | `5.0.x` | Experimental | Transpile code snippets (in docs) from TypeScript to jsii languages | -| [jsii-config] | `1.x` | Experimental | Interactive tool for generating jsii configuration | -| [jsii-release] | `1.x` | Community | Publishes jsii modules to all supported package managers | -| [jsii-srcmak] | `1.x` | Community | Generates relocatable source code in jsii languages from typescript | -| [jsii-docgen] | `1.x` | Community | Generates markdown API documentation for jsii modules | +| Name | Release | Stability | Description | +| --------------- | ------- | ------------- | --------------------------------------------------------------------- | +| [jsii1] | `1.x` | [Maintenance] | Compiles TypeScript to jsii module (TypeScript 3.9 Syntax) | +| [jsii] | `5.x` | GA | Compiles TypeScript to jsii module (TypeScript 5.x Syntax) | +| [jsii-pacmak] | `1.x` | GA | Creates ready-to-publish language-specific packages from jsii modules | +| [jsii-reflect] | `1.x` | GA | Strong-typed reflection library for jsii type systems | +| [jsii-diff] | `1.x` | GA | API backwards compatibility checker | +| [jsii-rosetta1] | `1.x` | [Maintenance] | Transpile code snippets (in docs) from TypeScript to jsii languages | +| [jsii-rosetta] | `5.x` | GA | Transpile code snippets (in docs) from TypeScript to jsii languages | +| [jsii-config] | `1.x` | Experimental | Interactive tool for generating jsii configuration | +| [jsii-release] | `1.x` | Community | Publishes jsii modules to all supported package managers | +| [jsii-srcmak] | `1.x` | Community | Generates relocatable source code in jsii languages from typescript | +| [jsii-docgen] | *any* | Community | Generates markdown API documentation for jsii modules | ??? question "Stability Definitions" - **GA**: Projects that are deemed *Generally Available* and for which customers can expect full support, including @@ -32,7 +32,6 @@ [semver]: https://semver.org/spec/v2.0.0.html - [Maintenance]: ../compiler-and-rosetta-maintenance.md [jsii1]: https://github.com/aws/jsii/tree/main/packages/jsii [jsii]: https://github.com/aws/jsii-compiler#readme diff --git a/gh-pages/content/user-guides/language-support/index.md b/gh-pages/content/user-guides/language-support/index.md index ed2788985b..eace4649a9 100644 --- a/gh-pages/content/user-guides/language-support/index.md +++ b/gh-pages/content/user-guides/language-support/index.md @@ -163,7 +163,7 @@ declared _Generally Available_. At this point, breaking changes are no longer po [`jsii-calc`]: ../../packages/jsii-calc [`jsii-config`]: ../../packages/jsii-config [`jsii-pacmak`]: ../../packages/jsii-pacmak -[`jsii-rosetta`]: ../../packages/jsii-rosetta +[`jsii-rosetta`]: https://github.com/aws/jsii-rosetta [standard compliance suite]: ../../specification/4-standard-compliance-suite.md [`public.ecr.aws/jsii/superchain`]: ../../superchain [`aws-delivlib`]: https://github.com/awslabs/aws-delivlib diff --git a/packages/jsii-pacmak/.eslintrc.yaml b/packages/jsii-pacmak/.eslintrc.yaml index 0cef14cbfe..dece27600d 100644 --- a/packages/jsii-pacmak/.eslintrc.yaml +++ b/packages/jsii-pacmak/.eslintrc.yaml @@ -3,3 +3,12 @@ extends: ../../eslint-config.yaml ignorePatterns: - test/generated-code/examples/** + +rules: + 'import/no-extraneous-dependencies': + - error + - devDependencies: # Only allow importing devDependencies from tests + - '**/test/**' + - '**/*.test.ts' + optionalDependencies: false # Disallow importing optional dependencies (those shouldn't be used here) + peerDependencies: true # jsii-pacmak has a peer dependency on jsii-rosetta diff --git a/packages/jsii-pacmak/bin/jsii-pacmak.ts b/packages/jsii-pacmak/bin/jsii-pacmak.ts index 9beb86fac9..4d4b76d954 100644 --- a/packages/jsii-pacmak/bin/jsii-pacmak.ts +++ b/packages/jsii-pacmak/bin/jsii-pacmak.ts @@ -1,6 +1,5 @@ #!/usr/bin/env node import '@jsii/check-node/run'; -import '../lib/suppress-jsii-upgrade-prompts'; import { UnknownSnippetMode } from 'jsii-rosetta'; import * as yargs from 'yargs'; diff --git a/packages/jsii-pacmak/lib/builder.ts b/packages/jsii-pacmak/lib/builder.ts index 3544bf3573..5ed65e40b6 100644 --- a/packages/jsii-pacmak/lib/builder.ts +++ b/packages/jsii-pacmak/lib/builder.ts @@ -1,4 +1,4 @@ -import { Rosetta } from 'jsii-rosetta'; +import { RosettaTabletReader } from 'jsii-rosetta'; import * as path from 'path'; import * as logging from './logging'; @@ -44,7 +44,7 @@ export interface BuildOptions { /** * The Rosetta instance to load examples from */ - readonly rosetta: Rosetta; + readonly rosetta: RosettaTabletReader; /** * Whether to generate runtime type checking code in places where compile-time diff --git a/packages/jsii-pacmak/lib/index.ts b/packages/jsii-pacmak/lib/index.ts index cadbe05af7..e29fceea4f 100644 --- a/packages/jsii-pacmak/lib/index.ts +++ b/packages/jsii-pacmak/lib/index.ts @@ -1,7 +1,5 @@ -import './suppress-jsii-upgrade-prompts'; - import { TypeSystem } from 'jsii-reflect'; -import { Rosetta, UnknownSnippetMode } from 'jsii-rosetta'; +import { RosettaTabletReader, UnknownSnippetMode } from 'jsii-rosetta'; import { resolve } from 'path'; import { cwd } from 'process'; @@ -41,7 +39,7 @@ export async function pacmak({ updateNpmIgnoreFiles = false, validateAssemblies = false, }: PacmakOptions): Promise { - const rosetta = new Rosetta({ + const rosetta = new RosettaTabletReader({ unknownSnippets: rosettaUnknownSnippets, prefixDisclaimer: true, }); @@ -315,7 +313,7 @@ async function buildTargetsForLanguage( fingerprint: boolean; force: boolean; perLanguageDirectory: boolean; - rosetta: Rosetta; + rosetta: RosettaTabletReader; runtimeTypeChecking: boolean; }, ): Promise { diff --git a/packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts b/packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts deleted file mode 100644 index 6e6f6bc3f2..0000000000 --- a/packages/jsii-pacmak/lib/suppress-jsii-upgrade-prompts.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Suppress the upgrade prompt from jsii and jsii-rosetta -process.env.JSII_SUPPRESS_UPGRADE_PROMPT = '1'; diff --git a/packages/jsii-pacmak/lib/target.ts b/packages/jsii-pacmak/lib/target.ts index 4949f29690..cbb55cc521 100644 --- a/packages/jsii-pacmak/lib/target.ts +++ b/packages/jsii-pacmak/lib/target.ts @@ -1,7 +1,7 @@ import * as spec from '@jsii/spec'; import * as fs from 'fs-extra'; import * as reflect from 'jsii-reflect'; -import { Rosetta } from 'jsii-rosetta'; +import { RosettaTabletReader } from 'jsii-rosetta'; import * as path from 'path'; import * as spdx from 'spdx-license-list/full'; @@ -16,7 +16,7 @@ export abstract class Target { protected readonly arguments: { [name: string]: any }; protected readonly targetName: string; protected readonly assembly: reflect.Assembly; - protected readonly rosetta: Rosetta; + protected readonly rosetta: RosettaTabletReader; protected readonly runtimeTypeChecking: boolean; protected abstract readonly generator: IGenerator; @@ -211,7 +211,7 @@ export interface TargetOptions { assembly: reflect.Assembly; /** The Rosetta instance */ - rosetta: Rosetta; + rosetta: RosettaTabletReader; /** Whether to generate runtime type-checking code */ runtimeTypeChecking: boolean; diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetdocgenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetdocgenerator.ts index d1cb2ea2f6..1d7b88817e 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetdocgenerator.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetdocgenerator.ts @@ -1,7 +1,7 @@ import * as spec from '@jsii/spec'; import { CodeMaker } from 'codemaker'; import { - Rosetta, + RosettaTabletReader, TargetLanguage, enforcesStrictMode, markDownToXmlDoc, @@ -23,7 +23,7 @@ export class DotNetDocGenerator { public constructor( code: CodeMaker, - private readonly rosetta: Rosetta, + private readonly rosetta: RosettaTabletReader, private readonly assembly: spec.Assembly, ) { this.code = code; @@ -106,7 +106,7 @@ export class DotNetDocGenerator { } /** - * Returns the lines that should go into the section + * Returns the lines that should go into the section {@link http://www.google.com|Google} */ private renderRemarks(docs: spec.Docs, apiLocation: ApiLocation): string[] { const ret: string[] = []; diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts index cd65a88b36..e0d1a5339d 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts @@ -4,7 +4,7 @@ import * as fs from 'fs-extra'; import * as http from 'http'; import * as https from 'https'; import * as reflect from 'jsii-reflect'; -import { Rosetta } from 'jsii-rosetta'; +import { RosettaTabletReader } from 'jsii-rosetta'; import * as path from 'path'; import { Generator, Legalese } from '../../generator'; @@ -23,7 +23,7 @@ import { ParameterValidator } from './runtime-type-checking'; export class DotNetGenerator extends Generator { private readonly nameutils: DotNetNameUtils = new DotNetNameUtils(); - private readonly rosetta: Rosetta; + private readonly rosetta: RosettaTabletReader; // Flags that tracks if we have already wrote the first member of the class private firstMemberWritten = false; @@ -37,7 +37,7 @@ export class DotNetGenerator extends Generator { public constructor( private readonly assembliesCurrentlyBeingCompiled: string[], options: { - readonly rosetta: Rosetta; + readonly rosetta: RosettaTabletReader; readonly runtimeTypeChecking: boolean; }, ) { diff --git a/packages/jsii-pacmak/lib/targets/go.ts b/packages/jsii-pacmak/lib/targets/go.ts index 3373341811..66b7e53964 100644 --- a/packages/jsii-pacmak/lib/targets/go.ts +++ b/packages/jsii-pacmak/lib/targets/go.ts @@ -1,7 +1,7 @@ import { CodeMaker } from 'codemaker'; import * as fs from 'fs-extra'; import { Assembly } from 'jsii-reflect'; -import { Rosetta } from 'jsii-rosetta'; +import { RosettaTabletReader } from 'jsii-rosetta'; import * as path from 'path'; import { IGenerator, Legalese } from '../generator'; @@ -150,11 +150,11 @@ class GoGenerator implements IGenerator { }); private readonly documenter: Documentation; - private readonly rosetta: Rosetta; + private readonly rosetta: RosettaTabletReader; private readonly runtimeTypeChecking: boolean; public constructor(options: { - readonly rosetta: Rosetta; + readonly rosetta: RosettaTabletReader; readonly runtimeTypeChecking: boolean; }) { this.rosetta = options.rosetta; diff --git a/packages/jsii-pacmak/lib/targets/go/documentation.ts b/packages/jsii-pacmak/lib/targets/go/documentation.ts index 2ce22dc4a0..56a1766734 100644 --- a/packages/jsii-pacmak/lib/targets/go/documentation.ts +++ b/packages/jsii-pacmak/lib/targets/go/documentation.ts @@ -1,12 +1,12 @@ import { Stability } from '@jsii/spec'; import { CodeMaker } from 'codemaker'; import { Docs } from 'jsii-reflect'; -import { ApiLocation, Rosetta, TargetLanguage } from 'jsii-rosetta'; +import { ApiLocation, RosettaTabletReader, TargetLanguage } from 'jsii-rosetta'; export class Documentation { public constructor( private readonly code: CodeMaker, - private readonly rosetta: Rosetta, + private readonly rosetta: RosettaTabletReader, ) {} /** diff --git a/packages/jsii-pacmak/lib/targets/java.ts b/packages/jsii-pacmak/lib/targets/java.ts index f1a6df7e18..cbcff38688 100644 --- a/packages/jsii-pacmak/lib/targets/java.ts +++ b/packages/jsii-pacmak/lib/targets/java.ts @@ -6,7 +6,7 @@ import { createHash } from 'crypto'; import * as fs from 'fs-extra'; import * as reflect from 'jsii-reflect'; import { - Rosetta, + RosettaTabletReader, TargetLanguage, enforcesStrictMode, markDownToJavaDoc, @@ -633,10 +633,10 @@ class JavaGenerator extends Generator { [name: string]: spec.AssemblyConfiguration; } = {}; - private readonly rosetta: Rosetta; + private readonly rosetta: RosettaTabletReader; public constructor(options: { - readonly rosetta: Rosetta; + readonly rosetta: RosettaTabletReader; readonly runtimeTypeChecking: boolean; }) { super({ ...options, generateOverloadsForMethodWithOptionals: true }); diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts index 2e0e02a6a6..3ebd6c05fe 100644 --- a/packages/jsii-pacmak/lib/targets/python.ts +++ b/packages/jsii-pacmak/lib/targets/python.ts @@ -7,7 +7,7 @@ import * as fs from 'fs-extra'; import * as reflect from 'jsii-reflect'; import { TargetLanguage, - Rosetta, + RosettaTabletReader, enforcesStrictMode, ApiLocation, } from 'jsii-rosetta'; @@ -2406,7 +2406,7 @@ class PythonGenerator extends Generator { private readonly types: Map; public constructor( - private readonly rosetta: Rosetta, + private readonly rosetta: RosettaTabletReader, options: GeneratorOptions, ) { super(options); diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 171a9f6960..8fc03b2c3a 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -45,7 +45,6 @@ "escape-string-regexp": "^4.0.0", "fs-extra": "^10.1.0", "jsii-reflect": "^0.0.0", - "jsii-rosetta": "^0.0.0", "semver": "^7.5.4", "spdx-license-list": "^6.8.0", "xmlbuilder": "^15.1.1", @@ -65,8 +64,12 @@ "jsii": "^0.0.0", "jsii-build-tools": "^0.0.0", "jsii-calc": "^3.20.120", + "jsii-rosetta": "^0.0.0", "pyright": "^1.1.332" }, + "peerDependencies": { + "jsii-rosetta": "^0.0.0 || ~5.2.0 || ~5.3.0 || ~5.4.0" + }, "keywords": [ "jsii", "aws" diff --git a/packages/jsii-pacmak/test/targets/go.test.ts b/packages/jsii-pacmak/test/targets/go.test.ts index a259b6dc7f..f33eb1f270 100644 --- a/packages/jsii-pacmak/test/targets/go.test.ts +++ b/packages/jsii-pacmak/test/targets/go.test.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs'; import { TypeSystem } from 'jsii-reflect'; -import { Rosetta } from 'jsii-rosetta'; +import { RosettaTabletReader } from 'jsii-rosetta'; import { tmpdir } from 'os'; import { join } from 'path'; @@ -18,7 +18,7 @@ test('does not generate imports for unused types', async () => { require.resolve('./fixtures/dependent.jsii.json'), ); - const rosetta = new Rosetta(); + const rosetta = new RosettaTabletReader(); const subject = new Golang({ arguments: {}, assembly, diff --git a/packages/jsii-reflect/lib/class.ts b/packages/jsii-reflect/lib/class.ts index 866ae8ab83..672de97503 100644 --- a/packages/jsii-reflect/lib/class.ts +++ b/packages/jsii-reflect/lib/class.ts @@ -122,7 +122,7 @@ export class ClassType extends ReferenceType { return out; } - public isClassType() { + public isClassType(): this is ClassType { return true; } diff --git a/scripts/align-version.js b/scripts/align-version.js index 225aad57d6..9f3db9c818 100755 --- a/scripts/align-version.js +++ b/scripts/align-version.js @@ -38,8 +38,13 @@ for (const file of process.argv.splice(2)) { } function processSection(section, file) { - for (const [ name, version ] of Object.entries(section)) { - if (version === marker || version === '^' + marker) { + for (const [name, version] of Object.entries(section)) { + if ( + version === marker || + version === '^' + marker || + // dependencies on jsii-rosetta can include many compatible versions + (name == 'jsii-rosetta' && version.includes('^' + marker)) + ) { section[name] = version.replace(marker, repoVersion); } } From 459481f360e911ad6d8b5b5afbcce3b596299d85 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Fri, 26 Apr 2024 11:05:40 +0100 Subject: [PATCH 12/18] fix(reflect): additional type predicates for `isXyzType` methods (#4491) This helps downstream consumers to not have to add type annotations themselves when using these methods. Before: ```ts function needsInterface(type: reflect.InterfaceType) {} if (type.isInterfaceType()) { needsInterface(type as reflect.InterfaceType); } ``` After: ```ts function needsInterface(type: reflect.InterfaceType) {} if (type.isInterfaceType()) { needsInterface(type); } ``` --- By submitting this pull request, I confirm that my contribution is made under the terms of the [Apache 2.0 license]. [Apache 2.0 license]: https://www.apache.org/licenses/LICENSE-2.0 --- packages/jsii-reflect/lib/enum.ts | 2 +- packages/jsii-reflect/lib/interface.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/jsii-reflect/lib/enum.ts b/packages/jsii-reflect/lib/enum.ts index ac9c6bbd64..6e4db8eaa0 100644 --- a/packages/jsii-reflect/lib/enum.ts +++ b/packages/jsii-reflect/lib/enum.ts @@ -18,7 +18,7 @@ export class EnumType extends Type { return this.spec.members.map((m) => new EnumMember(this, m)); } - public isEnumType() { + public isEnumType(): this is EnumType { return true; } } diff --git a/packages/jsii-reflect/lib/interface.ts b/packages/jsii-reflect/lib/interface.ts index d02ec2933b..05567cce07 100644 --- a/packages/jsii-reflect/lib/interface.ts +++ b/packages/jsii-reflect/lib/interface.ts @@ -72,11 +72,11 @@ export class InterfaceType extends ReferenceType { return Object.fromEntries(this._getMethods(inherited, this)); } - public isDataType() { + public isDataType(): this is InterfaceType { return !!this.spec.datatype; } - public isInterfaceType() { + public isInterfaceType(): this is InterfaceType { return true; } From c4856acf2175228552db41043185b8b02227b2ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 11:47:02 +0000 Subject: [PATCH 13/18] chore(deps-dev): Update mkdocs-material requirement from ~=9.5.19 to ~=9.5.20 in /gh-pages (#4492) Updates the requirements on [mkdocs-material](https://github.com/squidfunk/mkdocs-material) to permit the latest version.
Release notes

Sourced from mkdocs-material's releases.

mkdocs-material-9.5.20

  • Fixed deprecation warning in privacy plugin (9.5.19 regression)
  • Fixed #7119: Tags plugin emits deprecation warning (9.5.19 regression)
  • Fixed #7118: Social plugin crashes if fonts are disabled (9.5.19 regression)
  • Fixed #7085: Social plugin crashes on Windows when downloading fonts
Changelog

Sourced from mkdocs-material's changelog.

mkdocs-material-9.5.20 (2024-04-29)

  • Fixed deprecation warning in privacy plugin (9.5.19 regression)
  • Fixed #7119: Tags plugin emits deprecation warning (9.5.19 regression)
  • Fixed #7118: Social plugin crashes if fonts are disabled (9.5.19 regression)
  • Fixed #7085: Social plugin crashes on Windows when downloading fonts

mkdocs-material-9.5.19+insiders-4.53.8 (2024-04-26)

  • Fixed #7052: Preview extension automatically including all pages
  • Fixed #7051: Instant previews mounting on footnote references
  • Fixed #5165: Improved tooltips not mounting in sidebar for typeset plugin

mkdocs-material-9.5.19+insiders-4.53.7 (2024-04-25)

  • Fixed #7060: Incorrect resolution of translation when using static-i18n

mkdocs-material-9.5.19 (2024-04-25)

  • Updated MkDocs to 1.6 and limited version to < 2
  • Updated Docker image to latest Alpine Linux
  • Removed setup.py, now that GitHub fully understands pyproject.toml
  • Improved interop of social plugin with third-party MkDocs themes
  • Fixed #7099: Blog reading time not rendered correctly for Japanese
  • Fixed #7097: Improved resilience of tags plugin when no tags are given
  • Fixed #7090: Active tab indicator in nested content tabs rendering bug

mkdocs-material-9.5.18 (2024-04-16)

  • Refactored tooltips implementation to fix positioning issues
  • Fixed #7044: Rendering glitch when hovering contributor avatar in Chrome
  • Fixed #7043: Highlighted lines in code blocks cutoff on mobile
  • Fixed #6910: Incorrect position of tooltip for page status in sidebar
  • Fixed #6760: Incorrect position and overly long tooltip in tables
  • Fixed #6488: Incorrect position and cutoff tooltip in content tabs

mkdocs-material-9.5.17+insiders-4.53.6 (2024-04-05)

  • Ensure working directory is set for projects when using projects plugin
  • Fixed #6970: Incorrect relative paths in git submodules with projects plugin

mkdocs-material-9.5.17+insiders-4.53.5 (2024-04-02)

  • Fixed social plugin crashing when no colors are specified in palettes

mkdocs-material-9.5.17 (2024-04-02)

  • Updated Serbian translations
  • Fixed #7003: Confusing keyboard interaction for palette toggle
  • Fixed #7001: Blog posts now show time by default (9.5.16 regression)

... (truncated)

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- gh-pages/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt index f2f73cd661..f51699eff2 100644 --- a/gh-pages/requirements-dev.txt +++ b/gh-pages/requirements-dev.txt @@ -1,4 +1,4 @@ mkdocs~=1.6.0 mkdocs-awesome-pages-plugin~=2.9.2 -mkdocs-material~=9.5.19 +mkdocs-material~=9.5.20 mkdocs-git-revision-date-plugin~=0.3.2 From f972fae179371ee1387420829c83b796c915034c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 12:35:46 +0000 Subject: [PATCH 14/18] chore(deps): Update pytest requirement from ~=8.1 to ~=8.2 in /packages/@jsii/python-runtime (#4493) Updates the requirements on [pytest](https://github.com/pytest-dev/pytest) to permit the latest version.
Release notes

Sourced from pytest's releases.

8.2.0

pytest 8.2.0 (2024-04-27)

Deprecations

  • #12069: A deprecation warning is now raised when implementations of one of the following hooks request a deprecated py.path.local parameter instead of the pathlib.Path parameter which replaced it:

    • pytest_ignore_collect{.interpreted-text role="hook"} - the path parameter - use collection_path instead.
    • pytest_collect_file{.interpreted-text role="hook"} - the path parameter - use file_path instead.
    • pytest_pycollect_makemodule{.interpreted-text role="hook"} - the path parameter - use module_path instead.
    • pytest_report_header{.interpreted-text role="hook"} - the startdir parameter - use start_path instead.
    • pytest_report_collectionfinish{.interpreted-text role="hook"} - the startdir parameter - use start_path instead.

    The replacement parameters are available since pytest 7.0.0. The old parameters will be removed in pytest 9.0.0.

    See legacy-path-hooks-deprecated{.interpreted-text role="ref"} for more details.

Features

  • #11871: Added support for reading command line arguments from a file using the prefix character @, like e.g.: pytest @tests.txt. The file must have one argument per line.

    See Read arguments from file <args-from-file>{.interpreted-text role="ref"} for details.

Improvements

  • #11523: pytest.importorskip{.interpreted-text role="func"} will now issue a warning if the module could be found, but raised ImportError{.interpreted-text role="class"} instead of ModuleNotFoundError{.interpreted-text role="class"}.

    The warning can be suppressed by passing exc_type=ImportError to pytest.importorskip{.interpreted-text role="func"}.

    See import-or-skip-import-error{.interpreted-text role="ref"} for details.

  • #11728: For unittest-based tests, exceptions during class cleanup (as raised by functions registered with TestCase.addClassCleanup <unittest.TestCase.addClassCleanup>{.interpreted-text role="meth"}) are now reported instead of silently failing.

  • #11777: Text is no longer truncated in the short test summary info section when -vv is given.

  • #12112: Improved namespace packages detection when consider_namespace_packages{.interpreted-text role="confval"} is enabled, covering more situations (like editable installs).

  • #9502: Added PYTEST_VERSION{.interpreted-text role="envvar"} environment variable which is defined at the start of the pytest session and undefined afterwards. It contains the value of pytest.__version__, and among other things can be used to easily check if code is running from within a pytest run.

Bug Fixes

  • #12065: Fixed a regression in pytest 8.0.0 where test classes containing setup_method and tests using @staticmethod or @classmethod would crash with AttributeError: 'NoneType' object has no attribute 'setup_method'.

    Now the request.instance <pytest.FixtureRequest.instance>{.interpreted-text role="attr"} attribute of tests using @staticmethod and @classmethod is no longer None, but a fresh instance of the class, like in non-static methods.

... (truncated)

Commits
  • 6bd3f31 Tweak changelog for 8.2.0
  • 9b6219b Prepare release version 8.2.0
  • 835765c Merge pull request #12130 from bluetech/fixtures-inline
  • 7e7503c unittest: report class cleanup exceptions (#12250)
  • 882c4da fixtures: inline fail_fixturefunc
  • 2e8fb9f fixtures: extract a _check_fixturedef method
  • acf2971 fixtures: inline _getnextfixturedef into _get_active_fixturedef
  • 3c77aec fixtures: move "request" check early
  • d217d68 fixtures: inline _compute_fixture_value
  • 530be28 fixtures: use early return in _get_active_fixturedef
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index feb1a71cf6..567ced8d12 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -1,7 +1,7 @@ black~=24.4 mypy==1.9.0 pip~=24.0 -pytest~=8.1 +pytest~=8.2 pytest-mypy~=0.10 setuptools~=69.5.1 types-python-dateutil~=2.9 From 343462b45b73ff9429c3b6a15d60b85aa6aebdfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:17:01 +0000 Subject: [PATCH 15/18] chore(deps): Bump mypy from 1.9.0 to 1.10.0 in /packages/@jsii/python-runtime (#4494) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [mypy](https://github.com/python/mypy) from 1.9.0 to 1.10.0.
Changelog

Sourced from mypy's changelog.

Mypy Release Notes

Next release

Mypy 1.10

We’ve just uploaded mypy 1.10 to the Python Package Index (PyPI). Mypy is a static type checker for Python. This release includes new features, performance improvements and bug fixes. You can install it as follows:

python3 -m pip install -U mypy

You can read the full documentation for this release on Read the Docs.

Support TypeIs (PEP 742)

Mypy now supports TypeIs (PEP 742), which allows functions to narrow the type of a value, similar to isinstance(). Unlike TypeGuard, TypeIs can narrow in both the if and else branches of an if statement:

from typing_extensions import TypeIs

def is_str(s: object) -> TypeIs[str]:
return isinstance(s, str)


def f(o: str | int) -> None:
if is_str(o):
# Type of o is 'str'
...
else:
# Type of o is 'int'
...

TypeIs will be added to the typing module in Python 3.13, but it can be used on earlier Python versions by importing it from typing_extensions.

This feature was contributed by Jelle Zijlstra (PR 16898).

Support TypeVar Defaults (PEP 696)

PEP 696 adds support for type parameter defaults. Example:

from typing import Generic
from typing_extensions import TypeVar

</tr></table>

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.9.0&new-version=1.10.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/python-runtime/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt index 567ced8d12..36649159f3 100644 --- a/packages/@jsii/python-runtime/requirements.txt +++ b/packages/@jsii/python-runtime/requirements.txt @@ -1,5 +1,5 @@ black~=24.4 -mypy==1.9.0 +mypy==1.10.0 pip~=24.0 pytest~=8.2 pytest-mypy~=0.10 From 4917ddf32ce150d8e6806f38f4565a1cf6086a2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:58:25 +0000 Subject: [PATCH 16/18] chore(deps): Bump xunit from 2.7.1 to 2.8.0 in /packages/@jsii/dotnet-runtime/src (#4495) Bumps [xunit](https://github.com/xunit/xunit) from 2.7.1 to 2.8.0.
Commits
  • be260b3 v2.8.0
  • a8ceb66 #783: Add -useansicolor flag to console runner (v2)
  • 7b0ff93 Don't show /aggressive with unlimited threads
  • 46cdf06 Support parallel algorithm in MSBuild runner
  • b4aa876 Support multipler syntax in MSBuild runner
  • 6790b48 Add aggressive display to TestFrameworkEnvironment reported by XunitTestAssem...
  • 3dd7e91 Update mocks to make CollectionBehaviorAttribute property values optional
  • 4c82dea Asking for default threads should set 0, not null
  • d73cdef Should not try to use a semaphore when we've been asked for unlimited threads
  • 3722e54 Enable multiplier style max threads support
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=xunit&package-manager=nuget&previous-version=2.7.1&new-version=2.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index e8512a8786..698dcbb85d 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -12,7 +12,7 @@ - + From fa31d5517097e9e89657b28249be35f45148ae35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 14:41:02 +0000 Subject: [PATCH 17/18] chore(deps): Bump xunit.runner.visualstudio from 2.5.8 to 2.8.0 in /packages/@jsii/dotnet-runtime/src (#4496) Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.8 to 2.8.0.
Commits
  • 6438bb8 v2.8.0
  • 2afd4cd Pick up latest dependencies
  • b8be108 Add multiplier format support to RunSettings
  • 3c2e493 Update to 2.7.2-pre.17 and support Xunit.ParallelAlgorithm in RunSetttings
  • 144931e Missing height on version
  • 4315921 Fix concurrency bug in AssemblyHelper (#407)
  • 8617393 Bump up to 2.5.9-pre
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=xunit.runner.visualstudio&package-manager=nuget&previous-version=2.5.8&new-version=2.8.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- packages/@jsii/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets index 698dcbb85d..f8a691db65 100644 --- a/packages/@jsii/Directory.Build.targets +++ b/packages/@jsii/Directory.Build.targets @@ -13,7 +13,7 @@ - + From 4f7935720ed73333f30464ca64022cd00addd951 Mon Sep 17 00:00:00 2001 From: AWS CDK Team Date: Tue, 30 Apr 2024 18:12:15 +0000 Subject: [PATCH 18/18] chore(release): 1.98.0 --- CHANGELOG.md | 17 +++++++++++++++++ lerna.json | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd33b5f469..b8675fd053 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.98.0](https://github.com/aws/jsii/compare/v1.97.0...v1.98.0) (2024-04-30) + + +### ⚠ BREAKING CHANGES + +* **pacmak:** jsii-pacmak now has a peer dependency on jsii-rosetta. Please ensure a version of jsii-rosetta matching your version of jsii is available. Most package managers install peer dependencies automatically and no change is required. However users of yarn v1 or npm v3 to v6 must install jsii-rosetta manually. + +### Features + +* node22 support ([#4489](https://github.com/aws/jsii/issues/4489)) ([699366d](https://github.com/aws/jsii/commit/699366db4df0179aaf1aec151d28e0cea6c2edba)) + + +### Bug Fixes + +* **pacmak:** jsii-pacmak uses incompatible version of jsii-rosetta ([#4487](https://github.com/aws/jsii/issues/4487)) ([cdb47e4](https://github.com/aws/jsii/commit/cdb47e4e148522ca17a28187b514673046a3f1a3)), closes [#4098](https://github.com/aws/jsii/issues/4098) +* **reflect:** additional type predicates for `isXyzType` methods ([#4491](https://github.com/aws/jsii/issues/4491)) ([459481f](https://github.com/aws/jsii/commit/459481f360e911ad6d8b5b5afbcce3b596299d85)) + ## [1.97.0](https://github.com/aws/jsii/compare/v1.96.0...v1.97.0) (2024-04-08) diff --git a/lerna.json b/lerna.json index 2ad0493913..f3f091a5c1 100644 --- a/lerna.json +++ b/lerna.json @@ -12,6 +12,6 @@ "rejectCycles": true } }, - "version": "1.97.0", + "version": "1.98.0", "$schema": "node_modules/lerna/schemas/lerna-schema.json" }