diff --git a/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts b/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts index 8d06fe1148967..6c0ac50aa9ee9 100644 --- a/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts +++ b/packages/@aws-cdk/cfnspec/build-tools/create-missing-libraries.ts @@ -295,12 +295,11 @@ async function main() { await addDependencyToMegaPackage(path.join('@aws-cdk', 'cloudformation-include'), module.packageName, version, ['dependencies', 'peerDependencies']); await addDependencyToMegaPackage('aws-cdk-lib', module.packageName, version, ['devDependencies']); await addDependencyToMegaPackage('monocdk', module.packageName, version, ['devDependencies']); - await addDependencyToMegaPackage('decdk', module.packageName, version, ['dependencies']); } } /** - * A few of our packages (e.g., decdk, aws-cdk-lib) require a dependency on every service package. + * A few of our packages (e.g., aws-cdk-lib) require a dependency on every service package. * This automates adding the dependency (and peer dependency) to the package.json. */ async function addDependencyToMegaPackage(megaPackageName: string, packageName: string, version: string, dependencyTypes: string[]) { diff --git a/packages/@aws-cdk/cfnspec/build-tools/update.sh b/packages/@aws-cdk/cfnspec/build-tools/update.sh index 9cb2376f1104e..449825636182d 100755 --- a/packages/@aws-cdk/cfnspec/build-tools/update.sh +++ b/packages/@aws-cdk/cfnspec/build-tools/update.sh @@ -89,8 +89,7 @@ node ${scriptdir}/create-missing-libraries.js || { exit 1 } -# update decdk dep list -(cd ${scriptdir}/../../../decdk && node ./deps.js || true) +# update monocdk dep list (cd ${scriptdir}/../../../monocdk && yarn gen || true) # append old changelog after new and replace as the last step because otherwise we will not be idempotent diff --git a/packages/@aws-cdk/cloudformation-include/build.js b/packages/@aws-cdk/cloudformation-include/build.js index 454a10a5014d5..ab4d071b6cf21 100644 --- a/packages/@aws-cdk/cloudformation-include/build.js +++ b/packages/@aws-cdk/cloudformation-include/build.js @@ -1,7 +1,6 @@ /** * This build file has two purposes: - * 1. It adds a dependency on each @aws-cdk/aws-xyz package with L1s to this package, - * similarly to how deps.js does for decdk. + * 1. It adds a dependency on each @aws-cdk/aws-xyz package with L1s to this package. * 2. It generates the file cfn-types-2-classes.json that contains a mapping * between the CloudFormation type and the fully-qualified name of the L1 class, * used in the logic of the CfnInclude class. diff --git a/scripts/align-version.sh b/scripts/align-version.sh index e48e2dd421990..1a0709c9793b5 100755 --- a/scripts/align-version.sh +++ b/scripts/align-version.sh @@ -19,7 +19,6 @@ marker=$(node -p "require('./scripts/resolve-version').marker.replace(/\./g, '\\ # Exclude a couple of specific ones that we don't care about. package_jsons=$(find . -name package.json |\ grep -v node_modules |\ - grep -v packages/decdk/test/fixture/package.json |\ grep -v .github/actions/prlinter/package.json) if grep -l "[^0-9]${marker}" $package_jsons; then diff --git a/scripts/compile-samples b/scripts/compile-samples index a253f3ffaa21b..826031970a73a 100755 --- a/scripts/compile-samples +++ b/scripts/compile-samples @@ -5,7 +5,7 @@ # on them you can use this script for quicker feedback. # # This could maybe have been an 'npm run' script, but it's not self-contained -# (needs the "decdk" package to compile against and runs jsii-rosetta from the +# (needs the "aws-cdk-lib" package to compile against and runs jsii-rosetta from the # repo root) so that didn't feel right. For now this is what we have. set -eu scriptdir=$(cd $(dirname $0) && pwd) @@ -23,9 +23,9 @@ for dir in $dirs; do # Run jsii npm run build - # Run rosetta against decdk dir, failing on compilation errors + # Run rosetta against aws-cdk-lib dir, failing on compilation errors node --experimental-worker $scriptdir/../node_modules/.bin/jsii-rosetta \ - --directory $scriptdir/../packages/decdk \ + --directory $scriptdir/../packages/aws-cdk-lib \ --compile \ --output /dev/null \ --verbose \ diff --git a/scripts/list-deprecated-apis.js b/scripts/list-deprecated-apis.js index a4596ebdf1a69..874a42c4e36ee 100755 --- a/scripts/list-deprecated-apis.js +++ b/scripts/list-deprecated-apis.js @@ -48,8 +48,8 @@ class StripDeprecatedPrinter { async function main(printer) { const typesystem = new jsiiReflect.TypeSystem(); - // Decdk depends on everything, so that's a perfect directory to load as closure - await typesystem.loadNpmDependencies(path.resolve(__dirname, '..', 'packages', 'decdk'), { validate: false }); + // aws-cdk-lib depends on everything, so that's a perfect directory to load as closure + await typesystem.loadNpmDependencies(path.resolve(__dirname, '..', 'packages', 'aws-cdk-lib'), { validate: false }); printer.printHeader(); diff --git a/scripts/run-rosetta.sh b/scripts/run-rosetta.sh index da627fa05e4f8..1a0be40012bf9 100755 --- a/scripts/run-rosetta.sh +++ b/scripts/run-rosetta.sh @@ -62,14 +62,14 @@ fi #---------------------------------------------------------------------- -# Compile examples with respect to "decdk" directory, as all packages will +# Compile examples with respect to "aws-cdk-lib" directory, as all packages will # be symlinked there so they can all be included. echo "💎 Extracting code samples" >&2 time $ROSETTA extract \ --compile \ --verbose \ --cache ${rosetta_cache_file} \ - --directory packages/decdk \ + --directory packages/aws-cdk-lib \ ${extract_opts} \ $(cat $jsii_pkgs_file) @@ -82,7 +82,7 @@ if $infuse; then --compile \ --verbose \ --cache ${rosetta_cache_file} \ - --directory packages/decdk \ + --directory packages/aws-cdk-lib \ $(cat $jsii_pkgs_file) fi