@fy-stack/app-construct 0.0.147-alpha.3068 → 0.0.147-alpha.30691
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/dist/lib/lambda/apps/image-app-construct.d.ts.map +1 -1
- package/dist/lib/lambda/apps/image-app-construct.js +3 -8
- package/dist/lib/lambda/apps/next-app-router-construct.d.ts +2 -2
- package/dist/lib/lambda/apps/next-app-router-construct.d.ts.map +1 -1
- package/dist/lib/lambda/apps/next-app-router-construct.js +5 -3
- package/dist/lib/lambda/types.d.ts +1 -1
- package/dist/lib/lambda/types.d.ts.map +1 -1
- package/dist/lib/shared/code-deployment.js +1 -1
- package/dist/lib/shared/next-app-router.js +3 -3
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAEL,QAAQ,EAIT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;;;
|
|
1
|
+
{"version":3,"file":"image-app-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/image-app-construct.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAEL,eAAe,EAKhB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAEL,QAAQ,EAIT,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;;;iBAErB,CAAC;AAEH,qBAAa,iBAAkB,SAAQ,SAAU,YAAW,YAAY;IAC/D,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAoDzD,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,IAAI;IAIpD,KAAK,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAIvC,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB;IAW1D,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;IAqBzD,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAIvD,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;;;;;CAG7B"}
|
|
@@ -18,14 +18,9 @@ const getDefaultLambda_1 = require("../utils/getDefaultLambda");
|
|
|
18
18
|
const lambda_api_1 = require("../utils/lambda-api");
|
|
19
19
|
const lambda_attach_1 = require("../utils/lambda-attach");
|
|
20
20
|
const lambda_grant_1 = require("../utils/lambda-grant");
|
|
21
|
-
const BuildParamsSchema = zod_1.z
|
|
22
|
-
.
|
|
23
|
-
|
|
24
|
-
.object({ file: zod_1.z.string().optional() })
|
|
25
|
-
.passthrough()
|
|
26
|
-
.optional(),
|
|
27
|
-
})
|
|
28
|
-
.passthrough();
|
|
21
|
+
const BuildParamsSchema = zod_1.z.looseObject({
|
|
22
|
+
container: zod_1.z.looseObject({ file: zod_1.z.string().optional() }).optional(),
|
|
23
|
+
});
|
|
29
24
|
class ImageAppConstruct extends constructs_1.Construct {
|
|
30
25
|
function;
|
|
31
26
|
queue;
|
|
@@ -8,7 +8,7 @@ import { Construct } from 'constructs';
|
|
|
8
8
|
import { z } from 'zod';
|
|
9
9
|
import { AppConstruct, AppProperties } from '../types';
|
|
10
10
|
declare const BuildParamsSchema: z.ZodObject<{
|
|
11
|
-
cmd: z.ZodString
|
|
11
|
+
cmd: z.ZodOptional<z.ZodString>;
|
|
12
12
|
}, z.core.$loose>;
|
|
13
13
|
export declare class NextAppRouterConstruct extends Construct implements AppConstruct {
|
|
14
14
|
function: lambda.Function;
|
|
@@ -24,7 +24,7 @@ export declare class NextAppRouterConstruct extends Construct implements AppCons
|
|
|
24
24
|
subscription(): ITopicSubscription;
|
|
25
25
|
static parse(params: unknown): {
|
|
26
26
|
[x: string]: unknown;
|
|
27
|
-
cmd
|
|
27
|
+
cmd?: string | undefined;
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAIjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;
|
|
1
|
+
{"version":3,"file":"next-app-router-construct.d.ts","sourceRoot":"","sources":["../../../../src/lib/lambda/apps/next-app-router-construct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAEzD,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AAIjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAMvD,QAAA,MAAM,iBAAiB;;iBAAgD,CAAC;AAExE,qBAAa,sBAAuB,SAAQ,SAAU,YAAW,YAAY;IACpE,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IAEpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAU;gBAG9B,KAAK,EAAE,SAAS,EAChB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;IAmEzD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC;IAkBpE,gBAAgB,CAAC,cAAc,EAAE,MAAM;IAIvC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC;IAgG3D,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;IAI7C,KAAK,CAAC,GAAG,MAAM,EAAE,SAAS,EAAE;IAI5B,YAAY,IAAI,kBAAkB;IAIlC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO;;;;CAG7B"}
|
|
@@ -19,7 +19,7 @@ const getDefaultLambda_1 = require("../utils/getDefaultLambda");
|
|
|
19
19
|
const lambda_attach_1 = require("../utils/lambda-attach");
|
|
20
20
|
const lambda_grant_1 = require("../utils/lambda-grant");
|
|
21
21
|
const code_from_param_1 = require("../../shared/code-from-param");
|
|
22
|
-
const BuildParamsSchema = zod_1.z.
|
|
22
|
+
const BuildParamsSchema = zod_1.z.looseObject({ cmd: zod_1.z.string().optional() });
|
|
23
23
|
class NextAppRouterConstruct extends constructs_1.Construct {
|
|
24
24
|
function;
|
|
25
25
|
queue;
|
|
@@ -48,6 +48,8 @@ class NextAppRouterConstruct extends constructs_1.Construct {
|
|
|
48
48
|
const deployment = (0, next_app_router_1.staticDeployment)(this, artifactBucket, props.output);
|
|
49
49
|
this.files = { artifactBucket, ...deployment.files };
|
|
50
50
|
const serverOutput = path.join(props.output, '/.next/standalone');
|
|
51
|
+
if (!cmd)
|
|
52
|
+
throw new Error('cmd is required when building from local');
|
|
51
53
|
fs.writeFileSync(path.join(serverOutput, 'run.sh'), cmd);
|
|
52
54
|
handler = 'run.sh';
|
|
53
55
|
code = lambda.Code.fromAsset(serverOutput);
|
|
@@ -88,7 +90,7 @@ class NextAppRouterConstruct extends constructs_1.Construct {
|
|
|
88
90
|
invokeMode: aws_lambda_1.InvokeMode.RESPONSE_STREAM,
|
|
89
91
|
});
|
|
90
92
|
if (this.files.staticFiles) {
|
|
91
|
-
const staticFiles = s3Deploy.Source.bucket(this.
|
|
93
|
+
const staticFiles = s3Deploy.Source.bucket(this.files.artifactBucket, this.files.staticFiles.key);
|
|
92
94
|
const deployment = new s3Deploy.BucketDeployment(this, `${strippedBasePath}StaticDeployment`, {
|
|
93
95
|
destinationBucket: this.static,
|
|
94
96
|
prune: false,
|
|
@@ -103,7 +105,7 @@ class NextAppRouterConstruct extends constructs_1.Construct {
|
|
|
103
105
|
}
|
|
104
106
|
}
|
|
105
107
|
if (this.files.publicFiles) {
|
|
106
|
-
const publicFiles = s3Deploy.Source.bucket(this.
|
|
108
|
+
const publicFiles = s3Deploy.Source.bucket(this.files.artifactBucket, this.files.publicFiles.key);
|
|
107
109
|
const deployment = new s3Deploy.BucketDeployment(this, `${strippedBasePath}PublicDeployment`, {
|
|
108
110
|
destinationBucket: this.static,
|
|
109
111
|
prune: false,
|
|
@@ -14,7 +14,7 @@ export interface AppConstruct extends Attach, Grant, CDNResource, EventResource,
|
|
|
14
14
|
}
|
|
15
15
|
export type App = {
|
|
16
16
|
type: typeof AppType.IMAGE_APP | typeof AppType.NEXT_APP_ROUTER | typeof AppType.NODE_APP | typeof AppType.NODE_API;
|
|
17
|
-
} & Omit<AppProperties, 'vpc' | 'logGroup'
|
|
17
|
+
} & Omit<AppProperties, 'vpc' | 'logGroup'> & AppResource;
|
|
18
18
|
export type AppResource = {
|
|
19
19
|
output: string;
|
|
20
20
|
cmd: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/lambda/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,OAAO,EACP,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,YACf,SAAQ,MAAM,EACZ,KAAK,EACL,WAAW,EACX,aAAa,EACb,WAAW;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EACA,OAAO,OAAO,CAAC,SAAS,GACxB,OAAO,OAAO,CAAC,eAAe,GAC9B,OAAO,OAAO,CAAC,QAAQ,GACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/lambda/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,OAAO,EACP,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,KAAK,EACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,YACf,SAAQ,MAAM,EACZ,KAAK,EACL,WAAW,EACX,aAAa,EACb,WAAW;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,IAAI,EACA,OAAO,OAAO,CAAC,SAAS,GACxB,OAAO,OAAO,CAAC,eAAe,GAC9B,OAAO,OAAO,CAAC,QAAQ,GACvB,OAAO,OAAO,CAAC,QAAQ,CAAC;CAC7B,GAAG,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,UAAU,CAAC,GACzC,WAAW,CAAC;AAEd,MAAM,MAAM,WAAW,GACnB;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1B,MAAM,MAAM,aAAa,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IACjE,QAAQ,EAAE,SAAS,CAAC;IACpB,KAAK,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrD,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAClD,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;CAC3B,GAAG,WAAW,CAAC"}
|
|
@@ -12,12 +12,12 @@ const s3Deploy = tslib_1.__importStar(require("aws-cdk-lib/aws-s3-deployment"));
|
|
|
12
12
|
const ssm = tslib_1.__importStar(require("aws-cdk-lib/aws-ssm"));
|
|
13
13
|
function filesFromSSM(scope, reference) {
|
|
14
14
|
return {
|
|
15
|
-
artifact: ssm.StringParameter.fromStringParameterName(scope, '
|
|
15
|
+
artifact: ssm.StringParameter.fromStringParameterName(scope, 'ArtifactStorageParam', `/${reference}/artifacts`).stringValue,
|
|
16
16
|
publicFiles: {
|
|
17
|
-
key: ssm.StringParameter.fromStringParameterName(scope, '
|
|
17
|
+
key: ssm.StringParameter.fromStringParameterName(scope, 'PublicFilesParam', `/${reference}/files/publicFiles/key`).stringValue,
|
|
18
18
|
},
|
|
19
19
|
staticFiles: {
|
|
20
|
-
key: ssm.StringParameter.fromStringParameterName(scope, '
|
|
20
|
+
key: ssm.StringParameter.fromStringParameterName(scope, 'StaticFilesParam', `/${reference}/files/staticFiles/key`).stringValue,
|
|
21
21
|
},
|
|
22
22
|
};
|
|
23
23
|
}
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fy-stack/app-construct",
|
|
3
|
-
"version": "0.0.147-alpha.
|
|
3
|
+
"version": "0.0.147-alpha.30691",
|
|
4
4
|
"repository": "https://github.com/festusyuma/fy-stack",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@fy-stack/types": "0.0.147-alpha.
|
|
6
|
+
"@fy-stack/types": "0.0.147-alpha.30691",
|
|
7
7
|
"tslib": "^2.3.0",
|
|
8
8
|
"zod": "^4.3.6"
|
|
9
9
|
},
|