diff --git a/.gitattributes b/.gitattributes index 4cb6a956..c459ca2e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,8 +10,7 @@ /.github/workflows/upgrade-projen.yml linguist-generated /.mergify.yml linguist-generated /.npmignore linguist-generated -/.projen/ linguist-generated -/.versionrc.json linguist-generated +/.projen/** linguist-generated /LICENSE linguist-generated /package.json linguist-generated /tsconfig.eslint.json linguist-generated diff --git a/.github/workflows/upgrade-dependencies.yml b/.github/workflows/upgrade-dependencies.yml index cbc048cb..eebe027b 100644 --- a/.github/workflows/upgrade-dependencies.yml +++ b/.github/workflows/upgrade-dependencies.yml @@ -73,7 +73,6 @@ jobs: *Automatically created by projen via the "upgrade-dependencies" workflow* branch: github-actions/upgrade-dependencies title: "chore(deps): upgrade dependencies" - labels: "" body: >- Upgrades project dependencies. See details in [workflow run]. diff --git a/.github/workflows/upgrade-projen.yml b/.github/workflows/upgrade-projen.yml index ac6616a1..f97f57d0 100644 --- a/.github/workflows/upgrade-projen.yml +++ b/.github/workflows/upgrade-projen.yml @@ -73,7 +73,6 @@ jobs: *Automatically created by projen via the "upgrade-projen" workflow* branch: github-actions/upgrade-projen title: "chore(deps): upgrade projen" - labels: auto-merge body: >- Upgrades project dependencies. See details in [workflow run]. diff --git a/.gitignore b/.gitignore index 18a1c92c..7e573ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,6 @@ yarn-error.log* !/.projen/deps.json !/.projen/tasks.json !/.projenrc.js -!/.versionrc.json !/LICENSE !/package.json !/src diff --git a/.mergify.yml b/.mergify.yml index 0e4dd8da..a27ea82e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -12,14 +12,3 @@ pull_request_rules: 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 - - status-success=build diff --git a/.npmignore b/.npmignore index 5c62cf9f..e0bd6701 100644 --- a/.npmignore +++ b/.npmignore @@ -6,7 +6,6 @@ /.mergify.yml /.projen /.projenrc.js -/.versionrc.json /.vscode /coverage /src diff --git a/.projen/deps.json b/.projen/deps.json index c2a51f91..65d48e87 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -58,7 +58,7 @@ }, { "name": "projen", - "version": "^0.20.11", + "version": "^0.22.2", "type": "build" }, { diff --git a/.projen/tasks.json b/.projen/tasks.json index da8ab7a0..48ec14a0 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -126,14 +126,11 @@ "description": "Bumps version based on latest git tag and generates a changelog entry", "env": { "OUTFILE": "package.json", - "INITIAL_VERSION": "v0.1.0" + "CHANGELOG": ".changelog.tmp.md" }, "steps": [ { - "builtin": "release/resolve-version" - }, - { - "exec": "npx standard-version@^9" + "builtin": "release/bump-version" } ], "condition": "! git log --oneline -1 | grep -q \"chore(release):\"" @@ -143,7 +140,8 @@ "category": "20.release", "description": "Restores version to 0.0.0", "env": { - "OUTFILE": "package.json" + "OUTFILE": "package.json", + "CHANGELOG": ".changelog.tmp.md" }, "steps": [ { @@ -164,6 +162,9 @@ { "exec": "yarn install --check-files" }, + { + "exec": "yarn upgrade @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser eslint eslint-import-resolver-node eslint-import-resolver-typescript eslint-plugin-import jest jest-junit json-schema npm-check-updates npm-check-updates standard-version ts-jest typescript @types/fs-extra fs-extra shlex" + }, { "exec": "npx projen" } @@ -182,6 +183,9 @@ { "exec": "yarn install --check-files" }, + { + "exec": "yarn upgrade projen" + }, { "exec": "npx projen" } diff --git a/.versionrc.json b/.versionrc.json deleted file mode 100644 index 0cf5d15c..00000000 --- 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 e65f4a1d..2e78e545 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "jest-junit": "^12", "json-schema": "^0.3.0", "npm-check-updates": "^11", - "projen": "^0.20.11", + "projen": "^0.22.2", "standard-version": "^9", "ts-jest": "^26.5.0", "typescript": "^3.9.5" diff --git a/yarn.lock b/yarn.lock index 8c25dde9..ff052ca5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5266,10 +5266,10 @@ 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.11: - version "0.20.11" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.20.11.tgz#d349ec6d80b3fdbb8f50ea6a6e427a5280d7f76e" - integrity sha512-uWVHxNmIy//0a/VB3TaBo87KvvQAT9Gt4rwoTA6+mm3cMaxJaRTDvt+mK578DfkGYiA2L4CgzM86kwzadZWAhA== +projen@^0.22.2: + version "0.22.2" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.22.2.tgz#47afbaa53aaec8b1d2e8c09c13546d7820d93687" + integrity sha512-5SshxGcUX65oHdKUC5WAtkUDuDSsgSLZI/HutITDtdJ6jir7FrQicNvWNXTrIRz7ipqnxqvDllWzxx0NXrOGEw== dependencies: "@iarna/toml" "^2.2.5" chalk "^4.1.1"