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
78 changes: 6 additions & 72 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,12 @@ const ADDITIONAL_CLI_IGNORE_PATTERNS = [
];

const defaultTsOptions: NonNullable<TypeScriptWorkspaceOptions['tsconfig']>['compilerOptions'] = {
target: 'ES2020',
module: 'commonjs',
lib: ['es2020'],
module: 'node18',
target: 'es2022',
lib: ['es2022'],
incremental: true,
esModuleInterop: false,
esModuleInterop: true,
noEmitOnError: true,
skipLibCheck: true,
isolatedModules: true,
};
Expand Down Expand Up @@ -544,14 +545,6 @@ const cloudFormationDiff = configureProject(
'string-width@^4',
'table@^6',
],
// FIXME: this should be a jsii project
// (EDIT: or should it? We're going to bundle it into aws-cdk-lib)
tsconfig: {
compilerOptions: {
...defaultTsOptions,
},
},

jestOptions: jestOptionsForProject({
jestConfig: {
coverageThreshold: {
Expand Down Expand Up @@ -630,11 +623,6 @@ const yarnCling = configureProject(
deps: ['@yarnpkg/parsers', 'semver'],
devDeps: ['@types/semver', 'fast-check'],
minNodeVersion: '20',
tsconfig: {
compilerOptions: {
...defaultTsOptions,
},
},
jestOptions: jestOptionsForProject({
jestConfig: {
coverageThreshold: {
Expand Down Expand Up @@ -663,11 +651,6 @@ const yargsGen = configureProject(
deps: ['@cdklabs/typewriter', 'prettier@^2.8', 'lodash.clonedeep'],
devDeps: ['@types/semver', '@types/yarnpkg__lockfile', '@types/lodash.clonedeep', '@types/prettier@^2'],
minNodeVersion: '20', // Necessary for 'structuredClone'
tsconfig: {
compilerOptions: {
...defaultTsOptions,
},
},
}),
);

Expand All @@ -688,11 +671,6 @@ const cliPluginContract = configureProject(
],
devDeps: [
],
tsconfig: {
compilerOptions: {
...defaultTsOptions,
},
},
}),
);

Expand Down Expand Up @@ -760,20 +738,6 @@ const cdkAssetsLib = configureProject(
'aws-sdk-client-mock',
'aws-sdk-client-mock-jest',
],
tsconfigDev: {
compilerOptions: {
...defaultTsOptions,
},
include: ['bin/**/*.ts'],
},
tsconfig: {
compilerOptions: {
...defaultTsOptions,
rootDir: undefined,
outDir: undefined,
},
include: ['bin/**/*.ts'],
},
jestOptions: jestOptionsForProject({
jestConfig: {
// We have many tests here that commonly time out
Expand Down Expand Up @@ -897,9 +861,7 @@ const TOOLKIT_LIB_EXCLUDE_PATTERNS = [

const toolkitLibTsCompilerOptions = {
...defaultTsOptions,
target: 'es2022',
lib: ['es2022', 'esnext.disposable'],
module: 'NodeNext',
declarationMap: true,
};

Expand Down Expand Up @@ -1011,12 +973,6 @@ const toolkitLib = configureProject(
...toolkitLibTsCompilerOptions,
},
},
tsconfigDev: {
compilerOptions: {
...toolkitLibTsCompilerOptions,
rootDir: '.', // shouldn't be required but something broke... check again once we have gotten rid of the tmpToolkitHelpers package
},
},
nextVersionCommand: 'tsx ../../../projenrc/next-version.ts maybeRc',
}),
);
Expand Down Expand Up @@ -1303,25 +1259,10 @@ const cli = configureProject(
'yargs@^15',
],
excludeDepsFromUpgrade: ['aws-cdk-lib'], // this is handled separately further down
tsconfig: {
compilerOptions: {
...defaultTsOptions,
lib: ['es2019', 'es2022.error'],

// Changes the meaning of 'import' for libraries whose top-level export is a function
// 'aws-cdk' has been written against `false` for interop
esModuleInterop: false,

// Necessary to properly compile proxy-agent and lru-cache without esModuleInterop set.
skipLibCheck: true,
},
},
tsconfigDev: {
compilerOptions: {
...defaultTsOptions,
lib: ['es2019', 'esnext.disposable', 'es2022.error'],
esModuleInterop: false,
skipLibCheck: true,
lib: ['es2022', 'esnext.disposable'],
},
},
eslintOptions: {
Expand Down Expand Up @@ -1471,11 +1412,6 @@ const cdkAliasPackage = configureProject(
nextVersionCommand: `tsx ../../projenrc/next-version.ts copyVersion:../../${cliPackageJson}`,
releasableCommits: transitiveToolkitPackages('cdk'),
majorVersion: 2,
tsconfig: {
compilerOptions: {
...defaultTsOptions,
},
},
}),
);
void cdkAliasPackage;
Expand Down Expand Up @@ -1657,10 +1593,8 @@ const cliInteg = configureProject(
tsconfig: {
compilerOptions: {
...defaultTsOptions,
esModuleInterop: false,
target: 'es2022',
lib: ['es2022', 'esnext.disposable', 'dom'],
module: 'NodeNext',
},
include: ['**/*.ts'],
exclude: ['resources/**/*'],
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/lib/with-cdk-app.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
import * as assert from 'assert';
import assert from 'assert';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/cli-integ/tsconfig.dev.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/tsconfig.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jest.mock('child_process');

import 'aws-sdk-client-mock-jest';

import * as fs from 'fs';
import fs from 'fs';
import { Manifest } from '@aws-cdk/cloud-assembly-schema';
import type { GetAuthorizationTokenResponse } from '@aws-sdk/client-ecr';
import {
Expand Down
13 changes: 6 additions & 7 deletions packages/@aws-cdk/cdk-assets-lib/tsconfig.dev.json

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

15 changes: 8 additions & 7 deletions packages/@aws-cdk/cdk-assets-lib/tsconfig.json

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

2 changes: 1 addition & 1 deletion packages/@aws-cdk/cdk-build-tools/lib/os.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as child_process from 'child_process';
import * as fs from 'fs';
import * as util from 'util';
import * as chalk from 'chalk';
import chalk from 'chalk';
import { Timers } from './timer';

interface ShellOptions {
Expand Down
10 changes: 5 additions & 5 deletions packages/@aws-cdk/cli-plugin-contract/tsconfig.dev.json

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

10 changes: 5 additions & 5 deletions packages/@aws-cdk/cli-plugin-contract/tsconfig.json

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

10 changes: 5 additions & 5 deletions packages/@aws-cdk/cloud-assembly-api/tsconfig.dev.json

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

Loading
Loading