@aws-cdk-testing/cli-integ 3.35.1 → 3.36.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/npm-shrinkwrap.json +1 -1
  2. package/package.json +2 -2
  3. package/tests/init-typescript-app/init-typescript-app.integtest.js +10 -4
package/npm-shrinkwrap.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aws-cdk-testing/cli-integ",
3
- "version": "3.35.1",
3
+ "version": "3.36.0",
4
4
  "lockfileVersion": 1,
5
5
  "requires": true,
6
6
  "dependencies": {
package/package.json CHANGED
@@ -39,7 +39,7 @@
39
39
  "organization": true
40
40
  },
41
41
  "devDependencies": {
42
- "@aws-cdk/toolkit-lib": "1.33.0",
42
+ "@aws-cdk/toolkit-lib": "1.34.0",
43
43
  "@aws-cdk/yarn-cling": "0.0.0",
44
44
  "@cdklabs/eslint-plugin": "^2.0.11",
45
45
  "@stylistic/eslint-plugin": "^3",
@@ -126,7 +126,7 @@
126
126
  "publishConfig": {
127
127
  "access": "public"
128
128
  },
129
- "version": "3.35.1",
129
+ "version": "3.36.0",
130
130
  "packageManager": "yarn@4.13.0",
131
131
  "types": "lib/index.d.ts",
132
132
  "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"yarn projen\"."
package/tests/init-typescript-app/init-typescript-app.integtest.js CHANGED
@@ -66,9 +66,9 @@ TYPESCRIPT_VERSIONS.forEach(tsVersion => {
66
66
  // Necessary because recent versions of ts-jest require TypeScript>=4.3 but we
67
67
  // still want to test with older versions as well.
68
68
  await removeDevDependencies(context);
69
- await shell.shell(['npm', 'install', '--save-dev', `typescript@${tsVersion}`]);
70
- // After we've removed devDependencies we need to re-install ts-node because it's necessary for `cdk synth`
71
- await shell.shell(['npm', 'install', '--save-dev', 'ts-node@^10']);
69
+ // The generated app type-checks with `tsc` and runs through `tsx`, so those
70
+ // two packages are the only toolchain needed for `cdk synth`.
71
+ await shell.shell(['npm', 'install', '--save-dev', `typescript@${tsVersion}`, 'tsx@^4']);
72
72
  await shell.shell(['npm', 'install']); // Older versions of npm require this to be a separate step from the one above
73
73
  await shell.shell(['npx', 'tsc', '--version']);
74
74
  await shell.shell(['npm', 'prune']);
@@ -84,5 +84,11 @@ async function removeDevDependencies(context) {
84
84
  const pj = JSON.parse(await fs_1.promises.readFile(filename, { encoding: 'utf-8' }));
85
85
  delete pj.devDependencies;
86
86
  await fs_1.promises.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });
87
+ // The generated tsconfig explicitly lists the @types packages we just removed;
88
+ // with them gone, tsc would fail on the missing type definition files.
89
+ const tsconfigFilename = path.join(context.integTestDir, 'tsconfig.json');
90
+ const tsconfig = JSON.parse(await fs_1.promises.readFile(tsconfigFilename, { encoding: 'utf-8' }));
91
+ delete tsconfig.compilerOptions.types;
92
+ await fs_1.promises.writeFile(tsconfigFilename, JSON.stringify(tsconfig, undefined, 2), { encoding: 'utf-8' });
87
93
  }
88
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"init-typescript-app.integtest.js","sourceRoot":"","sources":["init-typescript-app.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport type { TemporaryDirectoryContext } from '../../lib';\nimport { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '../../lib';\nimport { typescriptVersionsSync, typescriptVersionsYoungerThanDaysSync } from '../../lib/npm';\n\n['app', 'sample-app'].forEach(template => {\n  integTest(`typescript init ${template}`, withTemporaryDirectory(withPackages(async (context) => {\n    const shell = ShellHelper.fromContext(context);\n    await context.cli.makeCliAvailable();\n\n    await shell.shell(['cdk', 'init', '--lib-version', context.library.requestedVersion(), '-l', 'typescript', template]);\n\n    await shell.shell(['npm', 'ci']); // this will fail if we have bundled dependencies that introduce version conflicts\n\n    await shell.shell(['npm', 'prune']);\n    await shell.shell(['npm', 'ls']); // this will fail if we have unmet peer dependencies\n    await shell.shell(['npm', 'run', 'build']);\n    await shell.shell(['npm', 'run', 'test']);\n\n    await shell.shell(['cdk', 'synth']);\n  })), 300_000);\n});\n\n// Same as https://github.com/DefinitelyTyped/DefinitelyTyped?tab=readme-ov-file#support-window\nconst TYPESCRIPT_VERSION_AGE_DAYS = 2 * 365;\n\nconst TYPESCRIPT_VERSIONS = typescriptVersionsYoungerThanDaysSync(TYPESCRIPT_VERSION_AGE_DAYS, typescriptVersionsSync());\n\n/**\n * Test our generated code with various versions of TypeScript\n */\nTYPESCRIPT_VERSIONS.forEach(tsVersion => {\n  integTest(`typescript ${tsVersion} init app`, withTemporaryDirectory(withPackages(async (context) => {\n    const shell = ShellHelper.fromContext(context);\n    await context.cli.makeCliAvailable();\n\n    await shell.shell(['node', '--version']);\n    await shell.shell(['npm', '--version']);\n\n    await shell.shell(['cdk', 'init', '--lib-version', context.library.requestedVersion(), '-l', 'typescript', 'app', '--generate-only']);\n\n    // Necessary because recent versions of ts-jest require TypeScript>=4.3 but we\n    // still want to test with older versions as well.\n    await removeDevDependencies(context);\n\n    await shell.shell(['npm', 'install', '--save-dev', `typescript@${tsVersion}`]);\n\n    // After we've removed devDependencies we need to re-install ts-node because it's necessary for `cdk synth`\n    await shell.shell(['npm', 'install', '--save-dev', 'ts-node@^10']);\n\n    await shell.shell(['npm', 'install']); // Older versions of npm require this to be a separate step from the one above\n\n    await shell.shell(['npx', 'tsc', '--version']);\n    await shell.shell(['npm', 'prune']);\n    await shell.shell(['npm', 'ls']); // this will fail if we have unmet peer dependencies\n\n    // We just removed the 'jest' dependency so remove the tests as well because they won't compile\n    await shell.shell(['rm', '-rf', 'test/']);\n\n    await shell.shell(['npm', 'run', 'build']);\n    await shell.shell(['cdk', 'synth']);\n  })));\n});\n\nasync function removeDevDependencies(context: TemporaryDirectoryContext) {\n  const filename = path.join(context.integTestDir, 'package.json');\n  const pj = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));\n  delete pj.devDependencies;\n  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });\n}\n"]}
94
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"init-typescript-app.integtest.js","sourceRoot":"","sources":["init-typescript-app.integtest.ts"],"names":[],"mappings":"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","sourcesContent":["import { promises as fs } from 'fs';\nimport * as path from 'path';\nimport type { TemporaryDirectoryContext } from '../../lib';\nimport { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '../../lib';\nimport { typescriptVersionsSync, typescriptVersionsYoungerThanDaysSync } from '../../lib/npm';\n\n['app', 'sample-app'].forEach(template => {\n  integTest(`typescript init ${template}`, withTemporaryDirectory(withPackages(async (context) => {\n    const shell = ShellHelper.fromContext(context);\n    await context.cli.makeCliAvailable();\n\n    await shell.shell(['cdk', 'init', '--lib-version', context.library.requestedVersion(), '-l', 'typescript', template]);\n\n    await shell.shell(['npm', 'ci']); // this will fail if we have bundled dependencies that introduce version conflicts\n\n    await shell.shell(['npm', 'prune']);\n    await shell.shell(['npm', 'ls']); // this will fail if we have unmet peer dependencies\n    await shell.shell(['npm', 'run', 'build']);\n    await shell.shell(['npm', 'run', 'test']);\n\n    await shell.shell(['cdk', 'synth']);\n  })), 300_000);\n});\n\n// Same as https://github.com/DefinitelyTyped/DefinitelyTyped?tab=readme-ov-file#support-window\nconst TYPESCRIPT_VERSION_AGE_DAYS = 2 * 365;\n\nconst TYPESCRIPT_VERSIONS = typescriptVersionsYoungerThanDaysSync(TYPESCRIPT_VERSION_AGE_DAYS, typescriptVersionsSync());\n\n/**\n * Test our generated code with various versions of TypeScript\n */\nTYPESCRIPT_VERSIONS.forEach(tsVersion => {\n  integTest(`typescript ${tsVersion} init app`, withTemporaryDirectory(withPackages(async (context) => {\n    const shell = ShellHelper.fromContext(context);\n    await context.cli.makeCliAvailable();\n\n    await shell.shell(['node', '--version']);\n    await shell.shell(['npm', '--version']);\n\n    await shell.shell(['cdk', 'init', '--lib-version', context.library.requestedVersion(), '-l', 'typescript', 'app', '--generate-only']);\n\n    // Necessary because recent versions of ts-jest require TypeScript>=4.3 but we\n    // still want to test with older versions as well.\n    await removeDevDependencies(context);\n\n    // The generated app type-checks with `tsc` and runs through `tsx`, so those\n    // two packages are the only toolchain needed for `cdk synth`.\n    await shell.shell(['npm', 'install', '--save-dev', `typescript@${tsVersion}`, 'tsx@^4']);\n\n    await shell.shell(['npm', 'install']); // Older versions of npm require this to be a separate step from the one above\n\n    await shell.shell(['npx', 'tsc', '--version']);\n    await shell.shell(['npm', 'prune']);\n    await shell.shell(['npm', 'ls']); // this will fail if we have unmet peer dependencies\n\n    // We just removed the 'jest' dependency so remove the tests as well because they won't compile\n    await shell.shell(['rm', '-rf', 'test/']);\n\n    await shell.shell(['npm', 'run', 'build']);\n    await shell.shell(['cdk', 'synth']);\n  })));\n});\n\nasync function removeDevDependencies(context: TemporaryDirectoryContext) {\n  const filename = path.join(context.integTestDir, 'package.json');\n  const pj = JSON.parse(await fs.readFile(filename, { encoding: 'utf-8' }));\n  delete pj.devDependencies;\n  await fs.writeFile(filename, JSON.stringify(pj, undefined, 2), { encoding: 'utf-8' });\n\n  // The generated tsconfig explicitly lists the @types packages we just removed;\n  // with them gone, tsc would fail on the missing type definition files.\n  const tsconfigFilename = path.join(context.integTestDir, 'tsconfig.json');\n  const tsconfig = JSON.parse(await fs.readFile(tsconfigFilename, { encoding: 'utf-8' }));\n  delete tsconfig.compilerOptions.types;\n  await fs.writeFile(tsconfigFilename, JSON.stringify(tsconfig, undefined, 2), { encoding: 'utf-8' });\n}\n"]}