Skip to content

fix(cli): init templates still assume the same versions #33449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 14, 2025
Merged

fix(cli): init templates still assume the same versions #33449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b77ba47
fix(cli): init templates still assume the same versions
rix0rrr Feb 14, 2025
a529ae8
Add a unit test
rix0rrr Feb 14, 2025
441fc04
Make displayversion lazy
rix0rrr Feb 14, 2025
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
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/app/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test": "jest"
},
"devDependencies": {
"aws-cdk": "%cdk-version%",
"aws-cdk": "%cdk-cli-version%",
"jest": "^29.7.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/app/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/node": "22.7.9",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"aws-cdk": "%cdk-version%",
"aws-cdk": "%cdk-cli-version%",
"ts-node": "^10.9.2",
"typescript": "~5.6.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/sample-app/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test": "jest"
},
"devDependencies": {
"aws-cdk": "%cdk-version%",
"aws-cdk": "%cdk-cli-version%",
"jest": "^29.7.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk/lib/init-templates/sample-app/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/node": "22.7.9",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"aws-cdk": "%cdk-version%",
"aws-cdk": "%cdk-cli-version%",
"ts-node": "^10.9.2",
"typescript": "~5.6.3"
},
Expand Down
5 changes: 5 additions & 0 deletions packages/aws-cdk/lib/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import * as childProcess from 'child_process';
import * as path from 'path';
import * as chalk from 'chalk';
import * as fs from 'fs-extra';
import { versionNumber } from './cli/version';
import { invokeBuiltinHooks } from './init-hooks';
import { error, info, warning } from './logging';
import { ToolkitError } from './toolkit/error';
Expand Down Expand Up @@ -176,6 +177,7 @@ export class InitTemplate {

private expand(template: string, language: string, project: ProjectInfo) {
const cdkVersion = project.versions['aws-cdk-lib'];
const cdkCliVersion = project.versions['aws-cdk'];
let constructsVersion = project.versions.constructs;

switch (language) {
Expand All @@ -202,6 +204,7 @@ export class InitTemplate {
.replace(/%name\.camelCased%/g, camelCase(project.name))
.replace(/%name\.PascalCased%/g, camelCase(project.name, { pascalCase: true }))
.replace(/%cdk-version%/g, cdkVersion)
.replace(/%cdk-cli-version%/g, cdkCliVersion)
.replace(/%constructs-version%/g, constructsVersion)
.replace(/%cdk-home%/g, cdkHomeDir())
.replace(/%name\.PythonModule%/g, project.name.replace(/-/g, '_'))
Expand Down Expand Up @@ -475,6 +478,7 @@ async function execute(cmd: string, args: string[], { cwd }: { cwd: string }) {
}

interface Versions {
['aws-cdk']: string;
['aws-cdk-lib']: string;
constructs: string;
}
Expand All @@ -491,6 +495,7 @@ async function loadInitVersions(): Promise<Versions> {
const ret = {
'aws-cdk-lib': contents['aws-cdk-lib'],
'constructs': contents.constructs,
'aws-cdk': versionNumber(),
};
for (const [key, value] of Object.entries(ret)) {
/* istanbul ignore next */
Expand Down
Loading