From 43f749378a8dc4186b75b957bd79839a66b13383 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 12:17:44 +0000
Subject: [PATCH 01/28] chore(deps-dev): Update mkdocs-material requirement
from ~=9.4.6 to ~=9.4.7 in /gh-pages (#4312)
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.4.7
Added Azerbaijani translations
Changelog
Sourced from mkdocs-material's changelog .
mkdocs-material-9.4.7+insiders-4.42.3 (2023-10-27)
Fixed #6251 : Cards in grids cut off on very small screens
Fixed #6241 : Using social plugin + static-i18n plugin errors
mkdocs-material-9.4.7 (2023-10-27)
Added Azerbaijani translations
mkdocs-material-9.4.6+insiders-4.42.2 (2023-10-14)
Fixed #6186 : Privacy plugin ignores hash fragments on images
Fixed #6180 : Projects plugin crashing when adding or removing files
mkdocs-material-9.4.6 (2023-10-14)
Updated Danish and Norwegian (Nynorsk) translations
Fixed #6169 : Blog post metadata layout overflows on small screens
mkdocs-material-9.4.5 (2023-10-10)
Fixed sidebar auto-positioning (9.4.2 regression)
Fixed #6166 : Improve group plugin compatibility with Python < 3.10
Fixed #6157 : Hiding tags does not work (9.4.3 regression)
mkdocs-material-9.4.4+insiders-4.42.1 (2023-10-05)
Fixed spacing of related links in blog posts on small screens
mkdocs-material-9.4.4 (2023-10-05)
Added support for overriding text to be copied for code blocks
Fixed broken layout in some browsers at breakpoints when using zoom
Fixed #6132 : Incomplete search highlighting for code blocks in titles
mkdocs-material-9.4.3 (2023-10-02)
Added support for instant navigation progress indicator
Improved spacing and alignment of tags
Moved back-to-top button into separate partial
Fixed #6104 : Indentation for some code blocks lost in search
Fixed #6094 : Blog post metadata overlaps with footer on small screens
Fixed #6069 : Blog plugin crashes for categories with non-ASCII names
Updated templates
mkdocs-material-9.4.2 (2023-09-25)
... (truncated)
Commits
ff76068
Prepare 9.4.7 release
525fc94
Merge branch 'master' of github.com:squidfunk/mkdocs-material
92ef0e2
Updated Premium sponsors
8feb512
fixed typo: "hosting" -> "hoisting" (#6244 )
565a5e8
Updated dependencies
6044863
Merge branch 'master' of github.com:squidfunk/mkdocs-material
874b9db
Documentation (#6239 )
7b61a2f
Added documentation chat bot (experimental)
997da1e
Updated dependencies
0341516
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 c8399e92b8..1042c2d582 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.4.6
+mkdocs-material~=9.4.7
mkdocs-git-revision-date-plugin~=0.3.2
From fc27de934bff81d6b3fe5a92501db48de81fbf26 Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Wed, 1 Nov 2023 17:02:18 +0000
Subject: [PATCH 02/28] chore: fix pages build (#4313)
Fixes the following error in the pages build workflow ([example](https://github.com/aws/jsii/actions/runs/6720427611)):
```
INFO - DeprecationWarning: 'materialx.emoji.twemoji' is deprecated.
Material emoji logic has been officially moved into mkdocs-material
version 9.4. Please use Material's 'material.extensions.emoji.twemoji'
as mkdocs_material_extensions is deprecated and will no longer be
supported moving forward. This is the last release.
```
---
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/mkdocs.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gh-pages/mkdocs.yml b/gh-pages/mkdocs.yml
index 03aaf9d83e..4ea220165e 100644
--- a/gh-pages/mkdocs.yml
+++ b/gh-pages/mkdocs.yml
@@ -58,8 +58,8 @@ markdown_extensions:
- pymdownx.superfences
- pymdownx.tabbed
- pymdownx.emoji:
- emoji_index: !!python/name:materialx.emoji.twemoji
- emoji_generator: !!python/name:materialx.emoji.to_svg
+ emoji_index: !!python/name:material.extensions.emoji.twemoji
+ emoji_generator: !!python/name:material.extensions.emoji.to_svg
plugins:
- awesome-pages:
From 087ff241bc852b49d91c79883e5faeaf5bb92f42 Mon Sep 17 00:00:00 2001
From: Cory Hall <43035978+corymhall@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:56:23 -0400
Subject: [PATCH 03/28] chore: switch to python 3.8 (#4239)
Python 3.7 has been end-of-life since 2023-06-27, and an
increasing amount of our dependencies are dropping support for it as a
consequence.
We introduced a warning to users that are still using Python 3.7 with
release v1.86.0 around August 1, 2023.
We are now effectively dropping support for Python 3.7.
Related: https://github.com/aws/jsii/commit/0ef7acef765690f99075888d6c3e6f03d7cc2d59
BREAKING CHANGE: jsii-pacmak and the libraries it generates for Python
targets now require a minimum Python version of 3.8, instead of 3.7
previously. We recommend users upgrade to the latest supported Python
release (Python 3.11).
---
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 | 26 +++++++++----------
CONTRIBUTING.md | 4 +--
.../user-guides/language-support/index.md | 2 +-
.../configuration/targets/python.md | 1 -
.../content/user-guides/lib-author/index.md | 2 +-
packages/@jsii/python-runtime/pyproject.toml | 4 +--
packages/@jsii/python-runtime/setup.py | 5 ++--
packages/jsii-pacmak/lib/targets/python.ts | 5 ++--
.../__snapshots__/examples.test.js.snap | 10 +++----
.../prerelease-identifiers.test.js.snap | 20 ++++++--------
.../__snapshots__/target-python.test.js.snap | 20 ++++++--------
11 files changed, 43 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 884e769d3d..5fbb9186a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,10 +47,10 @@ jobs:
with:
cache: yarn
node-version: '16'
- - name: Set up Python 3.7
+ - name: Set up Python 3.8
uses: actions/setup-python@v4
with:
- python-version: '3.7'
+ python-version: '3.8'
cache: pip
- name: Install python3-venv
run: sudo apt install -y python3-venv
@@ -130,10 +130,10 @@ jobs:
with:
cache: yarn
node-version: '16'
- - name: Set up Python 3.7
+ - name: Set up Python 3.8
uses: actions/setup-python@v4
with:
- python-version: '3.7'
+ python-version: '3.8'
cache: pip
- name: Install python3-venv
run: sudo apt install -y python3-venv
@@ -197,7 +197,7 @@ jobs:
java: ['8']
node: ['16'] # EOL 2023-09-11
os: [ubuntu-latest]
- python: ['3.7']
+ python: ['3.8']
# Add specific combinations to be tested against "node 14" (to restrict cardinality)
include:
# Test using Windows
@@ -207,7 +207,7 @@ jobs:
go: '1.18'
java: '8'
node: '16'
- python: '3.7'
+ python: '3.8'
# Test using macOS
- title: 'macOS'
os: macos-latest
@@ -215,7 +215,7 @@ jobs:
go: '1.18'
java: '8'
node: '16'
- python: '3.7'
+ python: '3.8'
# Test alternate Nodes
- title: 'Node 16'
java: '8'
@@ -223,21 +223,21 @@ jobs:
go: '1.18'
node: '16' # EOL 2023-09-11
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
- title: 'Node 18'
java: '8'
dotnet: '6.0.x'
go: '1.18'
node: '18' # EOL 2025-04-30
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
- title: 'Node 20'
java: '8'
dotnet: '6.0.x'
go: '1.18'
node: '20' # EOL 2026-04-30
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate .NETs
- title: '.NET 7.0'
java: '8'
@@ -245,7 +245,7 @@ jobs:
go: '1.18'
node: '16'
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate Gos
- title: 'Go 1.19'
java: '8'
@@ -253,7 +253,7 @@ jobs:
go: '1.19'
node: '16'
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate Javas
- title: 'Java 11'
java: '11'
@@ -261,7 +261,7 @@ jobs:
go: '1.18'
node: '16'
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate Pythons
- title: 'Python 3.8'
python: '3.8'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d313502da..31ca82f6ce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ in your development environment.
+ [`maven >= 3.0.5`](https://maven.apache.org)
- [.NET `6.0`] or later
+ *Recommended:* [`mono >= 6`](https://www.mono-project.com)
-- [Python `3.7.3`] or later
+- [Python `3.8.10`] or later
+ [`pip`](https://pip.pypa.io/en/stable/installing/)
+ [`setuptools >= 38.6.0`](https://pypi.org/project/setuptools/)
+ [`wheel`](https://pypi.org/project/wheel/)
@@ -57,7 +57,7 @@ in your development environment.
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
[.NET `6.0`]: https://www.microsoft.com/net/download
-[Python `3.7.3`]: https://www.python.org/downloads/release/python-373/
+[Python `3.8.10`]: https://www.python.org/downloads/release/python-3810/
[Go]: https://go.dev/dl/
## Getting Started
diff --git a/gh-pages/content/user-guides/language-support/index.md b/gh-pages/content/user-guides/language-support/index.md
index 03b9dcc5c5..ed2788985b 100644
--- a/gh-pages/content/user-guides/language-support/index.md
+++ b/gh-pages/content/user-guides/language-support/index.md
@@ -69,7 +69,7 @@ in significant re-engineering effort:
- How are dependencies modeled? If [semantic versioning] is not the norm, what is the strategy to correctly represent
semantic version ranges?
- What are the toolchain and platform requirements?
- - For example, **Java** requires an OpenJDK 8 distribution and `maven`, **Python** requires `python` 3.7 or above,
+ - For example, **Java** requires an OpenJDK 8 distribution and `maven`, **Python** requires `python` 3.8 or above,
etc...
## Code Generation
diff --git a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
index 7a41219615..2eadcf7c2d 100644
--- a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
+++ b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
@@ -16,7 +16,6 @@ The `python` target requires two configuration entries:
- Additionally, the following `Programming Language ::` classifiers are already set (more could be added by the user
if relevant):
- `Programming Language :: Python :: 3 :: Only`
- - `Programming Language :: Python :: 3.7`
- `Programming Language :: Python :: 3.8`
- `Programming Language :: Python :: 3.9`
- `Programming Language :: Python :: 3.10`
diff --git a/gh-pages/content/user-guides/lib-author/index.md b/gh-pages/content/user-guides/lib-author/index.md
index dac3277655..fdf52ab1c0 100644
--- a/gh-pages/content/user-guides/lib-author/index.md
+++ b/gh-pages/content/user-guides/lib-author/index.md
@@ -19,7 +19,7 @@ to produce releasable artifacts.
| .NET | .NET ≥ 6.0 |
| Go | Go ≥ 1.18 |
| Java | JDK ≥ 8 *and* Maven ≥ 3.6 |
-| Python | Python ≥ 3.7 |
+| Python | Python ≥ 3.8 |
## :octicons-desktop-download-24: Download Locations
diff --git a/packages/@jsii/python-runtime/pyproject.toml b/packages/@jsii/python-runtime/pyproject.toml
index 4ccebe88f3..791f88fdba 100644
--- a/packages/@jsii/python-runtime/pyproject.toml
+++ b/packages/@jsii/python-runtime/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools~=62.2", "wheel~=0.37"]
build-backend = 'setuptools.build_meta'
[tool.black]
-target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
+target-version = ['py38', 'py39', 'py310', 'py311']
include = '\.pyi?$'
exclude = '\.(git|mypy_cache|env)'
@@ -11,6 +11,6 @@ exclude = '\.(git|mypy_cache|env)'
ignore_missing_imports = true
[tool.pyright]
-pythonVersion = "3.7"
+pythonVersion = "3.8"
venv = ".env"
venvPath = "."
diff --git a/packages/@jsii/python-runtime/setup.py b/packages/@jsii/python-runtime/setup.py
index 5ae79af4b7..c5378575c3 100644
--- a/packages/@jsii/python-runtime/setup.py
+++ b/packages/@jsii/python-runtime/setup.py
@@ -36,16 +36,15 @@
"publication>=0.0.3", # This is used by all generated code.
"typeguard~=2.13.3", # This is used by all generated code.
"python-dateutil",
- "typing_extensions>=3.7,<5.0",
+ "typing_extensions>=3.8,<5.0",
],
- python_requires="~=3.7",
+ python_requires="~=3.8",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
index 55b73db957..c0ab22271e 100644
--- a/packages/jsii-pacmak/lib/targets/python.ts
+++ b/packages/jsii-pacmak/lib/targets/python.ts
@@ -2102,7 +2102,7 @@ class Package {
package_dir: { '': 'src' },
packages: modules.map((m) => m.pythonName),
package_data: packageData,
- python_requires: '~=3.7',
+ python_requires: '~=3.8',
install_requires: [
`jsii${toPythonVersionRange(`^${VERSION}`)}`,
'publication>=0.0.3',
@@ -2115,7 +2115,6 @@ class Package {
'Operating System :: OS Independent',
'Programming Language :: JavaScript',
'Programming Language :: Python :: 3 :: Only',
- 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
@@ -2236,7 +2235,7 @@ class Package {
code.line();
code.line('[tool.pyright]');
code.line('defineConstant = { DEBUG = true }');
- code.line('pythonVersion = "3.7"');
+ code.line('pythonVersion = "3.8"');
code.line('pythonPlatform = "All"');
code.line('reportSelfClsParameterName = false');
code.closeFile('pyproject.toml');
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
index 72c40a5489..cbc750ca01 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
@@ -1225,7 +1225,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1266,7 +1266,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1277,7 +1277,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -2647,7 +2646,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -2688,7 +2687,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -2699,7 +2698,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
index 4482893e5c..473d5cfe94 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
@@ -417,7 +417,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -454,7 +454,7 @@ kwargs = json.loads(
"foo@1.2.3.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"bar>=2.0.0.rc42, <3.0.0",
"jsii<0.0.1",
@@ -466,7 +466,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -932,7 +931,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -969,7 +968,7 @@ kwargs = json.loads(
"foo@1.2.3.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"bar>=4.5.6.dev1337, <5.0.0",
"jsii<0.0.1",
@@ -981,7 +980,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1427,7 +1425,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1464,7 +1462,7 @@ kwargs = json.loads(
"foo@2.0.0-rc.42.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1475,7 +1473,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1919,7 +1916,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1956,7 +1953,7 @@ kwargs = json.loads(
"foo@4.5.6-pre.1337.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1967,7 +1964,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
index e5db3283dd..b0d3531ebb 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
@@ -248,7 +248,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -289,7 +289,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -301,7 +301,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -803,7 +802,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -844,7 +843,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -855,7 +854,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1331,7 +1329,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1374,7 +1372,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1387,7 +1385,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -2992,7 +2989,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -3072,7 +3069,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -3085,7 +3082,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
From 265ff62ea42d661078f29e6614444e906eb969c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:27:23 +0000
Subject: [PATCH 04/28] chore(deps): Bump xunit from 2.5.2 to 2.6.1 in
/packages/@jsii/dotnet-runtime-test/test (#4315)
Bumps [xunit](https://github.com/xunit/xunit) from 2.5.2 to 2.6.1.
Commits
9f1684f
v2.6.1
5d9ef4b
Remove unnecessary XUNIT_VALUETASK definition
0266bac
Latest assertions
fb3c3cf
Remove all ValueTask support from assertions
801790c
Reconcile AcceptanceTestAssembly and friends with v3
f244cc8
More shared assertion tests that shouldn't return ValueTask
262dd72
Shared assertion tests cannot return ValueTask
36bbf77
Bump up to v2.6.1-pre
6a07b95
v2.6.0
5a7297e
#2806 : Performance improvements in Assert.Equal (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.5.2&new-version=2.6.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 0665d06ed2..2b77132144 100644
--- a/packages/@jsii/Directory.Build.targets
+++ b/packages/@jsii/Directory.Build.targets
@@ -12,7 +12,7 @@
-
+
From 3fa30c38a0494c8b1d1f97c3855969d1ec3cc77f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:45:35 +0000
Subject: [PATCH 05/28] chore(deps-dev): Update mkdocs-material requirement
from ~=9.4.7 to ~=9.4.8 in /gh-pages (#4316)
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.4.8
Fixed invalid local address replacement when using instant loading
Fixed #6275 : Crash after navigation caused 404 when using instant loading
Changelog
Sourced from mkdocs-material's changelog .
mkdocs-material-9.4.8+insiders-4.43.0 (2023-11-05)
Added support for GitLab committers (document contributors)
Fixed #6264 : Fixed compatibility with Python < 3.10
Fixed #6254 : Meta plugin not applying meta files to blog posts
mkdocs-material-9.4.8 (2023-11-05)
Fixed invalid local address replacement when using instant loading
Fixed #6275 : Crash after navigation caused 404 when using instant loading
mkdocs-material-9.4.7+insiders-4.42.3 (2023-10-27)
Fixed #6251 : Cards in grids cut off on very small screens
Fixed #6241 : Using social plugin + static-i18n plugin errors
mkdocs-material-9.4.7 (2023-10-27)
Added Azerbaijani translations
mkdocs-material-9.4.6+insiders-4.42.2 (2023-10-14)
Fixed #6186 : Privacy plugin ignores hash fragments on images
Fixed #6180 : Projects plugin crashing when adding or removing files
mkdocs-material-9.4.6 (2023-10-14)
Updated Danish and Norwegian (Nynorsk) translations
Fixed #6169 : Blog post metadata layout overflows on small screens
mkdocs-material-9.4.5 (2023-10-10)
Fixed sidebar auto-positioning (9.4.2 regression)
Fixed #6166 : Improve group plugin compatibility with Python < 3.10
Fixed #6157 : Hiding tags does not work (9.4.3 regression)
mkdocs-material-9.4.4+insiders-4.42.1 (2023-10-05)
Fixed spacing of related links in blog posts on small screens
mkdocs-material-9.4.4 (2023-10-05)
Added support for overriding text to be copied for code blocks
Fixed broken layout in some browsers at breakpoints when using zoom
Fixed #6132 : Incomplete search highlighting for code blocks in titles
mkdocs-material-9.4.3 (2023-10-02)
Added support for instant navigation progress indicator
Improved spacing and alignment of tags
... (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 1042c2d582..3b3f489d37 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.4.7
+mkdocs-material~=9.4.8
mkdocs-git-revision-date-plugin~=0.3.2
From 90ce1da3f7c057fc2094df0dc99ce9cb286630aa Mon Sep 17 00:00:00 2001
From: mikewrighton
Date: Mon, 6 Nov 2023 11:19:07 -0500
Subject: [PATCH 06/28] revert: "switch to python 3.8 (#4239)" (#4317)
This reverts commit 087ff241bc852b49d91c79883e5faeaf5bb92f42.
---
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 | 26 +++++++++----------
CONTRIBUTING.md | 4 +--
.../user-guides/language-support/index.md | 2 +-
.../configuration/targets/python.md | 1 +
.../content/user-guides/lib-author/index.md | 2 +-
packages/@jsii/python-runtime/pyproject.toml | 4 +--
packages/@jsii/python-runtime/setup.py | 5 ++--
packages/jsii-pacmak/lib/targets/python.ts | 5 ++--
.../__snapshots__/examples.test.js.snap | 10 ++++---
.../prerelease-identifiers.test.js.snap | 20 ++++++++------
.../__snapshots__/target-python.test.js.snap | 20 ++++++++------
11 files changed, 56 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5fbb9186a4..884e769d3d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,10 +47,10 @@ jobs:
with:
cache: yarn
node-version: '16'
- - name: Set up Python 3.8
+ - name: Set up Python 3.7
uses: actions/setup-python@v4
with:
- python-version: '3.8'
+ python-version: '3.7'
cache: pip
- name: Install python3-venv
run: sudo apt install -y python3-venv
@@ -130,10 +130,10 @@ jobs:
with:
cache: yarn
node-version: '16'
- - name: Set up Python 3.8
+ - name: Set up Python 3.7
uses: actions/setup-python@v4
with:
- python-version: '3.8'
+ python-version: '3.7'
cache: pip
- name: Install python3-venv
run: sudo apt install -y python3-venv
@@ -197,7 +197,7 @@ jobs:
java: ['8']
node: ['16'] # EOL 2023-09-11
os: [ubuntu-latest]
- python: ['3.8']
+ python: ['3.7']
# Add specific combinations to be tested against "node 14" (to restrict cardinality)
include:
# Test using Windows
@@ -207,7 +207,7 @@ jobs:
go: '1.18'
java: '8'
node: '16'
- python: '3.8'
+ python: '3.7'
# Test using macOS
- title: 'macOS'
os: macos-latest
@@ -215,7 +215,7 @@ jobs:
go: '1.18'
java: '8'
node: '16'
- python: '3.8'
+ python: '3.7'
# Test alternate Nodes
- title: 'Node 16'
java: '8'
@@ -223,21 +223,21 @@ jobs:
go: '1.18'
node: '16' # EOL 2023-09-11
os: ubuntu-latest
- python: '3.8'
+ python: '3.7'
- title: 'Node 18'
java: '8'
dotnet: '6.0.x'
go: '1.18'
node: '18' # EOL 2025-04-30
os: ubuntu-latest
- python: '3.8'
+ python: '3.7'
- title: 'Node 20'
java: '8'
dotnet: '6.0.x'
go: '1.18'
node: '20' # EOL 2026-04-30
os: ubuntu-latest
- python: '3.8'
+ python: '3.7'
# Test alternate .NETs
- title: '.NET 7.0'
java: '8'
@@ -245,7 +245,7 @@ jobs:
go: '1.18'
node: '16'
os: ubuntu-latest
- python: '3.8'
+ python: '3.7'
# Test alternate Gos
- title: 'Go 1.19'
java: '8'
@@ -253,7 +253,7 @@ jobs:
go: '1.19'
node: '16'
os: ubuntu-latest
- python: '3.8'
+ python: '3.7'
# Test alternate Javas
- title: 'Java 11'
java: '11'
@@ -261,7 +261,7 @@ jobs:
go: '1.18'
node: '16'
os: ubuntu-latest
- python: '3.8'
+ python: '3.7'
# Test alternate Pythons
- title: 'Python 3.8'
python: '3.8'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 31ca82f6ce..5d313502da 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ in your development environment.
+ [`maven >= 3.0.5`](https://maven.apache.org)
- [.NET `6.0`] or later
+ *Recommended:* [`mono >= 6`](https://www.mono-project.com)
-- [Python `3.8.10`] or later
+- [Python `3.7.3`] or later
+ [`pip`](https://pip.pypa.io/en/stable/installing/)
+ [`setuptools >= 38.6.0`](https://pypi.org/project/setuptools/)
+ [`wheel`](https://pypi.org/project/wheel/)
@@ -57,7 +57,7 @@ in your development environment.
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
[.NET `6.0`]: https://www.microsoft.com/net/download
-[Python `3.8.10`]: https://www.python.org/downloads/release/python-3810/
+[Python `3.7.3`]: https://www.python.org/downloads/release/python-373/
[Go]: https://go.dev/dl/
## Getting Started
diff --git a/gh-pages/content/user-guides/language-support/index.md b/gh-pages/content/user-guides/language-support/index.md
index ed2788985b..03b9dcc5c5 100644
--- a/gh-pages/content/user-guides/language-support/index.md
+++ b/gh-pages/content/user-guides/language-support/index.md
@@ -69,7 +69,7 @@ in significant re-engineering effort:
- How are dependencies modeled? If [semantic versioning] is not the norm, what is the strategy to correctly represent
semantic version ranges?
- What are the toolchain and platform requirements?
- - For example, **Java** requires an OpenJDK 8 distribution and `maven`, **Python** requires `python` 3.8 or above,
+ - For example, **Java** requires an OpenJDK 8 distribution and `maven`, **Python** requires `python` 3.7 or above,
etc...
## Code Generation
diff --git a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
index 2eadcf7c2d..7a41219615 100644
--- a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
+++ b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
@@ -16,6 +16,7 @@ The `python` target requires two configuration entries:
- Additionally, the following `Programming Language ::` classifiers are already set (more could be added by the user
if relevant):
- `Programming Language :: Python :: 3 :: Only`
+ - `Programming Language :: Python :: 3.7`
- `Programming Language :: Python :: 3.8`
- `Programming Language :: Python :: 3.9`
- `Programming Language :: Python :: 3.10`
diff --git a/gh-pages/content/user-guides/lib-author/index.md b/gh-pages/content/user-guides/lib-author/index.md
index fdf52ab1c0..dac3277655 100644
--- a/gh-pages/content/user-guides/lib-author/index.md
+++ b/gh-pages/content/user-guides/lib-author/index.md
@@ -19,7 +19,7 @@ to produce releasable artifacts.
| .NET | .NET ≥ 6.0 |
| Go | Go ≥ 1.18 |
| Java | JDK ≥ 8 *and* Maven ≥ 3.6 |
-| Python | Python ≥ 3.8 |
+| Python | Python ≥ 3.7 |
## :octicons-desktop-download-24: Download Locations
diff --git a/packages/@jsii/python-runtime/pyproject.toml b/packages/@jsii/python-runtime/pyproject.toml
index 791f88fdba..4ccebe88f3 100644
--- a/packages/@jsii/python-runtime/pyproject.toml
+++ b/packages/@jsii/python-runtime/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools~=62.2", "wheel~=0.37"]
build-backend = 'setuptools.build_meta'
[tool.black]
-target-version = ['py38', 'py39', 'py310', 'py311']
+target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
include = '\.pyi?$'
exclude = '\.(git|mypy_cache|env)'
@@ -11,6 +11,6 @@ exclude = '\.(git|mypy_cache|env)'
ignore_missing_imports = true
[tool.pyright]
-pythonVersion = "3.8"
+pythonVersion = "3.7"
venv = ".env"
venvPath = "."
diff --git a/packages/@jsii/python-runtime/setup.py b/packages/@jsii/python-runtime/setup.py
index c5378575c3..5ae79af4b7 100644
--- a/packages/@jsii/python-runtime/setup.py
+++ b/packages/@jsii/python-runtime/setup.py
@@ -36,15 +36,16 @@
"publication>=0.0.3", # This is used by all generated code.
"typeguard~=2.13.3", # This is used by all generated code.
"python-dateutil",
- "typing_extensions>=3.8,<5.0",
+ "typing_extensions>=3.7,<5.0",
],
- python_requires="~=3.8",
+ python_requires="~=3.7",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
index c0ab22271e..55b73db957 100644
--- a/packages/jsii-pacmak/lib/targets/python.ts
+++ b/packages/jsii-pacmak/lib/targets/python.ts
@@ -2102,7 +2102,7 @@ class Package {
package_dir: { '': 'src' },
packages: modules.map((m) => m.pythonName),
package_data: packageData,
- python_requires: '~=3.8',
+ python_requires: '~=3.7',
install_requires: [
`jsii${toPythonVersionRange(`^${VERSION}`)}`,
'publication>=0.0.3',
@@ -2115,6 +2115,7 @@ class Package {
'Operating System :: OS Independent',
'Programming Language :: JavaScript',
'Programming Language :: Python :: 3 :: Only',
+ 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
@@ -2235,7 +2236,7 @@ class Package {
code.line();
code.line('[tool.pyright]');
code.line('defineConstant = { DEBUG = true }');
- code.line('pythonVersion = "3.8"');
+ code.line('pythonVersion = "3.7"');
code.line('pythonPlatform = "All"');
code.line('reportSelfClsParameterName = false');
code.closeFile('pyproject.toml');
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
index cbc750ca01..72c40a5489 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
@@ -1225,7 +1225,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1266,7 +1266,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1277,6 +1277,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -2646,7 +2647,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -2687,7 +2688,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -2698,6 +2699,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
index 473d5cfe94..4482893e5c 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
@@ -417,7 +417,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -454,7 +454,7 @@ kwargs = json.loads(
"foo@1.2.3.jsii.tgz"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"bar>=2.0.0.rc42, <3.0.0",
"jsii<0.0.1",
@@ -466,6 +466,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -931,7 +932,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -968,7 +969,7 @@ kwargs = json.loads(
"foo@1.2.3.jsii.tgz"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"bar>=4.5.6.dev1337, <5.0.0",
"jsii<0.0.1",
@@ -980,6 +981,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1425,7 +1427,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1462,7 +1464,7 @@ kwargs = json.loads(
"foo@2.0.0-rc.42.jsii.tgz"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1473,6 +1475,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1916,7 +1919,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1953,7 +1956,7 @@ kwargs = json.loads(
"foo@4.5.6-pre.1337.jsii.tgz"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1964,6 +1967,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
index b0d3531ebb..e5db3283dd 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
@@ -248,7 +248,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -289,7 +289,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -301,6 +301,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -802,7 +803,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -843,7 +844,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -854,6 +855,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1329,7 +1331,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1372,7 +1374,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1385,6 +1387,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -2989,7 +2992,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.8"
+pythonVersion = "3.7"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -3069,7 +3072,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.8",
+ "python_requires": "~=3.7",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -3082,6 +3085,7 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
+ "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
From c87da436671d677d1fee276d0932ea7edd431f78 Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Wed, 8 Nov 2023 13:58:02 +0000
Subject: [PATCH 07/28] feat(jsii-reflect): TypeSystem can be locked to improve
reflection performance (#4318)
Memoizes additional calls that rely on the typesystem to retrieve type instances.
These calls can (theoretically) change when the typesystem is changed.
Therefore we cannot assume it's okay to always memoize the first call.
To workaround this limitation, we introduce a new mechanism to manually `lock` the typesystem once all assemblies are loaded.
We then can start memoizing the additional calls.
For example in `awslint` this reduces the runtime against `aws-cdk-lib` by ~20s.
---
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/_memoized.ts | 67 ++++++++++++-----
packages/jsii-reflect/lib/class.ts | 14 +++-
packages/jsii-reflect/lib/method.ts | 2 +
packages/jsii-reflect/lib/type-system.ts | 19 +++++
packages/jsii-reflect/lib/type.ts | 2 +-
packages/jsii-reflect/test/_memoized.test.ts | 79 ++++++++++++++++++++
6 files changed, 163 insertions(+), 20 deletions(-)
create mode 100644 packages/jsii-reflect/test/_memoized.test.ts
diff --git a/packages/jsii-reflect/lib/_memoized.ts b/packages/jsii-reflect/lib/_memoized.ts
index 3cc46383ed..9bce919802 100644
--- a/packages/jsii-reflect/lib/_memoized.ts
+++ b/packages/jsii-reflect/lib/_memoized.ts
@@ -1,7 +1,30 @@
-/* eslint-disable @typescript-eslint/ban-types -- WeakMap demands T extends object */
+import { TypeSystem } from './type-system';
+/* eslint-disable @typescript-eslint/ban-types -- WeakMap demands T extends object */
const CACHE = new WeakMap>();
+function memoizedGet(original: () => any, propertyKey: string): () => any {
+ return function (this: object): unknown {
+ let cache = CACHE.get(this);
+ if (cache == null) {
+ cache = new Map();
+ CACHE.set(this, cache);
+ }
+ if (cache.has(propertyKey)) {
+ const result = cache.get(propertyKey);
+ if (Array.isArray(result)) {
+ // Return a copy of arrays as a precaution
+ return Array.from(result);
+ }
+ return result;
+ }
+ const result = original.call(this);
+ // If the result is an array, memoize a copy for safety.
+ cache.set(propertyKey, Array.isArray(result) ? Array.from(result) : result);
+ return result;
+ };
+}
+
/**
* Decorates property readers for readonly properties so that their results are
* memoized in a `WeakMap`-based cache. Those properties will consequently be
@@ -9,6 +32,10 @@ const CACHE = new WeakMap>();
*
* This can only be applied to property accessors (`public get foo(): any`), and not to
* property declarations (`public readonly foo: any`).
+ *
+ * This should not be applied to any computations relying on a typesystem.
+ * The typesystem can be changed and thus change the result of the call.
+ * Use `memoizedWhenLocked` instead.
*/
export function memoized(
_prototype: unknown,
@@ -23,23 +50,27 @@ export function memoized(
}
const original = descriptor.get;
- descriptor.get = function memoizedGet(this: object): unknown {
- let cache = CACHE.get(this);
- if (cache == null) {
- cache = new Map();
- CACHE.set(this, cache);
- }
- if (cache.has(propertyKey)) {
- const result = cache.get(propertyKey);
- if (Array.isArray(result)) {
- // Return a copy of arrays as a precaution
- return Array.from(result);
- }
- return result;
+ descriptor.get = memoizedGet(original, propertyKey);
+}
+
+export function memoizedWhenLocked(
+ _prototype: T,
+ propertyKey: string,
+ descriptor: PropertyDescriptor,
+): void {
+ if (!descriptor.get) {
+ throw new Error(`@memoized can only be applied to property getters!`);
+ }
+ if (descriptor.set) {
+ throw new Error(`@memoized can only be applied to readonly properties!`);
+ }
+
+ const original = descriptor.get;
+ descriptor.get = function (this: T): unknown {
+ if (this.system.isLocked) {
+ return memoizedGet(original, propertyKey).call(this);
}
- const result = original.call(this);
- // If the result is an array, memoize a copy for safety.
- cache.set(propertyKey, Array.isArray(result) ? Array.from(result) : result);
- return result;
+
+ return original.call(this);
};
}
diff --git a/packages/jsii-reflect/lib/class.ts b/packages/jsii-reflect/lib/class.ts
index 21a8d703d8..866ae8ab83 100644
--- a/packages/jsii-reflect/lib/class.ts
+++ b/packages/jsii-reflect/lib/class.ts
@@ -1,5 +1,6 @@
import * as jsii from '@jsii/spec';
+import { memoizedWhenLocked } from './_memoized';
import { Assembly } from './assembly';
import { Initializer } from './initializer';
import { InterfaceType } from './interface';
@@ -20,6 +21,7 @@ export class ClassType extends ReferenceType {
/**
* Base class (optional).
*/
+ @memoizedWhenLocked
public get base(): ClassType | undefined {
if (!this.spec.base) {
return undefined;
@@ -60,12 +62,22 @@ export class ClassType extends ReferenceType {
/**
* Returns list of all base classes (first is the direct base and last is the top-most).
+ *
+ * @deprecated use ClassType.ancestors instead
*/
public getAncestors() {
+ return this.ancestors;
+ }
+
+ /**
+ * Returns list of all base classes (first is the direct base and last is the top-most).
+ */
+ @memoizedWhenLocked
+ public get ancestors() {
const out = new Array();
if (this.base) {
out.push(this.base);
- out.push(...this.base.getAncestors());
+ out.push(...this.base.ancestors);
}
return out;
}
diff --git a/packages/jsii-reflect/lib/method.ts b/packages/jsii-reflect/lib/method.ts
index 88f326a0fc..78bfad12d8 100644
--- a/packages/jsii-reflect/lib/method.ts
+++ b/packages/jsii-reflect/lib/method.ts
@@ -1,5 +1,6 @@
import * as jsii from '@jsii/spec';
+import { memoizedWhenLocked } from './_memoized';
import { Assembly } from './assembly';
import { Callable } from './callable';
import { Documentable } from './docs';
@@ -42,6 +43,7 @@ export class Method
return this.spec.name;
}
+ @memoizedWhenLocked
public get overrides(): Type | undefined {
if (!this.spec.overrides) {
return undefined;
diff --git a/packages/jsii-reflect/lib/type-system.ts b/packages/jsii-reflect/lib/type-system.ts
index 6855924fb6..965a9d301a 100644
--- a/packages/jsii-reflect/lib/type-system.ts
+++ b/packages/jsii-reflect/lib/type-system.ts
@@ -22,6 +22,11 @@ export class TypeSystem {
private readonly _cachedClasses = new Map();
+ private _locked = false;
+ public get isLocked(): boolean {
+ return this._locked;
+ }
+
/**
* All assemblies in this type system.
*/
@@ -29,6 +34,16 @@ export class TypeSystem {
return Array.from(this._assemblyLookup.values());
}
+ /**
+ * Locks the TypeSystem from further changes
+ *
+ * Call this once all assemblies have been loaded.
+ * This allows the reflection to optimize and cache certain expensive calls.
+ */
+ public lock() {
+ this._locked = true;
+ }
+
/**
* Load all JSII dependencies of the given NPM package directory.
*
@@ -164,6 +179,10 @@ export class TypeSystem {
}
public addAssembly(asm: Assembly, options: { isRoot?: boolean } = {}) {
+ if (this.isLocked) {
+ throw new Error('The typesystem has been locked from further changes');
+ }
+
if (asm.system !== this) {
throw new Error('Assembly has been created for different typesystem');
}
diff --git a/packages/jsii-reflect/lib/type.ts b/packages/jsii-reflect/lib/type.ts
index 80d0841e3d..a05722136f 100644
--- a/packages/jsii-reflect/lib/type.ts
+++ b/packages/jsii-reflect/lib/type.ts
@@ -124,7 +124,7 @@ export abstract class Type implements Documentable, SourceLocatable {
return this.getInterfaces(true).some((iface) => iface === base);
}
if (this.isClassType() && base.isClassType()) {
- return this.getAncestors().some((clazz) => clazz === base);
+ return this.ancestors.some((clazz) => clazz === base);
}
return false;
}
diff --git a/packages/jsii-reflect/test/_memoized.test.ts b/packages/jsii-reflect/test/_memoized.test.ts
new file mode 100644
index 0000000000..2dc69cb9e3
--- /dev/null
+++ b/packages/jsii-reflect/test/_memoized.test.ts
@@ -0,0 +1,79 @@
+import { TypeSystem } from '../lib';
+import { memoized, memoizedWhenLocked } from '../lib/_memoized';
+
+const accessorSpy = jest.fn(() => 'foobar');
+
+class TestClass {
+ public constructor(public readonly system: TypeSystem) {}
+
+ public get uncached(): string {
+ return accessorSpy();
+ }
+
+ @memoized
+ public get cached(): string {
+ return accessorSpy();
+ }
+
+ @memoizedWhenLocked
+ public get cachedWhenLocked(): string {
+ return accessorSpy();
+ }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+function noop(_val: unknown) {}
+
+describe('memoized', () => {
+ beforeEach(() => {
+ accessorSpy.mockClear();
+ });
+ const subject = new TestClass(new TypeSystem());
+
+ test('cached property is memoized', () => {
+ // Access the property twice
+ noop(subject.cached);
+ noop(subject.cached);
+
+ expect(accessorSpy).toHaveBeenCalledTimes(1);
+ expect(subject.cached).toBe('foobar');
+ });
+
+ test('uncached property is not memoized', () => {
+ // Access the property twice
+ noop(subject.uncached);
+ noop(subject.uncached);
+
+ expect(accessorSpy).toHaveBeenCalledTimes(2);
+ expect(subject.uncached).toBe('foobar');
+ });
+});
+
+describe('memoizedWhenLocked', () => {
+ let subject: TestClass;
+ beforeEach(() => {
+ accessorSpy.mockClear();
+ subject = new TestClass(new TypeSystem());
+ });
+
+ test('property is memoized when the typesystem is locked', () => {
+ // Lock the typesystem to enable memoizing
+ subject.system.lock();
+
+ // Access the property twice
+ noop(subject.cachedWhenLocked);
+ noop(subject.cachedWhenLocked);
+
+ expect(accessorSpy).toHaveBeenCalledTimes(1);
+ expect(subject.cachedWhenLocked).toBe('foobar');
+ });
+
+ test('property is not memoized when the typesystem is not locked', () => {
+ // Access the property twice
+ noop(subject.cachedWhenLocked);
+ noop(subject.cachedWhenLocked);
+
+ expect(accessorSpy).toHaveBeenCalledTimes(2);
+ expect(subject.cachedWhenLocked).toBe('foobar');
+ });
+});
From f8c2e0c20ff6937c5dfb3a9ccab9c2f6262fea5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Nov 2023 12:36:37 +0000
Subject: [PATCH 08/28] chore(deps): Bump golang.org/x/tools from 0.14.0 to
0.15.0 in /packages/@jsii/go-runtime-test/project (#4320)
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.14.0 to 0.15.0.
Release notes
Sourced from golang.org/x/tools's releases .
gopls/v0.14.1
This release contains just two changes:
A workaround for a regression affecting some users of GOPACKAGESDRIVER
: golang/go#63751 , for example those using gopls with an older version of Bazel . When the go/packages
driver is missing compiler or architecture information, gopls now assumes a default value rather than failing to load package information.
A fix for a minor bug in the new "remove unused parameter" refactoring: golang/go#63755 . Notably, this bug was discovered via an automated report from someone who had opted in to Go telemetry .
Commits
729e159
go.mod: update golang.org/x dependencies
38ed81a
gopls/internal/regtest/marker: porting extract tests
bbf8380
gopls/internal/regtest/marker: use golden diffs for suggested fixes
51df92b
go/ssa: two minor cleanups
e7fb31a
internal/cmd/deadcode: rename -format to -f
c538b4e
internal/cmd/deadcode: add -whylive=function flag
b753e58
internal/lsp/helper: fix misspelled "Code generated" comment
2638d66
internal/cmd/deadcode: omit package/func keywords in default output
118c362
gopls/internal/lsp/source: fix signatureHelp with pointer receivers
4124316
gopls/internal/lsp/cache: remove baseCtx from the View
Additional commits viewable in compare view
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/tools&package-manager=go_modules&previous-version=0.14.0&new-version=0.15.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/go-runtime-test/project/go.mod | 6 +++---
packages/@jsii/go-runtime-test/project/go.sum | 7 +++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/packages/@jsii/go-runtime-test/project/go.mod
index 2df4c28d4c..63f2d81cff 100644
--- a/packages/@jsii/go-runtime-test/project/go.mod
+++ b/packages/@jsii/go-runtime-test/project/go.mod
@@ -9,7 +9,7 @@ require (
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
github.com/stretchr/testify v1.8.4
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
- golang.org/x/tools v0.14.0
+ golang.org/x/tools v0.15.0
)
require (
@@ -21,8 +21,8 @@ require (
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
- golang.org/x/mod v0.13.0 // indirect
- golang.org/x/sys v0.13.0 // indirect
+ golang.org/x/mod v0.14.0 // indirect
+ golang.org/x/sys v0.14.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum
index f70e5dce91..51e269bb6a 100644
--- a/packages/@jsii/go-runtime-test/project/go.sum
+++ b/packages/@jsii/go-runtime-test/project/go.sum
@@ -28,12 +28,15 @@ golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -50,6 +53,8 @@ golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
@@ -64,6 +69,8 @@ golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
+golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
From 87847254c8a39f6e99383bfa3a375ae6c8d9a8a5 Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Mon, 13 Nov 2023 19:54:12 +0000
Subject: [PATCH 09/28] feat: make node 18 the default (#4325)
Removes testing and superchain releases for EOL Node 16
Deprecation and EOL messages of node versions are automated, so no need to announce or wait.
We are well past the promised 30 days support after Node 16 went EOL.
---
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 | 6 +-
.github/workflows/main.yml | 38 +++++------
packages/@jsii/check-node/src/constants.ts | 7 +-
packages/@jsii/check-node/src/index.test.ts | 2 +-
packages/@jsii/check-node/src/index.ts | 7 +-
.../python-runtime/tests/test_invoke_bin.py | 6 +-
superchain/Dockerfile | 4 +-
superchain/README.md | 64 +++++++++----------
8 files changed, 65 insertions(+), 69 deletions(-)
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 0409219a56..b9daa0fc3b 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -22,8 +22,8 @@ jobs:
fail-fast: false
matrix:
debian:
- - 'buster' # 10
- node: ['16', '18', '20']
+ - 'buster' # 10
+ node: ['18', '20']
include:
- debian: 'bullseye' # 11
node: '20'
@@ -31,7 +31,7 @@ jobs:
node: '20'
env:
# Node version whose images will be aliased without the -nodeXX segment
- DEFAULT_NODE_MAJOR_VERSION: 16
+ DEFAULT_NODE_MAJOR_VERSION: 18
steps:
- name: Check out
uses: actions/checkout@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 884e769d3d..799e338529 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,11 +42,11 @@ jobs:
with:
distribution: 'zulu'
java-version: '8'
- - name: Set up Node 16
+ - name: Set up Node 18
uses: actions/setup-node@v4
with:
cache: yarn
- node-version: '16'
+ node-version: '18'
- name: Set up Python 3.7
uses: actions/setup-python@v4
with:
@@ -125,11 +125,11 @@ jobs:
with:
distribution: 'zulu'
java-version: '8'
- - name: Set up Node 16
+ - name: Set up Node 18
uses: actions/setup-node@v4
with:
cache: yarn
- node-version: '16'
+ node-version: '18'
- name: Set up Python 3.7
uses: actions/setup-python@v4
with:
@@ -195,10 +195,10 @@ jobs:
dotnet: ['6.0.x']
go: ['1.18']
java: ['8']
- node: ['16'] # EOL 2023-09-11
+ node: ['18'] # EOL 2025-04-30
os: [ubuntu-latest]
python: ['3.7']
- # Add specific combinations to be tested against "node 14" (to restrict cardinality)
+ # Add specific combinations to be tested against (to restrict cardinality)
include:
# Test using Windows
- title: 'Windows'
@@ -206,7 +206,7 @@ jobs:
dotnet: '6.0.x'
go: '1.18'
java: '8'
- node: '16'
+ node: '18'
python: '3.7'
# Test using macOS
- title: 'macOS'
@@ -214,16 +214,9 @@ jobs:
dotnet: '6.0.x'
go: '1.18'
java: '8'
- node: '16'
+ node: '18'
python: '3.7'
# Test alternate Nodes
- - title: 'Node 16'
- java: '8'
- dotnet: '6.0.x'
- go: '1.18'
- node: '16' # EOL 2023-09-11
- os: ubuntu-latest
- python: '3.7'
- title: 'Node 18'
java: '8'
dotnet: '6.0.x'
@@ -243,7 +236,7 @@ jobs:
java: '8'
dotnet: '7.0.x'
go: '1.18'
- node: '16'
+ node: '18'
os: ubuntu-latest
python: '3.7'
# Test alternate Gos
@@ -251,7 +244,7 @@ jobs:
java: '8'
dotnet: '6.0.x'
go: '1.19'
- node: '16'
+ node: '18'
os: ubuntu-latest
python: '3.7'
# Test alternate Javas
@@ -259,7 +252,7 @@ jobs:
java: '11'
dotnet: '6.0.x'
go: '1.18'
- node: '16'
+ node: '18'
os: ubuntu-latest
python: '3.7'
# Test alternate Pythons
@@ -268,28 +261,28 @@ jobs:
dotnet: '6.0.x'
go: '1.18'
java: '8'
- node: '16'
+ node: '18'
os: ubuntu-latest
- title: 'Python 3.9'
python: '3.9'
dotnet: '6.0.x'
go: '1.18'
java: '8'
- node: '16'
+ node: '18'
os: ubuntu-latest
- title: 'Python 3.10'
python: '3.10'
dotnet: '6.0.x'
go: '1.18'
java: '8'
- node: '16'
+ node: '18'
os: ubuntu-latest
- title: 'Python 3.11'
python: '3.11'
dotnet: '6.0.x'
go: '1.18'
java: '8'
- node: '16'
+ node: '18'
os: ubuntu-latest
runs-on: ${{ matrix.os }}
@@ -479,4 +472,3 @@ jobs:
with:
name: integtest_aws-cdk-lib
path: ./node_modules/aws-cdk-lib/dist/
-
diff --git a/packages/@jsii/check-node/src/constants.ts b/packages/@jsii/check-node/src/constants.ts
index a267bc0b20..def0d5f8eb 100644
--- a/packages/@jsii/check-node/src/constants.ts
+++ b/packages/@jsii/check-node/src/constants.ts
@@ -35,9 +35,6 @@ export class NodeRelease {
endOfLife: new Date('2022-04-30'),
supportedRange: '^12.7.0',
}),
- new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),
-
- // Currently active releases (as of last edit to this file...)
new NodeRelease(16, {
endOfLife: new Date('2023-09-11'),
supportedRange: '^16.3.0',
@@ -46,8 +43,12 @@ export class NodeRelease {
endOfLife: new Date('2022-06-01'),
supportedRange: '^17.3.0',
}),
+ new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),
+
+ // Currently active releases (as of last edit to this file...)
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') }),
// Future (planned releases)
];
diff --git a/packages/@jsii/check-node/src/index.test.ts b/packages/@jsii/check-node/src/index.test.ts
index 47f5cb8973..b7b5126e19 100644
--- a/packages/@jsii/check-node/src/index.test.ts
+++ b/packages/@jsii/check-node/src/index.test.ts
@@ -11,7 +11,7 @@ test('tested node releases are correctly registered & supported', () => {
// This test is there to ensure house-keeping happens when it should. If we are
// testing a given node release, it must not have been EOL for over 60 days.
-test(`tested node release (${process.version}) has not ben EOL for more than 60 days`, () => {
+test(`tested node release (${process.version}) has not been EOL for more than 60 days`, () => {
const { nodeRelease } = NodeRelease.forThisRuntime();
expect(nodeRelease?.endOfLifeDate?.getTime()).toBeGreaterThan(
Date.now() - 60 * 86_400_000,
diff --git a/packages/@jsii/check-node/src/index.ts b/packages/@jsii/check-node/src/index.ts
index 4c9fdbb5f3..aacd28441d 100644
--- a/packages/@jsii/check-node/src/index.ts
+++ b/packages/@jsii/check-node/src/index.ts
@@ -22,12 +22,13 @@ export function checkNode(envPrefix = 'JSII'): void {
if (nodeRelease?.endOfLife) {
const silenceVariable = `${envPrefix}_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION`;
- const acknowledgeNodeEol =
- 'Node14 is now end of life (EOL) as of April 30, 2023. Support of EOL runtimes are only guaranteed for 30 days after EOL. By silencing this warning you acknowledge that you are using an EOL version of Node and will upgrade to a supported version as soon as possible.';
+ const silencedVersions = (process.env[silenceVariable] ?? '')
+ .split(',')
+ .map((v) => v.trim());
const qualifier = nodeRelease.endOfLifeDate
? ` on ${nodeRelease.endOfLifeDate.toISOString().slice(0, 10)}`
: '';
- if (!(process.env[silenceVariable] === acknowledgeNodeEol))
+ if (!silencedVersions.includes(nodeRelease.majorVersion.toString()))
veryVisibleMessage(
bgRed.white.bold,
`Node ${nodeRelease.majorVersion} has reached end-of-life${qualifier} and is not supported.`,
diff --git a/packages/@jsii/python-runtime/tests/test_invoke_bin.py b/packages/@jsii/python-runtime/tests/test_invoke_bin.py
index 8ff6a94271..f4e91fbee5 100644
--- a/packages/@jsii/python-runtime/tests/test_invoke_bin.py
+++ b/packages/@jsii/python-runtime/tests/test_invoke_bin.py
@@ -23,8 +23,10 @@ def silence_node_deprecation_warnings():
for var in variables:
environ[var] = "1"
- nodeEolAcknowledgement = "Node14 is now end of life (EOL) as of April 30, 2023. Support of EOL runtimes are only guaranteed for 30 days after EOL. By silencing this warning you acknowledge that you are using an EOL version of Node and will upgrade to a supported version as soon as possible."
- environ["JSII_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION"] = nodeEolAcknowledgement
+ # silence this for the next decades
+ environ[
+ "JSII_SILENCE_WARNING_END_OF_LIFE_NODE_VERSION"
+ ] = "14,16,18,20,22,24,26,28,30,32,34"
# Execute the test
yield
diff --git a/superchain/Dockerfile b/superchain/Dockerfile
index c157ccf7ab..a557605549 100644
--- a/superchain/Dockerfile
+++ b/superchain/Dockerfile
@@ -232,10 +232,10 @@ COPY superchain/m2-settings.xml /root/.m2/settings.xml
# Install Go
COPY --from=bindist /opt/golang/go ${GOROOT}
-# Install Node 14+ (configurable with '--build-arg NODE_MAJOR_VERSION=xxx') and yarn
+# Install Node (configurable with '--build-arg NODE_MAJOR_VERSION=xxx') and yarn
# (Put this as late as possible in the Dockerfile so we get to reuse the layer cache
# for most of the multiple builds).
-ARG NODE_MAJOR_VERSION="16"
+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 \
diff --git a/superchain/README.md b/superchain/README.md
index 5bd89c07c9..a50226a9e2 100644
--- a/superchain/README.md
+++ b/superchain/README.md
@@ -8,15 +8,15 @@ required in order to package [jsii] projects in all supported languages.
## Included Language SDKs
-SDK | Version
-----------------|-------------------------------------------
-`OpenJDK 20` | Amazon Corretto `>= 20.0.0`
-`.NET SDK` | `>= 6.0.14`
-`mono` | `>= 6.8.0.105`
-`Javascript` | see [NodeJS and NPM](#nodejs-and-npm)
-`PowerShell` | `pwsh >= 7.1.3`
-`Python 3` | `python3 >= 3.7.4` with `pip3 >= 20.0.2`
-`Go` | `go >= 1.18`
+| SDK | Version |
+| ------------ | ---------------------------------------- |
+| `OpenJDK 20` | Amazon Corretto `>= 20.0.0` |
+| `.NET SDK` | `>= 6.0.14` |
+| `mono` | `>= 6.8.0.105` |
+| `Javascript` | see [NodeJS and NPM](#nodejs-and-npm) |
+| `PowerShell` | `pwsh >= 7.1.3` |
+| `Python 3` | `python3 >= 3.7.4` with `pip3 >= 20.0.2` |
+| `Go` | `go >= 1.18` |
## Image tags
@@ -31,9 +31,7 @@ public.ecr.aws/jsii/superchain:- (-node)(-nightly)
- ` ` is the base image tag (e.g: `buster-slim`, `bullseye-slim`, `bookworm-slim`)
- The only supported value is `buster-slim`
- `` is the major version of node contained in the image
- - `14` corresponds to node 14.x, this is the default
- - `16` corresponds to node 16.x
- - `18` corresponds to node 18.x
+ - `18` corresponds to node 18.x, this is the default
- `20` corresponds to node 20.x
- `-nightly` images are released from the `HEAD` of the [`aws/jsii`][jsii]
repository and should typically not be used for production workloads
@@ -42,12 +40,14 @@ The previous image tags have been discontinued:
- `:latest` (users should migrate to `:1-buster-slim`)
- `:nightly` (users should migrate to `:1-buster-slim-nightly`)
-- `:node10` (users should migrate to `:1-buster-slim-node14`)
-- `:node10-nightly` (users should migrate to `:1-buster-slim-node14-nightly`)
-- `:node12` (users shoudl migrate to `:1-buster-slim-node14`)
-- `:node12-nightly` (users shoudl migrate to `:1-buster-slim-node14-nightly`)
-- `:node14` (users shoudl migrate to `:1-buster-slim-node14`)
-- `:node14-nightly` (users shoudl migrate to `:1-buster-slim-node14-nightly`)
+- `:node10` (users should migrate to `:1-buster-slim-node18`)
+- `:node10-nightly` (users should migrate to `:1-buster-slim-node18-nightly`)
+- `:node12` (users should migrate to `:1-buster-slim-node18`)
+- `:node12-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`)
+- `:node14` (users should migrate to `:1-buster-slim-node18`)
+- `:node14-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`)
+- `:node16` (users should migrate to `:1-buster-slim-node18`)
+- `:node16-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`)
## Building
@@ -82,20 +82,20 @@ jsii$ docker build [...] --build-arg NODE_MAJOR_VERSION=16
## Included Tools & Utilities
-Tool / Utility | Version
----------------|--------------------------------------------
-`aws` | `>= 2.11.17`
-`bundler` | `>= 1.17.3` and `>= 2.1.4`
-`docker` | `>= 18.09.9-ce`
-`git` | `>= 2.23.1`
-`make` | `>= 3.82`
-`maven` | `>= 3.6.3`
-`openssl` | `>= 1.0.2k-fips`
-`rsync` | `>= 3.1.2`
-`yarn` | `>= 1.21.1`
-`zip` & `unzip`| `>= 6.0-19`
-`gh` | `>= 1.9.2`
-`sam` | `>= 1.37.0`
+| Tool / Utility | Version |
+| --------------- | -------------------------- |
+| `aws` | `>= 2.11.17` |
+| `bundler` | `>= 1.17.3` and `>= 2.1.4` |
+| `docker` | `>= 18.09.9-ce` |
+| `git` | `>= 2.23.1` |
+| `make` | `>= 3.82` |
+| `maven` | `>= 3.6.3` |
+| `openssl` | `>= 1.0.2k-fips` |
+| `rsync` | `>= 3.1.2` |
+| `yarn` | `>= 1.21.1` |
+| `zip` & `unzip` | `>= 6.0-19` |
+| `gh` | `>= 1.9.2` |
+| `sam` | `>= 1.37.0` |
## License
From a2ab31609d361ac5ceca6c928584ec59f2d705d3 Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Mon, 13 Nov 2023 23:43:23 +0000
Subject: [PATCH 10/28] fix(kernel): invokeBinScript fails when using symlinked
cache (#4324)
Invoking bin scripts from jsii packages would fail if the symlinked cache was enabled and the invoked script depended on an other package. The reason for this was that scripts were only invoked with `--preserve-symlinks`, however for "main scripts" (like standalone binaries), we also need to call `--preserve-symlinks-main` on the node process.
Note this cannot be tested in the kernel package itself, as it's not possible to invoke the test process with the correct options.
---
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/kernel/src/kernel.ts | 11 +++++++++--
packages/@jsii/kernel/src/tar-cache/index.ts | 2 +-
packages/jsii-calc/bin/run.ts | 5 +++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/packages/@jsii/kernel/src/kernel.ts b/packages/@jsii/kernel/src/kernel.ts
index 7acf8a37c1..5b310ec9a5 100644
--- a/packages/@jsii/kernel/src/kernel.ts
+++ b/packages/@jsii/kernel/src/kernel.ts
@@ -1371,13 +1371,20 @@ export class Kernel {
throw new JsiiFault(`Script with name ${req.script} was not defined.`);
}
+ // Make sure the current NODE_OPTIONS are honored if we shell out to node
+ const nodeOptions = [...process.execArgv];
+
+ // When we are using the symlinked version of the cache, we need to preserve both symlink settings for binaries
+ if (nodeOptions.includes('--preserve-symlinks')) {
+ nodeOptions.push('--preserve-symlinks-main');
+ }
+
return {
command: path.join(packageDir, scriptPath),
args: req.args ?? [],
env: {
...process.env,
- // Make sure the current NODE_OPTIONS are honored if we shell out to node
- NODE_OPTIONS: process.execArgv.join(' '),
+ NODE_OPTIONS: nodeOptions.join(' '),
// Make sure "this" node is ahead of $PATH just in case
PATH: `${path.dirname(process.execPath)}:${process.env.PATH}`,
},
diff --git a/packages/@jsii/kernel/src/tar-cache/index.ts b/packages/@jsii/kernel/src/tar-cache/index.ts
index 1bc67cdfa9..7d7fbc0358 100644
--- a/packages/@jsii/kernel/src/tar-cache/index.ts
+++ b/packages/@jsii/kernel/src/tar-cache/index.ts
@@ -15,7 +15,7 @@ export interface ExtractResult {
* When `'hit'`, the data was already present in cache and was returned from
* cache.
*
- * When `'miss'`, the data was extracted into the caache and returned from
+ * When `'miss'`, the data was extracted into the cache and returned from
* cache.
*
* When `undefined`, the cache is not enabled.
diff --git a/packages/jsii-calc/bin/run.ts b/packages/jsii-calc/bin/run.ts
index bfa844c8e6..647ffebc53 100755
--- a/packages/jsii-calc/bin/run.ts
+++ b/packages/jsii-calc/bin/run.ts
@@ -2,11 +2,16 @@
/* eslint-disable no-console */
+import * as calcLib from '@scope/jsii-calc-lib';
+
const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
const runCommand = async () => {
console.info('Hello World!');
+ // Make sure this binary depends on an external package to test dependencies with invokeBinScript
+ new calcLib.Number(1);
+
const args = process.argv.slice(2);
if (args.length > 0) {
console.info(` arguments: ${args.join(', ')}`);
From 9450e62bc7d8b8169c62a9b2ada067cb4286d138 Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine
Date: Tue, 14 Nov 2023 10:28:37 +0900
Subject: [PATCH 11/28] chore: fix typo in CallbackExtensions.cs (#4301)
specificy -> specificity
---
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
---
.../src/Amazon.JSII.Runtime/CallbackExtensions.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs
index 8e0f03c52c..946fe08b7e 100644
--- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs
+++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs
@@ -65,7 +65,7 @@ out object? result
return null;
}
- throw new ArgumentException("Callback does not specificy a method, getter, or setter to invoke");
+ throw new ArgumentException("Callback does not specify a method, getter, or setter to invoke");
}
private static CallbackResult? InvokeMethod(InvokeRequest request, IReferenceMap referenceMap)
@@ -251,4 +251,4 @@ private CallbackResult(TypeReference type, bool isOptional, object? value) : bas
public object? Value { get; }
}
-}
\ No newline at end of file
+}
From d55b8d57ce43dc9fd3d5132d7ba3ad0aa9ead3b9 Mon Sep 17 00:00:00 2001
From: Anurag Roy <89125578+NextThread@users.noreply.github.com>
Date: Tue, 14 Nov 2023 14:26:36 +0530
Subject: [PATCH 12/28] fix(pacmak): *.tsbuildinfo not in auto-generated
.npmignore file (#4236)
#3978
Added *.tsbuildinfo to auto-generated .npmignore file
---
packages/jsii-pacmak/lib/npm-modules.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/jsii-pacmak/lib/npm-modules.ts b/packages/jsii-pacmak/lib/npm-modules.ts
index 81f2820c83..20948947e6 100644
--- a/packages/jsii-pacmak/lib/npm-modules.ts
+++ b/packages/jsii-pacmak/lib/npm-modules.ts
@@ -135,6 +135,7 @@ async function updateNpmIgnore(
'Exclude typescript source and config',
'*.ts',
'tsconfig.json',
+ '*.tsbuildinfo',
);
includePattern(
'Include javascript files and typescript declarations',
From bd02eef4de521d52d39e7ee6bc789f17574e740d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:38:09 +0000
Subject: [PATCH 13/28] chore(deps): Bump Microsoft.NET.Test.Sdk from 17.7.2 to
17.8.0 in /packages/@jsii/dotnet-runtime-test/test (#4322)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.7.2 to 17.8.0.
Release notes
Sourced from Microsoft.NET.Test.Sdk's releases .
v17.8.0
What's Changed
Full Changelog : https://github.com/microsoft/vstest/compare/v17.7.2...v17.8.0
v17.8.0-release-23468-02
What's Changed
Full Changelog : https://github.com/microsoft/vstest/compare/v17.8.0-preview-23424-02...v17.8.0-release-23468-02
v17.8.0-preview-23424-02
What's Changed
New Contributors
Full Changelog : https://github.com/microsoft/vstest/compare/v17.8.0-preview-23371-04...v17.8.0-preview-23424-02
v17.8.0-preview-23371-04
Issues Fixed
Take System dlls from testhost folder #4610
Simplify naming in ExecutionTests
Fix XmlException when writing Html log with certain test names #4576
Full Changelog : here
Drops
Commits
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Microsoft.NET.Test.Sdk&package-manager=nuget&previous-version=17.7.2&new-version=17.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 2b77132144..623fa429de 100644
--- a/packages/@jsii/Directory.Build.targets
+++ b/packages/@jsii/Directory.Build.targets
@@ -10,7 +10,7 @@
-
+
From c27196c667176650a0ab50f0d367aa54b9ab7075 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 10:42:40 +0000
Subject: [PATCH 14/28] chore(deps): Bump golang.org/x/tools from 0.14.0 to
0.15.0 in /packages/@jsii/go-runtime/jsii-runtime-go (#4319)
Bumps [golang.org/x/tools](https://github.com/golang/tools) from 0.14.0 to 0.15.0.
Release notes
Sourced from golang.org/x/tools's releases .
gopls/v0.14.1
This release contains just two changes:
A workaround for a regression affecting some users of GOPACKAGESDRIVER
: golang/go#63751 , for example those using gopls with an older version of Bazel . When the go/packages
driver is missing compiler or architecture information, gopls now assumes a default value rather than failing to load package information.
A fix for a minor bug in the new "remove unused parameter" refactoring: golang/go#63755 . Notably, this bug was discovered via an automated report from someone who had opted in to Go telemetry .
Commits
729e159
go.mod: update golang.org/x dependencies
38ed81a
gopls/internal/regtest/marker: porting extract tests
bbf8380
gopls/internal/regtest/marker: use golden diffs for suggested fixes
51df92b
go/ssa: two minor cleanups
e7fb31a
internal/cmd/deadcode: rename -format to -f
c538b4e
internal/cmd/deadcode: add -whylive=function flag
b753e58
internal/lsp/helper: fix misspelled "Code generated" comment
2638d66
internal/cmd/deadcode: omit package/func keywords in default output
118c362
gopls/internal/lsp/source: fix signatureHelp with pointer receivers
4124316
gopls/internal/lsp/cache: remove baseCtx from the View
Additional commits viewable in compare view
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=golang.org/x/tools&package-manager=go_modules&previous-version=0.14.0&new-version=0.15.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/go-runtime/jsii-runtime-go/go.mod | 6 +++---
packages/@jsii/go-runtime/jsii-runtime-go/go.sum | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
index d4f6e6965b..a614f41e5b 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
@@ -8,7 +8,7 @@ require (
github.com/mattn/go-isatty v0.0.19
github.com/stretchr/testify v1.8.4
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
- golang.org/x/tools v0.14.0
+ golang.org/x/tools v0.15.0
)
require (
@@ -16,8 +16,8 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
- golang.org/x/mod v0.13.0 // indirect
- golang.org/x/sys v0.13.0 // indirect
+ golang.org/x/mod v0.14.0 // indirect
+ golang.org/x/sys v0.14.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
index c85b2a3e19..7043a6e4f4 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
@@ -20,22 +20,22 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
+golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
From 960305f67910c74863afdb8ada19781b0c60806e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 11:27:04 +0000
Subject: [PATCH 15/28] chore(deps-dev): Bump pip from 23.3 to 23.3.1 in
/packages/jsii-pacmak/test/generated-code (#4306)
Bumps [pip](https://github.com/pypa/pip) from 23.3 to 23.3.1.
Changelog
Sourced from pip's changelog .
23.3.1 (2023-10-21)
Bug Fixes
Handle a timezone indicator of Z when parsing dates in the self check. ([#12338](https://github.com/pypa/pip/issues/12338) <https://github.com/pypa/pip/issues/12338>
_)
Fix bug where installing the same package at the same time with multiple pip processes could fail. ([#12361](https://github.com/pypa/pip/issues/12361) <https://github.com/pypa/pip/issues/12361>
_)
Commits
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pip&package-manager=pip&previous-version=23.3&new-version=23.3.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-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 04ac2a2a1e..3f6b30ae79 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.4.1
-pip==23.3 # required to use --config-settings
+pip==23.3.1 # required to use --config-settings
From e3191e520d009e65befb7a9bfeaed6480eef763c Mon Sep 17 00:00:00 2001
From: Kayo
Date: Tue, 14 Nov 2023 04:30:35 -0800
Subject: [PATCH 16/28] docs(typescript-restrictions): clarify non-jsii deps
(#3995)
I spent about a day and a half trying to figure this out, so I thought I'd add a little clarification :)
tl;dr: I'm making a CDK Construct package that also includes a custom lambda handler. That handler takes on a non-jsii dep but I couldn't figure out why JSII kept trying to compile that non-jsii dep until I read
> The API of the *jsii module* can not expose any type from bundled dependencies, since those types would not be available in other languages.
about 20 times.
---
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
---
.../user-guides/lib-author/typescript-restrictions.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gh-pages/content/user-guides/lib-author/typescript-restrictions.md b/gh-pages/content/user-guides/lib-author/typescript-restrictions.md
index b8a53b83a9..9ab1bc1f22 100644
--- a/gh-pages/content/user-guides/lib-author/typescript-restrictions.md
+++ b/gh-pages/content/user-guides/lib-author/typescript-restrictions.md
@@ -14,10 +14,14 @@ A *jsii module* can declare dependencies on any other *jsii module* by adding en
`package.json` file. Since most other platforms do not support multiple different versions of the same library to
coexist in the same closure, it is recommended to also declare all such dependencies as `peerDependencies`.
+### non-jsii dependencies
+
Occasionally, a dependency on a *non-jsii module* is useful. Since such dependencies do not have generated bindings in
all the supported languages, they must be bundled with the *jsii module* that depends on them, by adding the library
-into the `bundleDependencies` array in `package.json`. The API of the *jsii module* can not expose any type from bundled
-dependencies, since those types would not be available in other languages.
+into the `bundleDependencies` array in `package.json`.
+
+The API of the *jsii module* can not expose any type from bundled dependencies, since those types would not be available in other languages.
+TypeScript files that include a non-jsii dependency (e.g. a lambda handler for an AWS CDK Construct) cannot be exported from the `main`/`types` entry point.
!!! info
For more information on `package.json` file contents, refer to the [npm documentation][package-json].
From 68be5e1ad887fcf08598b677854ca4bce3c27007 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 13:32:51 +0000
Subject: [PATCH 17/28] chore(deps): Bump axios from 1.5.1 to 1.6.1 (#4321)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [axios](https://github.com/axios/axios) from 1.5.1 to 1.6.1.
Release notes
Sourced from axios's releases .
Release v1.6.1
Release notes:
Bug Fixes
formdata: fixed content-type header normalization for non-standard browser environments; (#6056 ) (dd465ab )
platform: fixed emulated browser detection in node.js environment; (#6055 ) (3dc8369 )
Contributors to this release
Release v1.6.0
Release notes:
Bug Fixes
CSRF: fixed CSRF vulnerability CVE-2023-45857 (#6028 ) (96ee232 )
dns: fixed lookup function decorator to work properly in node v20; (#6011 ) (5aaff53 )
types: fix AxiosHeaders types; (#5931 ) (a1c8ad0 )
PRs
⚠️ Critical vulnerability fix. See https://security.snyk.io/vuln/SNYK-JS-AXIOS-6032459
Contributors to this release
Changelog
Sourced from axios's changelog .
1.6.1 (2023-11-08)
Bug Fixes
formdata: fixed content-type header normalization for non-standard browser environments; (#6056 ) (dd465ab )
platform: fixed emulated browser detection in node.js environment; (#6055 ) (3dc8369 )
Contributors to this release
1.6.0 (2023-10-26)
Bug Fixes
CSRF: fixed CSRF vulnerability CVE-2023-45857 (#6028 ) (96ee232 )
dns: fixed lookup function decorator to work properly in node v20; (#6011 ) (5aaff53 )
types: fix AxiosHeaders types; (#5931 ) (a1c8ad0 )
PRs
⚠️ Critical vulnerability fix. See https://security.snyk.io/vuln/SNYK-JS-AXIOS-6032459
Contributors to this release
Commits
f6d2cf9
chore(ci): fix publish action content permission; (#6061 )
a22f4b9
chore(release): v1.6.1 (#6060 )
cb8bb2b
chore(ci): Publish to NPM with provenance (#5835 )
37cbf92
chore(ci): added labeling and notification for published PRs; (#6059 )
dd465ab
fix(formdata): fixed content-type header normalization for non-standard brows...
3dc8369
fix(platform): fixed emulated browser detection in node.js environment; (#6055 )
f7adacd
chore(release): v1.6.0 (#6031 )
9917e67
chore(ci): fix release-it arg; (#6032 )
96ee232
fix(CSRF): fixed CSRF vulnerability CVE-2023-45857 (#6028 )
7d45ab2
chore(tests): fixed tests to pass in node v19 and v20 with keep-alive
enabl...
Additional commits viewable in compare view
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=axios&package-manager=npm_and_yarn&previous-version=1.5.1&new-version=1.6.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 d3f60e3921..6cd4bce5a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2345,9 +2345,9 @@ available-typed-arrays@^1.0.5:
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axios@^1.0.0:
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.1.tgz#11fbaa11fc35f431193a9564109c88c1f27b585f"
- integrity sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.1.tgz#76550d644bf0a2d469a01f9244db6753208397d7"
+ integrity sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
From 7197b4f21e7f6776fbbfe5bac7f03a308cd9f7c0 Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Tue, 14 Nov 2023 14:48:08 +0000
Subject: [PATCH 18/28] feat(superchain): publish a bullseye image with node18
& python 3.9 (#4326)
This will become the new default for most use cases.
---
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 | 3 +--
CONTRIBUTING.md | 5 +++--
superchain/README.md | 20 ++++++--------------
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index b9daa0fc3b..3df903d346 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -23,10 +23,9 @@ jobs:
matrix:
debian:
- 'buster' # 10
+ - 'bullseye' # 11
node: ['18', '20']
include:
- - debian: 'bullseye' # 11
- node: '20'
- debian: 'bookworm' #12
node: '20'
env:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d313502da..e83234bd5b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -228,13 +228,14 @@ The [Python](./packages/jsii-pacmak/lib/targets/python.ts) target is a good
example to work from.
## Releasing
+
### The `public.ecr.aws/jsii/superchain` Docker image
-Upon merging new changes to the `main` branch, the `public.ecr.aws/jsii/superchain:1-buster-slim-nightly`
+Upon merging new changes to the `main` branch, the `public.ecr.aws/jsii/superchain:1-bullseye-slim-nightly`
image will be released after a last validation build.
Upon making a new `jsii` release (when the GitHub release entry - and its
-corresponding git tag - is created), the `public.ecr.aws/jsii/superchain:1-buster-slim` image will
+corresponding git tag - is created), the `public.ecr.aws/jsii/superchain:1-bullseye-slim` image will
be released after a last validation build.
The latest release information (for both of the Docker image tags) can be seen
diff --git a/superchain/README.md b/superchain/README.md
index a50226a9e2..c1a718be7b 100644
--- a/superchain/README.md
+++ b/superchain/README.md
@@ -38,16 +38,10 @@ public.ecr.aws/jsii/superchain:- (-node)(-nightly)
The previous image tags have been discontinued:
-- `:latest` (users should migrate to `:1-buster-slim`)
-- `:nightly` (users should migrate to `:1-buster-slim-nightly`)
-- `:node10` (users should migrate to `:1-buster-slim-node18`)
-- `:node10-nightly` (users should migrate to `:1-buster-slim-node18-nightly`)
-- `:node12` (users should migrate to `:1-buster-slim-node18`)
-- `:node12-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`)
-- `:node14` (users should migrate to `:1-buster-slim-node18`)
-- `:node14-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`)
-- `:node16` (users should migrate to `:1-buster-slim-node18`)
-- `:node16-nightly` (users shoudl migrate to `:1-buster-slim-node18-nightly`)
+- `:latest` (users should migrate to `:1-bullseye-slim`)
+- `:nightly` (users should migrate to `:1-bullseye-slim-nightly`)
+- `:nodeX` (users should migrate to an image using a supported node version)
+- `:nodeX-nightly` (users should migrate to a nightly image using a supported node version)
## Building
@@ -68,10 +62,8 @@ jsii$ docker build . -f superchain/Dockerfile -t jsii/superchain:local --target=
We build multiple versions of this image, for different versions of Node. They are available as:
-* `public.ecr.aws/jsii/superchain:1-buster-slim-node14(-nightly)`
-* `public.ecr.aws/jsii/superchain:1-buster-slim-node16(-nightly)`
-* `public.ecr.aws/jsii/superchain:1-buster-slim-node18(-nightly)`
-* `public.ecr.aws/jsii/superchain:1-buster-slim-node20(-nightly)`
+* `public.ecr.aws/jsii/superchain:1-bullseye-slim-node18(-nightly)`
+* `public.ecr.aws/jsii/superchain:1-bullseye-slim-node20(-nightly)`
If you are building this image from source, you can control the Node version with the
`NODE_MAJOR_VERSION` build argument:
From 416e2b504895800281a3598b3139b141330aa906 Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Tue, 14 Nov 2023 19:36:43 +0000
Subject: [PATCH 19/28] feat: switch to python 3.8 (#4239) (#4327)
Python 3.7 has been end-of-life since 2023-06-27, and an increasing amount of our dependencies are dropping support for it as a consequence.
We introduced a warning to users that are still using Python 3.7 with release v1.86.0 around August 1, 2023.
We are now effectively dropping support for Python 3.7.
Related: https://github.com/aws/jsii/commit/0ef7acef765690f99075888d6c3e6f03d7cc2d59
Re-roll of #4239, which was reverted because the build & release pipeline failed. After some investigation this was because the job used a superchain image with python3.7. However after this change a minimum version of python 3.8 is required.
BREAKING CHANGE: jsii-pacmak and the libraries it generates for Python targets now require a minimum Python version of 3.8, instead of 3.7 previously. We recommend users upgrade to the latest supported Python release (Python 3.11).
---
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 | 24 +++++++++----------
CONTRIBUTING.md | 4 ++--
.../user-guides/language-support/index.md | 2 +-
.../configuration/targets/python.md | 1 -
.../content/user-guides/lib-author/index.md | 2 +-
packages/@jsii/python-runtime/pyproject.toml | 4 ++--
packages/@jsii/python-runtime/setup.py | 5 ++--
packages/jsii-pacmak/lib/targets/python.ts | 5 ++--
.../__snapshots__/examples.test.js.snap | 10 ++++----
.../prerelease-identifiers.test.js.snap | 20 +++++++---------
.../__snapshots__/target-python.test.js.snap | 20 +++++++---------
11 files changed, 42 insertions(+), 55 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 799e338529..0efe8e7a11 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,10 +47,10 @@ jobs:
with:
cache: yarn
node-version: '18'
- - name: Set up Python 3.7
+ - name: Set up Python 3.8
uses: actions/setup-python@v4
with:
- python-version: '3.7'
+ python-version: '3.8'
cache: pip
- name: Install python3-venv
run: sudo apt install -y python3-venv
@@ -130,10 +130,10 @@ jobs:
with:
cache: yarn
node-version: '18'
- - name: Set up Python 3.7
+ - name: Set up Python 3.8
uses: actions/setup-python@v4
with:
- python-version: '3.7'
+ python-version: '3.8'
cache: pip
- name: Install python3-venv
run: sudo apt install -y python3-venv
@@ -197,7 +197,7 @@ jobs:
java: ['8']
node: ['18'] # EOL 2025-04-30
os: [ubuntu-latest]
- python: ['3.7']
+ python: ['3.8']
# Add specific combinations to be tested against (to restrict cardinality)
include:
# Test using Windows
@@ -207,7 +207,7 @@ jobs:
go: '1.18'
java: '8'
node: '18'
- python: '3.7'
+ python: '3.8'
# Test using macOS
- title: 'macOS'
os: macos-latest
@@ -215,7 +215,7 @@ jobs:
go: '1.18'
java: '8'
node: '18'
- python: '3.7'
+ python: '3.8'
# Test alternate Nodes
- title: 'Node 18'
java: '8'
@@ -223,14 +223,14 @@ jobs:
go: '1.18'
node: '18' # EOL 2025-04-30
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
- title: 'Node 20'
java: '8'
dotnet: '6.0.x'
go: '1.18'
node: '20' # EOL 2026-04-30
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate .NETs
- title: '.NET 7.0'
java: '8'
@@ -238,7 +238,7 @@ jobs:
go: '1.18'
node: '18'
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate Gos
- title: 'Go 1.19'
java: '8'
@@ -246,7 +246,7 @@ jobs:
go: '1.19'
node: '18'
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate Javas
- title: 'Java 11'
java: '11'
@@ -254,7 +254,7 @@ jobs:
go: '1.18'
node: '18'
os: ubuntu-latest
- python: '3.7'
+ python: '3.8'
# Test alternate Pythons
- title: 'Python 3.8'
python: '3.8'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e83234bd5b..21b3a0eab6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -45,7 +45,7 @@ in your development environment.
+ [`maven >= 3.0.5`](https://maven.apache.org)
- [.NET `6.0`] or later
+ *Recommended:* [`mono >= 6`](https://www.mono-project.com)
-- [Python `3.7.3`] or later
+- [Python `3.8.10`] or later
+ [`pip`](https://pip.pypa.io/en/stable/installing/)
+ [`setuptools >= 38.6.0`](https://pypi.org/project/setuptools/)
+ [`wheel`](https://pypi.org/project/wheel/)
@@ -57,7 +57,7 @@ in your development environment.
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
[.NET `6.0`]: https://www.microsoft.com/net/download
-[Python `3.7.3`]: https://www.python.org/downloads/release/python-373/
+[Python `3.8.10`]: https://www.python.org/downloads/release/python-3810/
[Go]: https://go.dev/dl/
## Getting Started
diff --git a/gh-pages/content/user-guides/language-support/index.md b/gh-pages/content/user-guides/language-support/index.md
index 03b9dcc5c5..ed2788985b 100644
--- a/gh-pages/content/user-guides/language-support/index.md
+++ b/gh-pages/content/user-guides/language-support/index.md
@@ -69,7 +69,7 @@ in significant re-engineering effort:
- How are dependencies modeled? If [semantic versioning] is not the norm, what is the strategy to correctly represent
semantic version ranges?
- What are the toolchain and platform requirements?
- - For example, **Java** requires an OpenJDK 8 distribution and `maven`, **Python** requires `python` 3.7 or above,
+ - For example, **Java** requires an OpenJDK 8 distribution and `maven`, **Python** requires `python` 3.8 or above,
etc...
## Code Generation
diff --git a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
index 7a41219615..2eadcf7c2d 100644
--- a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
+++ b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
@@ -16,7 +16,6 @@ The `python` target requires two configuration entries:
- Additionally, the following `Programming Language ::` classifiers are already set (more could be added by the user
if relevant):
- `Programming Language :: Python :: 3 :: Only`
- - `Programming Language :: Python :: 3.7`
- `Programming Language :: Python :: 3.8`
- `Programming Language :: Python :: 3.9`
- `Programming Language :: Python :: 3.10`
diff --git a/gh-pages/content/user-guides/lib-author/index.md b/gh-pages/content/user-guides/lib-author/index.md
index dac3277655..fdf52ab1c0 100644
--- a/gh-pages/content/user-guides/lib-author/index.md
+++ b/gh-pages/content/user-guides/lib-author/index.md
@@ -19,7 +19,7 @@ to produce releasable artifacts.
| .NET | .NET ≥ 6.0 |
| Go | Go ≥ 1.18 |
| Java | JDK ≥ 8 *and* Maven ≥ 3.6 |
-| Python | Python ≥ 3.7 |
+| Python | Python ≥ 3.8 |
## :octicons-desktop-download-24: Download Locations
diff --git a/packages/@jsii/python-runtime/pyproject.toml b/packages/@jsii/python-runtime/pyproject.toml
index 4ccebe88f3..791f88fdba 100644
--- a/packages/@jsii/python-runtime/pyproject.toml
+++ b/packages/@jsii/python-runtime/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["setuptools~=62.2", "wheel~=0.37"]
build-backend = 'setuptools.build_meta'
[tool.black]
-target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
+target-version = ['py38', 'py39', 'py310', 'py311']
include = '\.pyi?$'
exclude = '\.(git|mypy_cache|env)'
@@ -11,6 +11,6 @@ exclude = '\.(git|mypy_cache|env)'
ignore_missing_imports = true
[tool.pyright]
-pythonVersion = "3.7"
+pythonVersion = "3.8"
venv = ".env"
venvPath = "."
diff --git a/packages/@jsii/python-runtime/setup.py b/packages/@jsii/python-runtime/setup.py
index 5ae79af4b7..c5378575c3 100644
--- a/packages/@jsii/python-runtime/setup.py
+++ b/packages/@jsii/python-runtime/setup.py
@@ -36,16 +36,15 @@
"publication>=0.0.3", # This is used by all generated code.
"typeguard~=2.13.3", # This is used by all generated code.
"python-dateutil",
- "typing_extensions>=3.7,<5.0",
+ "typing_extensions>=3.8,<5.0",
],
- python_requires="~=3.7",
+ python_requires="~=3.8",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
index 55b73db957..c0ab22271e 100644
--- a/packages/jsii-pacmak/lib/targets/python.ts
+++ b/packages/jsii-pacmak/lib/targets/python.ts
@@ -2102,7 +2102,7 @@ class Package {
package_dir: { '': 'src' },
packages: modules.map((m) => m.pythonName),
package_data: packageData,
- python_requires: '~=3.7',
+ python_requires: '~=3.8',
install_requires: [
`jsii${toPythonVersionRange(`^${VERSION}`)}`,
'publication>=0.0.3',
@@ -2115,7 +2115,6 @@ class Package {
'Operating System :: OS Independent',
'Programming Language :: JavaScript',
'Programming Language :: Python :: 3 :: Only',
- 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
@@ -2236,7 +2235,7 @@ class Package {
code.line();
code.line('[tool.pyright]');
code.line('defineConstant = { DEBUG = true }');
- code.line('pythonVersion = "3.7"');
+ code.line('pythonVersion = "3.8"');
code.line('pythonPlatform = "All"');
code.line('reportSelfClsParameterName = false');
code.closeFile('pyproject.toml');
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
index 72c40a5489..cbc750ca01 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap
@@ -1225,7 +1225,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1266,7 +1266,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1277,7 +1277,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -2647,7 +2646,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -2688,7 +2687,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -2699,7 +2698,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
index 4482893e5c..473d5cfe94 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
@@ -417,7 +417,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -454,7 +454,7 @@ kwargs = json.loads(
"foo@1.2.3.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"bar>=2.0.0.rc42, <3.0.0",
"jsii<0.0.1",
@@ -466,7 +466,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -932,7 +931,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -969,7 +968,7 @@ kwargs = json.loads(
"foo@1.2.3.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"bar>=4.5.6.dev1337, <5.0.0",
"jsii<0.0.1",
@@ -981,7 +980,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1427,7 +1425,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1464,7 +1462,7 @@ kwargs = json.loads(
"foo@2.0.0-rc.42.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1475,7 +1473,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1919,7 +1916,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1956,7 +1953,7 @@ kwargs = json.loads(
"foo@4.5.6-pre.1337.jsii.tgz"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1967,7 +1964,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
index e5db3283dd..b0d3531ebb 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/target-python.test.js.snap
@@ -248,7 +248,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -289,7 +289,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -301,7 +301,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -803,7 +802,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -844,7 +843,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -855,7 +854,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -1331,7 +1329,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -1374,7 +1372,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -1387,7 +1385,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
@@ -2992,7 +2989,7 @@ build-backend = "setuptools.build_meta"
[tool.pyright]
defineConstant = { DEBUG = true }
-pythonVersion = "3.7"
+pythonVersion = "3.8"
pythonPlatform = "All"
reportSelfClsParameterName = false
@@ -3072,7 +3069,7 @@ kwargs = json.loads(
"py.typed"
]
},
- "python_requires": "~=3.7",
+ "python_requires": "~=3.8",
"install_requires": [
"jsii<0.0.1",
"publication>=0.0.3",
@@ -3085,7 +3082,6 @@ kwargs = json.loads(
"Operating System :: OS Independent",
"Programming Language :: JavaScript",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
From a7d2d7fbb37a4af3266c42c527c814db6d128e58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 20:27:13 +0000
Subject: [PATCH 20/28] chore(deps): Bump github.com/fatih/color from 1.15.0 to
1.16.0 in /packages/@jsii/go-runtime/jsii-runtime-go (#4314)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [github.com/fatih/color](https://github.com/fatih/color) from 1.15.0 to 1.16.0.
Release notes
Sourced from github.com/fatih/color's releases .
v1.16.0
What's Changed
Dependency updates
New Contributors
Full Changelog : https://github.com/fatih/color/compare/v1.15.0...v1.16.0
Commits
0f9779e
Merge pull request #213 from fatih/dependabot/go_modules/golang.org/x/sys-0.14.0
0c78604
Bump golang.org/x/sys from 0.13.0 to 0.14.0
96e0f73
Merge pull request #208 from fatih/dependabot/github_actions/actions/checkout-4
4c66e32
Bump actions/checkout from 3 to 4
2fb03d6
Merge pull request #202 from fatih/dependabot/github_actions/actions/setup-go-4
8ba7bbd
Bump actions/setup-go from 3 to 4
e3f97f3
Merge pull request #209 from fatih/dependabot/go_modules/golang.org/x/sys-0.13.0
e146575
Bump golang.org/x/sys from 0.10.0 to 0.13.0
d2d7a5e
Merge pull request #212 from fatih/dependabot/go_modules/github.com/mattn/go-...
f3e45da
Merge branch 'main' into dependabot/go_modules/github.com/mattn/go-isatty-0.0.20
Additional commits viewable in compare view
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/fatih/color&package-manager=go_modules&previous-version=1.15.0&new-version=1.16.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/go-runtime-test/project/go.mod | 4 +-
packages/@jsii/go-runtime-test/project/go.sum | 43 ++-----------------
.../@jsii/go-runtime/jsii-runtime-go/go.mod | 4 +-
.../@jsii/go-runtime/jsii-runtime-go/go.sum | 8 ++--
4 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/packages/@jsii/go-runtime-test/project/go.mod b/packages/@jsii/go-runtime-test/project/go.mod
index 63f2d81cff..e6de3322f6 100644
--- a/packages/@jsii/go-runtime-test/project/go.mod
+++ b/packages/@jsii/go-runtime-test/project/go.mod
@@ -16,9 +16,9 @@ require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/fatih/color v1.15.0 // indirect
+ github.com/fatih/color v1.16.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-isatty v0.0.19 // indirect
+ github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/mod v0.14.0 // indirect
diff --git a/packages/@jsii/go-runtime-test/project/go.sum b/packages/@jsii/go-runtime-test/project/go.sum
index 51e269bb6a..95448607a6 100644
--- a/packages/@jsii/go-runtime-test/project/go.sum
+++ b/packages/@jsii/go-runtime-test/project/go.sum
@@ -2,13 +2,13 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -20,55 +20,20 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
-golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
-golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
-golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg=
-golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
-golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
-golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
-golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
-golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
-golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
index a614f41e5b..8311a01cbc 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.mod
@@ -4,8 +4,8 @@ go 1.18
require (
github.com/Masterminds/semver/v3 v3.2.1
- github.com/fatih/color v1.15.0
- github.com/mattn/go-isatty v0.0.19
+ github.com/fatih/color v1.16.0
+ github.com/mattn/go-isatty v0.0.20
github.com/stretchr/testify v1.8.4
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.15.0
diff --git a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
index 7043a6e4f4..95448607a6 100644
--- a/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
+++ b/packages/@jsii/go-runtime/jsii-runtime-go/go.sum
@@ -2,13 +2,13 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
-github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
From 5593f2d7f74483e9fd8990dcedd26a7c0496e1ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 21:30:05 +0000
Subject: [PATCH 21/28] chore(deps): Bump mypy from 1.4.1 to 1.7.0 in
/packages/@jsii/python-runtime (#4328)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [mypy](https://github.com/python/mypy) from 1.4.1 to 1.7.0.
Changelog
Sourced from mypy's changelog .
Mypy Release Notes
Next release
Stubgen will now include __all__
in its output if it is in the input file (PR 16356 ).
Mypy 1.7
We’ve just uploaded mypy 1.7 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 .
Using TypedDict for **kwargs
Typing
Mypy now has support for using Unpack[...]
with a TypedDict type to annotate **kwargs
arguments enabled by default. Example:
# Or 'from typing_extensions import ...'
from typing import TypedDict, Unpack
class Person(TypedDict):
name: str
age: int
def foo(**kwargs: Unpack[Person]) -> None:
...
foo(name="x", age=1) # Ok
foo(name=1) # Error
The definition of foo
above is equivalent to the one below, with keyword-only arguments name
and age
:
def foo(*, name: str, age: int) -> None:
...
Refer to PEP 692 for more information. Note that unlike in the current version of the PEP, mypy always treats signatures with Unpack[SomeTypedDict]
as equivalent to their expanded forms with explicit keyword arguments, and there aren't special type checking rules for TypedDict arguments.
This was contributed by Ivan Levkivskyi back in 2022 (PR 13471 ).
TypeVarTuple Support Enabled (Experimental)
Mypy now has support for variadic generics (TypeVarTuple) enabled by default, as an experimental feature. Refer to PEP 646 for the details.
TypeVarTuple was implemented by Jared Hance and Ivan Levkivskyi over several mypy releases, with help from Jukka Lehtosalo.
... (truncated)
Commits
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.4.1&new-version=1.7.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 ce4cb80211..9147b0632f 100644
--- a/packages/@jsii/python-runtime/requirements.txt
+++ b/packages/@jsii/python-runtime/requirements.txt
@@ -1,5 +1,5 @@
black~=23.3
-mypy==1.4.1
+mypy==1.7.0
pip~=23.3
pytest~=7.4
pytest-mypy~=0.10
From 00538f500d031e3184989719332c1d30abaef26d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 22:36:34 +0000
Subject: [PATCH 22/28] chore(deps-dev): Bump mypy from 1.4.1 to 1.7.0 in
/packages/jsii-pacmak/test/generated-code (#4329)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [mypy](https://github.com/python/mypy) from 1.4.1 to 1.7.0.
Changelog
Sourced from mypy's changelog .
Mypy Release Notes
Next release
Stubgen will now include __all__
in its output if it is in the input file (PR 16356 ).
Mypy 1.7
We’ve just uploaded mypy 1.7 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 .
Using TypedDict for **kwargs
Typing
Mypy now has support for using Unpack[...]
with a TypedDict type to annotate **kwargs
arguments enabled by default. Example:
# Or 'from typing_extensions import ...'
from typing import TypedDict, Unpack
class Person(TypedDict):
name: str
age: int
def foo(**kwargs: Unpack[Person]) -> None:
...
foo(name="x", age=1) # Ok
foo(name=1) # Error
The definition of foo
above is equivalent to the one below, with keyword-only arguments name
and age
:
def foo(*, name: str, age: int) -> None:
...
Refer to PEP 692 for more information. Note that unlike in the current version of the PEP, mypy always treats signatures with Unpack[SomeTypedDict]
as equivalent to their expanded forms with explicit keyword arguments, and there aren't special type checking rules for TypedDict arguments.
This was contributed by Ivan Levkivskyi back in 2022 (PR 13471 ).
TypeVarTuple Support Enabled (Experimental)
Mypy now has support for variadic generics (TypeVarTuple) enabled by default, as an experimental feature. Refer to PEP 646 for the details.
TypeVarTuple was implemented by Jared Hance and Ivan Levkivskyi over several mypy releases, with help from Jukka Lehtosalo.
... (truncated)
Commits
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mypy&package-manager=pip&previous-version=1.4.1&new-version=1.7.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 3f6b30ae79..953c8fa1f9 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.4.1
+mypy==1.7.0
pip==23.3.1 # required to use --config-settings
From 6669b8d669700ee01d8a5771f6cedbe9e7b0e0ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 23:36:02 +0000
Subject: [PATCH 23/28] chore(deps): Update black requirement from ~=23.3 to
~=23.11 in /packages/@jsii/python-runtime (#4323)
Updates the requirements on [black](https://github.com/psf/black) to permit the latest version.
Release notes
Sourced from black's releases .
23.11.0
Highlights
Support formatting ranges of lines with the new --line-ranges
command-line option
(#4020 )
Stable style
Fix crash on formatting bytes strings that look like docstrings (#4003 )
Fix crash when whitespace followed a backslash before newline in a docstring (#4008 )
Fix standalone comments inside complex blocks crashing Black (#4016 )
Fix crash on formatting code like await (a ** b)
(#3994 )
No longer treat leading f-strings as docstrings. This matches Python's behaviour and
fixes a crash (#4019 )
Preview style
Multiline dicts and lists that are the sole argument to a function are now
indented less (#3964 )
Multiline unpacked dicts and lists as the sole argument to a function are now also
indented less (#3992 )
In f-string debug expressions, quote types that are visible in the final string
are now preserved (#4005 )
Fix a bug where long case
blocks were not split into multiple lines. Also enable
general trailing comma rules on case
blocks (#4024 )
Keep requiring two empty lines between module-level docstring and first function or
class definition (#4028 )
Add support for single-line format skip with other comments on the same line (#3959 )
Configuration
Consistently apply force exclusion logic before resolving symlinks (#4015 )
Fix a bug in the matching of absolute path names in --include
(#3976 )
Performance
Fix mypyc builds on arm64 on macOS (#4017 )
Integrations
Black's pre-commit integration will now run only on git hooks appropriate for a code
formatter (#3940 )
Changelog
Sourced from black's changelog .
23.11.0
Highlights
Support formatting ranges of lines with the new --line-ranges
command-line option
(#4020 )
Stable style
Fix crash on formatting bytes strings that look like docstrings (#4003 )
Fix crash when whitespace followed a backslash before newline in a docstring (#4008 )
Fix standalone comments inside complex blocks crashing Black (#4016 )
Fix crash on formatting code like await (a ** b)
(#3994 )
No longer treat leading f-strings as docstrings. This matches Python's behaviour and
fixes a crash (#4019 )
Preview style
Multiline dicts and lists that are the sole argument to a function are now indented
less (#3964 )
Multiline unpacked dicts and lists as the sole argument to a function are now also
indented less (#3992 )
In f-string debug expressions, quote types that are visible in the final string are
now preserved (#4005 )
Fix a bug where long case
blocks were not split into multiple lines. Also enable
general trailing comma rules on case
blocks (#4024 )
Keep requiring two empty lines between module-level docstring and first function or
class definition (#4028 )
Add support for single-line format skip with other comments on the same line (#3959 )
Configuration
Consistently apply force exclusion logic before resolving symlinks (#4015 )
Fix a bug in the matching of absolute path names in --include
(#3976 )
Performance
Fix mypyc builds on arm64 on macOS (#4017 )
Integrations
Black's pre-commit integration will now run only on git hooks appropriate for a code
formatter (#3940 )
23.10.1
Highlights
Maintenance release to get a fix out for GitHub Action edge case (#3957 )
... (truncated)
Commits
2a1c67e
Prepare release 23.11.0 (#4032 )
72e7a2e
Remove redundant condition from has_magic_trailing_comma
(#4023 )
1a7d9c2
Preserve visible quote types for f-string debug expressions (#4005 )
f4c7be5
docs: fix minor typo (#4030 )
2e4fac9
Apply force exclude logic before symlink resolution (#4015 )
66008fd
[563] Fix standalone comments inside complex blocks crashing Black (#4016 )
50ed622
Fix long case blocks not split into multiple lines (#4024 )
46be1f8
Support formatting specified lines (#4020 )
ecbd9e8
Fix crash with f-string docstrings (#4019 )
e808e61
Preview: Keep requiring two empty lines between module-level docstring and fi...
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 9147b0632f..982191a507 100644
--- a/packages/@jsii/python-runtime/requirements.txt
+++ b/packages/@jsii/python-runtime/requirements.txt
@@ -1,4 +1,4 @@
-black~=23.3
+black~=23.11
mypy==1.7.0
pip~=23.3
pytest~=7.4
From 4e87342c72547b3d1f49c80a530687bf75774194 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Nov 2023 00:23:30 +0000
Subject: [PATCH 24/28] chore(deps): Update setuptools requirement from
~=68.0.0 to ~=68.2.2 in /packages/@jsii/python-runtime (#4330)
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 .
v68.2.2
Bugfixes
Improve backwards compatibility with deprecated CLI practices. (#4048 )
v68.2.1
Bugfixes
Avoid using caching attributes in Distribution.metadata
for requirements.
This is done for backwards compatibility with customizations that attempt to
modify install_requires
or extras_require
at a late point (still not
recommended). (#4043 )
Misc
v68.2.0
Features
Rework how setuptools
internally handles dependencies/install_requires
and optional-dependencies/extras_require
. (#3903 )
Improve the generated PKG-INFO
files, by adding Requires-Dist
fields.
Previously, these fields would be omitted in favour of a non-standard
*.egg-info/requires.txt
file (which is still generated for the time being). (#3904 )
Improve atomicity when writing PKG-INFO
files to avoid race
conditions with importlib.metadata
. (#3904 )
Bugfixes
Fix the name given to the *-nspkg.pth
files in editable installs,
ensuring they are unique per distribution. (#4041 )
Workaround some limitations on pkg_resources
-style legacy namespaces in
the meta path finder for editable installations. (#4041 )
... (truncated)
Commits
2255e63
Bump version: 68.2.1 → 68.2.2
74cc26c
Improve backwards compatibility with deprecated CLI practices (#4048 )
e3d5edd
Fix import statement on quickstart guide (#4049 )
5f29762
fix import statement on quickstart guide
facbb75
Add news fragment
7b7971e
Set requirements attributes directly into dist when parsing pyproject.toml
566f294
Test command line parsing of '--version' interoperates with pyproject.toml
0120605
Bump version: 68.2.0 → 68.2.1
6e1bd6b
Fix bumpversion state
d30aaa5
Update test deps (#4045 )
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 982191a507..40c1cb7234 100644
--- a/packages/@jsii/python-runtime/requirements.txt
+++ b/packages/@jsii/python-runtime/requirements.txt
@@ -3,7 +3,7 @@ mypy==1.7.0
pip~=23.3
pytest~=7.4
pytest-mypy~=0.10
-setuptools~=68.0.0
+setuptools~=68.2.2
types-python-dateutil~=2.8
wheel~=0.41
From 8594cd4e63d13611f7bddf50bfff30fe658d8933 Mon Sep 17 00:00:00 2001
From: AWS CDK Automation
<43080478+aws-cdk-automation@users.noreply.github.com>
Date: Tue, 14 Nov 2023 17:09:56 -0800
Subject: [PATCH 25/28] chore: npm-check-updates && yarn upgrade (#4310)
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
---
package.json | 12 +-
packages/@jsii/dotnet-runtime/package.json | 2 +-
packages/@jsii/integ-test/package.json | 2 +-
packages/@jsii/kernel/package.json | 4 +-
packages/@jsii/kernel/src/kernel.ts | 4 +-
packages/jsii-diff/package.json | 2 +-
.../targets/dotnet/runtime-type-checking.ts | 4 +-
packages/jsii-pacmak/package.json | 10 +-
.../jsii-rosetta/lib/languages/default.ts | 4 +-
packages/jsii-rosetta/lib/languages/go.ts | 18 +-
packages/jsii-rosetta/lib/translate.ts | 2 +-
packages/jsii-rosetta/package.json | 12 +-
packages/jsii/lib/jsii-diagnostic.ts | 2 +-
packages/jsii/package.json | 8 +-
yarn.lock | 772 +++++++++---------
15 files changed, 441 insertions(+), 417 deletions(-)
diff --git a/package.json b/package.json
index 9221ef7228..6b6ca606aa 100644
--- a/package.json
+++ b/package.json
@@ -16,12 +16,12 @@
},
"devDependencies": {
"@jest/types": "^28.1.3",
- "@types/jest": "^29.5.6",
+ "@types/jest": "^29.5.8",
"@types/node": "^14.18.63",
- "@typescript-eslint/eslint-plugin": "^6.8.0",
- "@typescript-eslint/parser": "^6.8.0",
+ "@typescript-eslint/eslint-plugin": "^6.11.0",
+ "@typescript-eslint/parser": "^6.11.0",
"all-contributors-cli": "^6.26.1",
- "eslint": "^8.51.0",
+ "eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^3.6.1",
@@ -31,8 +31,8 @@
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.1.3",
- "lerna": "^7.4.1",
- "prettier": "^3.0.3",
+ "lerna": "^7.4.2",
+ "prettier": "^3.1.0",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
"typescript": "~4.7.4"
diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json
index 0a1ae2b8b1..ad883b3ae8 100644
--- a/packages/@jsii/dotnet-runtime/package.json
+++ b/packages/@jsii/dotnet-runtime/package.json
@@ -39,7 +39,7 @@
},
"devDependencies": {
"@jsii/runtime": "^0.0.0",
- "@types/semver": "^7.5.3",
+ "@types/semver": "^7.5.5",
"jsii-build-tools": "^0.0.0",
"semver": "^7.5.4"
}
diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json
index 0489a201a6..16a148955d 100644
--- a/packages/@jsii/integ-test/package.json
+++ b/packages/@jsii/integ-test/package.json
@@ -27,6 +27,6 @@
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
- "@types/tar": "^6.1.6"
+ "@types/tar": "^6.1.9"
}
}
diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json
index 5717acd74a..bb932148a5 100644
--- a/packages/@jsii/kernel/package.json
+++ b/packages/@jsii/kernel/package.json
@@ -40,8 +40,8 @@
"@scope/jsii-calc-base": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
"@types/fs-extra": "^9.0.13",
- "@types/lockfile": "^1.0.3",
- "@types/tar": "^6.1.6",
+ "@types/lockfile": "^1.0.4",
+ "@types/tar": "^6.1.9",
"jest-expect-message": "^1.1.3",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120"
diff --git a/packages/@jsii/kernel/src/kernel.ts b/packages/@jsii/kernel/src/kernel.ts
index 5b310ec9a5..caab41c6d0 100644
--- a/packages/@jsii/kernel/src/kernel.ts
+++ b/packages/@jsii/kernel/src/kernel.ts
@@ -417,9 +417,7 @@ export class Kernel {
if (this.#syncInProgress) {
throw new JsiiFault(
- `Cannot invoke async method '${req.objref[TOKEN_REF]}.${
- req.method
- }' while sync ${this.#syncInProgress} is being processed`,
+ `Cannot invoke async method '${req.objref[TOKEN_REF]}.${req.method}' while sync ${this.#syncInProgress} is being processed`,
);
}
diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json
index 4148bb05ba..8d88a6aac0 100644
--- a/packages/jsii-diff/package.json
+++ b/packages/jsii-diff/package.json
@@ -42,7 +42,7 @@
},
"devDependencies": {
"@types/fs-extra": "^9.0.13",
- "@types/tar-fs": "^2.0.2",
+ "@types/tar-fs": "^2.0.4",
"jest-expect-message": "^1.1.3",
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0"
diff --git a/packages/jsii-pacmak/lib/targets/dotnet/runtime-type-checking.ts b/packages/jsii-pacmak/lib/targets/dotnet/runtime-type-checking.ts
index 8014a86638..50a9082198 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet/runtime-type-checking.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet/runtime-type-checking.ts
@@ -242,8 +242,8 @@ abstract class Validation {
t.startsWith('"')
? t.slice(1, t.length - 1)
: t.startsWith('$"')
- ? t.slice(2, t.length - 1)
- : `{${t}}`,
+ ? t.slice(2, t.length - 1)
+ : `{${t}}`,
)
.join(', ');
if (allowNull) {
diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json
index 61a1cea805..171a9f6960 100644
--- a/packages/jsii-pacmak/package.json
+++ b/packages/jsii-pacmak/package.json
@@ -47,7 +47,7 @@
"jsii-reflect": "^0.0.0",
"jsii-rosetta": "^0.0.0",
"semver": "^7.5.4",
- "spdx-license-list": "^6.7.0",
+ "spdx-license-list": "^6.8.0",
"xmlbuilder": "^15.1.1",
"yargs": "^16.2.0"
},
@@ -56,11 +56,11 @@
"@jsii/java-runtime": "^0.0.0",
"@jsii/go-runtime": "^0.0.0",
"@scope/jsii-calc-lib": "^0.0.0",
- "@types/clone": "^2.1.3",
- "@types/diff": "^5.0.7",
- "@types/commonmark": "^0.27.8",
+ "@types/clone": "^2.1.4",
+ "@types/diff": "^5.0.8",
+ "@types/commonmark": "^0.27.9",
"@types/fs-extra": "^9.0.13",
- "@types/semver": "^7.5.3",
+ "@types/semver": "^7.5.5",
"diff": "^5.1.0",
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
diff --git a/packages/jsii-rosetta/lib/languages/default.ts b/packages/jsii-rosetta/lib/languages/default.ts
index 15c989006f..f1fc26d352 100644
--- a/packages/jsii-rosetta/lib/languages/default.ts
+++ b/packages/jsii-rosetta/lib/languages/default.ts
@@ -171,8 +171,8 @@ export abstract class DefaultVisitor implements AstHandler {
ts.isPropertyAssignment(p)
? isExpressionOfFunctionType(context.typeChecker, p.initializer)
: ts.isShorthandPropertyAssignment(p)
- ? isExpressionOfFunctionType(context.typeChecker, p.name)
- : false,
+ ? isExpressionOfFunctionType(context.typeChecker, p.name)
+ : false,
);
const inferredType = inferredTypeOfExpression(context.typeChecker, node);
diff --git a/packages/jsii-rosetta/lib/languages/go.ts b/packages/jsii-rosetta/lib/languages/go.ts
index 1dbb2631ff..c7469703c6 100644
--- a/packages/jsii-rosetta/lib/languages/go.ts
+++ b/packages/jsii-rosetta/lib/languages/go.ts
@@ -524,10 +524,10 @@ export class GoVisitor extends DefaultVisitor {
...(isClassStaticPropertyAccess
? ['()']
: // If the parent's not a call-like expression, and it's an inferred static property access, we need to put call
- // parentheses at the end, as static properties are accessed via synthetic readers.
- expressionLooksLikeTypeReference && findUp(node, ts.isCallLikeExpression) == null
- ? ['()']
- : []),
+ // parentheses at the end, as static properties are accessed via synthetic readers.
+ expressionLooksLikeTypeReference && findUp(node, ts.isCallLikeExpression) == null
+ ? ['()']
+ : []),
]);
}
@@ -741,11 +741,11 @@ export class GoVisitor extends DefaultVisitor {
ucFirst(this.goName(base.name.text, renderer, renderer.typeChecker.getSymbolAtLocation(base.name))),
])
: ts.isIdentifier(base)
- ? `new${ucFirst(this.goName(base.text, renderer, renderer.typeChecker.getSymbolAtLocation(base)))}`
- : (function () {
- renderer.reportUnsupported(node, TargetLanguage.GO);
- return renderer.convert(base);
- })();
+ ? `new${ucFirst(this.goName(base.text, renderer, renderer.typeChecker.getSymbolAtLocation(base)))}`
+ : (function () {
+ renderer.reportUnsupported(node, TargetLanguage.GO);
+ return renderer.convert(base);
+ })();
return new OTree(
[
diff --git a/packages/jsii-rosetta/lib/translate.ts b/packages/jsii-rosetta/lib/translate.ts
index ecda866c76..adeaf684e9 100644
--- a/packages/jsii-rosetta/lib/translate.ts
+++ b/packages/jsii-rosetta/lib/translate.ts
@@ -43,7 +43,7 @@ export function translateTypeScript(
export class Translator {
private readonly compiler = new TypeScriptCompiler();
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
- #diagnostics: ts.Diagnostic[] = [];
+ readonly #diagnostics: ts.Diagnostic[] = [];
public constructor(private readonly includeCompilerDiagnostics: boolean) {}
diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json
index 13f3256f96..5ec64197ad 100644
--- a/packages/jsii-rosetta/package.json
+++ b/packages/jsii-rosetta/package.json
@@ -16,11 +16,11 @@
"package": "package-js"
},
"devDependencies": {
- "@types/commonmark": "^0.27.8",
- "@types/mock-fs": "^4.13.3",
- "@types/stream-json": "^1.7.4",
- "@types/workerpool": "^6.4.4",
- "@types/semver": "^7.5.3",
+ "@types/commonmark": "^0.27.9",
+ "@types/mock-fs": "^4.13.4",
+ "@types/stream-json": "^1.7.6",
+ "@types/workerpool": "^6.4.6",
+ "@types/semver": "^7.5.5",
"jsii-build-tools": "0.0.0",
"memory-streams": "^0.1.3",
"mock-fs": "^5.2.0"
@@ -36,7 +36,7 @@
"stream-json": "^1.8.0",
"semver": "^7.5.4",
"semver-intersect": "^1.4.0",
- "fast-glob": "^3.3.1",
+ "fast-glob": "^3.3.2",
"jsii": "0.0.0"
},
"license": "Apache-2.0",
diff --git a/packages/jsii/lib/jsii-diagnostic.ts b/packages/jsii/lib/jsii-diagnostic.ts
index c575994438..3ba5a49c91 100644
--- a/packages/jsii/lib/jsii-diagnostic.ts
+++ b/packages/jsii/lib/jsii-diagnostic.ts
@@ -102,7 +102,7 @@ export class Code<
#category?: ts.DiagnosticCategory;
// eslint-disable-next-line @typescript-eslint/explicit-member-accessibility
- #formatter: T;
+ readonly #formatter: T;
/**
* Registers a new diagnostic code.
diff --git a/packages/jsii/package.json b/packages/jsii/package.json
index fecbe89276..cf663f5d4c 100644
--- a/packages/jsii/package.json
+++ b/packages/jsii/package.json
@@ -45,15 +45,15 @@
"semver": "^7.5.4",
"semver-intersect": "^1.4.0",
"sort-json": "^2.0.1",
- "spdx-license-list": "^6.7.0",
+ "spdx-license-list": "^6.8.0",
"typescript": "~3.9.10",
"yargs": "^16.2.0"
},
"devDependencies": {
- "@types/clone": "^2.1.3",
- "@types/deep-equal": "^1.0.3",
+ "@types/clone": "^2.1.4",
+ "@types/deep-equal": "^1.0.4",
"@types/fs-extra": "^9.0.13",
- "@types/semver": "^7.5.3",
+ "@types/semver": "^7.5.5",
"clone": "^2.1.2",
"jsii-build-tools": "^0.0.0"
},
diff --git a/yarn.lock b/yarn.lock
index 6cd4bce5a5..0d662b1b44 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,37 +24,37 @@
chalk "^2.4.2"
"@babel/compat-data@^7.22.9":
- version "7.23.2"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
- integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.3.tgz#3febd552541e62b5e883a25eb3effd7c7379db11"
+ integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ==
"@babel/core@^7.11.6", "@babel/core@^7.12.3":
- version "7.23.2"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.2.tgz#ed10df0d580fff67c5f3ee70fd22e2e4c90a9f94"
- integrity sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.3.tgz#5ec09c8803b91f51cc887dedc2654a35852849c9"
+ integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew==
dependencies:
"@ampproject/remapping" "^2.2.0"
"@babel/code-frame" "^7.22.13"
- "@babel/generator" "^7.23.0"
+ "@babel/generator" "^7.23.3"
"@babel/helper-compilation-targets" "^7.22.15"
- "@babel/helper-module-transforms" "^7.23.0"
+ "@babel/helper-module-transforms" "^7.23.3"
"@babel/helpers" "^7.23.2"
- "@babel/parser" "^7.23.0"
+ "@babel/parser" "^7.23.3"
"@babel/template" "^7.22.15"
- "@babel/traverse" "^7.23.2"
- "@babel/types" "^7.23.0"
+ "@babel/traverse" "^7.23.3"
+ "@babel/types" "^7.23.3"
convert-source-map "^2.0.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
json5 "^2.2.3"
semver "^6.3.1"
-"@babel/generator@^7.23.0", "@babel/generator@^7.7.2":
- version "7.23.0"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
- integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+"@babel/generator@^7.23.3", "@babel/generator@^7.7.2":
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e"
+ integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==
dependencies:
- "@babel/types" "^7.23.0"
+ "@babel/types" "^7.23.3"
"@jridgewell/gen-mapping" "^0.3.2"
"@jridgewell/trace-mapping" "^0.3.17"
jsesc "^2.5.1"
@@ -97,10 +97,10 @@
dependencies:
"@babel/types" "^7.22.15"
-"@babel/helper-module-transforms@^7.23.0":
- version "7.23.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
- integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
+"@babel/helper-module-transforms@^7.23.3":
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+ integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
dependencies:
"@babel/helper-environment-visitor" "^7.22.20"
"@babel/helper-module-imports" "^7.22.15"
@@ -160,10 +160,10 @@
chalk "^2.4.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
- version "7.23.0"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
- integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.3":
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9"
+ integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==
"@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
@@ -201,9 +201,9 @@
"@babel/helper-plugin-utils" "^7.8.0"
"@babel/plugin-syntax-jsx@^7.7.2":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
- integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473"
+ integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"
@@ -257,9 +257,9 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-typescript@^7.7.2":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
- integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz#24f460c85dbbc983cd2b9c4994178bcc01df958f"
+ integrity sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"
@@ -279,26 +279,26 @@
"@babel/parser" "^7.22.15"
"@babel/types" "^7.22.15"
-"@babel/traverse@^7.23.2", "@babel/traverse@^7.7.2":
- version "7.23.2"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
- integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+"@babel/traverse@^7.23.2", "@babel/traverse@^7.23.3", "@babel/traverse@^7.7.2":
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b"
+ integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
dependencies:
"@babel/code-frame" "^7.22.13"
- "@babel/generator" "^7.23.0"
+ "@babel/generator" "^7.23.3"
"@babel/helper-environment-visitor" "^7.22.20"
"@babel/helper-function-name" "^7.23.0"
"@babel/helper-hoist-variables" "^7.22.5"
"@babel/helper-split-export-declaration" "^7.22.6"
- "@babel/parser" "^7.23.0"
- "@babel/types" "^7.23.0"
+ "@babel/parser" "^7.23.3"
+ "@babel/types" "^7.23.3"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.3.3":
- version "7.23.0"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
- integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3", "@babel/types@^7.3.3":
+ version "7.23.3"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598"
+ integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==
dependencies:
"@babel/helper-string-parser" "^7.22.5"
"@babel/helper-validator-identifier" "^7.22.20"
@@ -334,14 +334,14 @@
eslint-visitor-keys "^3.3.0"
"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
- version "4.9.1"
- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.1.tgz#449dfa81a57a1d755b09aa58d826c1262e4283b4"
- integrity sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==
+ version "4.10.0"
+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+ integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
-"@eslint/eslintrc@^2.1.2":
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396"
- integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==
+"@eslint/eslintrc@^2.1.3":
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.3.tgz#797470a75fe0fbd5a53350ee715e85e87baff22d"
+ integrity sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==
dependencies:
ajv "^6.12.4"
debug "^4.3.2"
@@ -353,10 +353,10 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"
-"@eslint/js@8.51.0":
- version "8.51.0"
- resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.51.0.tgz#6d419c240cfb2b66da37df230f7e7eef801c32fa"
- integrity sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==
+"@eslint/js@8.53.0":
+ version "8.53.0"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d"
+ integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==
"@fixtures/jsii-calc-bundled@file:packages/@fixtures/jsii-calc-bundled":
version "0.19.0"
@@ -366,12 +366,12 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-"@humanwhocodes/config-array@^0.11.11":
- version "0.11.11"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844"
- integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==
+"@humanwhocodes/config-array@^0.11.13":
+ version "0.11.13"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
+ integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
dependencies:
- "@humanwhocodes/object-schema" "^1.2.1"
+ "@humanwhocodes/object-schema" "^2.0.1"
debug "^4.1.1"
minimatch "^3.0.5"
@@ -380,10 +380,10 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-"@humanwhocodes/object-schema@^1.2.1":
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
- integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
+ integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
"@hutson/parse-repository-url@^3.0.0":
version "3.0.2"
@@ -790,21 +790,21 @@
"@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14"
-"@lerna/child-process@7.4.1":
- version "7.4.1"
- resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.4.1.tgz#efacbbe79794ef977feb86873d853bb8708707be"
- integrity sha512-Bx1cRCZcVcWoz+atDQc4CSVzGuEgGJPOpIAXjQbBEA2cX5nqIBWdbye8eHu31En/F03aH9BhpNEJghs6wy4iTg==
+"@lerna/child-process@7.4.2":
+ version "7.4.2"
+ resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.4.2.tgz#a2fd013ac2150dc288270d3e0d0b850c06bec511"
+ integrity sha512-je+kkrfcvPcwL5Tg8JRENRqlbzjdlZXyaR88UcnCdNW0AJ1jX9IfHRys1X7AwSroU2ug8ESNC+suoBw1vX833Q==
dependencies:
chalk "^4.1.0"
execa "^5.0.0"
strong-log-transformer "^2.1.0"
-"@lerna/create@7.4.1":
- version "7.4.1"
- resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.4.1.tgz#3e4bb7235bf5700e7e63c470eba5619171331c1a"
- integrity sha512-zPO9GyWceRimtMD+j+aQ8xJgNPYn/Q/SzHf4wYN+4Rj5nrFKMyX+Et7FbWgUNpj0dRgyCCKBDYmTB7xQVVq4gQ==
+"@lerna/create@7.4.2":
+ version "7.4.2"
+ resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.4.2.tgz#f845fad1480e46555af98bd39af29571605dddc9"
+ integrity sha512-1wplFbQ52K8E/unnqB0Tq39Z4e+NEoNrpovEnl6GpsTUrC6WDp8+w0Le2uCBV0hXyemxChduCkLz4/y1H1wTeg==
dependencies:
- "@lerna/child-process" "7.4.1"
+ "@lerna/child-process" "7.4.2"
"@npmcli/run-script" "6.0.2"
"@nx/devkit" ">=16.5.1 < 17"
"@octokit/plugin-enterprise-rest" "6.0.1"
@@ -1536,9 +1536,9 @@
minimatch "^9.0.0"
"@types/babel__core@^7.1.14":
- version "7.20.3"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.3.tgz#d5625a50b6f18244425a1359a858c73d70340778"
- integrity sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==
+ version "7.20.4"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.4.tgz#26a87347e6c6f753b3668398e34496d6d9ac6ac0"
+ integrity sha512-mLnSC22IC4vcWiuObSRjrLd9XcBTGf59vUSoq2jkQDJ/QQ8PMI9rSuzE+aEV8karUMbskw07bKYoUJCKTUaygg==
dependencies:
"@babel/parser" "^7.20.7"
"@babel/types" "^7.20.7"
@@ -1547,67 +1547,67 @@
"@types/babel__traverse" "*"
"@types/babel__generator@*":
- version "7.6.6"
- resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.6.tgz#676f89f67dc8ddaae923f70ebc5f1fa800c031a8"
- integrity sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==
+ version "7.6.7"
+ resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.7.tgz#a7aebf15c7bc0eb9abd638bdb5c0b8700399c9d0"
+ integrity sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==
dependencies:
"@babel/types" "^7.0.0"
"@types/babel__template@*":
- version "7.4.3"
- resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.3.tgz#db9ac539a2fe05cfe9e168b24f360701bde41f5f"
- integrity sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+ integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
- version "7.20.3"
- resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.3.tgz#a971aa47441b28ef17884ff945d0551265a2d058"
- integrity sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==
+ version "7.20.4"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.4.tgz#ec2c06fed6549df8bc0eb4615b683749a4a92e1b"
+ integrity sha512-mSM/iKUk5fDDrEV/e83qY+Cr3I1+Q3qqTuEn++HAWYjEa1+NxZr6CNrcJGf2ZTnq4HoFGC3zaTPZTobCzCFukA==
dependencies:
"@babel/types" "^7.20.7"
-"@types/clone@^2.1.3":
- version "2.1.3"
- resolved "https://registry.yarnpkg.com/@types/clone/-/clone-2.1.3.tgz#91d16af4006a24fd3d683f5454d48b29a695b0e9"
- integrity sha512-DxFaNYaIUXW1OSRCVCC1UHoLcvk6bVJ0v9VvUaZ6kR5zK8/QazXlOThgdvnK0Xpa4sBq+b/Yoq/mnNn383hVRw==
+"@types/clone@^2.1.4":
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/@types/clone/-/clone-2.1.4.tgz#9680f886c935dcf596273f1218abb71efb01531a"
+ integrity sha512-NKRWaEGaVGVLnGLB2GazvDaZnyweW9FJLLFL5LhywGJB3aqGMT9R/EUoJoSRP4nzofYnZysuDmrEJtJdAqUOtQ==
-"@types/commonmark@^0.27.8":
- version "0.27.8"
- resolved "https://registry.yarnpkg.com/@types/commonmark/-/commonmark-0.27.8.tgz#6a8fd4ff5e06d71118d7ee3c5ade226b073436a0"
- integrity sha512-Vw7d8ldJUipu16fffEUQ2r3mFG4JvzY4MI4ETSH8IiKG1sKNcA5Jglrm01gcc86CSnWlwlreBu0pABwHci++Qw==
+"@types/commonmark@^0.27.9":
+ version "0.27.9"
+ resolved "https://registry.yarnpkg.com/@types/commonmark/-/commonmark-0.27.9.tgz#2d2d42e72127c84525fbbc87aaefb5a43e1129d7"
+ integrity sha512-d3+57WgyPCcIc6oshmcPkmP4+JqRRot9eeZLsBsutWtIxwWivpoyc2wEcolOp8MyO3ZWN846mMdoR02kdHSMCw==
-"@types/deep-equal@^1.0.3":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.3.tgz#f8315c99a85cc7a286b15cd9cac5e4a52e98d59d"
- integrity sha512-xP1pB67eLrRdMLKpXUXhYN/3uiJN1gNalcVOSY5kdJbxhGuZTTE8awSWOD9LCJDzQZVsuZZcnMMLRrbf+nOUSQ==
+"@types/deep-equal@^1.0.4":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.4.tgz#c0a854be62d6b9fae665137a6639aab53389a147"
+ integrity sha512-tqdiS4otQP4KmY0PR3u6KbZ5EWvhNdUoS/jc93UuK23C220lOZ/9TvjfxdPcKvqwwDVtmtSCrnr0p/2dirAxkA==
-"@types/diff@^5.0.7":
- version "5.0.7"
- resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.7.tgz#471bad8be0d911ed04d115863402920f3a84079c"
- integrity sha512-adBosR2GntaQQiuHnfRN9HtxYpoHHJBcdyz7VSXhjpSAmtvIfu/S1fjTqwuIx/Ypba6LCZdfWIqPYx2BR5TneQ==
+"@types/diff@^5.0.8":
+ version "5.0.8"
+ resolved "https://registry.yarnpkg.com/@types/diff/-/diff-5.0.8.tgz#28dc501cc3e7c62d4c5d096afe20755170acf276"
+ integrity sha512-kR0gRf0wMwpxQq6ME5s+tWk9zVCfJUl98eRkD05HWWRbhPB/eu4V1IbyZAsvzC1Gn4znBJ0HN01M4DGXdBEV8Q==
"@types/eslint-scope@^3.7.3":
- version "3.7.6"
- resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.6.tgz#585578b368ed170e67de8aae7b93f54a1b2fdc26"
- integrity sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==
+ version "3.7.7"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+ integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
"@types/eslint@*":
- version "8.44.5"
- resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.5.tgz#24d7f3b07aff47a13b570efd5c52d96f38cd352e"
- integrity sha512-Ol2eio8LtD/tGM4Ga7Jb83NuFwEv3NqvssSlifXL9xuFpSyQZw0ecmm2Kux6iU0KxQmp95hlPmGCzGJ0TCFeRA==
+ version "8.44.7"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.7.tgz#430b3cc96db70c81f405e6a08aebdb13869198f5"
+ integrity sha512-f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
"@types/estree@*", "@types/estree@^1.0.0":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.3.tgz#2be19e759a3dd18c79f9f436bd7363556c1a73dd"
- integrity sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+ integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
"@types/fs-extra@^9.0.13":
version "9.0.13"
@@ -1625,61 +1625,61 @@
"@types/node" "*"
"@types/graceful-fs@^4.1.3":
- version "4.1.8"
- resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.8.tgz#417e461e4dc79d957dc3107f45fe4973b09c2915"
- integrity sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==
+ version "4.1.9"
+ resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+ integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
dependencies:
"@types/node" "*"
"@types/inquirer@^8.2.3":
- version "8.2.8"
- resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.8.tgz#b05b904d1309beb819b495ec6d13eb585f591ee3"
- integrity sha512-q41JJZchAdegBXxSserfQKGJDbY9BRFAP2gCHh741DMuQZT90YW3/eE9BxO0HMtWpGjm/JatBdrkdbKaPZRSYw==
+ version "8.2.10"
+ resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.10.tgz#9444dce2d764c35bc5bb4d742598aaa4acb6561b"
+ integrity sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA==
dependencies:
"@types/through" "*"
rxjs "^7.2.0"
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#fdfdd69fa16d530047d9963635bd77c71a08c068"
- integrity sha512-zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ==
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+ integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
"@types/istanbul-lib-report@*":
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz#394798d5f727402eb5ec99eb9618ffcd2b7645a1"
- integrity sha512-8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+ integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
dependencies:
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-reports@^3.0.0":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz#0313e2608e6d6955d195f55361ddeebd4b74c6e7"
- integrity sha512-1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg==
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+ integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
dependencies:
"@types/istanbul-lib-report" "*"
-"@types/jest@^29.5.6":
- version "29.5.6"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.6.tgz#f4cf7ef1b5b0bfc1aa744e41b24d9cc52533130b"
- integrity sha512-/t9NnzkOpXb4Nfvg17ieHE6EeSjDS2SGSpNYfoLbUAeL/EOueU/RSdOWFpfQTXBEM7BguYW1XQ0EbM+6RlIh6w==
+"@types/jest@^29.5.8":
+ version "29.5.8"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.8.tgz#ed5c256fe2bc7c38b1915ee5ef1ff24a3427e120"
+ integrity sha512-fXEFTxMV2Co8ZF5aYFJv+YeA08RTYJfhtN5c9JSv/mFEMe+xxjufCb+PHL+bJcMs/ebPUsBu+UNTEz+ydXrR6g==
dependencies:
expect "^29.0.0"
pretty-format "^29.0.0"
"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
- version "7.0.14"
- resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1"
- integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==
+ version "7.0.15"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
"@types/json5@^0.0.29":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
-"@types/lockfile@^1.0.3":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@types/lockfile/-/lockfile-1.0.3.tgz#f3d19c9fe08657515eeb057a00af3281716f2a1d"
- integrity sha512-p0ZFzoiL0B9MbNaanUV4u86E9k9PaZdhahiKfsOqj30v/vtNz2NyZFp/VJpVp6E7Iy5a9lXozZmnjm7FbtoKnw==
+"@types/lockfile@^1.0.4":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@types/lockfile/-/lockfile-1.0.4.tgz#9d6a6d1b6dbd4853cecc7f334bc53ea0ff363b8e"
+ integrity sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ==
"@types/minimatch@^3.0.3":
version "3.0.5"
@@ -1692,23 +1692,23 @@
integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
"@types/minimist@^1.2.0":
- version "1.2.4"
- resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e"
- integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==
+ version "1.2.5"
+ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
+ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
-"@types/mock-fs@^4.13.3":
- version "4.13.3"
- resolved "https://registry.yarnpkg.com/@types/mock-fs/-/mock-fs-4.13.3.tgz#57a53413bd27bca41509053b105430eaf6bf1cce"
- integrity sha512-PeXnRqMVBkVjHNCxu1wzPBi9cv5uWVl6535XD11NXt8pasJXh2MHxWvJs6d7eyt/V6BGgHZ4O3LF71CVMdMasA==
+"@types/mock-fs@^4.13.4":
+ version "4.13.4"
+ resolved "https://registry.yarnpkg.com/@types/mock-fs/-/mock-fs-4.13.4.tgz#e73edb4b4889d44d23f1ea02d6eebe50aa30b09a"
+ integrity sha512-mXmM0o6lULPI8z3XNnQCpL0BGxPwx1Ul1wXYEPBGl4efShyxW2Rln0JOPEWGyZaYZMM6OVXM/15zUuFMY52ljg==
dependencies:
"@types/node" "*"
"@types/node@*":
- version "20.8.7"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.7.tgz#ad23827850843de973096edfc5abc9e922492a25"
- integrity sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==
+ version "20.9.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298"
+ integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==
dependencies:
- undici-types "~5.25.1"
+ undici-types "~5.26.4"
"@types/node@^14.18.63":
version "14.18.63"
@@ -1716,86 +1716,86 @@
integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
"@types/node@^16.9.2":
- version "16.18.59"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.59.tgz#4cdbd631be6d9be266a96fb17b5d0d7ad6bbe26c"
- integrity sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ==
+ version "16.18.61"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.61.tgz#5ea47e3018348bf3bbbe646b396ba5e720310be1"
+ integrity sha512-k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q==
"@types/normalize-package-data@^2.4.0":
- version "2.4.3"
- resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz#291c243e4b94dbfbc0c0ee26b7666f1d5c030e2c"
- integrity sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==
+ version "2.4.4"
+ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
+ integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
"@types/prettier@^2.1.5":
version "2.7.3"
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
-"@types/semver@^7.5.0", "@types/semver@^7.5.3":
- version "7.5.3"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04"
- integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==
+"@types/semver@^7.5.0", "@types/semver@^7.5.5":
+ version "7.5.5"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35"
+ integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==
"@types/stack-utils@^2.0.0":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
- integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+ integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
"@types/stream-chain@*":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@types/stream-chain/-/stream-chain-2.0.2.tgz#e809fce90191699acb63dd81030c2d2f68c30f21"
- integrity sha512-d6402cbTM/WAMVTJ5PPaCtjnXoVRCXewt7vgsR0cyQ1M+17kiSs1gNg9yHgpMa84woFhaVCn+AvRdovzGOPsQw==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/@types/stream-chain/-/stream-chain-2.0.4.tgz#065f0a75dc18db9f2747a8283ea450c37248a919"
+ integrity sha512-V7TsWLHrx79KumkHqSD7F8eR6POpEuWb6PuXJ7s/dRHAf3uVst3Jkp1yZ5XqIfECZLQ4a28vBVstTErmsMBvaQ==
dependencies:
"@types/node" "*"
-"@types/stream-json@^1.7.4":
- version "1.7.4"
- resolved "https://registry.yarnpkg.com/@types/stream-json/-/stream-json-1.7.4.tgz#6b14579213bc89d382f76120dba329456be509ba"
- integrity sha512-wf68w3uFNDX9d8QZHa7uYRaUBZ1tqjimQRMUOG0yT6LHKQMuUV1HBn/8tnGZItPdTfH1XtbVsUB8zq58k+WVXg==
+"@types/stream-json@^1.7.6":
+ version "1.7.6"
+ resolved "https://registry.yarnpkg.com/@types/stream-json/-/stream-json-1.7.6.tgz#e7ff3aa65678fe6fe47f2d0b49465953b2cf0739"
+ integrity sha512-ABja1RSTb7mImRPO665nxLHsLsuUEGNC1QC57Z4UQs835PIZHrLfQ9gMM+71+E9Tx5bZSNsyg1zaVThwZvgU4Q==
dependencies:
"@types/node" "*"
"@types/stream-chain" "*"
-"@types/tar-fs@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-2.0.2.tgz#d10b844cc1fcfa87de990a7cec350ee3d168c48b"
- integrity sha512-XuZRAvdo7FbDfgQCNkc8NOdSae5XtG+of2mTSgJ85G4OG0miN4E8BTGT+JBTLO87RQ7iCwsIDCqCsHnf2IaSXA==
+"@types/tar-fs@^2.0.4":
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/@types/tar-fs/-/tar-fs-2.0.4.tgz#7c7502d281d436db0ad0f78282acef71da02a292"
+ integrity sha512-ipPec0CjTmVDWE+QKr9cTmIIoTl7dFG/yARCM5MqK8i6CNLIG1P8x4kwDsOQY1ChZOZjH0wO9nvfgBvWl4R3kA==
dependencies:
"@types/node" "*"
"@types/tar-stream" "*"
"@types/tar-stream@*":
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-3.1.1.tgz#a0d936ec27c732e5287a84055b849637ee609974"
- integrity sha512-/1E+a09mAFQwhlEHqiS3LuNWIBiyrn0HqUWZk2IyGzodu9zkXbaT5vl94iGlZGnG2IONVFZd84SFhns3MhhAQQ==
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-3.1.3.tgz#f61427229691eda1b7d5719f34acdc4fc8a558ce"
+ integrity sha512-Zbnx4wpkWBMBSu5CytMbrT5ZpMiF55qgM+EpHzR4yIDu7mv52cej8hTkOc6K+LzpkOAbxwn/m7j3iO+/l42YkQ==
dependencies:
"@types/node" "*"
-"@types/tar@^6.1.6":
- version "6.1.6"
- resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.6.tgz#640223490df0696b9e8193fd2af5c65dcf0f9c3f"
- integrity sha512-HQ06kiiDXz9uqtmE9ksQUn1ovcPr1gGV9EgaCWo6FGYKD0onNBCetBzL0kfcS8Kbj1EFxJWY9jL2W4ZvvtGI8Q==
+"@types/tar@^6.1.9":
+ version "6.1.9"
+ resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.9.tgz#1f8f7033494224e61b97895070fafcdd6ec370f3"
+ integrity sha512-T3+O+OQd9cdGmOXuKQY9+B0ceZHRlGVPQ7M5QZqkaPyP/vWnxPXM2aCegq8GP/n1n9dBfq2EBUqCSKKjQAVOPA==
dependencies:
"@types/node" "*"
minipass "^4.0.0"
"@types/through@*":
- version "0.0.31"
- resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.31.tgz#eb410602641807e74a90c5e951f46686e75eed1c"
- integrity sha512-LpKpmb7FGevYgXnBXYs6HWnmiFyVG07Pt1cnbgM1IhEacITTiUaBXXvOR3Y50ksaJWGSfhbEvQFivQEFGCC55w==
+ version "0.0.33"
+ resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.33.tgz#14ebf599320e1c7851e7d598149af183c6b9ea56"
+ integrity sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==
dependencies:
"@types/node" "*"
-"@types/workerpool@^6.4.4":
- version "6.4.4"
- resolved "https://registry.yarnpkg.com/@types/workerpool/-/workerpool-6.4.4.tgz#3168d7e9811833eef8f6634535e2efc2bab54d7d"
- integrity sha512-rpYFug3QyKzQ7+y/x8BCTEseMorTyr9DiY3ao5KxzWJPtFyx/HL0SSLtJlRjUSpBeaMd/zn7hnLaWOb8WRFnnQ==
+"@types/workerpool@^6.4.6":
+ version "6.4.6"
+ resolved "https://registry.yarnpkg.com/@types/workerpool/-/workerpool-6.4.6.tgz#9272988dd6811418cf236cc8fab6ad4f22c7777a"
+ integrity sha512-nYSiM7rWgnF/y4jSvS4t95MwIG8c4iWxvQeliiV7rfUfkARU7iiPiw9NCVzdBghqLhs0LAO/U54jqXsmR93zmg==
dependencies:
"@types/node" "*"
"@types/yargs-parser@*":
- version "21.0.1"
- resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.1.tgz#07773d7160494d56aa882d7531aac7319ea67c3b"
- integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==
+ version "21.0.3"
+ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+ integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
"@types/yargs@17.0.19", "@types/yargs@^17.0.8":
version "17.0.19"
@@ -1804,16 +1804,16 @@
dependencies:
"@types/yargs-parser" "*"
-"@typescript-eslint/eslint-plugin@^6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz#06abe4265e7c82f20ade2dcc0e3403c32d4f148b"
- integrity sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==
+"@typescript-eslint/eslint-plugin@^6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.11.0.tgz#52aae65174ff526576351f9ccd41cea01001463f"
+ integrity sha512-uXnpZDc4VRjY4iuypDBKzW1rz9T5YBBK0snMn8MaTSNd2kMlj50LnLBABELjJiOL5YHk7ZD8hbSpI9ubzqYI0w==
dependencies:
"@eslint-community/regexpp" "^4.5.1"
- "@typescript-eslint/scope-manager" "6.8.0"
- "@typescript-eslint/type-utils" "6.8.0"
- "@typescript-eslint/utils" "6.8.0"
- "@typescript-eslint/visitor-keys" "6.8.0"
+ "@typescript-eslint/scope-manager" "6.11.0"
+ "@typescript-eslint/type-utils" "6.11.0"
+ "@typescript-eslint/utils" "6.11.0"
+ "@typescript-eslint/visitor-keys" "6.11.0"
debug "^4.3.4"
graphemer "^1.4.0"
ignore "^5.2.4"
@@ -1821,74 +1821,79 @@
semver "^7.5.4"
ts-api-utils "^1.0.1"
-"@typescript-eslint/parser@^6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.8.0.tgz#bb2a969d583db242f1ee64467542f8b05c2e28cb"
- integrity sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==
+"@typescript-eslint/parser@^6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.11.0.tgz#9640d9595d905f3be4f278bf515130e6129b202e"
+ integrity sha512-+whEdjk+d5do5nxfxx73oanLL9ghKO3EwM9kBCkUtWMRwWuPaFv9ScuqlYfQ6pAD6ZiJhky7TZ2ZYhrMsfMxVQ==
dependencies:
- "@typescript-eslint/scope-manager" "6.8.0"
- "@typescript-eslint/types" "6.8.0"
- "@typescript-eslint/typescript-estree" "6.8.0"
- "@typescript-eslint/visitor-keys" "6.8.0"
+ "@typescript-eslint/scope-manager" "6.11.0"
+ "@typescript-eslint/types" "6.11.0"
+ "@typescript-eslint/typescript-estree" "6.11.0"
+ "@typescript-eslint/visitor-keys" "6.11.0"
debug "^4.3.4"
-"@typescript-eslint/scope-manager@6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz#5cac7977385cde068ab30686889dd59879811efd"
- integrity sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==
+"@typescript-eslint/scope-manager@6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8"
+ integrity sha512-0A8KoVvIURG4uhxAdjSaxy8RdRE//HztaZdG8KiHLP8WOXSk0vlF7Pvogv+vlJA5Rnjj/wDcFENvDaHb+gKd1A==
dependencies:
- "@typescript-eslint/types" "6.8.0"
- "@typescript-eslint/visitor-keys" "6.8.0"
+ "@typescript-eslint/types" "6.11.0"
+ "@typescript-eslint/visitor-keys" "6.11.0"
-"@typescript-eslint/type-utils@6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz#50365e44918ca0fd159844b5d6ea96789731e11f"
- integrity sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==
+"@typescript-eslint/type-utils@6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz#d0b8b1ab6c26b974dbf91de1ebc5b11fea24e0d1"
+ integrity sha512-nA4IOXwZtqBjIoYrJcYxLRO+F9ri+leVGoJcMW1uqr4r1Hq7vW5cyWrA43lFbpRvQ9XgNrnfLpIkO3i1emDBIA==
dependencies:
- "@typescript-eslint/typescript-estree" "6.8.0"
- "@typescript-eslint/utils" "6.8.0"
+ "@typescript-eslint/typescript-estree" "6.11.0"
+ "@typescript-eslint/utils" "6.11.0"
debug "^4.3.4"
ts-api-utils "^1.0.1"
-"@typescript-eslint/types@6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.8.0.tgz#1ab5d4fe1d613e3f65f6684026ade6b94f7e3ded"
- integrity sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==
+"@typescript-eslint/types@6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53"
+ integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA==
-"@typescript-eslint/typescript-estree@6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz#9565f15e0cd12f55cf5aa0dfb130a6cb0d436ba1"
- integrity sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==
+"@typescript-eslint/typescript-estree@6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.11.0.tgz#7b52c12a623bf7f8ec7f8a79901b9f98eb5c7990"
+ integrity sha512-Aezzv1o2tWJwvZhedzvD5Yv7+Lpu1by/U1LZ5gLc4tCx8jUmuSCMioPFRjliN/6SJIvY6HpTtJIWubKuYYYesQ==
dependencies:
- "@typescript-eslint/types" "6.8.0"
- "@typescript-eslint/visitor-keys" "6.8.0"
+ "@typescript-eslint/types" "6.11.0"
+ "@typescript-eslint/visitor-keys" "6.11.0"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
semver "^7.5.4"
ts-api-utils "^1.0.1"
-"@typescript-eslint/utils@6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.8.0.tgz#d42939c2074c6b59844d0982ce26a51d136c4029"
- integrity sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==
+"@typescript-eslint/utils@6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.11.0.tgz#11374f59ef4cea50857b1303477c08aafa2ca604"
+ integrity sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g==
dependencies:
"@eslint-community/eslint-utils" "^4.4.0"
"@types/json-schema" "^7.0.12"
"@types/semver" "^7.5.0"
- "@typescript-eslint/scope-manager" "6.8.0"
- "@typescript-eslint/types" "6.8.0"
- "@typescript-eslint/typescript-estree" "6.8.0"
+ "@typescript-eslint/scope-manager" "6.11.0"
+ "@typescript-eslint/types" "6.11.0"
+ "@typescript-eslint/typescript-estree" "6.11.0"
semver "^7.5.4"
-"@typescript-eslint/visitor-keys@6.8.0":
- version "6.8.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz#cffebed56ae99c45eba901c378a6447b06be58b8"
- integrity sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==
+"@typescript-eslint/visitor-keys@6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz#d991538788923f92ec40d44389e7075b359f3458"
+ integrity sha512-+SUN/W7WjBr05uRxPggJPSzyB8zUpaYo2hByKasWbqr3PM8AXfZt8UHdNpBS1v9SA62qnSSMF3380SwDqqprgQ==
dependencies:
- "@typescript-eslint/types" "6.8.0"
+ "@typescript-eslint/types" "6.11.0"
eslint-visitor-keys "^3.4.1"
+"@ungap/structured-clone@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+ integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
version "1.11.6"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
@@ -2089,14 +2094,14 @@ acorn-jsx@^5.3.2:
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
acorn-walk@^8.1.1:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
- integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.0.tgz#2097665af50fd0cf7a2dfccd2b9368964e66540f"
+ integrity sha512-FS7hV565M5l1R08MXqo8odwMTB02C2UqzB17RVgu9EyuYFBqJZ3/ZY97sQD5FewVu1UyDFc1yztUDrAwT0EypA==
acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
- version "8.10.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
- integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+ version "8.11.2"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+ integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
add-stream@^1.0.0:
version "1.0.0"
@@ -2330,9 +2335,9 @@ asap@^2.0.0:
integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
async@^3.1.0, async@^3.2.3:
- version "3.2.4"
- resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
- integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
+ version "3.2.5"
+ resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
+ integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
asynckit@^0.4.0:
version "0.4.0"
@@ -2615,13 +2620,14 @@ cacache@^17.0.0:
tar "^6.1.11"
unique-filename "^3.0.0"
-call-bind@^1.0.0, call-bind@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
- integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+ integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
dependencies:
- function-bind "^1.1.1"
- get-intrinsic "^1.0.2"
+ function-bind "^1.1.2"
+ get-intrinsic "^1.2.1"
+ set-function-length "^1.1.1"
callsites@^3.0.0:
version "3.1.0"
@@ -2648,9 +2654,9 @@ camelcase@^6.2.0, camelcase@^6.3.0:
integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
caniuse-lite@^1.0.30001541:
- version "1.0.30001550"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001550.tgz#6ec6a2239eb2a8123cc26cfe0571db5c79eb8669"
- integrity sha512-p82WjBYIypO0ukTsd/FG3Xxs+4tFeaY9pfT4amQL8KWtYH7H9nYwReGAbMTJ0hsmRO8IfDtsS6p3ZWj8+1c2RQ==
+ version "1.0.30001562"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz#9d16c5fd7e9c592c4cd5e304bc0f75b0008b2759"
+ integrity sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==
case@^1.6.3:
version "1.6.3"
@@ -2933,10 +2939,10 @@ console-control-strings@^1.1.0:
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-conventional-changelog-angular@6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541"
- integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==
+conventional-changelog-angular@7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz#5eec8edbff15aa9b1680a8dcfbd53e2d7eb2ba7a"
+ integrity sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==
dependencies:
compare-func "^2.0.0"
@@ -3330,7 +3336,7 @@ defaults@^1.0.3:
dependencies:
clone "^1.0.2"
-define-data-property@^1.0.1:
+define-data-property@^1.0.1, define-data-property@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
@@ -3495,9 +3501,9 @@ ejs@^3.1.7:
jake "^10.8.5"
electron-to-chromium@^1.4.535:
- version "1.4.557"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.557.tgz#f3941b569c82b7bb909411855c6ff9bfe1507829"
- integrity sha512-6x0zsxyMXpnMJnHrondrD3SuAeKcwij9S+83j2qHAQPXbGTDDfgImzzwgGlzrIcXbHQ42tkG4qA6U860cImNhw==
+ version "1.4.582"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.582.tgz#4908215182266793499ac57d80e2680d7dd9b3db"
+ integrity sha512-89o0MGoocwYbzqUUjc+VNpeOFSOK9nIdC5wY4N+PVUarUK0MtjyTjks75AZS2bW4Kl8MdewdFsWaH0jLy+JNoA==
emittery@^0.10.2:
version "0.10.2"
@@ -3564,9 +3570,9 @@ envinfo@7.8.1:
integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
envinfo@^7.7.3:
- version "7.10.0"
- resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13"
- integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==
+ version "7.11.0"
+ resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f"
+ integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==
err-code@^2.0.2:
version "2.0.3"
@@ -3581,25 +3587,25 @@ error-ex@^1.3.1:
is-arrayish "^0.2.1"
es-abstract@^1.22.1:
- version "1.22.2"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.2.tgz#90f7282d91d0ad577f505e423e52d4c1d93c1b8a"
- integrity sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==
+ version "1.22.3"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+ integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
dependencies:
array-buffer-byte-length "^1.0.0"
arraybuffer.prototype.slice "^1.0.2"
available-typed-arrays "^1.0.5"
- call-bind "^1.0.2"
+ call-bind "^1.0.5"
es-set-tostringtag "^2.0.1"
es-to-primitive "^1.2.1"
function.prototype.name "^1.1.6"
- get-intrinsic "^1.2.1"
+ get-intrinsic "^1.2.2"
get-symbol-description "^1.0.0"
globalthis "^1.0.3"
gopd "^1.0.1"
- has "^1.0.3"
has-property-descriptors "^1.0.0"
has-proto "^1.0.1"
has-symbols "^1.0.3"
+ hasown "^2.0.0"
internal-slot "^1.0.5"
is-array-buffer "^3.0.2"
is-callable "^1.2.7"
@@ -3609,7 +3615,7 @@ es-abstract@^1.22.1:
is-string "^1.0.7"
is-typed-array "^1.1.12"
is-weakref "^1.0.2"
- object-inspect "^1.12.3"
+ object-inspect "^1.13.1"
object-keys "^1.1.1"
object.assign "^4.1.4"
regexp.prototype.flags "^1.5.1"
@@ -3623,28 +3629,28 @@ es-abstract@^1.22.1:
typed-array-byte-offset "^1.0.0"
typed-array-length "^1.0.4"
unbox-primitive "^1.0.2"
- which-typed-array "^1.1.11"
+ which-typed-array "^1.1.13"
es-module-lexer@^1.2.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1"
- integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
+ integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
es-set-tostringtag@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
- integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9"
+ integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==
dependencies:
- get-intrinsic "^1.1.3"
- has "^1.0.3"
+ get-intrinsic "^1.2.2"
has-tostringtag "^1.0.0"
+ hasown "^2.0.0"
es-shim-unscopables@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
- integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+ integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
dependencies:
- has "^1.0.3"
+ hasown "^2.0.0"
es-to-primitive@^1.2.1:
version "1.2.1"
@@ -3757,18 +3763,19 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-eslint@^8.51.0:
- version "8.51.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.51.0.tgz#4a82dae60d209ac89a5cff1604fea978ba4950f3"
- integrity sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==
+eslint@^8.53.0:
+ version "8.53.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce"
+ integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@eslint-community/regexpp" "^4.6.1"
- "@eslint/eslintrc" "^2.1.2"
- "@eslint/js" "8.51.0"
- "@humanwhocodes/config-array" "^0.11.11"
+ "@eslint/eslintrc" "^2.1.3"
+ "@eslint/js" "8.53.0"
+ "@humanwhocodes/config-array" "^0.11.13"
"@humanwhocodes/module-importer" "^1.0.1"
"@nodelib/fs.walk" "^1.2.8"
+ "@ungap/structured-clone" "^1.2.0"
ajv "^6.12.4"
chalk "^4.0.0"
cross-spawn "^7.0.2"
@@ -3949,10 +3956,10 @@ fast-diff@^1.1.2:
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
-fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
- integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+fast-glob@^3.2.9, fast-glob@^3.3.0, fast-glob@^3.3.1, fast-glob@^3.3.2:
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+ integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
@@ -4048,9 +4055,9 @@ find-up@^5.0.0:
path-exists "^4.0.0"
flat-cache@^3.0.4:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.1.tgz#a02a15fdec25a8f844ff7cc658f03dd99eb4609b"
- integrity sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+ integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
dependencies:
flatted "^3.2.9"
keyv "^4.5.3"
@@ -4151,7 +4158,7 @@ fsevents@^2.3.2, fsevents@~2.3.2:
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
-function-bind@^1.1.1:
+function-bind@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
@@ -4195,15 +4202,15 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
- integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+ integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
dependencies:
- function-bind "^1.1.1"
- has "^1.0.3"
+ function-bind "^1.1.2"
has-proto "^1.0.1"
has-symbols "^1.0.3"
+ hasown "^2.0.0"
get-package-type@^0.1.0:
version "0.1.0"
@@ -4477,11 +4484,11 @@ has-flag@^4.0.0:
integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
has-property-descriptors@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
- integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
+ integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
dependencies:
- get-intrinsic "^1.1.1"
+ get-intrinsic "^1.2.2"
has-proto@^1.0.1:
version "1.0.1"
@@ -4510,6 +4517,13 @@ has@^1.0.3:
resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
+hasown@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+ integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+ dependencies:
+ function-bind "^1.1.2"
+
hosted-git-info@^2.1.4:
version "2.8.9"
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -4746,12 +4760,12 @@ inquirer@^8.2.4, inquirer@^8.2.6:
wrap-ansi "^6.0.1"
internal-slot@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
- integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
+ integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
dependencies:
- get-intrinsic "^1.2.0"
- has "^1.0.3"
+ get-intrinsic "^1.2.2"
+ hasown "^2.0.0"
side-channel "^1.0.4"
interpret@^3.1.1:
@@ -4818,11 +4832,11 @@ is-cidr@^4.0.2:
cidr-regex "^3.1.1"
is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.8.1:
- version "2.13.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
- integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+ version "2.13.1"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+ integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
dependencies:
- has "^1.0.3"
+ hasown "^2.0.0"
is-date-object@^1.0.1:
version "1.0.5"
@@ -5034,9 +5048,9 @@ isobject@^3.0.1:
integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
- integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+ integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
istanbul-lib-instrument@^5.0.4:
version "5.2.1"
@@ -5930,13 +5944,13 @@ kleur@^3.0.3:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-lerna@^7.4.1:
- version "7.4.1"
- resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.4.1.tgz#d124fa5f0a1fe10ae9a6081bc363d98f3f6caca9"
- integrity sha512-c6sOO0dlJU689vStIsko+zjRdn2fJOWH8aNjePLNv2AubAdABKqfrDCpE2H/Q7+O80Duo68ZQtWYkUUk7hRWDw==
+lerna@^7.4.2:
+ version "7.4.2"
+ resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.4.2.tgz#03497125d7b7c8d463eebfe17a701b16bde2ad09"
+ integrity sha512-gxavfzHfJ4JL30OvMunmlm4Anw7d7Tq6tdVHzUukLdS9nWnxCN/QB21qR+VJYp5tcyXogHKbdUEGh6qmeyzxSA==
dependencies:
- "@lerna/child-process" "7.4.1"
- "@lerna/create" "7.4.1"
+ "@lerna/child-process" "7.4.2"
+ "@lerna/create" "7.4.2"
"@npmcli/run-script" "6.0.2"
"@nx/devkit" ">=16.5.1 < 17"
"@octokit/plugin-enterprise-rest" "6.0.1"
@@ -5946,7 +5960,7 @@ lerna@^7.4.1:
clone-deep "4.0.1"
cmd-shim "6.0.1"
columnify "1.6.0"
- conventional-changelog-angular "6.0.0"
+ conventional-changelog-angular "7.0.0"
conventional-changelog-core "5.0.1"
conventional-recommended-bump "7.0.1"
cosmiconfig "^8.2.0"
@@ -6165,9 +6179,9 @@ lines-and-columns@^1.1.6:
integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
lines-and-columns@~2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b"
- integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
+ integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
load-json-file@6.2.0:
version "6.2.0"
@@ -6290,9 +6304,11 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
"lru-cache@^9.1.1 || ^10.0.0":
- version "10.0.1"
- resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
- integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
+ version "10.0.2"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.2.tgz#34504678cc3266b09b8dfd6fab4e1515258271b7"
+ integrity sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==
+ dependencies:
+ semver "^7.3.5"
make-dir@4.0.0, make-dir@^4.0.0:
version "4.0.0"
@@ -6314,7 +6330,7 @@ make-error@^1.1.1:
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
-make-fetch-happen@^10.0.6, make-fetch-happen@^10.2.0:
+make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6, make-fetch-happen@^10.2.0:
version "10.2.1"
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
@@ -6336,7 +6352,7 @@ make-fetch-happen@^10.0.6, make-fetch-happen@^10.2.0:
socks-proxy-agent "^7.0.0"
ssri "^9.0.0"
-make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.0.3, make-fetch-happen@^11.1.1:
+make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1:
version "11.1.1"
resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
@@ -6692,15 +6708,15 @@ node-gyp-build@^4.3.0:
integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
node-gyp@^9.0.0, node-gyp@^9.1.0:
- version "9.4.0"
- resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
- integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
+ version "9.4.1"
+ resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
+ integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
dependencies:
env-paths "^2.2.0"
exponential-backoff "^3.1.1"
glob "^7.1.4"
graceful-fs "^4.2.6"
- make-fetch-happen "^11.0.3"
+ make-fetch-happen "^10.0.3"
nopt "^6.0.0"
npmlog "^6.0.0"
rimraf "^3.0.2"
@@ -7103,10 +7119,10 @@ nx@16.10.0, "nx@>=16.5.1 < 17":
"@nx/nx-win32-arm64-msvc" "16.10.0"
"@nx/nx-win32-x64-msvc" "16.10.0"
-object-inspect@^1.12.3, object-inspect@^1.9.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.0.tgz#42695d3879e1cd5bda6df5062164d80c996e23e2"
- integrity sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==
+object-inspect@^1.13.1, object-inspect@^1.9.0:
+ version "1.13.1"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+ integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
object-keys@^1.1.1:
version "1.1.1"
@@ -7543,10 +7559,10 @@ prettier@^2:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
-prettier@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643"
- integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==
+prettier@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.0.tgz#c6d16474a5f764ea1a4a373c593b779697744d5e"
+ integrity sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==
pretty-format@^28.1.3:
version "28.1.3"
@@ -7638,9 +7654,9 @@ proxy-from-env@^1.1.0:
integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
punycode@^2.1.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
- integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+ integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
pure-rand@^6.0.0:
version "6.0.4"
@@ -8078,6 +8094,16 @@ set-blocking@^2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+set-function-length@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+ integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+ dependencies:
+ define-data-property "^1.1.1"
+ get-intrinsic "^1.2.1"
+ gopd "^1.0.1"
+ has-property-descriptors "^1.0.0"
+
set-function-name@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
@@ -8245,10 +8271,10 @@ spdx-license-ids@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f"
integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==
-spdx-license-list@^6.7.0:
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/spdx-license-list/-/spdx-license-list-6.7.0.tgz#dd8c6aba00e7a3f9549e473d0be2b83c4cae081f"
- integrity sha512-NFqavuJxNsHdwSy/0PjmUpcc76XwlmHQRPjVVtE62qmSLhKJUnzSvJCkU9nrY6TsChfGU1xqGePriBkNtNRMiA==
+spdx-license-list@^6.8.0:
+ version "6.8.0"
+ resolved "https://registry.yarnpkg.com/spdx-license-list/-/spdx-license-list-6.8.0.tgz#92a99cd6c8b97fe98ae83c54deaffd4d9d503f74"
+ integrity sha512-5UdM7r9yJ1EvsPQZWfa41AZjLQngl9iMMysm9XBW7Lqhq7aF8cllfqjS+rFCHB8FFMGSM0yFWue2LUV9mR0QzQ==
split-text-to-chunks@^1.0.0:
version "1.0.0"
@@ -8575,9 +8601,9 @@ terser-webpack-plugin@^5.3.7:
terser "^5.16.8"
terser@^5.16.8:
- version "5.22.0"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.22.0.tgz#4f18103f84c5c9437aafb7a14918273310a8a49d"
- integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==
+ version "5.24.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.24.0.tgz#4ae50302977bca4831ccc7b4fef63a3c04228364"
+ integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw==
dependencies:
"@jridgewell/source-map" "^0.3.3"
acorn "^8.8.2"
@@ -8876,10 +8902,10 @@ unbox-primitive@^1.0.2:
has-symbols "^1.0.3"
which-boxed-primitive "^1.0.2"
-undici-types@~5.25.1:
- version "5.25.3"
- resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
- integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
+undici-types@~5.26.4:
+ version "5.26.5"
+ resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+ integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
unique-filename@^2.0.0:
version "2.0.1"
@@ -8910,9 +8936,9 @@ unique-slug@^4.0.0:
imurmurhash "^0.1.4"
universal-user-agent@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
- integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.1.tgz#15f20f55da3c930c57bddbf1734c6654d5fd35aa"
+ integrity sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==
universalify@^0.1.0:
version "0.1.2"
@@ -8920,9 +8946,9 @@ universalify@^0.1.0:
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
universalify@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
- integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+ integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
untildify@^4.0.0:
version "4.0.0"
@@ -9138,13 +9164,13 @@ which-module@^2.0.0:
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-which-typed-array@^1.1.11:
- version "1.1.11"
- resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
- integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+ version "1.1.13"
+ resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+ integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
dependencies:
available-typed-arrays "^1.0.5"
- call-bind "^1.0.2"
+ call-bind "^1.0.4"
for-each "^0.3.3"
gopd "^1.0.1"
has-tostringtag "^1.0.0"
From c0a41409568bc71b086fd1c56e2c5a08f708c3ad Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Wed, 15 Nov 2023 14:25:13 +0000
Subject: [PATCH 26/28] fix(superchain): installed setuptools is an unsupported
version (#4333)
Running the jsii-pacmak build tests inside a `jsii/superchain:1-bullseye-slim-nightly` container would fail with "invalid command 'bdist_wheel'".
This was due to an outdated & unsupported (by jsii) version of `setuptools` being present in the image.
In https://github.com/aws/jsii/pull/4219 we inadvertently removed installing a newer version of `setuptools`.
---
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-pacmak/test/build-test.sh | 4 +-
.../generated-code/python-pyright.test.ts | 2 +-
superchain/Dockerfile | 56 +++++++++----------
3 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/packages/jsii-pacmak/test/build-test.sh b/packages/jsii-pacmak/test/build-test.sh
index b8e09d5595..9a4514db39 100755
--- a/packages/jsii-pacmak/test/build-test.sh
+++ b/packages/jsii-pacmak/test/build-test.sh
@@ -46,7 +46,9 @@ else
# Hello Windows!
. ${venv}/Scripts/activate
fi
-${PYTHON} -m pip install --upgrade pip~=22.1 twine~=4.0
+
+# Note the venv is not used by the jsii-pacmak commands
+${PYTHON} -m pip install --upgrade "pip>=23.3.1" "setuptools>=68.0.0" "wheel>=0.41.3" "twine~=4.0"
# Provision a specific NuGet package cache
NUGET_CACHE=${outdir}/.nuget/packages
diff --git a/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts b/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts
index a06a7eeb77..eeb551ffb8 100644
--- a/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts
+++ b/packages/jsii-pacmak/test/generated-code/python-pyright.test.ts
@@ -65,7 +65,7 @@ beforeAll(async () => {
[
'[tool.pyright]',
'defineConstant = { DEBUG = true }',
- 'pythonVersion = "3.7"',
+ 'pythonVersion = "3.8"',
'pythonPlatform = "All"',
'reportSelfClsParameterName = false',
`venvPath = ${JSON.stringify(path.dirname(venv.venvRoot))}`,
diff --git a/superchain/Dockerfile b/superchain/Dockerfile
index a557605549..d995dc8458 100644
--- a/superchain/Dockerfile
+++ b/superchain/Dockerfile
@@ -40,7 +40,7 @@ ARG DEBIAN_VERSION="bookworm"
# We require a couple of tools to be available in order to work here...
RUN echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-backports main" \
- > "/etc/apt/sources.list.d/${DEBIAN_VERSION}-backports.list" \
+ > "/etc/apt/sources.list.d/${DEBIAN_VERSION}-backports.list" \
&& apt-get update \
&& apt-get install -y gpg tar zsh \
# We need a "recent" (>= 7.71) version of curl for --retry-all-errors, so we get it from backports...
@@ -54,9 +54,9 @@ ARG M2_VERSION="3.9.4"
ENV M2_DISTRO="https://www.apache.org/dist/maven/maven-3"
RUN set -eo pipefail \
&& curl -fSsL "${M2_DISTRO}/${M2_VERSION}/binaries/apache-maven-${M2_VERSION}-bin.tar.gz" \
- -o /tmp/apache-maven.tar.gz \
+ -o /tmp/apache-maven.tar.gz \
&& curl -fSsL "${M2_DISTRO}/${M2_VERSION}/binaries/apache-maven-${M2_VERSION}-bin.tar.gz.asc" \
- -o /tmp/apache-maven.tar.gz.asc \
+ -o /tmp/apache-maven.tar.gz.asc \
&& mkdir -p /tmp/gpg-maven && chmod go-rwx /tmp/gpg-maven \
&& curl -fSsL "https://www.apache.org/dist/maven/KEYS" | gpg --homedir /tmp/gpg-maven --import \
&& gpg --homedir /tmp/gpg-maven --verify /tmp/apache-maven.tar.gz.asc /tmp/apache-maven.tar.gz \
@@ -75,11 +75,11 @@ RUN DOTNET_VERSION=$(curl -fSsL "${DOTNET_FEED}/Sdk/${DOTNET_CHANNEL}/latest.ver
# Prepare PowerShell LTS distribution
ENV POWERSHELL_RELEASES="https://github.com/PowerShell/PowerShell/releases"
RUN POWERSHELL_RELEASE=$(curl -X GET -fSsIL "https://aka.ms/powershell-release?tag=lts" -o /dev/null \
- --retry 5 --retry-all-errors -w %{url_effective}) \
+ --retry 5 --retry-all-errors -w %{url_effective}) \
&& POWERSHELL_VERSION=${POWERSHELL_RELEASE#${POWERSHELL_RELEASES}/tag/v} \
&& ASSET="powershell-${POWERSHELL_VERSION}-linux-${${TARGETPLATFORM#linux/}/amd64/x64}.tar.gz" \
&& curl -fSsL "${POWERSHELL_RELEASES}/download/v${POWERSHELL_VERSION}/${ASSET}" --retry 5 --retry-all-errors \
- -o /tmp/powershell.tar.gz \
+ -o /tmp/powershell.tar.gz \
&& mkdir -p /opt/microsoft/powershell \
&& tar zxf /tmp/powershell.tar.gz -C /opt/microsoft/powershell \
&& chmod +x /opt/microsoft/powershell/pwsh
@@ -125,24 +125,24 @@ ENV LANG="C.UTF-8"
RUN apt-get update \
&& apt-get -y upgrade \
&& apt-get -y install --no-install-recommends \
- apt-transport-https \
- build-essential \
- ca-certificates \
- curl \
- dirmngr \
- git \
- gnupg \
- gzip \
- libffi-dev \
- libicu-dev \
- libssl-dev \
- openssh-client \
- openssl \
- rsync \
- sudo \
- unzip \
- zip \
- acl \
+ apt-transport-https \
+ build-essential \
+ ca-certificates \
+ curl \
+ dirmngr \
+ git \
+ gnupg \
+ gzip \
+ libffi-dev \
+ libicu-dev \
+ libssl-dev \
+ openssh-client \
+ openssl \
+ rsync \
+ sudo \
+ unzip \
+ zip \
+ acl \
&& rm -rf /var/lib/apt/lists/*
# Install mono
@@ -150,7 +150,7 @@ COPY superchain/gpg/mono.asc /tmp/mono.asc
RUN apt-key add /tmp/mono.asc && rm /tmp/mono.asc \
# Mono only provides a Debian Buster (10) distribution point, but it works with subsequent debians, too...
&& echo "deb https://download.mono-project.com/repo/debian stable-buster main" \
- > /etc/apt/sources.list.d/mono-official-stable.list \
+ > /etc/apt/sources.list.d/mono-official-stable.list \
&& apt-get update \
&& apt-get -y install mono-devel \
&& rm -rf /var/lib/apt/lists/*
@@ -171,7 +171,7 @@ RUN apt-get update
&& apt-get -y install python3-dev python3-pip python3-venv \
&& coercepip='--break-system-packages' \
&& if [[ ${DEBIAN_VERSION} == "buster" || ${DEBIAN_VERSION} == "bullseye" ]]; then coercepip=''; fi \
- && python3 -m pip install ${coercepip} pipx \
+ && python3 -m pip install ${coercepip} pipx "pip>=23.3.1" "setuptools>=68.0.0" "wheel>=0.41.3" \
&& rm -rf /var/lib/apt/lists/*
# Install Python tools globally using pipx (install globally)
@@ -213,7 +213,7 @@ ARG GITHUB_CLI_VERSION="1.13.1"
RUN BASE="https://github.com/cli/cli/releases/download" \
&& echo "${BASE}/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_${TARGETPLATFORM#linux/}.deb" \
&& curl -fSsL "${BASE}/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_${TARGETPLATFORM#linux/}.deb" \
- -o /tmp/gh.deb \
+ -o /tmp/gh.deb \
&& apt-get update \
&& apt-get -y install /tmp/gh.deb \
&& rm /tmp/gh.deb \
@@ -240,7 +240,7 @@ 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 \
+ > /etc/apt/sources.list.d/nodesource.list \
# Reduce priority of the "standard" nodejs package, so that the one from nodesource is always preferred...
&& echo "Package: nodejs" > /etc/apt/preferences.d/nodejs \
&& echo 'Pin: origin "deb.debian.org"' >> /etc/apt/preferences.d/nodejs \
@@ -256,7 +256,7 @@ RUN apt-key add /tmp/nodesource.asc && rm /tmp/nodesource.asc
RUN apt-get update \
&& apt-get -y install --no-install-recommends curl \
&& curl -fSsL "https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/debian_${TARGETPLATFORM#linux/}/amazon-ssm-agent.deb"\
- -o /tmp/amazon-ssm-agent.deb \
+ -o /tmp/amazon-ssm-agent.deb \
&& dpkg -i /tmp/amazon-ssm-agent.deb \
&& systemctl enable amazon-ssm-agent \
&& rm -rf /var/lib/apt/lists/*
From b92a2f9a5d144d76e33e60248fe59d5005e487d2 Mon Sep 17 00:00:00 2001
From: AWS CDK Team
Date: Thu, 16 Nov 2023 13:35:17 +0000
Subject: [PATCH 27/28] chore(release): 1.92.0
---
CHANGELOG.md | 28 ++++++++++++++++++++++++++++
lerna.json | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 930fc7c2bb..735abef620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,34 @@
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.92.0](https://github.com/aws/jsii/compare/v1.91.0...v1.92.0) (2023-11-16)
+
+
+### ⚠ BREAKING CHANGES
+
+* jsii-pacmak and the libraries it generates for Python targets now require a minimum Python version of 3.8, instead of 3.7 previously. We recommend users upgrade to the latest supported Python release (Python 3.11).
+* jsii-pacmak and the libraries it generates for Python
+targets now require a minimum Python version of 3.8, instead of 3.7
+previously. We recommend users upgrade to the latest supported Python
+release (Python 3.11).
+
+### Features
+
+* **jsii-reflect:** TypeSystem can be locked to improve reflection performance ([#4318](https://github.com/aws/jsii/issues/4318)) ([c87da43](https://github.com/aws/jsii/commit/c87da436671d677d1fee276d0932ea7edd431f78))
+* make node 18 the default ([#4325](https://github.com/aws/jsii/issues/4325)) ([8784725](https://github.com/aws/jsii/commit/87847254c8a39f6e99383bfa3a375ae6c8d9a8a5))
+* **superchain:** publish a bullseye image with node18 & python 3.9 ([#4326](https://github.com/aws/jsii/issues/4326)) ([7197b4f](https://github.com/aws/jsii/commit/7197b4f21e7f6776fbbfe5bac7f03a308cd9f7c0))
+* switch to python 3.8 ([#4239](https://github.com/aws/jsii/issues/4239)) ([#4327](https://github.com/aws/jsii/issues/4327)) ([416e2b5](https://github.com/aws/jsii/commit/416e2b504895800281a3598b3139b141330aa906))
+
+
+### Bug Fixes
+
+* **kernel:** invokeBinScript fails when using symlinked cache ([#4324](https://github.com/aws/jsii/issues/4324)) ([a2ab316](https://github.com/aws/jsii/commit/a2ab31609d361ac5ceca6c928584ec59f2d705d3))
+* **pacmak:** *.tsbuildinfo not in auto-generated .npmignore file ([#4236](https://github.com/aws/jsii/issues/4236)) ([d55b8d5](https://github.com/aws/jsii/commit/d55b8d57ce43dc9fd3d5132d7ba3ad0aa9ead3b9)), closes [#3978](https://github.com/aws/jsii/issues/3978)
+* **superchain:** installed setuptools is an unsupported version ([#4333](https://github.com/aws/jsii/issues/4333)) ([c0a4140](https://github.com/aws/jsii/commit/c0a41409568bc71b086fd1c56e2c5a08f708c3ad))
+
+
+* switch to python 3.8 ([#4239](https://github.com/aws/jsii/issues/4239)) ([087ff24](https://github.com/aws/jsii/commit/087ff241bc852b49d91c79883e5faeaf5bb92f42))
+
## [1.91.0](https://github.com/aws/jsii/compare/v1.90.0...v1.91.0) (2023-10-24)
## [1.90.0](https://github.com/aws/jsii/compare/v1.89.0...v1.90.0) (2023-10-06)
diff --git a/lerna.json b/lerna.json
index aa79516c86..69c784d5bf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -12,6 +12,6 @@
"rejectCycles": true
}
},
- "version": "1.91.0",
+ "version": "1.92.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
From 7d2da6f1c85f4b85ba30dd1d5ec31ea5b69e847d Mon Sep 17 00:00:00 2001
From: Momo Kornher
Date: Thu, 16 Nov 2023 13:44:17 +0000
Subject: [PATCH 28/28] Update CHANGELOG.md
---
CHANGELOG.md | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 735abef620..7c428182b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,17 +8,14 @@ All notable changes to this project will be documented in this file. See [standa
### ⚠ BREAKING CHANGES
* jsii-pacmak and the libraries it generates for Python targets now require a minimum Python version of 3.8, instead of 3.7 previously. We recommend users upgrade to the latest supported Python release (Python 3.11).
-* jsii-pacmak and the libraries it generates for Python
-targets now require a minimum Python version of 3.8, instead of 3.7
-previously. We recommend users upgrade to the latest supported Python
-release (Python 3.11).
+* all libraries and tools now require a minimum version of Node.js 18, instead of 16 previously. We recommend users upgrade to the latest supported Node.js release (Node.js 20).
### Features
* **jsii-reflect:** TypeSystem can be locked to improve reflection performance ([#4318](https://github.com/aws/jsii/issues/4318)) ([c87da43](https://github.com/aws/jsii/commit/c87da436671d677d1fee276d0932ea7edd431f78))
* make node 18 the default ([#4325](https://github.com/aws/jsii/issues/4325)) ([8784725](https://github.com/aws/jsii/commit/87847254c8a39f6e99383bfa3a375ae6c8d9a8a5))
* **superchain:** publish a bullseye image with node18 & python 3.9 ([#4326](https://github.com/aws/jsii/issues/4326)) ([7197b4f](https://github.com/aws/jsii/commit/7197b4f21e7f6776fbbfe5bac7f03a308cd9f7c0))
-* switch to python 3.8 ([#4239](https://github.com/aws/jsii/issues/4239)) ([#4327](https://github.com/aws/jsii/issues/4327)) ([416e2b5](https://github.com/aws/jsii/commit/416e2b504895800281a3598b3139b141330aa906))
+* switch to python 3.8 ([#4327](https://github.com/aws/jsii/issues/4327)) ([416e2b5](https://github.com/aws/jsii/commit/416e2b504895800281a3598b3139b141330aa906))
### Bug Fixes
@@ -27,9 +24,6 @@ release (Python 3.11).
* **pacmak:** *.tsbuildinfo not in auto-generated .npmignore file ([#4236](https://github.com/aws/jsii/issues/4236)) ([d55b8d5](https://github.com/aws/jsii/commit/d55b8d57ce43dc9fd3d5132d7ba3ad0aa9ead3b9)), closes [#3978](https://github.com/aws/jsii/issues/3978)
* **superchain:** installed setuptools is an unsupported version ([#4333](https://github.com/aws/jsii/issues/4333)) ([c0a4140](https://github.com/aws/jsii/commit/c0a41409568bc71b086fd1c56e2c5a08f708c3ad))
-
-* switch to python 3.8 ([#4239](https://github.com/aws/jsii/issues/4239)) ([087ff24](https://github.com/aws/jsii/commit/087ff241bc852b49d91c79883e5faeaf5bb92f42))
-
## [1.91.0](https://github.com/aws/jsii/compare/v1.90.0...v1.91.0) (2023-10-24)
## [1.90.0](https://github.com/aws/jsii/compare/v1.89.0...v1.90.0) (2023-10-06)