diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7be15dc3..8600b7d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: build run: npx projen build - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -37,6 +37,7 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8035310c..ca610b96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage diff --git a/.github/workflows/update-projen-main.yml b/.github/workflows/update-projen-main.yml index 578d5948..8ba56eef 100644 --- a/.github/workflows/update-projen-main.yml +++ b/.github/workflows/update-projen-main.yml @@ -31,6 +31,7 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@v4 diff --git a/API.md b/API.md index fe69fb7b..b2c648b4 100644 --- a/API.md +++ b/API.md @@ -5304,10 +5304,11 @@ const clickUpCdkConstructLibraryOptions: clickupCdk.ClickUpCdkConstructLibraryOp | artifactsDirectory | string | A directory which will contain build artifacts. | | autoApproveUpgrades | boolean | Automatically approve deps upgrade PRs, allowing them to be merged by mergify (if configued). | | buildWorkflow | boolean | Define a GitHub workflow for building PRs. | +| buildWorkflowOptions | projen.javascript.BuildWorkflowOptions | Options for PR build workflow. | | buildWorkflowTriggers | projen.github.workflows.Triggers | Build workflow triggers. | | bundlerOptions | projen.javascript.BundlerOptions | Options for `Bundler`. | | checkLicenses | projen.javascript.LicenseCheckerOptions | Configure which licenses should be deemed acceptable for use by dependencies. | -| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | +| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | | codeCovTokenSecret | string | Define the secret name for a specified https://codecov.io/ token A secret is required to send coverage for private repositories. | | copyrightOwner | string | License copyright owner. | | copyrightPeriod | string | The copyright years to put in the LICENSE file. | @@ -5383,7 +5384,7 @@ const clickUpCdkConstructLibraryOptions: clickupCdk.ClickUpCdkConstructLibraryOp | constructsVersion | string | Minimum version of the `constructs` library to depend on. | | edgeLambdaAutoDiscover | boolean | Automatically adds an `cloudfront.experimental.EdgeFunction` for each `.edge-lambda.ts` handler in your source tree. If this is disabled, you can manually add an `awscdk.AutoDiscover` component to your project. | | experimentalIntegRunner | boolean | Enable experimental support for the AWS CDK integ-runner. | -| integrationTestAutoDiscover | boolean | Automatically discovers and creates integration tests for each `.integ.ts` file in under your test directory. | +| integrationTestAutoDiscover | boolean | Automatically discovers and creates integration tests for each `.integ.ts` file under your test directory. | | lambdaAutoDiscover | boolean | Automatically adds an `aws_lambda.Function` for each `.lambda.ts` handler in your source tree. If this is disabled, you either need to explicitly call `aws_lambda.Function.autoDiscover()` or define a `new aws_lambda.Function()` for each handler. | | lambdaExtensionAutoDiscover | boolean | Automatically adds an `awscdk.LambdaExtension` for each `.lambda-extension.ts` entrypoint in your source tree. If this is disabled, you can manually add an `awscdk.AutoDiscover` component to your project. | | lambdaOptions | projen.awscdk.LambdaFunctionCommonOptions | Common options for all AWS Lambda functions. | @@ -6745,7 +6746,21 @@ Define a GitHub workflow for building PRs. --- -##### `buildWorkflowTriggers`Optional +##### `buildWorkflowOptions`Optional + +```typescript +public readonly buildWorkflowOptions: BuildWorkflowOptions; +``` + +- *Type:* projen.javascript.BuildWorkflowOptions + +Options for PR build workflow. + +--- + +##### ~~`buildWorkflowTriggers`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.workflowTriggers` ```typescript public readonly buildWorkflowTriggers: Triggers; @@ -6794,7 +6809,7 @@ public readonly codeCov: boolean; - *Type:* boolean - *Default:* false -Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. +Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. --- @@ -6931,7 +6946,9 @@ Jest options. --- -##### `mutableBuild`Optional +##### ~~`mutableBuild`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.mutableBuild` ```typescript public readonly mutableBuild: boolean; @@ -7035,7 +7052,7 @@ public readonly projenDevDependency: boolean; ``` - *Type:* boolean -- *Default:* true +- *Default:* true if not a subproject Indicates of "projen" should be installed as a devDependency. @@ -7841,7 +7858,7 @@ public readonly integrationTestAutoDiscover: boolean; - *Type:* boolean - *Default:* true -Automatically discovers and creates integration tests for each `.integ.ts` file in under your test directory. +Automatically discovers and creates integration tests for each `.integ.ts` file under your test directory. --- @@ -8098,10 +8115,11 @@ const clickUpCdkTypeScriptAppOptions: clickupCdk.ClickUpCdkTypeScriptAppOptions | artifactsDirectory | string | A directory which will contain build artifacts. | | autoApproveUpgrades | boolean | Automatically approve deps upgrade PRs, allowing them to be merged by mergify (if configued). | | buildWorkflow | boolean | Define a GitHub workflow for building PRs. | +| buildWorkflowOptions | projen.javascript.BuildWorkflowOptions | Options for PR build workflow. | | buildWorkflowTriggers | projen.github.workflows.Triggers | Build workflow triggers. | | bundlerOptions | projen.javascript.BundlerOptions | Options for `Bundler`. | | checkLicenses | projen.javascript.LicenseCheckerOptions | Configure which licenses should be deemed acceptable for use by dependencies. | -| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | +| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | | codeCovTokenSecret | string | Define the secret name for a specified https://codecov.io/ token A secret is required to send coverage for private repositories. | | copyrightOwner | string | License copyright owner. | | copyrightPeriod | string | The copyright years to put in the LICENSE file. | @@ -9531,7 +9549,21 @@ Define a GitHub workflow for building PRs. --- -##### `buildWorkflowTriggers`Optional +##### `buildWorkflowOptions`Optional + +```typescript +public readonly buildWorkflowOptions: BuildWorkflowOptions; +``` + +- *Type:* projen.javascript.BuildWorkflowOptions + +Options for PR build workflow. + +--- + +##### ~~`buildWorkflowTriggers`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.workflowTriggers` ```typescript public readonly buildWorkflowTriggers: Triggers; @@ -9580,7 +9612,7 @@ public readonly codeCov: boolean; - *Type:* boolean - *Default:* false -Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. +Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. --- @@ -9717,7 +9749,9 @@ Jest options. --- -##### `mutableBuild`Optional +##### ~~`mutableBuild`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.mutableBuild` ```typescript public readonly mutableBuild: boolean; @@ -9821,7 +9855,7 @@ public readonly projenDevDependency: boolean; ``` - *Type:* boolean -- *Default:* true +- *Default:* true if not a subproject Indicates of "projen" should be installed as a devDependency. @@ -10761,10 +10795,11 @@ const clickUpTypeScriptProjectOptions: clickupTs.ClickUpTypeScriptProjectOptions | artifactsDirectory | string | A directory which will contain build artifacts. | | autoApproveUpgrades | boolean | Automatically approve deps upgrade PRs, allowing them to be merged by mergify (if configued). | | buildWorkflow | boolean | Define a GitHub workflow for building PRs. | +| buildWorkflowOptions | projen.javascript.BuildWorkflowOptions | Options for PR build workflow. | | buildWorkflowTriggers | projen.github.workflows.Triggers | Build workflow triggers. | | bundlerOptions | projen.javascript.BundlerOptions | Options for `Bundler`. | | checkLicenses | projen.javascript.LicenseCheckerOptions | Configure which licenses should be deemed acceptable for use by dependencies. | -| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | +| codeCov | boolean | Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. | | codeCovTokenSecret | string | Define the secret name for a specified https://codecov.io/ token A secret is required to send coverage for private repositories. | | copyrightOwner | string | License copyright owner. | | copyrightPeriod | string | The copyright years to put in the LICENSE file. | @@ -12168,7 +12203,21 @@ Define a GitHub workflow for building PRs. --- -##### `buildWorkflowTriggers`Optional +##### `buildWorkflowOptions`Optional + +```typescript +public readonly buildWorkflowOptions: BuildWorkflowOptions; +``` + +- *Type:* projen.javascript.BuildWorkflowOptions + +Options for PR build workflow. + +--- + +##### ~~`buildWorkflowTriggers`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.workflowTriggers` ```typescript public readonly buildWorkflowTriggers: Triggers; @@ -12217,7 +12266,7 @@ public readonly codeCov: boolean; - *Type:* boolean - *Default:* false -Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v3 A secret is required for private repos. Configured with `@codeCovTokenSecret`. +Define a GitHub workflow step for sending code coverage metrics to https://codecov.io/ Uses codecov/codecov-action@v4 A secret is required for private repos. Configured with `@codeCovTokenSecret`. --- @@ -12354,7 +12403,9 @@ Jest options. --- -##### `mutableBuild`Optional +##### ~~`mutableBuild`~~Optional + +- *Deprecated:* - Use `buildWorkflowOptions.mutableBuild` ```typescript public readonly mutableBuild: boolean; @@ -12458,7 +12509,7 @@ public readonly projenDevDependency: boolean; ``` - *Type:* boolean -- *Default:* true +- *Default:* true if not a subproject Indicates of "projen" should be installed as a devDependency. diff --git a/package.json b/package.json index 88012983..a2c82259 100644 --- a/package.json +++ b/package.json @@ -53,18 +53,18 @@ "jsii-pacmak": "^1.97.0", "jsii-rosetta": "5.0.x", "prettier": "^3.2.5", - "projen": "^0.80.4", + "projen": "^0.81.2", "standard-version": "^9", "ts-jest": "^29.1.2", "ts-node": "^10.9.2", "typescript": "^5.4.5" }, "peerDependencies": { - "projen": "^0.80.4" + "projen": "^0.81.2" }, "dependencies": { "cson-parser": "^4.0.9", - "projen": "^0.80.4", + "projen": "^0.81.2", "semver": "^7.6.0", "ts-deepmerge": "^6.2.1" }, diff --git a/test/__snapshots__/cdk-context-json.test.ts.snap b/test/__snapshots__/cdk-context-json.test.ts.snap index bde2feb3..d615cacb 100644 --- a/test/__snapshots__/cdk-context-json.test.ts.snap +++ b/test/__snapshots__/cdk-context-json.test.ts.snap @@ -96,6 +96,7 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened uses: actions/upload-artifact@v4 diff --git a/test/__snapshots__/clickup-cdk.test.ts.snap b/test/__snapshots__/clickup-cdk.test.ts.snap index bd5ad029..4da96c8f 100644 --- a/test/__snapshots__/clickup-cdk.test.ts.snap +++ b/test/__snapshots__/clickup-cdk.test.ts.snap @@ -187,7 +187,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -390,7 +390,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -852,7 +852,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -1312,7 +1312,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -1503,7 +1503,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -1698,7 +1698,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -1897,7 +1897,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -2088,7 +2088,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage diff --git a/test/__snapshots__/clickup-ts.test.ts.snap b/test/__snapshots__/clickup-ts.test.ts.snap index ab5dbe8f..c32b83ea 100644 --- a/test/__snapshots__/clickup-ts.test.ts.snap +++ b/test/__snapshots__/clickup-ts.test.ts.snap @@ -47,7 +47,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: \${{ secrets.CODECOV_TOKEN }} directory: coverage diff --git a/test/__snapshots__/update-projen.test.ts.snap b/test/__snapshots__/update-projen.test.ts.snap index 8b5a99a5..47a23f36 100644 --- a/test/__snapshots__/update-projen.test.ts.snap +++ b/test/__snapshots__/update-projen.test.ts.snap @@ -56,6 +56,7 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created uses: actions/upload-artifact@v4 diff --git a/yarn.lock b/yarn.lock index b8a83606..f54c975a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2728,9 +2728,9 @@ has@^1.0.3: integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ== hasown@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" - integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== dependencies: function-bind "^1.1.2" @@ -4355,10 +4355,10 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.80.4: - version "0.80.4" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.80.4.tgz#6e8f0f96a1274a7d2bfd9749ae704a9cdfb15eb4" - integrity sha512-I7+0tkOwSJMRaTb+zeEzD3VXbx4qiDKhz9/VfcoPIfcpI+xNizSX3AAjZ+U1K1t38npX2WD2Pph77ZrPkGp65A== +projen@^0.81.2: + version "0.81.2" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.81.2.tgz#0dd5264689a31c1002e862939e39787df301aab5" + integrity sha512-ZCFGbr6aEOfD2KFwWDF588Udl6t2t/qIy/vWfAuvd4wSrl1djnxK/LgKfVYSpYpzjoOLDkzFtYDAMiYvKK/gNw== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" @@ -5426,9 +5426,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^2.2.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.0.tgz#2376db1083d157f4b3a452995803dbcf43b08140" - integrity sha512-j9iR8g+/t0lArF4V6NE/QCfT+CO7iLqrXAHZbJdo+LfjqP1vR8Fg5bSiaq6Q2lOD1AUEVrEVIgABvBFYojJVYQ== + version "2.4.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed" + integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg== yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.9"