diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/package.json b/package.json index e411a8f6dd155..5b144ccedd287 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,8 @@ "patch-package": "^6.5.1", "semver": "^7.5.2", "standard-version": "^9.5.0", - "typescript": "~4.9.5" + "ts-node": "^10.9.1", + "typescript": "~5.1.3" }, "resolutions": { "colors": "1.4.0", diff --git a/packages/@aws-cdk-testing/cli-integ/lib/corking.ts b/packages/@aws-cdk-testing/cli-integ/lib/corking.ts index f083270a028f5..689c1c6ba77db 100644 --- a/packages/@aws-cdk-testing/cli-integ/lib/corking.ts +++ b/packages/@aws-cdk-testing/cli-integ/lib/corking.ts @@ -19,11 +19,12 @@ export class MemoryStream extends stream.Writable { this.parts.splice(0, this.parts.length); } - public async flushTo(strm: NodeJS.WritableStream) { + public async flushTo(strm: NodeJS.WritableStream): Promise { const flushed = strm.write(this.buffer()); if (!flushed) { return new Promise(ok => strm.once('drain', ok)); } + return; } public toString() { diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig-custom.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig-custom.json index fc66b94fd4695..d309db089a88b 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig-custom.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig-custom.json @@ -4,7 +4,6 @@ "inlineSourceMap": true, "inlineSources": true, "alwaysStrict": true, - "charset": "utf8", "declaration": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig.json b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig.json index 656e984b303a8..f91454565d8e0 100644 --- a/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig.json +++ b/packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig.json @@ -4,7 +4,6 @@ "inlineSourceMap": true, "inlineSources": true, "alwaysStrict": true, - "charset": "utf8", "declaration": true, "experimentalDecorators": true, "incremental": true, diff --git a/packages/@aws-cdk/cli-lib-alpha/generate.sh b/packages/@aws-cdk/cli-lib-alpha/generate.sh new file mode 100644 index 0000000000000..e5ea04d12acd8 --- /dev/null +++ b/packages/@aws-cdk/cli-lib-alpha/generate.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -euo pipefail + +commit=${CODEBUILD_RESOLVED_SOURCE_VERSION:-} +# CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local build or CodePipeline build), +# use the HEAD commit hash +if [ -z "${commit}" ]; then + commit="$(git rev-parse --verify HEAD)" +fi + +cat > build-info.json < `--inject:${i}`) : [], ...this.props.esbuildArgs ? [toCliArgs(this.props.esbuildArgs)] : [], diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/util.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/util.ts index 117e5ed354013..bc946336ad698 100644 --- a/packages/aws-cdk-lib/aws-lambda-nodejs/lib/util.ts +++ b/packages/aws-cdk-lib/aws-lambda-nodejs/lib/util.ts @@ -149,6 +149,7 @@ export function getTsconfigCompilerOptions(tsconfigPath: string): string { const compilerOptions = extractTsConfig(tsconfigPath); const excludedCompilerOptions = [ 'composite', + 'charset', 'noEmit', 'tsBuildInfoFile', ]; diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts index cf5ead0f917c0..4af3f281393df 100644 --- a/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts +++ b/packages/aws-cdk-lib/aws-lambda-nodejs/test/bundling.test.ts @@ -233,7 +233,7 @@ test('esbuild bundling with esbuild options', () => { defineInstructions, '--log-level=silent --keep-names --tsconfig=/asset-input/lib/custom-tsconfig.ts', '--metafile=/asset-output/index.meta.json --banner:js="/* comments */" --footer:js="/* comments */"', - '--charset=utf8 --main-fields=module,main --inject:./my-shim.js', + '--main-fields=module,main --inject:./my-shim.js', '--log-limit="0" --resolve-extensions=".ts,.js" --splitting --keep-names', ].join(' '), ], diff --git a/packages/aws-cdk-lib/aws-lambda-nodejs/test/util.test.ts b/packages/aws-cdk-lib/aws-lambda-nodejs/test/util.test.ts index e8355ff12c892..fc2b286f48b0d 100644 --- a/packages/aws-cdk-lib/aws-lambda-nodejs/test/util.test.ts +++ b/packages/aws-cdk-lib/aws-lambda-nodejs/test/util.test.ts @@ -186,7 +186,6 @@ describe('getTsconfigCompilerOptions', () => { const compilerOptions = getTsconfigCompilerOptions(tsconfig); expect(compilerOptions).toEqual([ '--alwaysStrict', - '--charset utf8', '--declaration', '--declarationMap false', '--experimentalDecorators', @@ -219,7 +218,6 @@ describe('getTsconfigCompilerOptions', () => { const compilerOptions = getTsconfigCompilerOptions(tsconfig); expect(compilerOptions).toEqual([ '--alwaysStrict', - '--charset utf8', '--declaration', '--declarationMap false', '--experimentalDecorators', diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json index 816dfeb3ab03f..93b0c2c1bd805 100644 --- a/packages/aws-cdk-lib/package.json +++ b/packages/aws-cdk-lib/package.json @@ -32,7 +32,7 @@ "stripDeprecated": true, "compressAssembly": true, "pre": [ - "npx ts-node -P tsconfig.dev.json region-info/build-tools/generate-static-data.ts", + "ts-node -P tsconfig.dev.json region-info/build-tools/generate-static-data.ts", "(cp -f $(node -p 'require.resolve(\"aws-sdk/apis/metadata.json\")') custom-resources/lib/aws-custom-resource/sdk-api-metadata.json && rm -rf custom-resources/test/aws-custom-resource/cdk.out)", "(rm -rf core/test/fs/fixtures && cd core/test/fs && tar -xzf fixtures.tar.gz)", "(rm -rf assets/test/fs/fixtures && cd assets/test/fs && tar -xzvf fixtures.tar.gz)", @@ -162,7 +162,7 @@ "ts-mock-imports": "^1.3.8", "ts-node": "^10.9.1", "sinon": "^9.2.4", - "typescript": "~5.0.4", + "typescript": "~5.1.3", "typescript-json-schema": "^0.56.0" }, "peerDependencies": { diff --git a/packages/aws-cdk-migration/package.json b/packages/aws-cdk-migration/package.json index 04c939f4349c1..8a0e1e21fe12b 100644 --- a/packages/aws-cdk-migration/package.json +++ b/packages/aws-cdk-migration/package.json @@ -35,7 +35,7 @@ "license": "Apache-2.0", "dependencies": { "glob": "^7.2.3", - "typescript": "~4.9.5" + "typescript": "~5.1.3" }, "devDependencies": { "@types/glob": "^7.2.0", diff --git a/packages/aws-cdk/.eslintrc.js b/packages/aws-cdk/.eslintrc.js index 437c4f0c222e9..6a52d172b6abd 100644 --- a/packages/aws-cdk/.eslintrc.js +++ b/packages/aws-cdk/.eslintrc.js @@ -1,5 +1,6 @@ const baseConfig = require('@aws-cdk/cdk-build-tools/config/eslintrc'); baseConfig.ignorePatterns.push('lib/init-templates/**/typescript/**/*.ts'); baseConfig.ignorePatterns.push('test/integ/cli/sam_cdk_integ_app/**/*.ts'); +baseConfig.ignorePatterns.push('vendor/noctilucent/**/*.ts'); baseConfig.parserOptions.project = __dirname + '/tsconfig.json'; module.exports = baseConfig; diff --git a/packages/aws-cdk/.gitignore b/packages/aws-cdk/.gitignore index 86263e936e436..899d0fdac592b 100644 --- a/packages/aws-cdk/.gitignore +++ b/packages/aws-cdk/.gitignore @@ -39,3 +39,6 @@ test/integ/cli/*.d.ts .DS_Store junit.xml + +# Exclude the noctilucent WASM package +lib/vendor/noctilucent/ diff --git a/packages/aws-cdk/.npmignore b/packages/aws-cdk/.npmignore index 2a474fe68b670..c1bf792f00614 100644 --- a/packages/aws-cdk/.npmignore +++ b/packages/aws-cdk/.npmignore @@ -28,3 +28,6 @@ tsconfig.json # exclude cdk artifacts **/cdk.out junit.xml + +# exclude noctilucent source +/vendor/noctilucent/ diff --git a/packages/aws-cdk/generate.sh b/packages/aws-cdk/generate.sh index e5ea04d12acd8..036695896515e 100755 --- a/packages/aws-cdk/generate.sh +++ b/packages/aws-cdk/generate.sh @@ -13,4 +13,32 @@ cat > build-info.json </dev/null 2>/dev/null; then + echo "installing wasm-pack, this may take a while..." + cargo install wasm-pack + fi + + pkgroot=$(cd $(dirname -- "$0") && pwd) + + cd vendor/noctilucent + wasm-pack build --target nodejs \ + --out-dir="${pkgroot}/lib/vendor/noctilucent" \ + --out-name=index + + cd ../../lib/vendor/noctilucent + rm package.json +) diff --git a/packages/aws-cdk/lib/cli.ts b/packages/aws-cdk/lib/cli.ts index 85ac53137a4b7..d97a7d3b2b21e 100644 --- a/packages/aws-cdk/lib/cli.ts +++ b/packages/aws-cdk/lib/cli.ts @@ -22,6 +22,7 @@ import { CdkToolkit, AssetBuildTime } from '../lib/cdk-toolkit'; import { realHandler as context } from '../lib/commands/context'; import { realHandler as docs } from '../lib/commands/docs'; import { realHandler as doctor } from '../lib/commands/doctor'; +import { MIGRATE_SUPPORTED_LANGUAGES, cliMigrate } from '../lib/commands/migrate'; import { RequireApproval } from '../lib/diff'; import { availableInitLanguages, cliInit, printAvailableTemplates } from '../lib/init'; import { data, debug, error, print, setLogLevel, setCI } from '../lib/logging'; @@ -269,6 +270,12 @@ async function parseCommandLineArguments(args: string[]) { .option('list', { type: 'boolean', desc: 'List the available templates' }) .option('generate-only', { type: 'boolean', default: false, desc: 'If true, only generates project files, without executing additional operations such as setting up a git repo, installing dependencies or compiling the project' }), ) + .command('migrate', false /* hidden from "cdk --help" */, (yargs: Argv) => yargs + .option('language', { type: 'string', alias: 'l', desc: 'The language to be used for the new project (default can be configured in ~/.cdk.json)', choices: MIGRATE_SUPPORTED_LANGUAGES }) + .option('input-path', { type: 'string', alias: 'inputpath', desc: 'The path to the CloudFormation template to migrate' }) + .option('output-path', { type: 'string', alias: 'outputpath', desc: 'The output path for the migrated cdk code' }) + .option('generate-only', { type: 'boolean', default: false, desc: 'If true, only generates project files, without executing additional operations such as setting up a git repo, installing dependencies or compiling the project' }), + ) .command('context', 'Manage cached context values', (yargs: Argv) => yargs .option('reset', { alias: 'e', desc: 'The context key (or its index) to reset', type: 'string', requiresArg: true }) .option('force', { alias: 'f', desc: 'Ignore missing key error', type: 'boolean', default: false }) @@ -649,6 +656,9 @@ export async function exec(args: string[], synthesizer?: Synthesizer): Promise t.hasName(type!)); + if (!template) { + throw new Error(`couldn't find template for ${type} app type, this should never happen`); + } + + if (!MIGRATE_SUPPORTED_LANGUAGES.includes(language)) { + throw new Error(`Unsupported language for cdk migrate: ${language}. Supported languages are: ${MIGRATE_SUPPORTED_LANGUAGES.join(', ')}`); + } + + await initializeProject(template, language, true, generateOnly, outputpath); + const template_file = fs.readFileSync(inputpath, 'utf8'); + const generated_app = nocti.transmute(template_file, language); + + // clear out the init'd bin/lib files to replace with our own + delete_files(outputpath + '/lib/'); + + // we hardcode everything to be called noctstack still so this works for now. + // Will change this to be much smarter once we can change stack name in noct + const bin_app = `#!/usr/bin/env node + import 'source-map-support/register'; + import * as cdk from 'aws-cdk-lib'; + import { NoctStack } from '../lib/generated_stack'; + + const app = new cdk.App(); + new NoctStack(app, 'NoctStack', { + /* If you don't specify 'env', this stack will be environment-agnostic. + * Account/Region-dependent features and context lookups will not work, + * but a single synthesized template can be deployed anywhere. */ + + /* Uncomment the next line to specialize this stack for the AWS Account + * and Region that are implied by the current CLI configuration. */ + // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION }, + + /* Uncomment the next line if you know exactly what Account and Region you + * want to deploy the stack to. */ + // env: { account: '123456789012', region: 'us-east-1' }, + + /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */ + });`; + const myname = path.basename(outputpath); + fs.writeFileSync(outputpath + '/lib/' + 'generated_stack.ts', generated_app); + fs.writeFileSync(outputpath + '/bin/' + `${myname}.ts`, bin_app); +} + +function delete_files(filepath: string) { + fs.readdir(filepath, (err, files) => { + if (err) throw err; + for (const file of files) { + fs.unlink(filepath + file, (cause) => { + if (cause) throw cause; + }); + } + }); +} diff --git a/packages/aws-cdk/lib/init-templates/app/typescript/package.json b/packages/aws-cdk/lib/init-templates/app/typescript/package.json index 49842ea1629ec..bc38af45efcb5 100644 --- a/packages/aws-cdk/lib/init-templates/app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/app/typescript/package.json @@ -17,7 +17,7 @@ "ts-jest": "^29.1.0", "aws-cdk": "%cdk-version%", "ts-node": "^10.9.1", - "typescript": "~5.0.4" + "typescript": "~5.1.3" }, "dependencies": { "aws-cdk-lib": "%cdk-version%", diff --git a/packages/aws-cdk/lib/init-templates/lib/typescript/package.json b/packages/aws-cdk/lib/init-templates/lib/typescript/package.json index 5833efc79b7a2..161176d695c8c 100644 --- a/packages/aws-cdk/lib/init-templates/lib/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/lib/typescript/package.json @@ -15,7 +15,7 @@ "constructs": "%constructs-version%", "jest": "^29.5.0", "ts-jest": "^29.1.0", - "typescript": "~5.0.4" + "typescript": "~5.1.3" }, "peerDependencies": { "aws-cdk-lib": "%cdk-version%", diff --git a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json index 9ee0e75f5ebf4..d936407260e2c 100644 --- a/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json +++ b/packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json @@ -17,7 +17,7 @@ "ts-jest": "^29.1.0", "aws-cdk": "%cdk-version%", "ts-node": "^10.9.1", - "typescript": "~5.0.4" + "typescript": "~5.1.3" }, "dependencies": { "aws-cdk-lib": "%cdk-version%", diff --git a/packages/aws-cdk/lib/init.ts b/packages/aws-cdk/lib/init.ts index 4c695e3198cb2..6ca74494466f3 100644 --- a/packages/aws-cdk/lib/init.ts +++ b/packages/aws-cdk/lib/init.ts @@ -247,7 +247,7 @@ export async function printAvailableTemplates(language?: string) { } } -async function initializeProject(template: InitTemplate, language: string, canUseNetwork: boolean, generateOnly: boolean, workDir: string) { +export async function initializeProject(template: InitTemplate, language: string, canUseNetwork: boolean, generateOnly: boolean, workDir: string) { await assertIsEmptyDirectory(workDir); print(`Applying project template ${chalk.green(template.name)} for ${chalk.blue(language)}`); await template.install(language, workDir); diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json index 05682ee09e2c7..1ad50493e7477 100644 --- a/packages/aws-cdk/package.json +++ b/packages/aws-cdk/package.json @@ -35,7 +35,8 @@ }, "resources": { "../../node_modules/vm2/lib/bridge.js": "lib/bridge.js", - "../../node_modules/vm2/lib/setup-sandbox.js": "lib/setup-sandbox.js" + "../../node_modules/vm2/lib/setup-sandbox.js": "lib/setup-sandbox.js", + "lib/vendor/noctilucent/index_bg.wasm": "lib/index_bg.wasm" }, "allowedLicenses": [ "Apache-2.0", diff --git a/packages/aws-cdk/tsconfig.json b/packages/aws-cdk/tsconfig.json index 75033560001a0..c810cbc0b0aab 100644 --- a/packages/aws-cdk/tsconfig.json +++ b/packages/aws-cdk/tsconfig.json @@ -2,7 +2,11 @@ "compilerOptions": { "target": "ES2020", "module": "commonjs", - "lib": ["es2019", "es2020", "dom"], + "lib": [ + "es2019", + "es2020", + "dom" + ], "strict": true, "alwaysStrict": true, "skipLibCheck": true, @@ -25,7 +29,8 @@ ], "exclude": [ "lib/init-templates/**/typescript/*/*.ts", - "test/integ/cli/sam_cdk_integ_app/**/*" + "test/integ/cli/sam_cdk_integ_app/**/*", + "vendor/**/*", ], "references": [ { diff --git a/packages/aws-cdk/vendor/README.md b/packages/aws-cdk/vendor/README.md new file mode 100644 index 0000000000000..1c9974a89f7e8 --- /dev/null +++ b/packages/aws-cdk/vendor/README.md @@ -0,0 +1,13 @@ +## Vendored-in dependencies + +The dependencies in this directory are checked out using the `gen` script. +This will fetch and clone the noctilucent crate and generate the wasm code if +that has not been done already, ensuring the dependencies are adequately +checked out. + +In order to update the notcilucent crate, run the ./generate.sh script. If you wish +to update to a different noctilucent commit hash instead of the one provided, modify +the hash in the generate.sh script and then rerun ./generate.sh + +The `THIRD_PARTY_LICENSES` file might need updating accordingly, which can be +automatically done by running `yarn pkglint`. diff --git a/packages/awslint/package.json b/packages/awslint/package.json index 366990d628f35..9bfda0946f130 100644 --- a/packages/awslint/package.json +++ b/packages/awslint/package.json @@ -30,7 +30,7 @@ "@types/jest": "^29.5.1", "@types/yargs": "^15.0.15", "@aws-cdk/pkglint": "0.0.0", - "typescript": "~4.9.5", + "typescript": "~5.1.3", "@typescript-eslint/eslint-plugin": "^4.33.0", "@typescript-eslint/parser": "^4.33.0", "eslint": "^7.32.0", diff --git a/tools/@aws-cdk/cdk-build-tools/lib/os.ts b/tools/@aws-cdk/cdk-build-tools/lib/os.ts index 94aff72e8b573..8f37a96c1295f 100644 --- a/tools/@aws-cdk/cdk-build-tools/lib/os.ts +++ b/tools/@aws-cdk/cdk-build-tools/lib/os.ts @@ -15,19 +15,24 @@ interface ShellOptions { * Is platform-aware, handles errors nicely. */ export async function shell(command: string[], options: ShellOptions = {}): Promise { - const timer = (options.timers || new Timers()).start(command[0]); - - await makeShellScriptExecutable(command[0]); - - const child = child_process.spawn(command[0], command.slice(1), { - // Need this for Windows where we want .cmd and .bat to be found as well. - shell: true, - stdio: ['ignore', 'pipe', 'pipe'], - env: { - ...process.env, - ...options.env, - }, - }); + const [cmd, ...args] = command; + const timer = (options.timers || new Timers()).start(cmd); + + await makeShellScriptExecutable(cmd); + + // yarn exec runs the provided command with the correct environment for the workspace. + const child = child_process.spawn( + cmd, + args, + { + // Need this for Windows where we want .cmd and .bat to be found as well. + shell: true, + stdio: ['ignore', 'pipe', 'pipe'], + env: { + ...process.env, + ...options.env, + }, + }); const makeRed = process.stderr.isTTY ? chalk.red : (x: string) => x; diff --git a/tools/@aws-cdk/cdk-build-tools/package.json b/tools/@aws-cdk/cdk-build-tools/package.json index 851d094d3c2e8..6724a43dcc9f2 100644 --- a/tools/@aws-cdk/cdk-build-tools/package.json +++ b/tools/@aws-cdk/cdk-build-tools/package.json @@ -66,7 +66,7 @@ "nyc": "^15.1.0", "semver": "^7.5.1", "ts-jest": "^29.1.0", - "typescript": "~4.9.5", + "typescript": "~5.1.3", "yargs": "^16.2.0" }, "keywords": [ diff --git a/tools/@aws-cdk/cdk-release/lib/lifecycles/bumphooks.ts b/tools/@aws-cdk/cdk-release/lib/lifecycles/bumphooks.ts index ca0aa348fe316..fb3b87236e129 100644 --- a/tools/@aws-cdk/cdk-release/lib/lifecycles/bumphooks.ts +++ b/tools/@aws-cdk/cdk-release/lib/lifecycles/bumphooks.ts @@ -41,7 +41,7 @@ export async function runBumpHooks(args: BumpOptions): Promise> { cwd: args.repoRoot, }); } catch (e: any) { - notify(args, '%s', e.message); + notify(args, '%s', [e.message]); } if (gitStatus) { diff --git a/tools/@aws-cdk/eslint-plugin/package.json b/tools/@aws-cdk/eslint-plugin/package.json index db8148825d214..df8b1de5039be 100644 --- a/tools/@aws-cdk/eslint-plugin/package.json +++ b/tools/@aws-cdk/eslint-plugin/package.json @@ -19,7 +19,7 @@ "@types/jest": "^29.5.1", "@types/estree": "*", "jest": "^29.5.0", - "typescript": "~4.9.5" + "typescript": "~5.1.3" }, "dependencies": { "@typescript-eslint/parser": "^4.33.0", diff --git a/tools/@aws-cdk/node-bundle/package.json b/tools/@aws-cdk/node-bundle/package.json index 78499e9d6a187..399fb7098a551 100644 --- a/tools/@aws-cdk/node-bundle/package.json +++ b/tools/@aws-cdk/node-bundle/package.json @@ -4,25 +4,25 @@ "node-bundle": "bin/node-bundle" }, "scripts": { - "build": "npx projen build", - "build+test": "npx projen build+test", - "bump": "npx projen bump", - "clobber": "npx projen clobber", - "compile": "npx projen compile", - "default": "npx projen default", - "eject": "npx projen eject", - "eslint": "npx projen eslint", - "package": "npx projen package", - "post-compile": "npx projen post-compile", - "post-upgrade": "npx projen post-upgrade", - "pre-compile": "npx projen pre-compile", - "release": "npx projen release", - "test": "npx projen test", - "test:watch": "npx projen test:watch", - "unbump": "npx projen unbump", - "upgrade": "npx projen upgrade", - "watch": "npx projen watch", - "projen": "npx projen" + "build": "projen build", + "build+test": "projen build+test", + "bump": "projen bump", + "clobber": "projen clobber", + "compile": "projen compile", + "default": "projen default", + "eject": "projen eject", + "eslint": "projen eslint", + "package": "projen package", + "post-compile": "projen post-compile", + "post-upgrade": "projen post-upgrade", + "pre-compile": "projen pre-compile", + "release": "projen release", + "test": "projen test", + "test:watch": "projen test:watch", + "unbump": "projen unbump", + "upgrade": "projen upgrade", + "watch": "projen watch", + "projen": "projen" }, "devDependencies": { "@types/jest": "^29.5.1", diff --git a/tools/@aws-cdk/pkglint/package.json b/tools/@aws-cdk/pkglint/package.json index bedf7f92ddbf5..ebf24351fc4df 100644 --- a/tools/@aws-cdk/pkglint/package.json +++ b/tools/@aws-cdk/pkglint/package.json @@ -51,7 +51,7 @@ "eslint-plugin-import": "^2.27.5", "eslint-plugin-jest": "^24.7.0", "jest": "^29.5.0", - "typescript": "~4.9.5" + "typescript": "~5.1.3" }, "nozem": { "ostools": [ diff --git a/tools/@aws-cdk/prlint/package.json b/tools/@aws-cdk/prlint/package.json index 40a61a9571b03..8ee225ad8f82b 100644 --- a/tools/@aws-cdk/prlint/package.json +++ b/tools/@aws-cdk/prlint/package.json @@ -25,7 +25,7 @@ "@types/jest": "^29.5.1", "jest": "^29.5.0", "make-runnable": "^1.4.1", - "typescript": "~4.9.5" + "typescript": "~5.1.3" }, "jest": { "testMatch": [ diff --git a/tools/@aws-cdk/yarn-cling/package.json b/tools/@aws-cdk/yarn-cling/package.json index f514f1a2f160c..a4c326322140a 100644 --- a/tools/@aws-cdk/yarn-cling/package.json +++ b/tools/@aws-cdk/yarn-cling/package.json @@ -43,7 +43,7 @@ "@types/semver": "^7.5.0", "@types/yarnpkg__lockfile": "^1.1.5", "jest": "^29.5.0", - "typescript": "~4.9.5" + "typescript": "~5.1.3" }, "dependencies": { "@yarnpkg/lockfile": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index a6d774439e9af..f67a447b95287 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12167,7 +12167,7 @@ typescript-json-schema@^0.56.0: typescript "~4.9.5" yargs "^17.1.1" -"typescript@>=3 < 6": +"typescript@>=3 < 6", typescript@~5.1.3: version "5.1.3" resolved "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826" integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==