Skip to content

Commit

Permalink
chore(release): 1.61.0 (#3605)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jun 16, 2022
2 parents 2799dc8 + f83d10a commit abf4039
Show file tree
Hide file tree
Showing 93 changed files with 1,774 additions and 1,785 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1402,6 +1402,24 @@
"contributions": [
"doc"
]
},
{
"login": "touchez-du-bois",
"name": "Takahiro Sugiura",
"avatar_url": "https://avatars.githubusercontent.com/u/434017?v=4",
"profile": "https://github.com/touchez-du-bois",
"contributions": [
"doc"
]
},
{
"login": "agdimech",
"name": "Adrian Dimech",
"avatar_url": "https://avatars.githubusercontent.com/u/51220968?v=4",
"profile": "https://github.com/agdimech",
"contributions": [
"code"
]
}
],
"repoType": "github",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Check out
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
cache: 'pip'
cache-dependency-path: 'gh-pages/requirements-dev.txt'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
cache: yarn
node-version: '14'
- name: Set up Python 3.7
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: '3.7'
- name: Install python3-venv
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
cache: yarn
node-version: '14'
- name: Set up Python 3.7
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: '3.7'
- name: Install python3-venv
Expand Down Expand Up @@ -315,7 +315,7 @@ jobs:
cache: yarn
node-version: ${{ matrix.node }}
- name: Set up Python ${{ matrix.python }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
- name: 'Linux: Install python3-venv'
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

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.61.0](https://github.com/aws/jsii/compare/v1.60.1...v1.61.0) (2022-06-16)


### Features

* add support for using custom .m2 directory ([#3573](https://github.com/aws/jsii/issues/3573)) ([0003c8a](https://github.com/aws/jsii/commit/0003c8a22dd44a2c89fcc117e1b1064b221aacfe))


### Bug Fixes

* @jsii/check-node crashes on loading with older node releases ([#3588](https://github.com/aws/jsii/issues/3588)) ([a1582bf](https://github.com/aws/jsii/commit/a1582bf7d9cc4081dd89e51efb4b3bc76b6e407e))
* instantiate perf observer for each iteration ([#3585](https://github.com/aws/jsii/issues/3585)) ([3827d93](https://github.com/aws/jsii/commit/3827d93d7a1c1c83247a79647e84a56c2b5e321a))
* italics in Markdown notation ([#3594](https://github.com/aws/jsii/issues/3594)) ([f754baa](https://github.com/aws/jsii/commit/f754baa81f78cce2f269732272fe305f6b34ca86))

## [1.60.1](https://github.com/aws/jsii/compare/v1.60.0...v1.60.1) (2022-06-09)

### Bug Fixes
Expand Down
50 changes: 26 additions & 24 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gh-pages/content/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ any other native type:
The documentation in this website is separated in different topics, which can be navigated using links in the site's
header bar:

- The [Welcome](./index.md) section provides a high level overview of *jsii.
- The [Welcome](./index.md) section provides a high level overview of *jsii*.
- The [User Guides](./user-guides) section includes the following:

- The [Library Author Guide](user-guides/lib-author) is intended for developers who are looking to author libraries
Expand Down
4 changes: 1 addition & 3 deletions gh-pages/partials/node-support-table.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

| Release | Status | End-of-Life |
| --------- | ---------------------------- | ------------ |
| `^12.7.0` | :white_check_mark: Supported | `2022-04-30` |
| `^14.5.0` | :white_check_mark: Supported | `2023-04-30` |
| `^14.6.0` | :white_check_mark: Supported | `2023-04-30` |
| `^16.3.0` | :white_check_mark: Supported | `2024-04-30` |
| `^17.3.0` | :test_tube: Best effort | `2022-06-01` |
| `^18.0.0` | :white_check_mark: Supported | `2025-04-30` |

??? question "Status Definitions"
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.3.0
mkdocs-awesome-pages-plugin~=2.7.0
mkdocs-material~=8.2.16
mkdocs-material~=8.3.4
mkdocs-git-revision-date-plugin~=0.3.2
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.60.1"
"version": "1.61.0"
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@
"compliance": "(cd tools/jsii-compliance && yarn report)"
},
"devDependencies": {
"@jest/types": "^28.1.0",
"@types/jest": "^28.1.0",
"@types/node": "^12.20.54",
"@typescript-eslint/eslint-plugin": "^5.27.0",
"@typescript-eslint/parser": "^5.27.0",
"@jest/types": "^28.1.1",
"@types/jest": "^28.1.1",
"@types/node": "^14.18.21",
"@typescript-eslint/eslint-plugin": "^5.28.0",
"@typescript-eslint/parser": "^5.28.0",
"all-contributors-cli": "^6.20.0",
"eslint": "^8.16.0",
"eslint": "^8.17.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.0.0",
"jest": "^28.1.0",
"jest-circus": "^28.1.0",
"jest-config": "^28.1.0",
"jest": "^28.1.1",
"jest-circus": "^28.1.1",
"jest-config": "^28.1.1",
"jest-expect-message": "^1.0.2",
"lerna": "^5.0.0",
"prettier": "^2.6.2",
"lerna": "^5.1.2",
"prettier": "^2.7.0",
"standard-version": "^9.5.0",
"ts-node": "^10.8.0",
"typescript": "~4.7.2"
"ts-node": "^10.8.1",
"typescript": "~4.7.3"
},
"repository": {
"type": "git",
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": ">= 14.5.0"
"node": ">= 14.6.0"
},
"main": "index.js"
}
92 changes: 61 additions & 31 deletions packages/@jsii/benchmarks/bin/benchmark.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as fs from 'fs-extra';
import * as path from 'path';
import * as yargs from 'yargs';

import { benchmarks } from '../lib';
Expand Down Expand Up @@ -39,43 +40,72 @@ interface ResultsJson {
/* eslint-disable-next-line @typescript-eslint/await-thenable */
const argv = await yargs
.command('$0', 'Runs jsii benchmark tests and displays results', (argv) =>
argv.option('output', {
type: 'string',
desc: 'location of benchmark results json file, does not output to file if not specified.',
}),
argv
.option('output', {
type: 'string',
desc: 'location of benchmark results json file, does not output to file if not specified.',
})
.option('profile-dir', {
type: 'string',
desc: 'directory to write benchmark profiles to',
}),
)
.help().argv;

// Run list of benchmarks in sequence
const resultsJson: ResultsJson[] = await benchmarks.reduce(
async (
accum: Promise<ResultsJson[]>,
benchmark: Benchmark<any>,
): Promise<ResultsJson[]> => {
const prev = await accum;
const result = await benchmark.run();
const extra = `${result.name} averaged ${result.average} milliseconds over ${result.iterations.length} runs`;
console.log(extra);
return [
...prev,
{
name: result.name,
unit: 'milliseconds',
value: result.average,
range: result.variance,
extra,
},
];
},
Promise.resolve([]),
);
try {
const resultsJson: ResultsJson[] = await benchmarks.reduce(
async (
accum: Promise<ResultsJson[]>,
benchmark: Benchmark<any>,
): Promise<ResultsJson[]> => {
const bench = argv.profileDir ? benchmark.profile() : benchmark;
const prev = await accum;
const result = await bench.run();

if (argv.output) {
await fs.writeJson(argv.output, resultsJson, { spaces: 2 });
console.log(`results written to ${argv.output}`);
}
// Output summary to console
const extra = `${result.name} averaged ${result.average} milliseconds over ${result.iterations.length} runs`;
console.log(extra);

// Write profiles if enabled
if (argv.profileDir) {
const dirName = result.name.replace(/[/\\:*?"<>]/g, '');
const profilesTargetDir = path.join(argv.profileDir, dirName);
await fs.mkdir(profilesTargetDir);

await Promise.all(
result.iterations.map(async (iter, idx) => {
const profileFile = path.join(profilesTargetDir, `${idx}.json`);
await fs.writeJson(profileFile, iter.profile);
}),
);
console.log(`profiles written to ${profilesTargetDir} directory`);
}

return resultsJson;
return [
...prev,
{
name: result.name,
unit: 'milliseconds',
value: result.average,
range: result.variance,
extra,
},
];
},
Promise.resolve([]),
);

if (argv.output) {
await fs.writeJson(argv.output, resultsJson, { spaces: 2 });
console.log(`results written to ${argv.output}`);
}

return resultsJson;
} catch (e) {
console.error(e);
throw e;
}
})()
.then((results) => {
console.log(`successfully completed ${results.length} benchmarks`);
Expand Down
Loading

0 comments on commit abf4039

Please sign in to comment.