Skip to content

Commit 4f930f6

Browse files
authored
chore: remove EOS packages jsii and jsii-rosetta (#4701)
Delete the 1.x version line of these packages. Please use [aws/jsii-compiler](https://github.com/aws/jsii-compiler) and [aws/jsii-rosetta](https://github.com/aws/jsii-rosetta) respectively. --- 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
1 parent 1892a7e commit 4f930f6

File tree

719 files changed

+447
-40393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

719 files changed

+447
-40393
lines changed

.github/workflows/main.yml

+6-63
Original file line numberDiff line numberDiff line change
@@ -376,67 +376,14 @@ jobs:
376376
# This is just a join target to simplify branch protection setup
377377
run: echo OK
378378

379-
benchmark:
380-
name: Run benchmark suite
381-
runs-on: ubuntu-latest
382-
permissions:
383-
contents: read
384-
pull-requests: write
385-
needs: build
386-
steps:
387-
# Check out the code
388-
- name: Download Artifact
389-
uses: actions/download-artifact@v3
390-
with:
391-
name: built-tree
392-
- name: Extract Artifact
393-
run: |-
394-
echo "::group::Untar Archive"
395-
tar zxvf built-tree.tgz
396-
echo "::endgroup"
397-
398-
rm built-tree.tgz
399-
- name: Set up Node
400-
uses: actions/setup-node@v4
401-
with:
402-
cache: yarn
403-
node-version: 'lts/*'
404-
- name: Install Dependencies
405-
run: yarn install --frozen-lockfile
406-
- name: Run Benchmark
407-
working-directory: packages/@jsii/benchmarks
408-
run: yarn bench --output ${{ runner.temp }}/bench-output.json
409-
- name: Compare Benchmark Results
410-
if: github.event_name == 'pull_request'
411-
uses: benchmark-action/github-action-benchmark@v1
412-
with:
413-
name: jsii Benchmark Regression
414-
tool: 'customSmallerIsBetter'
415-
output-file-path: ${{ runner.temp }}/bench-output.json
416-
comment-always: true
417-
github-token: ${{ secrets.GITHUB_TOKEN }}
418-
fail-on-alert: true
419-
- name: Upload Benchmark Results
420-
if: github.event_name == 'push'
421-
uses: benchmark-action/github-action-benchmark@v1
422-
with:
423-
name: jsii Benchmark
424-
tool: 'customSmallerIsBetter'
425-
output-file-path: ${{ runner.temp }}/bench-output.json
426-
github-token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
427-
auto-push: true
428-
429379
pacmak-integration-test:
430380
runs-on: ubuntu-latest
431381
needs: create-release-package
432382
strategy:
433383
fail-fast: false
434384
matrix:
435385
rosetta:
436-
# this will be the 1.x-dev version build in this repo
437-
- ./jsii-rosetta.tgz
438-
- 5.2.x
439-
- 5.3.x
386+
- latest
440387
- 5.4.x
441388
- 5.5.x
442389
- 5.6.x
@@ -473,15 +420,11 @@ jobs:
473420
run: sudo apt install -y python3-venv
474421
# Show time!
475422
- name: Prepare Work Tree
476-
# 1) Move the locally build version of jsii-rosetta somewhere else
477-
# 2) Remove @jsii/integ-test because it messed up version dependencies and is not needed
478-
# 3) Install aws-cdk-lib, and all locally build packages minus jsii-rosetta & @jsii/integ-test,
479-
# and the specific version of jsii-rosetta
480-
# This ensures we are running jsii-pacmak with the correct peer-dependency
481-
# 4) Print the jsii-rosetta version for confirmation
423+
# 1) Install aws-cdk-lib,
424+
# all locally build packages,
425+
# the specific version of jsii-rosetta.
426+
# 2) Print the jsii-rosetta version for confirmation
482427
run: |-
483-
mv ${{ runner.temp }}/release-package/js/jsii-rosetta.tgz ./jsii-rosetta.tgz
484-
rm ${{ runner.temp }}/release-package/private/@jsii-integ-test.tgz
485428
npm install --no-save --omit=dev \
486429
aws-cdk-lib@2 \
487430
constructs@10 \
@@ -498,7 +441,7 @@ jobs:
498441
./node_modules/.bin/jsii-pacmak --no-parallel ./node_modules/aws-cdk-lib
499442
# Upload artifact only on main and for latest rosetta
500443
- name: 'Upload Artifact: integtest_aws-cdk-lib'
501-
if: github.ref == 'ref/head/main' && matrix.rosetta == '5.4.x'
444+
if: github.ref == 'ref/head/main' && matrix.rosetta == 'latest'
502445
uses: actions/upload-artifact@v4
503446
with:
504447
name: integtest_aws-cdk-lib

CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Each one of these scripts can be executed either from the root of the repo using
9999
Troubleshooting bugs usually starts with adding a new test that demonstrates the
100100
faulty behavior, then modifying implementations until the test passes.
101101

102-
The `jsii-calc` and `@scope/*` packages are used to test expected brhavior from
102+
The `jsii-calc` and `@scope/*` packages are used to test expected behavior from
103103
the compiler (note that the [aws/jsii-compiler](github.com/aws/jsii-compiler)
104104
repository as a separate copy of these under the `fixtures` directory), as well
105105
as downstream tooling (`jsii-pacmak`, `jsii-rosetta`, etc...). Each language
@@ -276,3 +276,4 @@ To ensure compatibility, we also have integration tests.
276276

277277
1. Add the new version to the `jsii-rosetta` peer dependency in [package.json](./packages/jsii-pacmak/package.json)
278278
2. Add the new version to the `pacmak-integration-test` matrix in the main build workflow in [main.yml](.github/workflows/main.yml)
279+
3. Remove any versions for which support has ended (EOS) from both locations

README.md

+10-12
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,25 @@ usual), but also in **Python**, **Java**, **C#** (and other languages from the _
2121
Head over to our [documentation website](https://aws.github.io/jsii)!
2222

2323
The jsii toolchain is spread out on multiple repositories:
24-
- [aws/jsii-compiler](https://github.com/aws/jsii-compiler) is where the `jsii` compiler is maintained (except releases
25-
in the `1.x` line, which are maintained in this repository)
24+
25+
- [aws/jsii-compiler](https://github.com/aws/jsii-compiler) is where the `jsii` compiler is maintained
2626
- [aws/jsii-rosetta](https://github.com/aws/jsii-rosetta) is where the `jsii-rosetta` sample code transliteration tool
27-
is maintained (except releases in the `1.x` line, which are maintained in this repository)
27+
is maintained
2828
- [aws/jsii](https://github.com/aws/jsii) is where the rest of the toolchain is maintained, including:
29-
- `@jsii/spec`, the package that defines the *`.jsii` assembly* specification
30-
- `jsii-config`, an interactive tool to help configure your jsii package
31-
- `jsii-pacmak`, the bindings generator for jsii packages
32-
- `jsii-reflect`, a higher-level way to process *`.jsii` assemblies*
3329
- The jsii runtime libraries for the supported jsii target languages
34-
- `1.x` release lines of `jsii` and `jsii-rosetta`
30+
- `@jsii/spec`, the package that defines the _`.jsii` assembly_ specification
31+
- `jsii-pacmak`, the bindings generator for jsii packages
32+
- `jsii-reflect`, a higher-level way to process _`.jsii` assemblies_
33+
- `jsii-config`, an interactive tool to help configure your jsii package
3534

36-
# :book: Blog Posts
35+
## :book: Blog Posts
3736

3837
Here's a collection of blog posts (in chronological order) related to `jsii`:
3938

4039
- **2020-01-11:** <a id="blog-mbonig" /> [How to Create CDK Constructs][mbonig-2020-01-11], by [Matthew Bonig][@mbonig]
4140
- **2020-05-27:** <a id="blog-floydpink" /> [Generate Python, Java, and .NET software libraries from a TypeScript
4241
source][floydpink-2020-05-27], by [Hari Pachuveetil][@floydpink]
43-
- **2020-12-23:** <a id="blog-romainmuller" /> [How the jsii open source framework meets developers where they are
44-
][romain-2020-12-23], by [Romain Marcadier][@RomainMuller]
42+
- **2020-12-23:** <a id="blog-romainmuller" /> [How the jsii open source framework meets developers where they are][romain-2020-12-23], by [Romain Marcadier][@RomainMuller]
4543

4644
[mbonig-2020-01-11]: https://www.matthewbonig.com/2020/01/11/creating-constructs/
4745
[floydpink-2020-05-27]:
@@ -55,7 +53,7 @@ Here's a collection of blog posts (in chronological order) related to `jsii`:
5553
> :information_source: If you wrote blog posts about `jsii` and would like to have them referenced here, do not hesitate
5654
> to file a pull request to add the links here!
5755
58-
# :gear: Contributing
56+
## :gear: Contributing
5957

6058
See [CONTRIBUTING](./CONTRIBUTING.md).
6159

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"devDependencies": {
1818
"@jest/types": "^29.6.3",
1919
"@types/jest": "^29.5.14",
20-
"@types/node": "^14.18.63",
20+
"@types/node": "^18",
2121
"@typescript-eslint/eslint-plugin": "^8.14.0",
2222
"@typescript-eslint/parser": "^8.14.0",
2323
"all-contributors-cli": "^6.26.1",
2424
"eslint": "^9.14.0",
2525
"eslint-config-prettier": "^9.1.0",
2626
"eslint-import-resolver-node": "^0.3.9",
2727
"eslint-import-resolver-typescript": "^3.6.3",
28-
"eslint-plugin-import": "2.26.0",
28+
"eslint-plugin-import": "2.31.0",
2929
"eslint-plugin-prettier": "^5.2.1",
3030
"jest": "^29.7.0",
3131
"jest-circus": "^28.1.3",

packages/@jsii/benchmarks/.eslintrc.yaml

-9
This file was deleted.

packages/@jsii/benchmarks/.gitignore

-4
This file was deleted.

packages/@jsii/benchmarks/README.md

-25
This file was deleted.

packages/@jsii/benchmarks/bin/benchmark.ts

-138
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)