From f39ef3b342026055f225bb86f7b39e66e99e27ae Mon Sep 17 00:00:00 2001 From: Takumi Kadowaki Date: Tue, 19 Oct 2021 02:06:12 +0900 Subject: [PATCH] chore: Update projen to v0.30.3 (#88) * chore: Update projen to v0.30.3 * fix compile errors --- .eslintrc.json | 4 +- .gitattributes | 34 +-- .github/workflows/build.yml | 19 +- .github/workflows/release.yml | 68 +++--- .github/workflows/stale.yml | 32 +++ ...de-dependencies.yml => upgrade-master.yml} | 46 ++-- .gitignore | 80 +++---- .mergify.yml | 12 +- .npmignore | 37 ++-- .projen/deps.json | 8 +- .projen/tasks.json | 205 +++++++++++++----- .versionrc.json | 19 -- package.json | 18 +- src/dashboards/datadog-dashboard.ts | 5 +- src/monitors/datadog-downtime.ts | 5 +- src/monitors/datadog-monitor.ts | 3 +- src/users/datadog-user.ts | 5 +- tsconfig.eslint.json => tsconfig.dev.json | 5 +- tsconfig.jest.json | 35 --- yarn.lock | 191 +++++++--------- 20 files changed, 455 insertions(+), 376 deletions(-) create mode 100644 .github/workflows/stale.yml rename .github/workflows/{upgrade-dependencies.yml => upgrade-master.yml} (66%) delete mode 100644 .versionrc.json rename tsconfig.eslint.json => tsconfig.dev.json (92%) delete mode 100644 tsconfig.jest.json diff --git a/.eslintrc.json b/.eslintrc.json index af1765b..b6a3af9 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,7 +12,7 @@ "parserOptions": { "ecmaVersion": 2018, "sourceType": "module", - "project": "./tsconfig.eslint.json" + "project": "./tsconfig.dev.json" }, "extends": [ "plugin:import/typescript" @@ -27,7 +27,7 @@ "import/resolver": { "node": {}, "typescript": { - "project": "./tsconfig.eslint.json" + "project": "./tsconfig.dev.json" } } }, diff --git a/.gitattributes b/.gitattributes index c682724..1fd3a85 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,18 +1,20 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -*.snap linguist-generated -/.eslintrc.json linguist-generated -/.gitattributes linguist-generated -/.github/pull_request_template.md linguist-generated -/.github/workflows/build.yml linguist-generated -/.github/workflows/release.yml linguist-generated -/.github/workflows/upgrade-dependencies.yml linguist-generated -/.mergify.yml linguist-generated -/.npmignore linguist-generated -/.projen/ linguist-generated -/.versionrc.json linguist-generated -/LICENSE linguist-generated -/package.json linguist-generated -/tsconfig.eslint.json linguist-generated -/tsconfig.jest.json linguist-generated -/yarn.lock linguist-generated \ No newline at end of file +*.snap linguist-generated +/.eslintrc.json linguist-generated +/.gitattributes linguist-generated +/.github/pull_request_template.md linguist-generated +/.github/workflows/build.yml linguist-generated +/.github/workflows/release.yml linguist-generated +/.github/workflows/stale.yml linguist-generated +/.github/workflows/upgrade-master.yml linguist-generated +/.gitignore linguist-generated +/.mergify.yml linguist-generated +/.npmignore linguist-generated +/.projen/** linguist-generated +/.projen/deps.json linguist-generated +/.projen/tasks.json linguist-generated +/LICENSE linguist-generated +/package.json linguist-generated +/tsconfig.dev.json linguist-generated +/yarn.lock linguist-generated \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bafdb61..621ce96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -name: Build +name: build on: pull_request: {} workflow_dispatch: {} @@ -10,6 +10,7 @@ jobs: permissions: checks: write contents: write + actions: write env: CI: "true" steps: @@ -18,13 +19,13 @@ jobs: with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - - name: Install dependencies - run: yarn install --check-files --frozen-lockfile - name: Set git identity run: |- - git config user.name "Automation" + git config user.name "github-actions" git config user.email "github-actions@github.com" - - name: Build + - name: Install dependencies + run: yarn install --check-files --frozen-lockfile + - name: build run: npx projen build - name: Check for changes id: git_diff @@ -40,5 +41,11 @@ jobs: status="completed" -F conclusion="success" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - if: steps.git_diff.outputs.has_changes + name: Cancel workflow (if changed) + run: gh api -X POST /repos/${{ github.event.pull_request.head.repo.full_name + }}/actions/runs/${{ github.run_id }}/cancel + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} container: - image: jsii/superchain + image: jsii/superchain:1-buster-slim diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d198aa7..21392c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,6 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -name: Release +name: release on: push: branches: @@ -11,9 +11,10 @@ jobs: runs-on: ubuntu-latest permissions: contents: write + outputs: + latest_commit: ${{ steps.git_remote.outputs.latest_commit }} env: CI: "true" - RELEASE: "true" steps: - name: Checkout uses: actions/checkout@v2 @@ -21,31 +22,16 @@ jobs: fetch-depth: 0 - name: Set git identity run: |- - git config user.name "Automation" + git config user.name "github-actions" git config user.email "github-actions@github.com" - name: Install dependencies run: yarn install --check-files --frozen-lockfile - - name: Bump to next version - run: npx projen bump - - name: build - run: npx projen build - - name: Backup version file - run: cp -f package.json package.json.bak.json - - name: Unbump - run: npx projen unbump - - name: Anti-tamper check - run: git diff --ignore-space-at-eol --exit-code + - name: release + run: npx projen release - name: Check for new commits id: git_remote run: echo ::set-output name=latest_commit::"$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" - - name: Create release - if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - run: gh release create v$(node -p "require('./package.json.bak.json').version") - -F .changelog.tmp.md -t v$(node -p - "require('./package.json.bak.json').version") - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload artifact if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} uses: actions/upload-artifact@v2.1.1 @@ -53,13 +39,37 @@ jobs: name: dist path: dist container: - image: jsii/superchain + image: jsii/superchain:1-buster-slim + release_github: + name: Publish to GitHub Releases + needs: release + runs-on: ubuntu-latest + permissions: + contents: write + if: needs.release.outputs.latest_commit == github.sha + steps: + - name: Download build artifacts + uses: actions/download-artifact@v2 + with: + name: dist + path: dist + - name: Release + 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 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ github.repository }} + GITHUB_REF: ${{ github.ref }} release_npm: - name: Release to NPM + name: Publish to npm needs: release runs-on: ubuntu-latest permissions: contents: read + if: needs.release.outputs.latest_commit == github.sha steps: - name: Download build artifacts uses: actions/download-artifact@v2 @@ -69,17 +79,18 @@ jobs: - name: Release run: npx -p jsii-release@latest jsii-release-npm env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NPM_DIST_TAG: latest NPM_REGISTRY: registry.npmjs.org + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} container: - image: jsii/superchain + image: jsii/superchain:1-buster-slim-node14 release_maven: - name: Release to Maven + name: Publish to Maven Central needs: release runs-on: ubuntu-latest permissions: contents: read + if: needs.release.outputs.latest_commit == github.sha steps: - name: Download build artifacts uses: actions/download-artifact@v2 @@ -95,13 +106,14 @@ jobs: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_STAGING_PROFILE_ID: ${{ secrets.MAVEN_STAGING_PROFILE_ID }} container: - image: jsii/superchain + image: jsii/superchain:1-buster-slim-node14 release_pypi: - name: Release to PyPi + name: Publish to PyPI needs: release runs-on: ubuntu-latest permissions: contents: read + if: needs.release.outputs.latest_commit == github.sha steps: - name: Download build artifacts uses: actions/download-artifact@v2 @@ -114,4 +126,4 @@ jobs: TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} container: - image: jsii/superchain + image: jsii/superchain:1-buster-slim-node14 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..de088fd --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,32 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: stale +on: + schedule: + - cron: 0 1 * * * + workflow_dispatch: {} +jobs: + stale: + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + steps: + - uses: actions/stale@v4 + with: + days-before-stale: -1 + days-before-close: -1 + days-before-pr-stale: 14 + days-before-pr-close: 2 + stale-pr-message: This pull request is now marked as stale because it hasn't + seen activity for a while. Add a comment or it will be closed soon. + close-pr-message: Closing this pull request as it hasn't seen activity for a + while. Please add a comment @mentioning a maintainer to reopen. + stale-pr-label: stale + days-before-issue-stale: 60 + days-before-issue-close: 7 + stale-issue-message: This issue is now marked as stale because it hasn't seen + activity for a while. Add a comment or it will be closed soon. + close-issue-message: Closing this issue as it hasn't seen activity for a while. + Please add a comment @mentioning a maintainer to reopen. + stale-issue-label: stale diff --git a/.github/workflows/upgrade-dependencies.yml b/.github/workflows/upgrade-master.yml similarity index 66% rename from .github/workflows/upgrade-dependencies.yml rename to .github/workflows/upgrade-master.yml index ff5c7ed..f7b3e2d 100644 --- a/.github/workflows/upgrade-dependencies.yml +++ b/.github/workflows/upgrade-master.yml @@ -1,6 +1,6 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -name: upgrade-dependencies +name: upgrade-master on: workflow_dispatch: {} schedule: @@ -16,10 +16,16 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + ref: master + - name: Set git identity + run: |- + git config user.name "github-actions" + git config user.email "github-actions@github.com" - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies - run: npx projen upgrade-dependencies + run: npx projen upgrade - name: Build id: build run: npx projen build && echo "::set-output name=conclusion::success" || echo @@ -27,14 +33,14 @@ jobs: - name: Create Patch run: |- git add . - git diff --patch --staged > ${{ runner.temp }}/upgrade.patch + git diff --patch --staged > .upgrade.tmp.patch - name: Upload patch uses: actions/upload-artifact@v2 with: - name: upgrade.patch - path: ${{ runner.temp }}/upgrade.patch + name: .upgrade.tmp.patch + path: .upgrade.tmp.patch container: - image: jsii/superchain + image: jsii/superchain:1-buster-slim pr: name: Create Pull Request needs: upgrade @@ -46,14 +52,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + with: + ref: master + - name: Set git identity + run: |- + git config user.name "github-actions" + git config user.email "github-actions@github.com" - name: Download patch uses: actions/download-artifact@v2 with: - name: upgrade.patch + name: .upgrade.tmp.patch path: ${{ runner.temp }} - name: Apply patch - run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp - }}/upgrade.patch || echo "Empty patch. Skipping."' + run: '[ -s ${{ runner.temp }}/.upgrade.tmp.patch ] && git apply ${{ runner.temp + }}/.upgrade.tmp.patch || echo "Empty patch. Skipping."' - name: Create Pull Request id: create-pr uses: peter-evans/create-pull-request@v3 @@ -72,10 +84,9 @@ jobs: ------ - *Automatically created by projen via the "upgrade-dependencies" workflow* - branch: github-actions/upgrade-dependencies + *Automatically created by projen via the "upgrade-master" workflow* + branch: github-actions/upgrade-master title: "chore(deps): upgrade dependencies" - labels: "" body: >- Upgrades project dependencies. See details in [workflow run]. @@ -86,16 +97,19 @@ jobs: ------ - *Automatically created by projen via the "upgrade-dependencies" workflow* + *Automatically created by projen via the "upgrade-master" workflow* + author: github-actions + committer: github-actions + signoff: true - name: Update status check if: steps.create-pr.outputs.pull-request-url != '' run: "curl -i --fail -X POST -H \"Accept: application/vnd.github.v3+json\" -H \"Authorization: token ${GITHUB_TOKEN}\" https://api.github.com/repos/${{ github.repository }}/check-runs -d - '{\"name\":\"build\",\"head_sha\":\"github-actions/upgrade-dependenci\ - es\",\"status\":\"completed\",\"conclusion\":\"${{ + '{\"name\":\"build\",\"head_sha\":\"github-actions/upgrade-master\",\ + \"status\":\"completed\",\"conclusion\":\"${{ needs.upgrade.outputs.conclusion }}\",\"output\":{\"title\":\"Created - via the upgrade-dependencies workflow.\",\"summary\":\"Action run URL: + via the upgrade-master workflow.\",\"summary\":\"Action run URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}}'" env: diff --git a/.gitignore b/.gitignore index 8377858..030b317 100644 --- a/.gitignore +++ b/.gitignore @@ -1,52 +1,52 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -*.lcov +!/.gitattributes +!/.projen/tasks.json +!/.projen/deps.json +!/.github/workflows/stale.yml +!/package.json +!/LICENSE +!/.npmignore +logs *.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json +pids *.pid -*.pid.lock *.seed -*.tgz +*.pid.lock +lib-cov +coverage +*.lcov +.nyc_output +build/Release +node_modules/ +jspm_packages/ *.tsbuildinfo -.cache .eslintcache -.jsii -.nyc_output +*.tgz .yarn-integrity -/.changelog.tmp.md -/coverage -/dist -/lib -/test-reports/ -build/Release +.cache cdk.out/ -coverage -jspm_packages/ +!/.projenrc.js +/test-reports/ junit.xml -lerna-debug.log* -lib-cov -logs -node_modules/ -npm-debug.log* -pids -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -tsconfig.json -yarn-debug.log* -yarn-error.log* -!/.eslintrc.json -!/.gitattributes -!/.github/pull_request_template.md +/coverage/ !/.github/workflows/build.yml -!/.github/workflows/release.yml -!/.github/workflows/upgrade-dependencies.yml +/dist/changelog.md +/dist/version.txt !/.mergify.yml -!/.npmignore -!/.projen/deps.json -!/.projen/tasks.json -!/.projenrc.js -!/.versionrc.json +!/.github/pull_request_template.md +!/test/ +!/tsconfig.dev.json +!/src/ +/lib +/dist/ +!/.eslintrc.json +.jsii +tsconfig.json !/API.md -!/LICENSE -!/package.json -!/src -!/test -!/tsconfig.eslint.json -!/tsconfig.jest.json +!/.github/workflows/release.yml +!/.github/workflows/upgrade-master.yml diff --git a/.mergify.yml b/.mergify.yml index 0e4dd8d..ebf847d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -11,15 +11,5 @@ pull_request_rules: delete_head_branch: {} conditions: - "#approved-reviews-by>=1" - - status-success=build - - name: Automatic merge PRs with auto-merge label upon successful build - actions: - merge: - method: squash - commit_message: title+body - strict: smart - strict_method: merge - delete_head_branch: {} - conditions: - - label=auto-merge + - -label~=(do-not-merge) - status-success=build diff --git a/.npmignore b/.npmignore index 4c5024c..efe7d67 100644 --- a/.npmignore +++ b/.npmignore @@ -1,24 +1,23 @@ # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -/.changelog.tmp.md -/.eslintrc.json -/.github -/.idea -/.mergify.yml -/.projen -/.projenrc.js -/.versionrc.json -/.vscode -/coverage -/src -/test +/.projen/ /test-reports/ -/tsconfig.eslint.json -/tsconfig.jest.json -/tsconfig.json -dist junit.xml +/coverage/ +/dist/changelog.md +/dist/version.txt +/.mergify.yml +/test/ +/tsconfig.dev.json +/src/ +!/lib/ +!/lib/**/*.js +!/lib/**/*.d.ts +dist +/tsconfig.json +/.github/ +/.vscode/ +/.idea/ +/.projenrc.js tsconfig.tsbuildinfo +/.eslintrc.json !.jsii -!/lib -!/lib/**/*.d.ts -!/lib/**/*.js diff --git a/.projen/deps.json b/.projen/deps.json index 49c858e..a475627 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -11,7 +11,7 @@ }, { "name": "@types/node", - "version": "^10.17.0", + "version": "^14.17.0", "type": "build" }, { @@ -76,18 +76,12 @@ "version": "^11", "type": "build" }, - { - "name": "npm-check-updates", - "version": "^11", - "type": "build" - }, { "name": "prettier", "type": "build" }, { "name": "projen", - "version": "^0.20.7", "type": "build" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index 2b1e9e4..4c1e700 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -2,7 +2,6 @@ "tasks": { "clobber": { "name": "clobber", - "category": "30.maintain", "description": "hard resets to HEAD of origin and cleans the local repo", "env": { "BRANCH": "$(git branch --show-current)" @@ -35,7 +34,6 @@ }, "compile": { "name": "compile", - "category": "00.build", "description": "Only compile", "steps": [ { @@ -48,17 +46,15 @@ }, "test:compile": { "name": "test:compile", - "category": "10.test", "description": "compiles the test code", "steps": [ { - "exec": "tsc --noEmit --project tsconfig.jest.json" + "exec": "tsc --noEmit --project tsconfig.dev.json" } ] }, "test": { "name": "test", - "category": "10.test", "description": "Run tests", "steps": [ { @@ -77,7 +73,6 @@ }, "build": { "name": "build", - "category": "00.build", "description": "Full release build (test+compile)", "steps": [ { @@ -96,7 +91,6 @@ }, "test:watch": { "name": "test:watch", - "category": "10.test", "description": "Run jest in watch mode", "steps": [ { @@ -106,7 +100,6 @@ }, "test:update": { "name": "test:update", - "category": "10.test", "description": "Update jest snapshots", "steps": [ { @@ -116,28 +109,28 @@ }, "bump": { "name": "bump", - "category": "20.release", "description": "Bumps version based on latest git tag and generates a changelog entry", "env": { "OUTFILE": "package.json", - "INITIAL_VERSION": "v0.1.0" + "CHANGELOG": "dist/changelog.md", + "BUMPFILE": "dist/version.txt", + "RELEASETAG": "dist/releasetag.txt" }, "steps": [ { - "builtin": "release/resolve-version" - }, - { - "exec": "npx standard-version@^9" + "builtin": "release/bump-version" } ], "condition": "! git log --oneline -1 | grep -q \"chore(release):\"" }, "unbump": { "name": "unbump", - "category": "20.release", "description": "Restores version to 0.0.0", "env": { - "OUTFILE": "package.json" + "OUTFILE": "package.json", + "CHANGELOG": "dist/changelog.md", + "BUMPFILE": "dist/version.txt", + "RELEASETAG": "dist/releasetag.txt" }, "steps": [ { @@ -145,39 +138,17 @@ } ] }, - "upgrade-dependencies": { - "name": "upgrade-dependencies", - "description": "upgrade dependencies", - "env": { - "CI": "0" - }, + "publish:github": { + "name": "publish:github", + "description": "Publish this package to GitHub Releases", + "requiredEnv": [ + "GITHUB_TOKEN", + "GITHUB_REPOSITORY", + "GITHUB_REF" + ], "steps": [ { - "exec": "npm-check-updates --upgrade --target=minor --reject='projen'" - }, - { - "exec": "yarn install --check-files" - }, - { - "exec": "npx projen" - } - ] - }, - "upgrade-projen": { - "name": "upgrade-projen", - "description": "upgrade projen", - "env": { - "CI": "0" - }, - "steps": [ - { - "exec": "npm-check-updates --upgrade --target=minor --filter='projen'" - }, - { - "exec": "yarn install --check-files" - }, - { - "exec": "npx projen" + "exec": "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" } ] }, @@ -191,7 +162,6 @@ }, "watch": { "name": "watch", - "category": "00.build", "description": "Watch & compile in the background", "steps": [ { @@ -201,7 +171,6 @@ }, "package": { "name": "package", - "category": "20.release", "description": "Create an npm tarball", "steps": [ { @@ -211,7 +180,6 @@ }, "eslint": { "name": "eslint", - "category": "10.test", "description": "Runs eslint against the codebase", "steps": [ { @@ -221,7 +189,6 @@ }, "compat": { "name": "compat", - "category": "20.release", "description": "Perform API compatibility check against latest version", "steps": [ { @@ -229,15 +196,149 @@ } ] }, + "publish:npm": { + "name": "publish:npm", + "description": "Publish this package to npm", + "env": { + "NPM_DIST_TAG": "latest", + "NPM_REGISTRY": "registry.npmjs.org" + }, + "requiredEnv": [ + "NPM_TOKEN" + ], + "steps": [ + { + "exec": "npx -p jsii-release@latest jsii-release-npm" + } + ] + }, + "publish:maven": { + "name": "publish:maven", + "description": "Publish this package to Maven Central", + "requiredEnv": [ + "MAVEN_GPG_PRIVATE_KEY", + "MAVEN_GPG_PRIVATE_KEY_PASSPHRASE", + "MAVEN_PASSWORD", + "MAVEN_USERNAME", + "MAVEN_STAGING_PROFILE_ID" + ], + "steps": [ + { + "exec": "npx -p jsii-release@latest jsii-release-maven" + } + ] + }, + "publish:pypi": { + "name": "publish:pypi", + "description": "Publish this package to PyPI", + "requiredEnv": [ + "TWINE_USERNAME", + "TWINE_PASSWORD" + ], + "steps": [ + { + "exec": "npx -p jsii-release@latest jsii-release-pypi" + } + ] + }, "docgen": { "name": "docgen", - "category": "20.release", "description": "Generate API.md from .jsii manifest", "steps": [ { "exec": "jsii-docgen" } ] + }, + "release": { + "name": "release", + "description": "Prepare a release from \"master\" branch", + "env": { + "RELEASE": "true" + }, + "steps": [ + { + "exec": "rm -fr dist" + }, + { + "spawn": "bump" + }, + { + "spawn": "build" + }, + { + "spawn": "unbump" + }, + { + "exec": "git diff --ignore-space-at-eol --exit-code" + } + ] + }, + "upgrade": { + "name": "upgrade", + "description": "upgrade dependencies", + "env": { + "CI": "0" + }, + "steps": [ + { + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" + }, + { + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" + }, + { + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" + }, + { + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" + }, + { + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + }, + { + "exec": "yarn install --check-files" + }, + { + "exec": "yarn upgrade @aws-cdk/assert @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser aws-cdk eslint eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import jest jest-junit jsii jsii-diff jsii-docgen jsii-pacmak json-schema npm-check-updates prettier standard-version ts-jest typescript camelcase-keys @aws-cdk/core constructs @aws-cdk/core" + }, + { + "exec": "npx projen" + } + ] + }, + "upgrade-projen": { + "name": "upgrade-projen", + "description": "upgrade projen", + "env": { + "CI": "0" + }, + "steps": [ + { + "exec": "npm-check-updates --dep dev --upgrade --target=minor --filter='projen'" + }, + { + "exec": "npm-check-updates --dep optional --upgrade --target=minor --filter='projen'" + }, + { + "exec": "npm-check-updates --dep peer --upgrade --target=minor --filter='projen'" + }, + { + "exec": "npm-check-updates --dep prod --upgrade --target=minor --filter='projen'" + }, + { + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --filter='projen'" + }, + { + "exec": "yarn install --check-files" + }, + { + "exec": "yarn upgrade projen" + }, + { + "exec": "npx projen" + } + ] } }, "env": { diff --git a/.versionrc.json b/.versionrc.json deleted file mode 100644 index 0cf5d15..0000000 --- a/.versionrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "packageFiles": [ - { - "filename": "package.json", - "type": "json" - } - ], - "bumpFiles": [ - "package.json" - ], - "commitAll": false, - "infile": ".changelog.tmp.md", - "header": "", - "skip": { - "commit": true, - "tag": true - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/package.json b/package.json index 4e35aa1..a8d16e4 100644 --- a/package.json +++ b/package.json @@ -14,16 +14,20 @@ "test:update": "npx projen test:update", "bump": "npx projen bump", "unbump": "npx projen unbump", - "upgrade-dependencies": "npx projen upgrade-dependencies", - "upgrade-projen": "npx projen upgrade-projen", + "publish:github": "npx projen publish:github", "default": "npx projen default", "watch": "npx projen watch", "package": "npx projen package", "eslint": "npx projen eslint", "compat": "npx projen compat", + "publish:npm": "npx projen publish:npm", + "publish:maven": "npx projen publish:maven", + "publish:pypi": "npx projen publish:pypi", "docgen": "npx projen docgen", - "projen": "npx projen", - "start": "npx projen start" + "release": "npx projen release", + "upgrade": "npx projen upgrade", + "upgrade-projen": "npx projen upgrade-projen", + "projen": "npx projen" }, "author": { "name": "NomadBlacky", @@ -33,7 +37,7 @@ "devDependencies": { "@aws-cdk/assert": "^1.101.0", "@types/jest": "^26.0.22", - "@types/node": "^10.17.0", + "@types/node": "^14.17.0", "@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/parser": "^4.22.0", "aws-cdk": "^1.98.0", @@ -50,7 +54,7 @@ "json-schema": "^0.3.0", "npm-check-updates": "^11", "prettier": "^2.2.1", - "projen": "^0.20.7", + "projen": "^0.30.3", "standard-version": "^9", "ts-jest": "^26.5.4", "typescript": "^4.2.4" @@ -110,7 +114,7 @@ "preset": "ts-jest", "globals": { "ts-jest": { - "tsconfig": "tsconfig.jest.json" + "tsconfig": "tsconfig.dev.json" } } }, diff --git a/src/dashboards/datadog-dashboard.ts b/src/dashboards/datadog-dashboard.ts index 04d30d2..4f3768e 100644 --- a/src/dashboards/datadog-dashboard.ts +++ b/src/dashboards/datadog-dashboard.ts @@ -1,5 +1,6 @@ import { CfnResource, Construct } from '@aws-cdk/core'; -import * as camelcaseKeys from 'camelcase-keys'; +// eslint-disable-next-line @typescript-eslint/no-require-imports +import camelcaseKeys = require('camelcase-keys'); import { DatadogCredentials } from '../common/properties'; export interface DatadogDashboardProps { @@ -24,4 +25,4 @@ export class DatadogDashboard { properties: { ...cfnProperties }, }); } -} \ No newline at end of file +} diff --git a/src/monitors/datadog-downtime.ts b/src/monitors/datadog-downtime.ts index 7623859..6e06617 100644 --- a/src/monitors/datadog-downtime.ts +++ b/src/monitors/datadog-downtime.ts @@ -1,5 +1,6 @@ import { CfnResource, Construct } from '@aws-cdk/core'; -import * as camelcaseKeys from 'camelcase-keys'; +// eslint-disable-next-line @typescript-eslint/no-require-imports +import camelcaseKeys = require('camelcase-keys'); import { DatadogCredentials } from '../common/properties'; export interface DatadogDowntimeProps { @@ -66,4 +67,4 @@ export class DatadogDowntime { properties: { ...cfnProperties }, }); } -} \ No newline at end of file +} diff --git a/src/monitors/datadog-monitor.ts b/src/monitors/datadog-monitor.ts index c2a2efd..edebc67 100644 --- a/src/monitors/datadog-monitor.ts +++ b/src/monitors/datadog-monitor.ts @@ -1,5 +1,6 @@ import { CfnResource, Construct } from '@aws-cdk/core'; -import * as camelcaseKeys from 'camelcase-keys'; +// eslint-disable-next-line @typescript-eslint/no-require-imports +import camelcaseKeys = require('camelcase-keys'); import { DatadogCredentials } from '../common/properties'; import { MonitorOptions, MonitorType } from './properties'; diff --git a/src/users/datadog-user.ts b/src/users/datadog-user.ts index 0748c1e..d0ac6fc 100644 --- a/src/users/datadog-user.ts +++ b/src/users/datadog-user.ts @@ -1,5 +1,6 @@ import { CfnResource, Construct } from '@aws-cdk/core'; -import * as camelcaseKeys from 'camelcase-keys'; +// eslint-disable-next-line @typescript-eslint/no-require-imports +import camelcaseKeys = require('camelcase-keys'); import { DatadogCredentials } from '../common/properties'; export interface DatadogIAMUserProps { @@ -39,4 +40,4 @@ export class DatadogIAMUser { properties: { ...cfnProperties }, }); } -} \ No newline at end of file +} diff --git a/tsconfig.eslint.json b/tsconfig.dev.json similarity index 92% rename from tsconfig.eslint.json rename to tsconfig.dev.json index 06833d1..2e29dba 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.dev.json @@ -2,11 +2,12 @@ "compilerOptions": { "alwaysStrict": true, "declaration": true, + "esModuleInterop": true, "experimentalDecorators": true, "inlineSourceMap": true, "inlineSources": true, "lib": [ - "es2018" + "es2019" ], "module": "CommonJS", "noEmitOnError": false, @@ -21,7 +22,7 @@ "strictNullChecks": true, "strictPropertyInitialization": true, "stripInternal": true, - "target": "ES2018" + "target": "ES2019" }, "include": [ ".projenrc.js", diff --git a/tsconfig.jest.json b/tsconfig.jest.json deleted file mode 100644 index 06833d1..0000000 --- a/tsconfig.jest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "compilerOptions": { - "alwaysStrict": true, - "declaration": true, - "experimentalDecorators": true, - "inlineSourceMap": true, - "inlineSources": true, - "lib": [ - "es2018" - ], - "module": "CommonJS", - "noEmitOnError": false, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "resolveJsonModule": true, - "strict": true, - "strictNullChecks": true, - "strictPropertyInitialization": true, - "stripInternal": true, - "target": "ES2018" - }, - "include": [ - ".projenrc.js", - "src/**/*.ts", - "test/**/*.ts" - ], - "exclude": [ - "node_modules" - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/yarn.lock b/yarn.lock index 6224cc4..8d69df9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -804,15 +804,20 @@ integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg== "@types/node@*": - version "14.14.37" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e" - integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw== + version "16.11.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.1.tgz#2e50a649a50fc403433a14f829eface1a3443e97" + integrity sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA== -"@types/node@^10.17.0", "@types/node@^10.17.60": +"@types/node@^10.17.60": version "10.17.60" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== +"@types/node@^14.17.0": + version "14.17.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.27.tgz#5054610d37bb5f6e21342d0e6d24c494231f3b85" + integrity sha512-94+Ahf9IcaDuJTle/2b+wzvjmutxXAEXU6O81JHblYXUg2BDG+dnBy7VxIPHKAyEEDHzCMQydTJuWvrE+Aanzw== + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" @@ -1039,10 +1044,10 @@ ansi-regex@^4.1.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^5.0.0, ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" @@ -1670,16 +1675,19 @@ chalk@^4.1.1: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - charenc@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -1732,13 +1740,6 @@ cli-color@~0.1.6: dependencies: es5-ext "0.8.x" -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - cli-table@^0.3.6: version "0.3.6" resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc" @@ -1746,11 +1747,6 @@ cli-table@^0.3.6: dependencies: colors "1.0.3" -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -2906,15 +2902,6 @@ extend@~3.0.2: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" @@ -2985,7 +2972,7 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== -figures@^3.0.0, figures@^3.1.0: +figures@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== @@ -3317,7 +3304,19 @@ glob-parent@^5.0.0, glob-parent@^5.1.0: dependencies: is-glob "^4.0.1" -glob@^7, glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: +glob@^7, glob@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -3384,11 +3383,16 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4: +graceful-fs@^4.1.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4: version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -3575,7 +3579,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -3682,25 +3686,6 @@ ini@^1.3.2, ini@^1.3.5, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inquirer@^7.3.3: - version "7.3.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" - integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.19" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - interpret@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" @@ -3766,7 +3751,14 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0, is-core-module@^2.4.0: +is-core-module@^2.2.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== + dependencies: + has "^1.0.3" + +is-core-module@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== @@ -5304,7 +5296,7 @@ ms@^2.0.0, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -mute-stream@0.0.8, mute-stream@~0.0.4: +mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== @@ -5680,11 +5672,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - p-cancelable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" @@ -5915,9 +5902,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-type@^1.0.0: version "1.1.0" @@ -6050,18 +6037,17 @@ progress@^2.0.0, progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.20.7: - version "0.20.7" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.20.7.tgz#17eb6fc51f7a7b75327daebd95940b192054ff4c" - integrity sha512-cL0prn1aEFPYSlfFr1Oe82RRPNPZ6QrMw021W7ndU9cNjSVQA8eEHyQhnqMnkWqGlY6Cg6cXpcuKq9joqzBvgg== +projen@^0.30.3: + version "0.30.3" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.30.3.tgz#e1a374e7994006da4fa088b1a13a3c018a3a29e3" + integrity sha512-IrZKU9KTTBjVc6lV8DGoxQ3laXDJwxBiZF5hq9hZlG6hz98WpLiX6Qm9X1LTZNvNRLg6YFeX8Cu2j3fqva0bMg== dependencies: "@iarna/toml" "^2.2.5" - chalk "^4.1.1" + chalk "^4.1.2" decamelize "^4.0.0" fs-extra "^9.1.0" glob "^7" ini "^2.0.0" - inquirer "^7.3.3" semver "^7.3.5" shx "^0.3.3" xmlbuilder2 "^2.4.1" @@ -6491,14 +6477,6 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -6531,11 +6509,6 @@ rsvp@^4.8.4: resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -6543,13 +6516,6 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^6.6.0: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -7012,7 +6978,7 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: +string-width@^4.0.0, string-width@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== @@ -7021,6 +6987,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2 is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string.prototype.repeat@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf" @@ -7087,12 +7062,12 @@ strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-bom@^2.0.0: version "2.0.0" @@ -7254,18 +7229,11 @@ through2@^4.0.0: dependencies: readable-stream "3" -through@2, "through@>=2.2.7 <3", through@^2.3.6: +through@2, "through@>=2.2.7 <3": version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" @@ -7383,7 +7351,7 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -7913,7 +7881,7 @@ yaml@1.10.2, yaml@^1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3: +yargs-parser@20.x, yargs-parser@^20.2.3: version "20.2.7" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== @@ -7926,6 +7894,11 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + yargs@^15.4.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"