Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/dependabot.yml

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

18 changes: 17 additions & 1 deletion .projen/deps.json

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

47 changes: 28 additions & 19 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ const repoProject = new yarn.Monorepo({
'@aws-sdk/credential-providers',
'@aws-sdk/lib-storage',
'tsx',
'jest',
'@types/jest',
'eslint-config-prettier',
'eslint-plugin-prettier',
],
vscodeWorkspace: true,
vscodeWorkspaceOptions: {
Expand All @@ -246,7 +250,6 @@ const repoProject = new yarn.Monorepo({
yarnBerry: true,
consistentVersions: [
'typescript',
// '@types/node', // @todo
'eslint',
'eslint-import-resolver-typescript',
'eslint-plugin-import',
Expand All @@ -257,10 +260,11 @@ const repoProject = new yarn.Monorepo({
'@typescript-eslint/eslint-plugin',
'@typescript-eslint/parser',
'prettier',
// 'eslint-config-prettier', // @todo
// 'eslint-plugin-prettier', // @todo
// 'jest', // @todo
'eslint-config-prettier',
'eslint-plugin-prettier',
'jest',
'jest-junit',
'@types/jest',
],

eslintOptions: {
Expand Down Expand Up @@ -694,7 +698,6 @@ const cdkAssetsLib = configureProject(
srcdir: 'lib',
deps: [
cloudAssemblySchema.customizeReference({ versionType: 'any-future' }),
cxApi,
cloudAssemblyApi.customizeReference({ versionType: 'exact' }),
'archiver',
'fast-glob',
Expand All @@ -713,7 +716,7 @@ const cdkAssetsLib = configureProject(
'@types/archiver',
'@types/mime@^2',
'@types/picomatch',
'fs-extra',
'fs-extra@^11',
'graceful-fs',
'jszip',
'@types/mock-fs@^4',
Expand Down Expand Up @@ -913,7 +916,7 @@ const toolkitLib = configureProject(
'chalk@^4',
'chokidar@^4',
'fast-deep-equal',
'fs-extra@^9',
'fs-extra@^11',
'picomatch',
'p-limit@^3',
'semver',
Expand All @@ -930,7 +933,7 @@ const toolkitLib = configureProject(
'@jest/types',
'@microsoft/api-extractor',
'@smithy/util-stream',
'@types/fs-extra',
'@types/fs-extra@^11',
'@types/picomatch',
'@types/split2',
'aws-cdk-lib',
Expand Down Expand Up @@ -1183,7 +1186,7 @@ const cli = configureProject(
yargsGen,
cliPluginContract,
'@types/archiver',
'@types/fs-extra@^9',
'@types/fs-extra@^11',
'@types/mockery',
'@types/picomatch',
'@types/promptly',
Expand All @@ -1200,7 +1203,7 @@ const cli = configureProject(
'nock@13',
'sinon',
'ts-mock-imports',
'ts-node',
'tsx',
],
deps: [
cloudAssemblySchema.customizeReference({ versionType: 'any-future' }),
Expand Down Expand Up @@ -1245,7 +1248,7 @@ const cli = configureProject(
'chokidar@^4',
'decamelize@^5', // Non-ESM
'enquirer',
'fs-extra@^9',
'fs-extra@^11',
'fast-glob',
'picomatch',
'p-limit@^3',
Expand Down Expand Up @@ -1383,7 +1386,7 @@ cli.gitignore.addPatterns('build-info.json');
const cliPackageJson = `${cli.workspaceDirectory}/package.json`;

cli.preCompileTask.prependExec('./generate.sh');
cli.preCompileTask.prependExec('ts-node -P tsconfig.dev.json scripts/user-input-gen.ts');
cli.preCompileTask.prependExec('tsx --tsconfig tsconfig.dev.json scripts/user-input-gen.ts');

const includeCliResourcesCommands = [
'cp $(node -p \'require.resolve("cdk-from-cfn/index_bg.wasm")\') ./lib/',
Expand Down Expand Up @@ -1449,7 +1452,6 @@ const integRunner = configureProject(
srcdir: 'lib',
deps: [
cloudAssemblySchema.customizeReference({ versionType: 'any-future' }),
cxApi,
cloudAssemblyApi.customizeReference({ versionType: 'exact' }),
cli.customizeReference({ versionType: 'exact' }),
cdkAssetsLib.customizeReference({ versionType: 'exact' }),
Expand All @@ -1458,15 +1460,15 @@ const integRunner = configureProject(
'workerpool@^6',
'chokidar@^4',
'chalk@^4',
'fs-extra@^9',
'fs-extra@^11',
'yargs@^16',
'proxy-agent',
'@aws-cdk/aws-service-spec',
'@aws-sdk/client-cloudformation',
],
devDeps: [
'aws-cdk-lib',
'@types/fs-extra',
'@types/fs-extra@^11',
'@types/mock-fs@^4',
'mock-fs@^5',
'@types/workerpool@^6',
Expand Down Expand Up @@ -1568,7 +1570,7 @@ const cliInteg = configureProject(
'@smithy/util-retry', // smithy packages don't have the same major version as SDK packages
'@smithy/types', // smithy packages don't have the same major version as SDK packages
'chalk@^4',
'fs-extra@^9',
'fs-extra@^11',
'fast-glob',
'make-runnable@^1',
'mockttp@^3',
Expand All @@ -1591,7 +1593,7 @@ const cliInteg = configureProject(
toolkitLib.customizeReference({ versionType: 'exact' }),
'@types/semver@^7',
'@types/yargs@^16',
'@types/fs-extra@^9',
'@types/fs-extra@^11',
],
bin: {
'run-suite': 'bin/run-suite',
Expand Down Expand Up @@ -1661,7 +1663,9 @@ new pj.YamlFile(repo, '.github/dependabot.yml', {
{
'package-ecosystem': 'npm',
'schedule': { interval: 'weekly' },
'cooldown': dependabotCooldown,
'cooldown': {
'default-days': dependabotCooldown,
},
'labels': ['auto-approve'],
'allow': [{
'dependency-type': 'production',
Expand All @@ -1676,7 +1680,9 @@ new pj.YamlFile(repo, '.github/dependabot.yml', {
'package-ecosystem': pkgEco,
'directory': '/packages/aws-cdk/lib/init-templates',
'schedule': { interval: 'weekly' },
'cooldown': dependabotCooldown,
'cooldown': {
'default-days': dependabotCooldown,
},
'labels': ['auto-approve'],
'open-pull-requests-limit': 5,
})),
Expand Down Expand Up @@ -1772,6 +1778,9 @@ repoProject.github?.tryFindWorkflow('pull-request-lint')?.file?.patch(
].filter(s => s && !disallowed.has(s)).sort().join('\n')),
);

// enforce same node types everywhere
[repo, ...repo.subprojects].forEach(p => p.addDevDeps('@types/node@^20'));

repo.synth();

// #endregion
12 changes: 8 additions & 4 deletions package.json

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

6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/cli-integ/.projen/deps.json

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

12 changes: 6 additions & 6 deletions packages/@aws-cdk-testing/cli-integ/package.json

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

8 changes: 2 additions & 6 deletions packages/@aws-cdk/cdk-assets-lib/.projen/deps.json

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

Loading
Loading