From 455c49a37320e73ca54a2061e9931e7377a60917 Mon Sep 17 00:00:00 2001 From: Ben Stickley Date: Fri, 4 Aug 2023 14:27:34 -0400 Subject: [PATCH] fix: sync projen updates --- .github/workflows/release.yml | 2 +- .projen/tasks.json | 3 +- .projenrc.js | 2 +- yarn.lock | 58 +++++++++++++++++++++++++++++++++-- 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12c78236..3095cf9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ github.repository }} GITHUB_REF: ${{ github.ref }} - run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi + run: errout=$(mktemp); gh release create $(cat dist/releasetag.txt) -R $GITHUB_REPOSITORY -F dist/changelog.md -t $(cat dist/releasetag.txt) --target $GITHUB_REF -p 2> $errout && true; exitcode=$?; if [ $exitcode -ne 0 ] && ! grep -q "Release.tag_name already exists" $errout; then cat $errout; exit $exitcode; fi release_npm: name: Publish to npm needs: release diff --git a/.projen/tasks.json b/.projen/tasks.json index d7aa67b7..c04051d7 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -197,7 +197,8 @@ "description": "Prepare a release from \"main\" branch", "env": { "RELEASE": "true", - "MAJOR": "3" + "MAJOR": "4", + "PRERELEASE": "beta" }, "steps": [ { diff --git a/.projenrc.js b/.projenrc.js index 434bcbfe..79dea021 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -14,7 +14,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ prettier: true, // ignorePatterns: ['assets/**/*'] }, - majorVersion: 3, + majorVersion: 4, prerelease: 'beta', tsconfig: { compilerOptions: { noUnusedLocals: false }, include: ['assets/**/*.ts'] }, diff --git a/yarn.lock b/yarn.lock index 0adf3a07..94d651bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1318,6 +1318,14 @@ chalk "^4.1.2" semver "^7.5.1" +"@jsii/check-node@1.86.1": + version "1.86.1" + resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.86.1.tgz#ceffe3e06cf8208c2b5a16e60ff55faa72cd79a2" + integrity sha512-lxcuw/TgUkh1dD01B39V47pwmF8yWUm8BiQKb0jpOY0xaE9nSlq9kRfTR7XaXu37w59jeYepI5af/GyUf9+TXw== + dependencies: + chalk "^4.1.2" + semver "^7.5.4" + "@jsii/spec@1.85.0", "@jsii/spec@^1.80.0", "@jsii/spec@^1.85.0": version "1.85.0" resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.85.0.tgz#b4e1c54d7da64bead609f7bf3f5ae1a3bcc3225b" @@ -1325,6 +1333,13 @@ dependencies: ajv "^8.12.0" +"@jsii/spec@1.86.1", "@jsii/spec@^1.86.1": + version "1.86.1" + resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.86.1.tgz#0f8911f5d5cfb2606628f143ac7d195b7870c890" + integrity sha512-wD0Y0pVg/1jjbZImk2FIuj+YdpwLFEsKCpoC3XKLJyNyUZPSoJzrt3phLV8HRLmH0m52kw6rh044OIowedcc9A== + dependencies: + ajv "^8.12.0" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -2298,7 +2313,7 @@ "@typescript-eslint/types" "5.62.0" eslint-visitor-keys "^3.3.0" -"@xmldom/xmldom@^0.8.8": +"@xmldom/xmldom@^0.8.10", "@xmldom/xmldom@^0.8.8": version "0.8.10" resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== @@ -4099,7 +4114,7 @@ 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.12, fast-glob@^3.2.9, fast-glob@^3.3.0: +fast-glob@^3.2.12, 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== @@ -5736,7 +5751,25 @@ jsii-reflect@^1.80.0, jsii-reflect@^1.85.0: oo-ascii-tree "^1.85.0" yargs "^16.2.0" -jsii-rosetta@1.x, jsii-rosetta@^1.80.0, jsii-rosetta@^1.85.0: +jsii-rosetta@1.x: + version "1.86.1" + resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.86.1.tgz#7653f3593a5626e9d5e21e5bf330b6038ec92355" + integrity sha512-QmuFIFKYXsks6SpWsrztlFnXZptiwl7m0kpvqfiP8NGeGU5r5hTBglAorNh4FO58W5dYVUKmebEN076brhGRIQ== + dependencies: + "@jsii/check-node" "1.86.1" + "@jsii/spec" "1.86.1" + "@xmldom/xmldom" "^0.8.10" + commonmark "^0.30.0" + fast-glob "^3.3.1" + jsii "1.86.1" + semver "^7.5.4" + semver-intersect "^1.4.0" + stream-json "^1.8.0" + typescript "~3.9.10" + workerpool "^6.4.0" + yargs "^16.2.0" + +jsii-rosetta@^1.80.0, jsii-rosetta@^1.85.0: version "1.85.0" resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.85.0.tgz#c4ba8d5c426a4743c4dafbaaa960b6c2e6cf1b59" integrity sha512-3kGi7xZjA7fpVYmbn2VXvDA6iuva47ffdqyb28DhYxVWnlEJgff8XWuvQJSqrtxEcJF60dVD58N79pPghyvOgg== @@ -5773,6 +5806,25 @@ jsii@1.85.0, jsii@1.x: typescript "~3.9.10" yargs "^16.2.0" +jsii@1.86.1: + version "1.86.1" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.86.1.tgz#ba5f7d2d948b02c4efa2543260e1eb9e108bf436" + integrity sha512-gAi/mGRdIpCYY7Na61VPE717Z6+/1HTYqgxjMC+VdLXxITbWpaQqO+DqsOnhtsIh+JyjIQM7VOSZ+5Ymf1A74A== + dependencies: + "@jsii/check-node" "1.86.1" + "@jsii/spec" "^1.86.1" + case "^1.6.3" + chalk "^4" + fast-deep-equal "^3.1.3" + fs-extra "^10.1.0" + log4js "^6.9.1" + semver "^7.5.4" + semver-intersect "^1.4.0" + sort-json "^2.0.1" + spdx-license-list "^6.6.0" + typescript "~3.9.10" + yargs "^16.2.0" + json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"