Skip to content

Commit

Permalink
chore(release): 1.62.0 (#3658)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jul 12, 2022
2 parents abf4039 + dbc71c1 commit 293ac17
Show file tree
Hide file tree
Showing 150 changed files with 5,497 additions and 1,677 deletions.
12 changes: 8 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ updates:
labels:
- dependencies
- language/go
ignore:
- dependency-name: github.com/aws/jsii-runtime-go
- dependency-name: github.com/aws/jsii-runtime-go/*
- dependency-name: github.com/aws/jsii/jsii-calc/go/*

- package-ecosystem: gomod
directory: '/packages/@jsii/go-runtime/jsii-runtime-go'
Expand All @@ -70,6 +66,14 @@ updates:
labels:
- dependencies
- language/go

- package-ecosystem: gomod
directory: '/packages/@jsii/go-runtime-test/project'
schedule:
interval: daily
labels:
- dependencies
- language/go
ignore:
- dependency-name: github.com/aws/jsii-runtime-go
- dependency-name: github.com/aws/jsii-runtime-go/*
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ jobs:
${{ runner.os }}-buildx-${{ hashFiles('superchain/*') }}-
${{ runner.os }}-buildx-
# 1 pull per second from ECR Public
- name: Jitter the start time to avoid ECR Public throttling
id: sleep-start
if: steps.should-run.outputs.result == 'true'
run: |-
sleep $((RANDOM % 60))
- name: Determine build time
id: build-time
if: steps.should-run.outputs.result == 'true'
Expand All @@ -104,13 +111,6 @@ jobs:
-f superchain/Dockerfile \
.
# Replace the cache so it does not grow forever
- name: Update layer cache
if: always() && steps.should-run.outputs.result == 'true'
run: |-
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-out /tmp/.buildx-cache
# Testing sequentially, because in parallel it's too slow due to IO contention
- name: Test Image (AMD64)
if: steps.should-run.outputs.result == 'true'
Expand Down Expand Up @@ -209,3 +209,10 @@ jobs:
-f superchain/Dockerfile \
.
fi
# Replace the cache so it does not grow forever (should always be last!)
- name: Update layer cache
if: always() && steps.should-run.outputs.result == 'true'
run: |-
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-out /tmp/.buildx-cache
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ jobs:
uses: actions/setup-node@v3
with:
cache: yarn
node-version: '14'
node-version: '18'
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Benchmark
Expand Down
2 changes: 1 addition & 1 deletion .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pull_request_rules:
label:
add: [contribution/core]
conditions:
- author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|SomayaB|MrArnoldPalmer|NetaNir|iliapolo|njlynch|madeline-k|BenChaimberg|comcalvi|kaizen3031593|Chriscbr|corymhall|otaviomacedo|yuth|TheRealAmazonKendra|vinayak-kukreja)$
- author~=^(RomainMuller|rix0rrr|Jerry-AWS|MrArnoldPalmer|iliapolo|madeline-k|comcalvi|kaizencc|corymhall|otaviomacedo|yuth|TheRealAmazonKendra|vinayak-kukreja|mrgrain|ryparker|Naumel)$
- -label~="contribution/core"
- name: Tell them we're good now
actions:
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

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.62.0](https://github.com/aws/jsii/compare/v1.61.0...v1.62.0) (2022-07-12)


### Features

* **@jsii/spec:** add loadAssemblyFromBuffer function ([#3634](https://github.com/aws/jsii/issues/3634)) ([4f3a0d1](https://github.com/aws/jsii/commit/4f3a0d16a769a678a4ce4bde9a6bbbd715a48ab2))
* **@jsii/spec:** add a utility library to be consumed by jsii modules ([#3570](https://github.com/aws/jsii/issues/3570)) ([635404a](https://github.com/aws/jsii/commit/635404a561a52033f2c93ce238c861a7518a47f4))
* **rosetta:** tablets can be compressed ([#3652](https://github.com/aws/jsii/issues/3652)) ([359e74f](https://github.com/aws/jsii/commit/359e74f3c05a682ef1e55297e27f9e2d538b0694))
* use new read/load assembly functions everywhere ([#3600](https://github.com/aws/jsii/issues/3600)) ([623c0c1](https://github.com/aws/jsii/commit/623c0c14fbe4c4a50c208c5415e689e45f9f54c4)), closes [#3570](https://github.com/aws/jsii/issues/3570) [#3570](https://github.com/aws/jsii/issues/3570)


### Bug Fixes

* **benchmark:** compilation fails due to missing dependencies ([#3610](https://github.com/aws/jsii/issues/3610)) ([28db6e3](https://github.com/aws/jsii/commit/28db6e3c7696da919b8cf3a3a99e22dd53fcedd9))
* jitter Docker build startup ([#3646](https://github.com/aws/jsii/issues/3646)) ([5857ea8](https://github.com/aws/jsii/commit/5857ea8207c47c7002e365b09b5852c36a7c68a3))
* **jsii:** fail compilation when two or more enum members have same val ([#3412](https://github.com/aws/jsii/issues/3412)) ([f64dace](https://github.com/aws/jsii/commit/f64dace793f1db1bf5057f29017820d225887a1f)), closes [#2782](https://github.com/aws/jsii/issues/2782)
* Status icon for Go language that it is generally available. ([#3607](https://github.com/aws/jsii/issues/3607)) ([1762310](https://github.com/aws/jsii/commit/1762310ee59539d1dd604b639aae979ace5818af))

## [1.61.0](https://github.com/aws/jsii/compare/v1.60.1...v1.61.0) (2022-06-16)


Expand Down
9 changes: 6 additions & 3 deletions eslint-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
env:
es2020: true
jest: true
node: true

Expand All @@ -10,9 +11,9 @@ plugins:

parser: '@typescript-eslint/parser'
parserOptions:
ecmaVersion: 2018
ecmaVersion: 2020
impliedStrict: true
sourceType: module
sourceType: script
project: ./**/tsconfig.json

extends:
Expand Down Expand Up @@ -151,7 +152,9 @@ rules:

'import/no-extraneous-dependencies':
- error
- devDependencies: ['**/test/**'] # Only allow importing devDependencies from tests
- devDependencies: # Only allow importing devDependencies from tests
- '**/test/**'
- '**/*.test.ts'
optionalDependencies: false # Disallow importing optional dependencies (those shouldn't be used here)
peerDependencies: false # Disallow importing peer dependencies (those shouldn't be used here)

Expand Down
2 changes: 1 addition & 1 deletion gh-pages/content/overview/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The following target languages are currently offered by `jsii-pacmak`, or are cu
| Language | Status |
| ---------- | ---------------------------------------------- |
| C# | :octicons-check-circle-24: Generally Available |
| Go | :octicons-tools-24: Generally Available |
| Go | :octicons-check-circle-24: Generally Available |
| Java | :octicons-check-circle-24: Generally Available |
| JavaScript | :octicons-check-circle-24: Generally Available |
| Kotlin | :octicons-tools-24: Development |
Expand Down
2 changes: 1 addition & 1 deletion gh-pages/content/user-guides/language-support/callbacks.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public final class Main extends FooClass {
}
```

The schematized exchange between the _jsii runtime library_ and the _jsii kernem_ is the following:
The schematized exchange between the _jsii runtime library_ and the _jsii kernel_ is the following:

<!-- Original in `callbacks.monopic`, authored using Monodraw (https://monodraw.helftone.com) -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ are set in the `jsii.tsc` section of the `package.json` file, but use the same n
`declarationMap`), or to optimize the emitted code size (by disabling source maps entirely).
+ if any of these options is specified, the source map configuration will exactly match what is being provided here
+ If none are specified, the default settings will be used: `#!ts { inlineSourceMap: true, inlineSources: true }`
- `types` allows limiting which visible type libraries get loaded in the global scope by the typescript compiler. By
default, all visible `@types/*` packages will be loaded, which can be undesirable (in particular in monorepos, where
some type libraries are not compatible with the TypeScript compiler version that `jsii` uses). The value specified
here will be forwarded as-is to the TypeScript compiler.

Refer to the [TypeScript compiler options reference][ts-options] for more information about those options.

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.3.4
mkdocs-material~=8.3.8
mkdocs-git-revision-date-plugin~=0.3.2
23 changes: 12 additions & 11 deletions jest.config.ts → jest.config.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Config } from '@jest/types';
import jest from '@jest/types';
import { defaults } from 'jest-config';
import { cpus } from 'os';
import { env } from 'process';
Expand All @@ -10,8 +10,10 @@ import { env } from 'process';
* be overridden (for example, the coverage threshold), then a new
* `jest.config.ts` file should be created that imports from this one and
* modifies just what needs to be modified, typically using `overriddenConfig`.
*
* @type {jest.Config.InitialOptions}
*/
const config: Config.InitialOptions = {
const config = {
...defaults,

collectCoverage: true,
Expand Down Expand Up @@ -41,32 +43,31 @@ const config: Config.InitialOptions = {
* operation works deeply on objects, but overrides that are not objects (e.g:
* arrays, strings, ...) simply replace the original value.
*
* @param overrides values to be used for overriding the orignal configuration.
* @param {jest.Config.InitialOptions} overrides values to be used for overriding the orignal configuration.
*
* @return {jest.Config.InitialOptions}
*/
export function overriddenConfig(overrides: Config.InitialOptions) {
export function overriddenConfig(overrides) {
return merge(config, overrides);

function merge<T>(original: T, override: T): T {
function merge(original, override) {
if (typeof original === 'object') {
// Arrays are objects, too!
if (Array.isArray(override)) {
return override;
}

const result: any = {};
const result = {};
const allKeys = new Set([
...Object.keys(original),
...Object.keys(override),
]);

// TypeScript appears to choke if we do the "as any" in the same
// expression as the key access, so we delcare surrogate varibales...
const originalAsAny = original as any;
const overrideAsAny = override as any;

for (const key of Array.from(allKeys).sort()) {
const originalValue: unknown = originalAsAny[key];
const overrideValue: unknown = overrideAsAny[key];
const originalValue = original[key];
const overrideValue = override[key];
if (originalValue == null) {
result[key] = overrideValue;
} else if (overrideValue == null) {
Expand Down
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.61.0"
"version": "1.62.0"
}
34 changes: 19 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,26 @@
},
"devDependencies": {
"@jest/types": "^28.1.1",
"@types/jest": "^28.1.1",
"@types/jest": "^28.1.4",
"@types/node": "^14.18.21",
"@typescript-eslint/eslint-plugin": "^5.28.0",
"@typescript-eslint/parser": "^5.28.0",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.30.5",
"all-contributors-cli": "^6.20.0",
"eslint": "^8.17.0",
"eslint": "^8.19.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.7.1",
"eslint-import-resolver-typescript": "^3.2.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^4.0.0",
"jest": "^28.1.1",
"jest-circus": "^28.1.1",
"jest-config": "^28.1.1",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^28.1.2",
"jest-circus": "^28.1.2",
"jest-config": "^28.1.2",
"jest-expect-message": "^1.0.2",
"lerna": "^5.1.2",
"prettier": "^2.7.0",
"lerna": "^5.1.6",
"prettier": "^2.7.1",
"standard-version": "^9.5.0",
"ts-node": "^10.8.1",
"typescript": "~4.7.3"
"ts-node": "^10.8.2",
"typescript": "~4.7.4"
},
"repository": {
"type": "git",
Expand All @@ -50,10 +50,14 @@
],
"nohoist": [
"**/@fixtures/jsii-calc-bundled",
"**/@fixtures/jsii-calc-bundled/**"
"**/@fixtures/jsii-calc-bundled/**",
"**/typescript"
]
},
"resolutions": {
"@types/prettier": "2.6.0"
"minipass": "3.2.1"
},
"resolutions_info": {
"minipass": "https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60901"
}
}
22 changes: 22 additions & 0 deletions packages/@jsii/benchmarks/bin/benchmark.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,28 @@ interface ResultsJson {
Promise.resolve([]),
);

// If we are running in GitHub Actions, emit a summary document.
if (process.env.GITHUB_STEP_SUMMARY != null) {
await fs.writeFile(
process.env.GITHUB_STEP_SUMMARY,
[
'## Benchmark Results',
'',
'Suite | Avg | StdDev',
'------|-----|-------',
...resultsJson
.sort((l, r) => l.name.localeCompare(r.name))
.map(
({ name, value, range }) =>
`${name} | ${value.toFixed(1)} | ${Math.sqrt(range).toFixed(
2,
)}`,
),
].join('\n'),
'utf-8',
);
}

if (argv.output) {
await fs.writeJson(argv.output, resultsJson, { spaces: 2 });
console.log(`results written to ${argv.output}`);
Expand Down
Binary file not shown.
Loading

0 comments on commit 293ac17

Please sign in to comment.