Skip to content

Commit

Permalink
chore(release): 1.35.0 (#3003)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Sep 28, 2021
2 parents 9b72778 + 9174f1c commit 6ebef96
Show file tree
Hide file tree
Showing 67 changed files with 1,360 additions and 1,202 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ['10', '14']
node: ['12', '14', '16']
env:
# Node version whose images will be aliased without the -nodeXX segment
DEFAULT_NODE_MAJOR_VERSION: 12
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
java-version: '8'
distribution: 'zulu'
- name: Set up Node 12
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
cache: yarn
node-version: '12'
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
java-version: '8'
distribution: 'zulu'
- name: Set up Node 12
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
cache: yarn
node-version: '12'
Expand Down Expand Up @@ -213,64 +213,64 @@ jobs:
dotnet: ['3.1.x']
go: ['1.16']
java: ['8']
node: ['10', '12', '14']
node: ['12', '14', '16']
os: [ubuntu-latest]
python: ['3.6']
# Add specific combinations to be tested against "node 10" (to restrict cardinality)
# Add specific combinations to be tested against "node 12" (to restrict cardinality)
include:
# Test using Windows
- os: windows-latest
dotnet: '3.1.x'
go: '1.16'
java: '8'
node: '10'
node: '12'
python: '3.6'
# Test using macOS
- os: macos-latest
dotnet: '3.1.x'
go: '1.16'
java: '8'
node: '10'
node: '12'
python: '3.6'
# Test alternate .NETs
- java: '8'
dotnet: '5.0.x'
go: '1.16'
node: '10'
node: '12'
os: ubuntu-latest
python: '3.6'
- java: '8'
dotnet: '6.0.x'
dotnet-prerelease: true
go: '1.16'
node: '10'
node: '12'
os: ubuntu-latest
python: '3.6'
# Test alternate Javas
- java: '11'
dotnet: '3.1.x'
go: '1.16'
node: '10'
node: '12'
os: ubuntu-latest
python: '3.6'
# Test alternate Pythons
- python: '3.7'
dotnet: '3.1.x'
go: '1.16'
java: '8'
node: '10'
node: '12'
os: ubuntu-latest
- python: '3.8'
dotnet: '3.1.x'
go: '1.16'
java: '8'
node: '10'
node: '12'
os: ubuntu-latest
- python: '3.9'
dotnet: '3.1.x'
go: '1.16'
java: '8'
node: '10'
node: '12'
os: ubuntu-latest

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -304,7 +304,7 @@ jobs:
java-version: ${{ matrix.java }}
distribution: 'zulu'
- name: Set up Node ${{ matrix.node }}
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
cache: yarn
node-version: ${{ matrix.node }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
uses: actions/checkout@v2.3.4

- name: Set up Node
uses: actions/setup-node@v2.4.0
uses: actions/setup-node@v2.4.1
with:
cache: yarn
node-version: 10
node-version: 12

- name: Install Tools
run: |-
Expand Down Expand Up @@ -67,17 +67,16 @@ jobs:
EOF
- name: Run "ncu -u"
# We special-case @types/fs-extra because the current major (9.x) is broken with @types/node@10
# We special-case typescript because it's not semantically versionned, and major.minor is the API contract
run: |-
# Upgrade devDependencies at repository root
ncu --upgrade --target=minor --filter=@types/node,@types/fs-extra
ncu --upgrade --target=minor --filter=@types/node
ncu --upgrade --target=patch --filter=typescript
ncu --upgrade --target=latest --reject=@types/node,@types/fs-extra,typescript
ncu --upgrade --target=latest --reject=@types/node,typescript
# Upgrade all production dependencies (and other always major-pinned dependencies)
lerna exec --parallel ncu -- --upgrade --target=minor \
--filter='@types/fs-extra,${{ steps.production-dependencies.outputs.list }}' \
--filter='${{ steps.production-dependencies.outputs.list }}' \
--reject='typescript,${{ steps.monorepo-packages.outputs.list }}'
# Upgrade all minor-pinned dependencies
Expand All @@ -86,7 +85,7 @@ jobs:
# Upgrade all other dependencies (devDependencies) to the latest
lerna exec --parallel ncu -- --upgrade --target=latest \
--reject='@types/node,@types/fs-extra,typescript,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'
--reject='@types/node,typescript,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
- name: Run "yarn install"
Expand Down Expand Up @@ -131,6 +130,7 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
# Git commit details
author: 'AWS CDK Automation <aws-cdk-automation@users.noreply.github.com>'
branch: automation/yarn-upgrade
commit-message: |-
chore: npm-check-updates && yarn upgrade
Expand Down
6 changes: 3 additions & 3 deletions .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ pull_request_rules:
- status-success~=^Test \(macos-.*$
- status-success~=^Test \(windows-.*$
# One test for each supported nodejs version
- status-success~=^Test \(.* node 10 .*$
- status-success~=^Test \(.* node 12 .*$
- status-success~=^Test \(.* node 14 .*$
- status-success~=^Test \(.* node 16 .*$
# One test for each supported dotnet version
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
- status-success~=^Test \(.* dotnet 5\.0\.x .*$
Expand Down Expand Up @@ -85,9 +85,9 @@ pull_request_rules:
- status-success~=^Test \(macos-.*$
- status-success~=^Test \(windows-.*$
# One test for each supported nodejs version
- status-success~=^Test \(.* node 10 .*$
- status-success~=^Test \(.* node 12 .*$
- status-success~=^Test \(.* node 14 .*$
- status-success~=^Test \(.* node 16 .*$
# One test for each supported dotnet version
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
- status-success~=^Test \(.* dotnet 5\.0\.x .*$
Expand Down Expand Up @@ -134,9 +134,9 @@ pull_request_rules:
- status-success~=^Test \(macos-.*$
- status-success~=^Test \(windows-.*$
# One test for each supported nodejs version
- status-success~=^Test \(.* node 10 .*$
- status-success~=^Test \(.* node 12 .*$
- status-success~=^Test \(.* node 14 .*$
- status-success~=^Test \(.* node 16 .*$
# One test for each supported dotnet version
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
- status-success~=^Test \(.* dotnet 5\.0\.x .*$
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@

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.35.0](https://github.com/aws/jsii/compare/v1.34.0...v1.35.0) (2021-09-28)


### ⚠ BREAKING CHANGES

* the minimum supported version of `node` changed from
`10.3.0` to `12.7.0`. We recommend using `16.x` if possible.

### Features

* **rosetta:** propagate max heap size to worker threads ([#3002](https://github.com/aws/jsii/issues/3002)) ([9c7f63e](https://github.com/aws/jsii/commit/9c7f63eea27db55db83f1ad53552394edba4a931))


### Bug Fixes

* **jsii:** improve checks around peerDependencies ([#2997](https://github.com/aws/jsii/issues/2997)) ([d1ff3e6](https://github.com/aws/jsii/commit/d1ff3e678c9011df5e51816b37bec77767b6e8e2)), closes [#2994](https://github.com/aws/jsii/issues/2994)
* typo in documentation ([#2999](https://github.com/aws/jsii/issues/2999)) ([f3e2271](https://github.com/aws/jsii/commit/f3e2271855d528f3b43478e1f3b6d3e482d44900))


* upgrade baseline node requirement to >=12.7.0 ([#2946](https://github.com/aws/jsii/issues/2946)) ([f2c6842](https://github.com/aws/jsii/commit/f2c68426f1066de86f74fe4900011a10eef32c14))

## [1.34.0](https://github.com/aws/jsii/compare/v1.33.0...v1.34.0) (2021-08-25)


Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,23 @@ The following tools need to be installed to develop on JSII locally. We recommen
using the docker image from the above section, but if you wish to, you can install
in your development environment.

- [Node `8.11.0`] or later
- [Node `12.7.0`] or later
- [Yarn `1.19.1`] or later
- An OpenJDK-8 distribution (e.g: [Oracle's OpenJDK8], [Amazon Corretto 8])
+ [`maven >= 3.0.5`](https://maven.apache.org)
- [.NET Core `2.1`] or later
- [.NET Core `3.1`] or later
+ *Recommended:* [`mono >= 5`](https://www.mono-project.com)
- [Python `3.6.5`] 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/)
+ *Recommended:* [`twine`](https://pypi.org/project/twine/)

[Node `8.11.0`]: https://nodejs.org/download/release/v8.11.0/
[Node `12.7.0`]: https://nodejs.org/download/release/v12.7.0/
[Yarn `1.19.1`]: https://yarnpkg.com/en/docs/install
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
[.NET Core `2.0`]: https://www.microsoft.com/net/download
[.NET Core `3.1`]: https://www.microsoft.com/net/download
[Python `3.6.5`]: https://www.python.org/downloads/release/python-365/

## Getting Started
Expand Down
3 changes: 0 additions & 3 deletions buildspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ phases:
# Temporarily - install yarn if it's not there already
- yarn --version || npm install --global yarn
- yarn install --frozen-lockfile
# Temporary - gcc is needed for testify, but we can remove this once we have a new release
# of superchain, which will include it as of now.
- yum -y install gcc
build:
commands:
- yarn build && yarn test
Expand Down
2 changes: 1 addition & 1 deletion gh-pages/content/overview/runtime-architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ the request-response protocol is defined by the [kernel api specification]. On
- `#!json { "stdout": "<base64-encoded data>" }` when the console data is to be
written on the *Host Application*'s `STDOUT` stream.
- Any data that is not valid JSON, or that does not match either of the formats
described avove must be written as-is on the *Host Application*'s `STDERR`
described above must be written as-is on the *Host Application*'s `STDERR`
stream.

[kernel api specification]: ../specification/3-kernel-api.md
Expand Down
11 changes: 5 additions & 6 deletions gh-pages/partials/node-support-table.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
| Release | Status |
| --------- | ---------------------------- |
| `<10.3.0` | :x: Defunct |
| `^10.3.0` | :white_check_mark: Supported |
| `^11.0.0` | :warning: Unsupported |
| `^12.0.0` | :white_check_mark: Supported |
| `^13.0.0` | :warning: Unsupported |
| `<12.7.0` | :x: Defunct |
| `^12.7.0` | :white_check_mark: Supported |
| `^13.0.0` | :x: Defunct |
| `^14.0.0` | :white_check_mark: Supported |
| `^15.0.0` | :test_tube: Best effort |
| `^15.0.0` | :x: Defunct |
| `^16.0.0` | :white_check_mark: Supported |

??? question "Status Definitions"
- **:white_check_mark: Supported**: Long Term Support (LTS) releases (those with an even major version) are
Expand Down
2 changes: 1 addition & 1 deletion gh-pages/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs~=1.2.2
mkdocs-awesome-pages-plugin~=2.5.0
mkdocs-material~=7.2.4
mkdocs-material~=7.3.0
mkdocs-git-revision-date-plugin~=0.3.1
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
"rejectCycles": true
}
},
"version": "1.34.0"
"version": "1.35.0"
}
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
"compliance": "(cd tools/jsii-compliance && yarn report)"
},
"devDependencies": {
"@jest/types": "^27.0.6",
"@typescript-eslint/eslint-plugin": "^4.29.1",
"@typescript-eslint/parser": "^4.29.1",
"@jest/types": "^27.1.1",
"@typescript-eslint/eslint-plugin": "^4.31.2",
"@typescript-eslint/parser": "^4.31.2",
"all-contributors-cli": "^6.20.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-import-resolver-node": "^0.3.5",
"eslint-import-resolver-typescript": "^2.4.0",
"eslint-plugin-import": "^2.24.0",
"eslint-plugin-prettier": "^3.4.0",
"jest-circus": "^27.0.6",
"jest-config": "^27.0.6",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-prettier": "^4.0.0",
"jest-circus": "^27.2.1",
"jest-config": "^27.2.1",
"jest-expect-message": "^1.0.2",
"lerna": "^4.0.0",
"prettier": "^2.3.2",
"prettier": "^2.4.1",
"standard-version": "^9.3.1",
"ts-jest": "^27.0.4",
"ts-node": "^9.1.1",
"ts-jest": "^27.0.5",
"ts-node": "^10.2.1",
"typescript": "~3.9.10"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@fixtures/jsii-calc-bundled/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"directory": "packages/@fixtures/jsii-calc-bundled"
},
"engines": {
"node": ">= 10.3.0"
"node": ">= 12.7.0"
},
"main": "index.js"
}
6 changes: 3 additions & 3 deletions packages/@jsii/check-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
},
"devDependencies": {
"@types/chalk": "^2.2.0",
"@types/jest": "^27.0.1",
"@types/node": "^10.17.60",
"jest": "^27.0.6"
"@types/jest": "^27.0.2",
"@types/node": "^12.20.26",
"jest": "^27.2.1"
}
}
4 changes: 1 addition & 3 deletions packages/@jsii/check-node/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ export const DEADLINE_EPOCH_MS = new Date(
* forget to also change the `DEADLINE` value.
*/
export const VERSION_SUPPORT: { readonly [range: string]: SupportLevel } = {
'<10.3.0': SupportLevel.END_OF_LIFE,
'^10.3.0': SupportLevel.DEPRECATED,
'^11.0.0-0': SupportLevel.END_OF_LIFE,
'<12.0.0-0': SupportLevel.END_OF_LIFE,
'<12.7.0': SupportLevel.UNSUPPORTED,
'^12.7.0': SupportLevel.SUPPORTED,
'^13.0.0-0': SupportLevel.END_OF_LIFE,
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/dotnet-runtime-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"directory": "packages/@jsii/dotnet-runtime-test"
},
"engines": {
"node": ">= 10.3.0"
"node": ">= 12.7.0"
},
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand All @@ -31,7 +31,7 @@
},
"devDependencies": {
"@jsii/dotnet-runtime": "^0.0.0",
"@types/node": "^10.17.60",
"@types/node": "^12.20.26",
"jsii-calc": "^3.20.120",
"jsii-pacmak": "^0.0.0",
"typescript": "~3.9.10"
Expand Down
Loading

0 comments on commit 6ebef96

Please sign in to comment.