Skip to content

Commit

Permalink
Merge branch 'main' into conroy/markdown
Browse files Browse the repository at this point in the history
  • Loading branch information
kaizencc authored Feb 24, 2025
2 parents 99b2378 + dee84c1 commit c2df233
Show file tree
Hide file tree
Showing 64 changed files with 854 additions and 388 deletions.
1 change: 1 addition & 0 deletions .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .github/dependabot.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions .github/workflows/codecov.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

108 changes: 108 additions & 0 deletions .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .projen/files.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 18 additions & 8 deletions .projenrc.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { yarn, CdkCliIntegTestsWorkflow } from 'cdklabs-projen-project-types';
import * as pj from 'projen';
import { Stability } from 'projen/lib/cdk';
import { AdcPublishing } from './projenrc/adc-publishing';
import { BundleCli } from './projenrc/bundle';
import { CodeCovWorkflow } from './projenrc/codecov';
import { ESLINT_RULES } from './projenrc/eslint';
import { JsiiBuild } from './projenrc/jsii';

Expand Down Expand Up @@ -214,6 +216,8 @@ const repoProject = new yarn.Monorepo({
},
});

new AdcPublishing(repoProject);

// Eslint for projen config
// @ts-ignore
repoProject.eslint = new pj.javascript.Eslint(repoProject, {
Expand Down Expand Up @@ -499,9 +503,7 @@ const cdkBuildTools = configureProject(
// This should be deprecated, but only after the move
const cliPluginContract = configureProject(
new yarn.TypeScriptWorkspace({
...genericCdkProps({
private: true,
}),
...genericCdkProps(),
parent: repo,
name: '@aws-cdk/cli-plugin-contract',
description: 'Contract between the CLI and authentication plugins, for the exchange of AWS credentials',
Expand Down Expand Up @@ -1093,7 +1095,7 @@ const toolkitLib = configureProject(
coverageThreshold: {
// this is very sad but we will get better
statements: 85,
branches: 77,
branches: 76,
functions: 77,
lines: 85,
},
Expand Down Expand Up @@ -1145,13 +1147,16 @@ toolkitLib.postCompileTask.exec('node ./lib/api/aws-cdk.js >/dev/null 2>/dev/nul

// Do include all .ts files inside init-templates
toolkitLib.npmignore?.addPatterns(
'build-tools',
'docs',
'typedoc.json',
'*.d.ts.map',
// Explicitly allow all required files
'!build-info.json',
'!db.json.gz',
'!lib/api/bootstrap/bootstrap-template.yaml',
'*.d.ts',
'*.d.ts.map',
'!lib/*.js',
'!lib/*.d.ts',
'!LICENSE',
'!NOTICE',
'!THIRD_PARTY_LICENSES',
Expand All @@ -1176,7 +1181,7 @@ for (const tsconfig of [toolkitLib.tsconfigDev]) {
}

toolkitLib.addTask('docs', {
exec: 'typedoc lib/index.ts --excludeExternals --excludePrivate --excludeProtected --excludeInternal',
exec: 'typedoc lib/index.ts',
});
toolkitLib.addTask('publish-local', {
exec: './build-tools/package.sh',
Expand Down Expand Up @@ -1241,7 +1246,7 @@ new pj.YamlFile(repo, '.github/dependabot.yml', {
version: 2,
updates: ['pip', 'maven', 'nuget'].map((pkgEco) => ({
'package-ecosystem': pkgEco,
'directory': '/',
'directory': '/packages/aws-cdk/lib/init-templates',
'schedule': { interval: 'weekly' },
'labels': ['auto-approve'],
'open-pull-requests-limit': 5,
Expand Down Expand Up @@ -1279,4 +1284,9 @@ new CdkCliIntegTestsWorkflow(repo, {
],
});

new CodeCovWorkflow(repo, {
restrictToRepos: ['aws/aws-cdk-cli'],
packages: [cli.name],
});

repo.synth();
4 changes: 0 additions & 4 deletions packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/@aws-cdk/cli-plugin-contract/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/@aws-cdk/cli-plugin-contract/.npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions packages/@aws-cdk/cli-plugin-contract/.projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c2df233

Please sign in to comment.