projen 0.42.1 → 0.44.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.
- package/.jsii +438 -230
- package/API.md +177 -42
- package/docs/java.md +4 -6
- package/docs/python.md +1 -4
- package/docs/typescript.md +108 -0
- package/lib/awscdk/auto-discover.d.ts +7 -0
- package/lib/awscdk/auto-discover.js +6 -4
- package/lib/awscdk/awscdk-app-ts.d.ts +7 -28
- package/lib/awscdk/awscdk-app-ts.js +30 -37
- package/lib/awscdk/awscdk-construct.d.ts +13 -93
- package/lib/awscdk/awscdk-construct.js +49 -85
- package/lib/awscdk/awscdk-deps.d.ts +158 -0
- package/lib/awscdk/awscdk-deps.js +169 -0
- package/lib/awscdk/cdk-config.js +1 -1
- package/lib/awscdk/cdk-tasks.js +1 -1
- package/lib/awscdk/index.d.ts +1 -0
- package/lib/awscdk/index.js +2 -1
- package/lib/awscdk/integration-test.d.ts +7 -0
- package/lib/awscdk/integration-test.js +11 -9
- package/lib/awscdk/java-app.js +1 -1
- package/lib/awscdk/lambda-function.d.ts +8 -1
- package/lib/awscdk/lambda-function.js +14 -5
- package/lib/cdk/construct-lib.js +1 -1
- package/lib/cdk/jsii-docgen.js +1 -1
- package/lib/cdk/jsii-project.js +1 -1
- package/lib/cdk8s/cdk8s-app-ts.js +1 -1
- package/lib/cdk8s/cdk8s-construct.js +1 -1
- package/lib/cdktf/cdktf-construct.js +1 -1
- package/lib/component.js +1 -1
- package/lib/dependencies.js +1 -1
- package/lib/dev-env.js +1 -1
- package/lib/docker-compose.js +2 -2
- package/lib/file.js +1 -1
- package/lib/gitattributes.js +1 -1
- package/lib/github/auto-approve.js +1 -1
- package/lib/github/auto-merge.js +1 -1
- package/lib/github/dependabot.js +1 -1
- package/lib/github/github-project.js +1 -1
- package/lib/github/github.js +1 -1
- package/lib/github/mergify.js +1 -1
- package/lib/github/pr-template.js +1 -1
- package/lib/github/pull-request-lint.js +1 -1
- package/lib/github/stale.js +1 -1
- package/lib/github/task-workflow.js +1 -1
- package/lib/github/workflows.js +1 -1
- package/lib/gitpod.js +1 -1
- package/lib/ignore-file.js +1 -1
- package/lib/ini.js +1 -1
- package/lib/java/java-project.js +1 -1
- package/lib/java/junit.js +1 -1
- package/lib/java/maven-compile.js +1 -1
- package/lib/java/maven-packaging.js +1 -1
- package/lib/java/maven-sample.js +1 -1
- package/lib/java/pom.js +1 -1
- package/lib/java/projenrc.js +1 -1
- package/lib/javascript/bundler.js +1 -1
- package/lib/javascript/eslint.js +1 -1
- package/lib/javascript/jest.js +1 -1
- package/lib/javascript/node-package.js +6 -2
- package/lib/javascript/node-project.js +1 -1
- package/lib/javascript/npm-config.js +1 -1
- package/lib/javascript/projenrc.js +1 -1
- package/lib/javascript/typescript-config.js +1 -1
- package/lib/javascript/upgrade-dependencies.js +2 -2
- package/lib/json.js +1 -1
- package/lib/license.js +1 -1
- package/lib/logger.js +1 -1
- package/lib/makefile.js +1 -1
- package/lib/object-file.js +1 -1
- package/lib/project-build.js +1 -1
- package/lib/project.js +1 -1
- package/lib/projects.js +1 -1
- package/lib/projenrc-json.js +1 -1
- package/lib/python/pip.js +1 -1
- package/lib/python/poetry.js +2 -2
- package/lib/python/projenrc.js +6 -6
- package/lib/python/pytest.js +1 -1
- package/lib/python/python-project.d.ts +1 -1
- package/lib/python/python-project.js +3 -7
- package/lib/python/python-sample.js +1 -1
- package/lib/python/requirements-file.js +1 -1
- package/lib/python/setuppy.js +1 -1
- package/lib/python/setuptools.js +1 -1
- package/lib/python/venv.js +1 -1
- package/lib/readme.js +1 -1
- package/lib/release/publisher.js +1 -1
- package/lib/release/release-trigger.js +1 -1
- package/lib/release/release.js +1 -1
- package/lib/sample-file.js +2 -2
- package/lib/semver.js +1 -1
- package/lib/source-code.js +1 -1
- package/lib/task-runtime.js +1 -1
- package/lib/task.js +1 -1
- package/lib/tasks.js +1 -1
- package/lib/testing.js +1 -1
- package/lib/textfile.js +1 -1
- package/lib/toml.js +1 -1
- package/lib/typescript/projenrc.js +1 -1
- package/lib/typescript/typescript-typedoc.js +1 -1
- package/lib/typescript/typescript.js +3 -3
- package/lib/version.js +1 -1
- package/lib/vscode/devcontainer.js +1 -1
- package/lib/vscode/launch-config.js +1 -1
- package/lib/vscode/vscode.js +1 -1
- package/lib/web/next.js +3 -3
- package/lib/web/postcss.js +1 -1
- package/lib/web/react.js +4 -4
- package/lib/web/tailwind.js +1 -1
- package/lib/xmlfile.js +1 -1
- package/lib/yaml.js +1 -1
- package/package.json +1 -1
|
@@ -5,8 +5,8 @@ exports.AutoDiscover = void 0;
|
|
|
5
5
|
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const glob = require("glob");
|
|
8
|
-
const _1 = require(".");
|
|
9
8
|
const component_1 = require("../component");
|
|
9
|
+
const integration_test_1 = require("./integration-test");
|
|
10
10
|
const internal_1 = require("./internal");
|
|
11
11
|
const lambda_function_1 = require("./lambda-function");
|
|
12
12
|
/**
|
|
@@ -30,6 +30,7 @@ class AutoDiscover extends component_1.Component {
|
|
|
30
30
|
for (const entrypoint of entrypoints) {
|
|
31
31
|
new lambda_function_1.LambdaFunction(this.project, {
|
|
32
32
|
entrypoint: path_1.join(options.srcdir, entrypoint),
|
|
33
|
+
cdkDeps: options.cdkDeps,
|
|
33
34
|
...options.lambdaOptions,
|
|
34
35
|
});
|
|
35
36
|
}
|
|
@@ -39,8 +40,9 @@ class AutoDiscover extends component_1.Component {
|
|
|
39
40
|
cwd: path_1.join(this.project.outdir, options.testdir),
|
|
40
41
|
});
|
|
41
42
|
for (const entrypoint of entrypoints) {
|
|
42
|
-
new
|
|
43
|
+
new integration_test_1.IntegrationTest(this.project, {
|
|
43
44
|
entrypoint: path_1.join(options.testdir, entrypoint),
|
|
45
|
+
cdkDeps: options.cdkDeps,
|
|
44
46
|
tsconfigPath: options.tsconfigPath,
|
|
45
47
|
});
|
|
46
48
|
}
|
|
@@ -48,5 +50,5 @@ class AutoDiscover extends component_1.Component {
|
|
|
48
50
|
}
|
|
49
51
|
exports.AutoDiscover = AutoDiscover;
|
|
50
52
|
_a = JSII_RTTI_SYMBOL_1;
|
|
51
|
-
AutoDiscover[_a] = { fqn: "projen.awscdk.AutoDiscover", version: "0.
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
AutoDiscover[_a] = { fqn: "projen.awscdk.AutoDiscover", version: "0.44.0" };
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0by1kaXNjb3Zlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hd3NjZGsvYXV0by1kaXNjb3Zlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLCtCQUE0QjtBQUM1Qiw2QkFBNkI7QUFDN0IsNENBQXlDO0FBR3pDLHlEQUFxRDtBQUNyRCx5Q0FBeUU7QUFDekUsdURBQWdGOzs7Ozs7QUFxQmhGLE1BQWEsWUFBYSxTQUFRLHFCQUFTOzs7O0lBQ3pDLFlBQVksT0FBZ0IsRUFBRSxPQUE0QjtRQUN4RCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFFZixJQUFJLENBQUMsMkJBQTJCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDMUMsSUFBSSxDQUFDLDRCQUE0QixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFTywyQkFBMkIsQ0FBQyxPQUE0QjtRQUM5RCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sZ0NBQXFCLEVBQUUsRUFBRTtZQUM1RCxHQUFHLEVBQUUsV0FBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUM7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsS0FBSyxNQUFNLFVBQVUsSUFBSSxXQUFXLEVBQUU7WUFDcEMsSUFBSSxnQ0FBYyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUU7Z0JBQy9CLFVBQVUsRUFBRSxXQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUM7Z0JBQzVDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTztnQkFDeEIsR0FBRyxPQUFPLENBQUMsYUFBYTthQUN6QixDQUFDLENBQUM7U0FDSjtJQUNILENBQUM7SUFFTyw0QkFBNEIsQ0FBQyxPQUE0QjtRQUMvRCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sK0JBQW9CLEVBQUUsRUFBRTtZQUMzRCxHQUFHLEVBQUUsV0FBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUM7U0FDaEQsQ0FBQyxDQUFDO1FBRUgsS0FBSyxNQUFNLFVBQVUsSUFBSSxXQUFXLEVBQUU7WUFDcEMsSUFBSSxrQ0FBZSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUU7Z0JBQ2hDLFVBQVUsRUFBRSxXQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUM7Z0JBQzdDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTztnQkFDeEIsWUFBWSxFQUFFLE9BQU8sQ0FBQyxZQUFZO2FBQ25DLENBQUMsQ0FBQztTQUNKO0lBQ0gsQ0FBQzs7QUFsQ0gsb0NBb0NDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgam9pbiB9IGZyb20gJ3BhdGgnO1xuaW1wb3J0ICogYXMgZ2xvYiBmcm9tICdnbG9iJztcbmltcG9ydCB7IENvbXBvbmVudCB9IGZyb20gJy4uL2NvbXBvbmVudCc7XG5pbXBvcnQgeyBQcm9qZWN0IH0gZnJvbSAnLi4vcHJvamVjdCc7XG5pbXBvcnQgeyBBd3NDZGtEZXBzIH0gZnJvbSAnLi9hd3NjZGstZGVwcyc7XG5pbXBvcnQgeyBJbnRlZ3JhdGlvblRlc3QgfSBmcm9tICcuL2ludGVncmF0aW9uLXRlc3QnO1xuaW1wb3J0IHsgVFlQRVNDUklQVF9JTlRFR19FWFQsIFRZUEVTQ1JJUFRfTEFNQkRBX0VYVCB9IGZyb20gJy4vaW50ZXJuYWwnO1xuaW1wb3J0IHsgTGFtYmRhRnVuY3Rpb24sIExhbWJkYUZ1bmN0aW9uQ29tbW9uT3B0aW9ucyB9IGZyb20gJy4vbGFtYmRhLWZ1bmN0aW9uJztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbmV4cG9ydCBpbnRlcmZhY2UgQXV0b0Rpc2NvdmVyT3B0aW9ucyB7XG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBsYW1iZGFPcHRpb25zPzogTGFtYmRhRnVuY3Rpb25Db21tb25PcHRpb25zO1xuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IHNyY2Rpcjogc3RyaW5nO1xuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IHRlc3RkaXI6IHN0cmluZztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHJlYWRvbmx5IHRzY29uZmlnUGF0aDogc3RyaW5nO1xuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICByZWFkb25seSBjZGtEZXBzOiBBd3NDZGtEZXBzO1xufVxuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG5leHBvcnQgY2xhc3MgQXV0b0Rpc2NvdmVyIGV4dGVuZHMgQ29tcG9uZW50IHtcbiAgY29uc3RydWN0b3IocHJvamVjdDogUHJvamVjdCwgb3B0aW9uczogQXV0b0Rpc2NvdmVyT3B0aW9ucykge1xuICAgIHN1cGVyKHByb2plY3QpO1xuXG4gICAgdGhpcy5hdXRvRGlzY292ZXJMYW1iZGFGdW5jdGlvbnMob3B0aW9ucyk7XG4gICAgdGhpcy5hdXRvRGlzY292ZXJJbnRlZ3JhdGlvblRlc3RzKG9wdGlvbnMpO1xuICB9XG5cbiAgcHJpdmF0ZSBhdXRvRGlzY292ZXJMYW1iZGFGdW5jdGlvbnMob3B0aW9uczogQXV0b0Rpc2NvdmVyT3B0aW9ucykge1xuICAgIGNvbnN0IGVudHJ5cG9pbnRzID0gZ2xvYi5zeW5jKGAqKi8qJHtUWVBFU0NSSVBUX0xBTUJEQV9FWFR9YCwge1xuICAgICAgY3dkOiBqb2luKHRoaXMucHJvamVjdC5vdXRkaXIsIG9wdGlvbnMuc3JjZGlyKSxcbiAgICB9KTtcblxuICAgIGZvciAoY29uc3QgZW50cnlwb2ludCBvZiBlbnRyeXBvaW50cykge1xuICAgICAgbmV3IExhbWJkYUZ1bmN0aW9uKHRoaXMucHJvamVjdCwge1xuICAgICAgICBlbnRyeXBvaW50OiBqb2luKG9wdGlvbnMuc3JjZGlyLCBlbnRyeXBvaW50KSxcbiAgICAgICAgY2RrRGVwczogb3B0aW9ucy5jZGtEZXBzLFxuICAgICAgICAuLi5vcHRpb25zLmxhbWJkYU9wdGlvbnMsXG4gICAgICB9KTtcbiAgICB9XG4gIH1cblxuICBwcml2YXRlIGF1dG9EaXNjb3ZlckludGVncmF0aW9uVGVzdHMob3B0aW9uczogQXV0b0Rpc2NvdmVyT3B0aW9ucykge1xuICAgIGNvbnN0IGVudHJ5cG9pbnRzID0gZ2xvYi5zeW5jKGAqKi8qJHtUWVBFU0NSSVBUX0lOVEVHX0VYVH1gLCB7XG4gICAgICBjd2Q6IGpvaW4odGhpcy5wcm9qZWN0Lm91dGRpciwgb3B0aW9ucy50ZXN0ZGlyKSxcbiAgICB9KTtcblxuICAgIGZvciAoY29uc3QgZW50cnlwb2ludCBvZiBlbnRyeXBvaW50cykge1xuICAgICAgbmV3IEludGVncmF0aW9uVGVzdCh0aGlzLnByb2plY3QsIHtcbiAgICAgICAgZW50cnlwb2ludDogam9pbihvcHRpb25zLnRlc3RkaXIsIGVudHJ5cG9pbnQpLFxuICAgICAgICBjZGtEZXBzOiBvcHRpb25zLmNka0RlcHMsXG4gICAgICAgIHRzY29uZmlnUGF0aDogb3B0aW9ucy50c2NvbmZpZ1BhdGgsXG4gICAgICB9KTtcbiAgICB9XG4gIH1cblxufSJdfQ==
|
|
@@ -1,36 +1,12 @@
|
|
|
1
1
|
import { TypeScriptAppProject, TypeScriptProjectOptions } from '../typescript';
|
|
2
|
+
import { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';
|
|
2
3
|
import { CdkConfig, CdkConfigCommonOptions } from './cdk-config';
|
|
3
4
|
import { CdkTasks } from './cdk-tasks';
|
|
4
5
|
import { LambdaFunctionCommonOptions } from './lambda-function';
|
|
5
6
|
/**
|
|
6
7
|
* @experimental
|
|
7
8
|
*/
|
|
8
|
-
export interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions {
|
|
9
|
-
/**
|
|
10
|
-
* (experimental) AWS CDK version to use.
|
|
11
|
-
*
|
|
12
|
-
* @default "1.129.0"
|
|
13
|
-
* @experimental
|
|
14
|
-
* @featured true
|
|
15
|
-
*/
|
|
16
|
-
readonly cdkVersion: string;
|
|
17
|
-
/**
|
|
18
|
-
* (experimental) Use pinned version instead of caret version for CDK.
|
|
19
|
-
*
|
|
20
|
-
* You can use this to prevent yarn to mix versions for your CDK dependencies and to prevent auto-updates.
|
|
21
|
-
* If you use experimental features this will let you define the moment you include breaking changes.
|
|
22
|
-
*
|
|
23
|
-
* @default false
|
|
24
|
-
* @experimental
|
|
25
|
-
*/
|
|
26
|
-
readonly cdkVersionPinning?: boolean;
|
|
27
|
-
/**
|
|
28
|
-
* (experimental) Which AWS CDK modules (those that start with "@aws-cdk/") this app uses.
|
|
29
|
-
*
|
|
30
|
-
* @experimental
|
|
31
|
-
* @featured true
|
|
32
|
-
*/
|
|
33
|
-
readonly cdkDependencies?: string[];
|
|
9
|
+
export interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions, AwsCdkDepsCommonOptions {
|
|
34
10
|
/**
|
|
35
11
|
* (experimental) The CDK app's entrypoint (relative to the source directory, which is "src" by default).
|
|
36
12
|
*
|
|
@@ -65,7 +41,7 @@ export declare class AwsCdkTypeScriptApp extends TypeScriptAppProject {
|
|
|
65
41
|
*
|
|
66
42
|
* @experimental
|
|
67
43
|
*/
|
|
68
|
-
|
|
44
|
+
get cdkVersion(): string;
|
|
69
45
|
/**
|
|
70
46
|
* (experimental) The CDK app entrypoint.
|
|
71
47
|
*
|
|
@@ -84,6 +60,10 @@ export declare class AwsCdkTypeScriptApp extends TypeScriptAppProject {
|
|
|
84
60
|
* @experimental
|
|
85
61
|
*/
|
|
86
62
|
readonly cdkConfig: CdkConfig;
|
|
63
|
+
/**
|
|
64
|
+
* @experimental
|
|
65
|
+
*/
|
|
66
|
+
readonly cdkDeps: AwsCdkDeps;
|
|
87
67
|
/**
|
|
88
68
|
* @experimental
|
|
89
69
|
*/
|
|
@@ -95,5 +75,4 @@ export declare class AwsCdkTypeScriptApp extends TypeScriptAppProject {
|
|
|
95
75
|
* @experimental
|
|
96
76
|
*/
|
|
97
77
|
addCdkDependency(...modules: string[]): void;
|
|
98
|
-
private formatModuleSpec;
|
|
99
78
|
}
|
|
@@ -5,10 +5,11 @@ exports.AwsCdkTypeScriptApp = void 0;
|
|
|
5
5
|
const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
|
|
6
6
|
const path = require("path");
|
|
7
7
|
const fs = require("fs-extra");
|
|
8
|
-
const semver = require("semver");
|
|
9
8
|
const component_1 = require("../component");
|
|
9
|
+
const dependencies_1 = require("../dependencies");
|
|
10
10
|
const typescript_1 = require("../typescript");
|
|
11
11
|
const auto_discover_1 = require("./auto-discover");
|
|
12
|
+
const awscdk_deps_1 = require("./awscdk-deps");
|
|
12
13
|
const cdk_config_1 = require("./cdk-config");
|
|
13
14
|
const cdk_tasks_1 = require("./cdk-tasks");
|
|
14
15
|
/**
|
|
@@ -22,7 +23,7 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
|
|
|
22
23
|
* @experimental
|
|
23
24
|
*/
|
|
24
25
|
constructor(options) {
|
|
25
|
-
var _b, _c, _d, _e, _f, _g
|
|
26
|
+
var _b, _c, _d, _e, _f, _g;
|
|
26
27
|
super({
|
|
27
28
|
...options,
|
|
28
29
|
sampleCode: false,
|
|
@@ -33,35 +34,25 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
|
|
|
33
34
|
addToPreCompile: false,
|
|
34
35
|
},
|
|
35
36
|
});
|
|
37
|
+
this.cdkDeps = new awscdk_deps_1.AwsCdkDeps(this, {
|
|
38
|
+
dependencyType: dependencies_1.DependencyType.RUNTIME,
|
|
39
|
+
...options,
|
|
40
|
+
});
|
|
36
41
|
this.appEntrypoint = (_b = options.appEntrypoint) !== null && _b !== void 0 ? _b : 'main.ts';
|
|
37
|
-
this.cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;
|
|
38
42
|
// CLI
|
|
39
|
-
this.addDevDeps(
|
|
40
|
-
this.addCdkDependency('@aws-cdk/assert');
|
|
41
|
-
if (!this.cdkVersion) {
|
|
42
|
-
throw new Error('Required field cdkVersion is not specified.');
|
|
43
|
-
}
|
|
44
|
-
const cdkMajorVersion = (_d = (_c = semver.minVersion(this.cdkVersion)) === null || _c === void 0 ? void 0 : _c.major) !== null && _d !== void 0 ? _d : 1;
|
|
45
|
-
if (cdkMajorVersion < 2) {
|
|
46
|
-
this.addCdkDependency('@aws-cdk/core');
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
this.addCdkDependency('aws-cdk-lib');
|
|
50
|
-
this.addDeps('constructs@^10.0.5');
|
|
51
|
-
}
|
|
52
|
-
this.addCdkDependency(...(_e = options.cdkDependencies) !== null && _e !== void 0 ? _e : []);
|
|
43
|
+
this.addDevDeps(`aws-cdk@${this.cdkDeps.cdkVersion}`);
|
|
53
44
|
// no compile step because we do all of it in typescript directly
|
|
54
45
|
this.compileTask.reset();
|
|
55
46
|
this.cdkTasks = new cdk_tasks_1.CdkTasks(this);
|
|
56
47
|
// add synth to the build
|
|
57
48
|
this.postCompileTask.spawn(this.cdkTasks.synth);
|
|
58
|
-
const tsConfigFile = (
|
|
49
|
+
const tsConfigFile = (_c = this.tsconfig) === null || _c === void 0 ? void 0 : _c.fileName;
|
|
59
50
|
if (!tsConfigFile) {
|
|
60
51
|
throw new Error('Expecting tsconfig.json');
|
|
61
52
|
}
|
|
62
53
|
this.cdkConfig = new cdk_config_1.CdkConfig(this, {
|
|
63
54
|
app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,
|
|
64
|
-
featureFlags: cdkMajorVersion < 2,
|
|
55
|
+
featureFlags: this.cdkDeps.cdkMajorVersion < 2,
|
|
65
56
|
buildCommand: this.runTaskCommand(this.bundler.bundleTask),
|
|
66
57
|
watchIncludes: [
|
|
67
58
|
`${this.srcdir}/**/*.ts`,
|
|
@@ -80,25 +71,32 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
|
|
|
80
71
|
...options,
|
|
81
72
|
});
|
|
82
73
|
this.gitignore.exclude('.parcel-cache/');
|
|
83
|
-
(
|
|
84
|
-
(
|
|
74
|
+
(_d = this.npmignore) === null || _d === void 0 ? void 0 : _d.exclude(`${this.cdkConfig.cdkout}/`);
|
|
75
|
+
(_e = this.npmignore) === null || _e === void 0 ? void 0 : _e.exclude('.cdk.staging/');
|
|
85
76
|
if (this.tsconfig) {
|
|
86
77
|
this.tsconfig.exclude.push(this.cdkConfig.cdkout);
|
|
87
78
|
}
|
|
88
79
|
this.addDevDeps('ts-node@^9');
|
|
89
|
-
if ((
|
|
90
|
-
new SampleCode(this, cdkMajorVersion);
|
|
80
|
+
if ((_f = options.sampleCode) !== null && _f !== void 0 ? _f : true) {
|
|
81
|
+
new SampleCode(this, this.cdkDeps.cdkMajorVersion);
|
|
91
82
|
}
|
|
92
|
-
const lambdaAutoDiscover = (
|
|
83
|
+
const lambdaAutoDiscover = (_g = options.lambdaAutoDiscover) !== null && _g !== void 0 ? _g : true;
|
|
93
84
|
if (lambdaAutoDiscover) {
|
|
94
85
|
new auto_discover_1.AutoDiscover(this, {
|
|
95
86
|
srcdir: this.srcdir,
|
|
96
87
|
testdir: this.testdir,
|
|
97
88
|
lambdaOptions: options.lambdaOptions,
|
|
98
89
|
tsconfigPath: this.tsconfigDev.fileName,
|
|
90
|
+
cdkDeps: this.cdkDeps,
|
|
99
91
|
});
|
|
100
92
|
}
|
|
101
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* (experimental) The CDK version this app is using.
|
|
96
|
+
*
|
|
97
|
+
* @experimental
|
|
98
|
+
*/
|
|
99
|
+
get cdkVersion() { return this.cdkDeps.cdkVersion; }
|
|
102
100
|
/**
|
|
103
101
|
* (experimental) Adds an AWS CDK module dependencies.
|
|
104
102
|
*
|
|
@@ -106,18 +104,12 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
|
|
|
106
104
|
* @experimental
|
|
107
105
|
*/
|
|
108
106
|
addCdkDependency(...modules) {
|
|
109
|
-
|
|
110
|
-
return;
|
|
111
|
-
}
|
|
112
|
-
this.addDeps(...modules.map(m => this.formatModuleSpec(m)));
|
|
113
|
-
}
|
|
114
|
-
formatModuleSpec(module) {
|
|
115
|
-
return `${module}@${this.cdkVersion}`;
|
|
107
|
+
return this.cdkDeps.addV1Dependencies(...modules);
|
|
116
108
|
}
|
|
117
109
|
}
|
|
118
110
|
exports.AwsCdkTypeScriptApp = AwsCdkTypeScriptApp;
|
|
119
111
|
_a = JSII_RTTI_SYMBOL_1;
|
|
120
|
-
AwsCdkTypeScriptApp[_a] = { fqn: "projen.awscdk.AwsCdkTypeScriptApp", version: "0.
|
|
112
|
+
AwsCdkTypeScriptApp[_a] = { fqn: "projen.awscdk.AwsCdkTypeScriptApp", version: "0.44.0" };
|
|
121
113
|
class SampleCode extends component_1.Component {
|
|
122
114
|
constructor(project, cdkMajorVersion) {
|
|
123
115
|
super(project);
|
|
@@ -169,24 +161,25 @@ app.synth();`;
|
|
|
169
161
|
const testImports = new Array();
|
|
170
162
|
if (this.cdkMajorVersion < 2) {
|
|
171
163
|
testImports.push('import { App } from \'@aws-cdk/core\';');
|
|
164
|
+
testImports.push('import { Template } from \'@aws-cdk/assertions\';');
|
|
172
165
|
}
|
|
173
166
|
else {
|
|
174
167
|
testImports.push('import { App } from \'aws-cdk-lib\';');
|
|
168
|
+
testImports.push('import { Template } from \'aws-cdk-lib/assertions\';');
|
|
175
169
|
}
|
|
176
170
|
const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');
|
|
177
|
-
const testCode =
|
|
178
|
-
${testImports.join('\n')}
|
|
171
|
+
const testCode = `${testImports.join('\n')}
|
|
179
172
|
import { MyStack } from '../src/${appEntrypointName}';
|
|
180
173
|
|
|
181
174
|
test('Snapshot', () => {
|
|
182
175
|
const app = new App();
|
|
183
176
|
const stack = new MyStack(app, 'test');
|
|
184
177
|
|
|
185
|
-
|
|
186
|
-
expect(
|
|
178
|
+
const template = Template.fromStack(stack);
|
|
179
|
+
expect(template.toJSON()).toMatchSnapshot();
|
|
187
180
|
});`;
|
|
188
181
|
fs.mkdirpSync(testdir);
|
|
189
182
|
fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);
|
|
190
183
|
}
|
|
191
184
|
}
|
|
192
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awscdk-app-ts.js","sourceRoot":"","sources":["../../src/awscdk/awscdk-app-ts.ts"],"names":[],"mappings":";;;;;AAAA,6BAA6B;AAC7B,+BAA+B;AAC/B,iCAAiC;AACjC,4CAAyC;AACzC,8CAA+E;AAC/E,mDAA+C;AAC/C,6CAAiE;AACjE,2CAAuC;;;;;;;AAwBvC,MAAa,mBAAoB,SAAQ,iCAAoB;;;;IAa3D,YAAY,OAAmC;;QAC7C,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,UAAU,EAAE,KAAK;YACjB,cAAc,EAAE;gBACd,GAAG,OAAO,CAAC,cAAc;gBAEzB,uEAAuE;gBACvE,yDAAyD;gBACzD,eAAe,EAAE,KAAK;aACvB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,SAAG,OAAO,CAAC,aAAa,mCAAI,SAAS,CAAC;QAExD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAE5F,MAAM;QACN,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,MAAM,eAAe,eAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,0CAAE,KAAK,mCAAI,CAAC,CAAC;QACvE,IAAI,eAAe,GAAG,CAAC,EAAE;YACvB,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;SACxC;aAAM;YACL,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;SACpC;QAED,IAAI,CAAC,gBAAgB,CAAC,SAAG,OAAO,CAAC,eAAe,mCAAI,EAAE,CAAC,CAAC;QAExD,iEAAiE;QACjE,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEzB,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAQ,CAAC,IAAI,CAAC,CAAC;QAEnC,yBAAyB;QACzB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,YAAY,SAAG,IAAI,CAAC,QAAQ,0CAAE,QAAQ,CAAC;QAC7C,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,sBAAS,CAAC,IAAI,EAAE;YACnC,GAAG,EAAE,kBAAkB,YAAY,qBAAqB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,EAAE;YAC1G,YAAY,EAAE,eAAe,GAAG,CAAC;YACjC,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YAC1D,aAAa,EAAE;gBACb,GAAG,IAAI,CAAC,MAAM,UAAU;gBACxB,GAAG,IAAI,CAAC,OAAO,UAAU;aAC1B;YACD,aAAa,EAAE;gBACb,WAAW;gBACX,WAAW;gBACX,WAAW;gBACX,SAAS;gBACT,eAAe;gBACf,eAAe;gBACf,WAAW;gBACX,cAAc;aACf;YACD,GAAG,OAAO;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAEzC,MAAA,IAAI,CAAC,SAAS,0CAAE,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,EAAE;QACrD,MAAA,IAAI,CAAC,SAAS,0CAAE,OAAO,CAAC,eAAe,EAAE;QAEzC,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SACnD;QAED,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC9B,UAAI,OAAO,CAAC,UAAU,mCAAI,IAAI,EAAE;YAC9B,IAAI,UAAU,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;SACvC;QAED,MAAM,kBAAkB,SAAG,OAAO,CAAC,kBAAkB,mCAAI,IAAI,CAAC;QAC9D,IAAI,kBAAkB,EAAE;YACtB,IAAI,4BAAY,CAAC,IAAI,EAAE;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ;aACxC,CAAC,CAAC;SACJ;IACH,CAAC;;;;;;;IAGM,gBAAgB,CAAC,GAAG,OAAiB;QAC1C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,OAAO;SACR;QACD,IAAI,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACrC,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IACxC,CAAC;;AArHH,kDAsHC;;;AAED,MAAM,UAAW,SAAQ,qBAAS;IAGhC,YAAY,OAA4B,EAAmB,eAAuB;QAChF,KAAK,CAAC,OAAO,CAAC,CAAC;QAD0C,oBAAe,GAAf,eAAe,CAAQ;QAEhF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;IAC5B,CAAC;IAEM,UAAU;QACf,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACtF,OAAO;SACR;QAED,MAAM,UAAU,GAAG,IAAI,KAAK,EAAU,CAAC;QACvC,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC,EAAE;YAC5B,UAAU,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC;SACzF;aAAM;YACL,UAAU,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;YAC3E,UAAU,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;SAC9D;QAED,MAAM,OAAO,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;aAqB/B,CAAC;QAEV,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACtB,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;QAE5E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;YACxF,OAAO;SACR;QAED,MAAM,WAAW,GAAG,IAAI,KAAK,EAAU,CAAC;QACxC,IAAI,IAAI,CAAC,eAAe,GAAG,CAAC,EAAE;YAC5B,WAAW,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;SAC5D;aAAM;YACL,WAAW,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;SAC1D;QAGD,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAG;EACnB,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;kCACU,iBAAiB;;;;;;;;IAQ/C,CAAC;QAED,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvB,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,iBAAiB,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;CACF","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as semver from 'semver';\nimport { Component } from '../component';\nimport { TypeScriptAppProject, TypeScriptProjectOptions } from '../typescript';\nimport { AutoDiscover } from './auto-discover';\nimport { CdkConfig, CdkConfigCommonOptions } from './cdk-config';\nimport { CdkTasks } from './cdk-tasks';\nimport { LambdaFunctionCommonOptions } from './lambda-function';\n\nexport interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions {\n                                                                                    \n  readonly cdkVersion: string;\n\n                                                                                                                                                                                                                                                                                                                        \n  readonly cdkVersionPinning?: boolean;\n\n                                                                                                        \n  readonly cdkDependencies?: string[];\n\n                                                                                                                                          \n  readonly appEntrypoint?: string;\n\n                                                                                                                                                                                                                                                 \n  readonly lambdaAutoDiscover?: boolean;\n\n                                                                                                  \n  readonly lambdaOptions?: LambdaFunctionCommonOptions;\n}\n\n                                                              \nexport class AwsCdkTypeScriptApp extends TypeScriptAppProject {\n                                                   \n  public readonly cdkVersion: string;\n\n                                       \n  public readonly appEntrypoint: string;\n\n                                  \n  public readonly cdkTasks: CdkTasks;\n\n                                        \n  public readonly cdkConfig: CdkConfig;\n\n  constructor(options: AwsCdkTypeScriptAppOptions) {\n    super({\n      ...options,\n      sampleCode: false,\n      bundlerOptions: {\n        ...options.bundlerOptions,\n\n        // we invoke the \"bundle\" task as part of the build step in cdk.json so\n        // we don't want it to be added to the pre-compile phase.\n        addToPreCompile: false,\n      },\n    });\n\n    this.appEntrypoint = options.appEntrypoint ?? 'main.ts';\n\n    this.cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;\n\n    // CLI\n    this.addDevDeps(this.formatModuleSpec('aws-cdk'));\n    this.addCdkDependency('@aws-cdk/assert');\n\n    if (!this.cdkVersion) {\n      throw new Error('Required field cdkVersion is not specified.');\n    }\n\n    const cdkMajorVersion = semver.minVersion(this.cdkVersion)?.major ?? 1;\n    if (cdkMajorVersion < 2) {\n      this.addCdkDependency('@aws-cdk/core');\n    } else {\n      this.addCdkDependency('aws-cdk-lib');\n      this.addDeps('constructs@^10.0.5');\n    }\n\n    this.addCdkDependency(...options.cdkDependencies ?? []);\n\n    // no compile step because we do all of it in typescript directly\n    this.compileTask.reset();\n\n    this.cdkTasks = new CdkTasks(this);\n\n    // add synth to the build\n    this.postCompileTask.spawn(this.cdkTasks.synth);\n\n    const tsConfigFile = this.tsconfig?.fileName;\n    if (!tsConfigFile) {\n      throw new Error('Expecting tsconfig.json');\n    }\n\n    this.cdkConfig = new CdkConfig(this, {\n      app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,\n      featureFlags: cdkMajorVersion < 2,\n      buildCommand: this.runTaskCommand(this.bundler.bundleTask),\n      watchIncludes: [\n        `${this.srcdir}/**/*.ts`,\n        `${this.testdir}/**/*.ts`,\n      ],\n      watchExcludes: [\n        'README.md',\n        'cdk*.json',\n        '**/*.d.ts',\n        '**/*.js',\n        'tsconfig.json',\n        'package*.json',\n        'yarn.lock',\n        'node_modules',\n      ],\n      ...options,\n    });\n\n    this.gitignore.exclude('.parcel-cache/');\n\n    this.npmignore?.exclude(`${this.cdkConfig.cdkout}/`);\n    this.npmignore?.exclude('.cdk.staging/');\n\n    if (this.tsconfig) {\n      this.tsconfig.exclude.push(this.cdkConfig.cdkout);\n    }\n\n    this.addDevDeps('ts-node@^9');\n    if (options.sampleCode ?? true) {\n      new SampleCode(this, cdkMajorVersion);\n    }\n\n    const lambdaAutoDiscover = options.lambdaAutoDiscover ?? true;\n    if (lambdaAutoDiscover) {\n      new AutoDiscover(this, {\n        srcdir: this.srcdir,\n        testdir: this.testdir,\n        lambdaOptions: options.lambdaOptions,\n        tsconfigPath: this.tsconfigDev.fileName,\n      });\n    }\n  }\n\n                                                                                                         \n  public addCdkDependency(...modules: string[]) {\n    if (modules.length === 0) {\n      return;\n    }\n    this.addDeps(...modules.map(m => this.formatModuleSpec(m)));\n  }\n\n  private formatModuleSpec(module: string): string {\n    return `${module}@${this.cdkVersion}`;\n  }\n}\n\nclass SampleCode extends Component {\n  private readonly appProject: AwsCdkTypeScriptApp;\n\n  constructor(project: AwsCdkTypeScriptApp, private readonly cdkMajorVersion: number) {\n    super(project);\n    this.appProject = project;\n  }\n\n  public synthesize() {\n    const outdir = this.project.outdir;\n    const srcdir = path.join(outdir, this.appProject.srcdir);\n    if (fs.pathExistsSync(srcdir) && fs.readdirSync(srcdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const srcImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      srcImports.push('import { App, Construct, Stack, StackProps } from \\'@aws-cdk/core\\';');\n    } else {\n      srcImports.push('import { App, Stack, StackProps } from \\'aws-cdk-lib\\';');\n      srcImports.push('import { Construct } from \\'constructs\\';');\n    }\n\n    const srcCode = `${srcImports.join('\\n')}\n\nexport class MyStack extends Stack {\n  constructor(scope: Construct, id: string, props: StackProps = {}) {\n    super(scope, id, props);\n\n    // define resources here...\n  }\n}\n\n// for development, use account/region from cdk cli\nconst devEnv = {\n  account: process.env.CDK_DEFAULT_ACCOUNT,\n  region: process.env.CDK_DEFAULT_REGION,\n};\n\nconst app = new App();\n\nnew MyStack(app, 'my-stack-dev', { env: devEnv });\n// new MyStack(app, 'my-stack-prod', { env: prodEnv });\n\napp.synth();`;\n\n    fs.mkdirpSync(srcdir);\n    fs.writeFileSync(path.join(srcdir, this.appProject.appEntrypoint), srcCode);\n\n    const testdir = path.join(outdir, this.appProject.testdir);\n    if (fs.pathExistsSync(testdir) && fs.readdirSync(testdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const testImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      testImports.push('import { App } from \\'@aws-cdk/core\\';');\n    } else {\n      testImports.push('import { App } from \\'aws-cdk-lib\\';');\n    }\n\n\n    const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');\n    const testCode = `import '@aws-cdk/assert/jest';\n${testImports.join('\\n')}\nimport { MyStack } from '../src/${appEntrypointName}';\n\ntest('Snapshot', () => {\n  const app = new App();\n  const stack = new MyStack(app, 'test');\n\n  expect(stack).not.toHaveResource('AWS::S3::Bucket');\n  expect(app.synth().getStackArtifact(stack.artifactId).template).toMatchSnapshot();\n});`;\n\n    fs.mkdirpSync(testdir);\n    fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);\n  }\n}\n"]}
|
|
185
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awscdk-app-ts.js","sourceRoot":"","sources":["../../src/awscdk/awscdk-app-ts.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport { Component } from '../component';\nimport { DependencyType } from '../dependencies';\nimport { TypeScriptAppProject, TypeScriptProjectOptions } from '../typescript';\nimport { AutoDiscover } from './auto-discover';\nimport { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';\nimport { CdkConfig, CdkConfigCommonOptions } from './cdk-config';\nimport { CdkTasks } from './cdk-tasks';\nimport { LambdaFunctionCommonOptions } from './lambda-function';\n\nexport interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions, AwsCdkDepsCommonOptions {\n                                                                                                                                          \n  readonly appEntrypoint?: string;\n\n                                                                                                                                                                                                                                                 \n  readonly lambdaAutoDiscover?: boolean;\n\n                                                                                                  \n  readonly lambdaOptions?: LambdaFunctionCommonOptions;\n}\n\n                                                              \nexport class AwsCdkTypeScriptApp extends TypeScriptAppProject {\n                                                   \n  public get cdkVersion() { return this.cdkDeps.cdkVersion; }\n\n                                       \n  public readonly appEntrypoint: string;\n\n                                  \n  public readonly cdkTasks: CdkTasks;\n\n                                        \n  public readonly cdkConfig: CdkConfig;\n\n  public readonly cdkDeps: AwsCdkDeps;\n\n  constructor(options: AwsCdkTypeScriptAppOptions) {\n    super({\n      ...options,\n      sampleCode: false,\n      bundlerOptions: {\n        ...options.bundlerOptions,\n\n        // we invoke the \"bundle\" task as part of the build step in cdk.json so\n        // we don't want it to be added to the pre-compile phase.\n        addToPreCompile: false,\n      },\n    });\n\n    this.cdkDeps = new AwsCdkDeps(this, {\n      dependencyType: DependencyType.RUNTIME,\n      ...options,\n    });\n    this.appEntrypoint = options.appEntrypoint ?? 'main.ts';\n\n    // CLI\n    this.addDevDeps(`aws-cdk@${this.cdkDeps.cdkVersion}`);\n\n    // no compile step because we do all of it in typescript directly\n    this.compileTask.reset();\n\n    this.cdkTasks = new CdkTasks(this);\n\n    // add synth to the build\n    this.postCompileTask.spawn(this.cdkTasks.synth);\n\n    const tsConfigFile = this.tsconfig?.fileName;\n    if (!tsConfigFile) {\n      throw new Error('Expecting tsconfig.json');\n    }\n\n    this.cdkConfig = new CdkConfig(this, {\n      app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,\n      featureFlags: this.cdkDeps.cdkMajorVersion < 2,\n      buildCommand: this.runTaskCommand(this.bundler.bundleTask),\n      watchIncludes: [\n        `${this.srcdir}/**/*.ts`,\n        `${this.testdir}/**/*.ts`,\n      ],\n      watchExcludes: [\n        'README.md',\n        'cdk*.json',\n        '**/*.d.ts',\n        '**/*.js',\n        'tsconfig.json',\n        'package*.json',\n        'yarn.lock',\n        'node_modules',\n      ],\n      ...options,\n    });\n\n    this.gitignore.exclude('.parcel-cache/');\n\n    this.npmignore?.exclude(`${this.cdkConfig.cdkout}/`);\n    this.npmignore?.exclude('.cdk.staging/');\n\n    if (this.tsconfig) {\n      this.tsconfig.exclude.push(this.cdkConfig.cdkout);\n    }\n\n    this.addDevDeps('ts-node@^9');\n    if (options.sampleCode ?? true) {\n      new SampleCode(this, this.cdkDeps.cdkMajorVersion);\n    }\n\n    const lambdaAutoDiscover = options.lambdaAutoDiscover ?? true;\n    if (lambdaAutoDiscover) {\n      new AutoDiscover(this, {\n        srcdir: this.srcdir,\n        testdir: this.testdir,\n        lambdaOptions: options.lambdaOptions,\n        tsconfigPath: this.tsconfigDev.fileName,\n        cdkDeps: this.cdkDeps,\n      });\n    }\n  }\n\n                                                                                                         \n  public addCdkDependency(...modules: string[]) {\n    return this.cdkDeps.addV1Dependencies(...modules);\n  }\n}\n\nclass SampleCode extends Component {\n  private readonly appProject: AwsCdkTypeScriptApp;\n\n  constructor(project: AwsCdkTypeScriptApp, private readonly cdkMajorVersion: number) {\n    super(project);\n    this.appProject = project;\n  }\n\n  public synthesize() {\n    const outdir = this.project.outdir;\n    const srcdir = path.join(outdir, this.appProject.srcdir);\n    if (fs.pathExistsSync(srcdir) && fs.readdirSync(srcdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const srcImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      srcImports.push('import { App, Construct, Stack, StackProps } from \\'@aws-cdk/core\\';');\n    } else {\n      srcImports.push('import { App, Stack, StackProps } from \\'aws-cdk-lib\\';');\n      srcImports.push('import { Construct } from \\'constructs\\';');\n    }\n\n    const srcCode = `${srcImports.join('\\n')}\n\nexport class MyStack extends Stack {\n  constructor(scope: Construct, id: string, props: StackProps = {}) {\n    super(scope, id, props);\n\n    // define resources here...\n  }\n}\n\n// for development, use account/region from cdk cli\nconst devEnv = {\n  account: process.env.CDK_DEFAULT_ACCOUNT,\n  region: process.env.CDK_DEFAULT_REGION,\n};\n\nconst app = new App();\n\nnew MyStack(app, 'my-stack-dev', { env: devEnv });\n// new MyStack(app, 'my-stack-prod', { env: prodEnv });\n\napp.synth();`;\n\n    fs.mkdirpSync(srcdir);\n    fs.writeFileSync(path.join(srcdir, this.appProject.appEntrypoint), srcCode);\n\n    const testdir = path.join(outdir, this.appProject.testdir);\n    if (fs.pathExistsSync(testdir) && fs.readdirSync(testdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const testImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      testImports.push('import { App } from \\'@aws-cdk/core\\';');\n      testImports.push('import { Template } from \\'@aws-cdk/assertions\\';');\n    } else {\n      testImports.push('import { App } from \\'aws-cdk-lib\\';');\n      testImports.push('import { Template } from \\'aws-cdk-lib/assertions\\';');\n    }\n\n    const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');\n    const testCode = `${testImports.join('\\n')}\nimport { MyStack } from '../src/${appEntrypointName}';\n\ntest('Snapshot', () => {\n  const app = new App();\n  const stack = new MyStack(app, 'test');\n\n  const template = Template.fromStack(stack);\n  expect(template.toJSON()).toMatchSnapshot();\n});`;\n\n    fs.mkdirpSync(testdir);\n    fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);\n  }\n}\n"]}
|
|
@@ -1,83 +1,12 @@
|
|
|
1
1
|
import { ConstructLibrary, ConstructLibraryOptions } from '../cdk';
|
|
2
|
+
import { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';
|
|
2
3
|
import { LambdaFunctionCommonOptions } from './lambda-function';
|
|
3
4
|
/**
|
|
4
|
-
* (experimental) Options for
|
|
5
|
+
* (experimental) Options for `AwsCdkConstructLibrary`.
|
|
5
6
|
*
|
|
6
7
|
* @experimental
|
|
7
8
|
*/
|
|
8
|
-
export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions {
|
|
9
|
-
/**
|
|
10
|
-
* (experimental) Minimum target version this library is tested against.
|
|
11
|
-
*
|
|
12
|
-
* @default "2.0.0"
|
|
13
|
-
* @experimental
|
|
14
|
-
* @featured true
|
|
15
|
-
*/
|
|
16
|
-
readonly cdkVersion: string;
|
|
17
|
-
/**
|
|
18
|
-
* (experimental) Minimum target version of constructs being tested against. If not provided, the default value depends on the configured `cdkVersion`:.
|
|
19
|
-
*
|
|
20
|
-
* - For CDK 1.x, the default is "3.2.27"
|
|
21
|
-
* - For CDK 2.x, the default is "10.0.5"
|
|
22
|
-
* - Otherwise, the default is "*"
|
|
23
|
-
*
|
|
24
|
-
* @default - When the default behavior is used, the dependency on `constructs` will
|
|
25
|
-
* be added as both a `peerDependency` and a `devDependency`.
|
|
26
|
-
* @experimental
|
|
27
|
-
*/
|
|
28
|
-
readonly constructsVersion?: string;
|
|
29
|
-
/**
|
|
30
|
-
* (experimental) Use pinned version instead of caret version for CDK.
|
|
31
|
-
*
|
|
32
|
-
* You can use this to prevent yarn to mix versions for your CDK dependencies and to prevent auto-updates.
|
|
33
|
-
* If you use experimental features this will let you define the moment you include breaking changes.
|
|
34
|
-
*
|
|
35
|
-
* @default false
|
|
36
|
-
* @experimental
|
|
37
|
-
*/
|
|
38
|
-
readonly cdkVersionPinning?: boolean;
|
|
39
|
-
/**
|
|
40
|
-
* (deprecated) Which AWS CDK modules (those that start with "@aws-cdk/") does this library require when consumed?
|
|
41
|
-
*
|
|
42
|
-
* @deprecated - For CDK 2.x use 'peerDeps' instead
|
|
43
|
-
*/
|
|
44
|
-
readonly cdkDependencies?: string[];
|
|
45
|
-
/**
|
|
46
|
-
* (deprecated) If this is enabled (default), all modules declared in `cdkDependencies` will be also added as normal `dependencies` (as well as `peerDependencies`).
|
|
47
|
-
*
|
|
48
|
-
* This is to ensure that downstream consumers actually have your CDK dependencies installed
|
|
49
|
-
* when using npm < 7 or yarn, where peer dependencies are not automatically installed.
|
|
50
|
-
* If this is disabled, `cdkDependencies` will be added to `devDependencies` to ensure
|
|
51
|
-
* they are present during development.
|
|
52
|
-
*
|
|
53
|
-
* @default true
|
|
54
|
-
* @deprecated - Not used for CDK 2.x
|
|
55
|
-
*/
|
|
56
|
-
readonly cdkDependenciesAsDeps?: boolean;
|
|
57
|
-
/**
|
|
58
|
-
* (deprecated) Install the @aws-cdk/assert library?
|
|
59
|
-
*
|
|
60
|
-
* @default false
|
|
61
|
-
* @deprecated - use cdkAssertions instead
|
|
62
|
-
*/
|
|
63
|
-
readonly cdkAssert?: boolean;
|
|
64
|
-
/**
|
|
65
|
-
* (experimental) Install the @aws-cdk/assertions library?
|
|
66
|
-
*
|
|
67
|
-
* Only needed for CDK 1.x. If using CDK 2.x then
|
|
68
|
-
* assertions is already included in 'aws-cdk-lib'
|
|
69
|
-
*
|
|
70
|
-
* @default true
|
|
71
|
-
* @experimental
|
|
72
|
-
*/
|
|
73
|
-
readonly cdkAssertions?: boolean;
|
|
74
|
-
/**
|
|
75
|
-
* (deprecated) AWS CDK modules required for testing.
|
|
76
|
-
*
|
|
77
|
-
* @deprecated - For CDK 2.x use 'devDeps' instead
|
|
78
|
-
* @featured true
|
|
79
|
-
*/
|
|
80
|
-
readonly cdkTestDependencies?: string[];
|
|
9
|
+
export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions, AwsCdkDepsCommonOptions {
|
|
81
10
|
/**
|
|
82
11
|
* (experimental) Automatically adds an `aws_lambda.Function` for each `.lambda.ts` handler in your source tree. If this is disabled, you either need to explicitly call `aws_lambda.Function.autoDiscover()` or define a `new aws_lambda.Function()` for each handler.
|
|
83
12
|
*
|
|
@@ -105,48 +34,39 @@ export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions {
|
|
|
105
34
|
*/
|
|
106
35
|
export declare class AwsCdkConstructLibrary extends ConstructLibrary {
|
|
107
36
|
/**
|
|
108
|
-
* (experimental) The target CDK version for this library.
|
|
109
|
-
*
|
|
110
37
|
* @experimental
|
|
111
38
|
*/
|
|
112
|
-
readonly
|
|
39
|
+
readonly cdkDeps: AwsCdkDeps;
|
|
113
40
|
/**
|
|
114
|
-
* (experimental) Whether CDK dependencies are added as normal dependencies (and peer dependencies).
|
|
115
|
-
*
|
|
116
41
|
* @experimental
|
|
117
42
|
*/
|
|
118
|
-
|
|
43
|
+
constructor(options: AwsCdkConstructLibraryOptions);
|
|
119
44
|
/**
|
|
45
|
+
* (experimental) The target CDK version for this library.
|
|
46
|
+
*
|
|
120
47
|
* @experimental
|
|
121
48
|
*/
|
|
122
|
-
|
|
49
|
+
get cdkVersion(): string;
|
|
123
50
|
/**
|
|
124
51
|
* @deprecated use `cdkVersion`
|
|
125
52
|
*/
|
|
126
53
|
get version(): string;
|
|
127
54
|
/**
|
|
128
|
-
* (
|
|
55
|
+
* (deprecated) Adds dependencies to AWS CDK modules.
|
|
129
56
|
*
|
|
130
|
-
*
|
|
131
|
-
* and "peerDependencies". This is because currently npm would not
|
|
132
|
-
* automatically install peer dependencies that are not declared as concerete
|
|
133
|
-
* dependencies by the consumer, so this is a little npm "hack" so that
|
|
134
|
-
* consumers will not need to depend on them directly if they don't interact
|
|
135
|
-
* with them.
|
|
136
|
-
* See `cdkDependenciesAsDeps` for changing the default behavior.
|
|
57
|
+
* Since this is a library project, dependencies will be added as peer dependencies.
|
|
137
58
|
*
|
|
138
59
|
* @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
|
|
139
|
-
* @
|
|
60
|
+
* @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1Dependencies()`
|
|
140
61
|
*/
|
|
141
62
|
addCdkDependencies(...deps: string[]): void;
|
|
142
63
|
/**
|
|
143
|
-
* (
|
|
64
|
+
* (deprecated) Adds AWS CDK modules as dev dependencies.
|
|
144
65
|
*
|
|
145
66
|
* @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
|
|
146
|
-
* @
|
|
67
|
+
* @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1DevDependencies()`
|
|
147
68
|
*/
|
|
148
69
|
addCdkTestDependencies(...deps: string[]): void;
|
|
149
|
-
private formatModuleSpec;
|
|
150
70
|
}
|
|
151
71
|
/**
|
|
152
72
|
* @deprecated use `AwsCdkConstructLibraryOptions`
|