cdk-nuxt 0.2.3 → 0.2.7

package/index.d.ts

@@ -0,0 +1,2 @@
+export { NuxtAppStack, NuxtAppStackProps } from "./lib/stack/nuxt-app-stack";
+export { NuxtAppAssetsCleanupStack, NuxtAppAssetsCleanupProps } from "./lib/stack/nuxt-app-assets-cleanup-stack";

package/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var nuxt_app_stack_1 = require("./lib/stack/nuxt-app-stack");
+Object.defineProperty(exports, "NuxtAppStack", { enumerable: true, get: function () { return nuxt_app_stack_1.NuxtAppStack; } });
+var nuxt_app_assets_cleanup_stack_1 = require("./lib/stack/nuxt-app-assets-cleanup-stack");
+Object.defineProperty(exports, "NuxtAppAssetsCleanupStack", { enumerable: true, get: function () { return nuxt_app_assets_cleanup_stack_1.NuxtAppAssetsCleanupStack; } });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZEQUEwRTtBQUFsRSw4R0FBQSxZQUFZLE9BQUE7QUFDcEIsMkZBQThHO0FBQXRHLDBJQUFBLHlCQUF5QixPQUFBIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHtOdXh0QXBwU3RhY2ssIE51eHRBcHBTdGFja1Byb3BzfSBmcm9tIFwiLi9saWIvc3RhY2svbnV4dC1hcHAtc3RhY2tcIlxuZXhwb3J0IHtOdXh0QXBwQXNzZXRzQ2xlYW51cFN0YWNrLCBOdXh0QXBwQXNzZXRzQ2xlYW51cFByb3BzfSBmcm9tIFwiLi9saWIvc3RhY2svbnV4dC1hcHAtYXNzZXRzLWNsZWFudXAtc3RhY2tcIiJdfQ==

package/lib/cli/deploy.js

@@ -2,19 +2,30 @@
 
 const shell = require("shelljs");
 const path = require("path");
-require('dotenv').config()
 
 const deploymentFolder = '.nuxt/cdk-deployment';
+const deploymentSourceFolder = `${deploymentFolder}/src`;
+const deploymentLayerFolder = `${deploymentFolder}/layer/nodejs`;
 
+// Refresh the deployment folder to a clean state
 shell.rm('-rf', deploymentFolder);
-shell.mkdir('-p', `${deploymentFolder}/.nuxt/dist`);
+shell.mkdir('-p', `${deploymentSourceFolder}/.nuxt/dist`);
+shell.mkdir('-p', deploymentLayerFolder);
 
-shell.cp('-r', '.nuxt/dist/server', `${deploymentFolder}/.nuxt/dist`);
+// Copy our files required for SSR
+shell.cp('-r', '.nuxt/dist/server', `${deploymentSourceFolder}/.nuxt/dist`);
+shell.cp(path.join(__dirname, '../functions/app/index.js'), deploymentSourceFolder);
 
-shell.cp(path.join(__dirname, '../server/lambda-handler.js'), deploymentFolder);
+// Prepare the Lambda layer for the node_modules required for SSR
+shell.cp('package.json', deploymentLayerFolder);
+shell.cp('yarn.lock', deploymentLayerFolder);
+shell.cd(deploymentLayerFolder);
+shell.exec('yarn install --production --frozen-lockfile');
+shell.cd('../../../..');
 
-shell.cp('.env', deploymentFolder);
-shell.cp('nuxt.config.js', deploymentFolder);
+// Copy the config files
+shell.cp('.env', deploymentSourceFolder);
+shell.cp('nuxt.config.js', deploymentSourceFolder);
 
-const entryPoint = path.join(__dirname, '../index.ts')
-shell.exec(`yarn cdk deploy --require-approval never --all --app="yarn ts-node ${entryPoint}"`);
+// Run the deployment
+shell.exec('yarn cdk deploy --require-approval never --all --app="yarn ts-node stack/index.ts"');

package/lib/{server/lambda-handler.js → functions/app/index.js}

@@ -1,4 +1,4 @@
 const { createNuxtHandler } = require('nuxt-aws-lambda')
 const config = require('./nuxt.config.js')
 
-module.exports.render = createNuxtHandler(config)
+module.exports.handler = createNuxtHandler(config)

package/lib/stack/nuxt-app-assets-cleanup-stack.js

@@ -13,6 +13,8 @@ const path = require("path");
 class NuxtAppAssetsCleanupStack extends aws_cdk_lib_1.Stack {
     constructor(scope, id, props) {
         super(scope, id, props);
+        // Note, that this stack can't be tagged independently of the NuxtAppStack, as both are sharing the
+        // same scope (CDK App). This would overwrite previous set tags for the CDK App (last one wins).
         this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;
         this.staticAssetsBucket = props.staticAssetsBucket;
         this.layer = this.createLayer();
@@ -34,7 +36,7 @@ class NuxtAppAssetsCleanupStack extends aws_cdk_lib_1.Stack {
             runtime: aws_lambda_1.Runtime.NODEJS_14_X,
             architecture: aws_lambda_1.Architecture.ARM_64,
             layers: [this.layer],
-            handler: `index.handler`,
+            handler: 'index.handler',
             code: aws_lambda_1.Code.fromAsset(path.join(__dirname, '../functions/assets_cleanup/build/app')),
             timeout: aws_cdk_lib_1.Duration.minutes(1),
             memorySize: 128,
@@ -65,4 +67,4 @@ class NuxtAppAssetsCleanupStack extends aws_cdk_lib_1.Stack {
     }
 }
 exports.NuxtAppAssetsCleanupStack = NuxtAppAssetsCleanupStack;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnV4dC1hcHAtYXNzZXRzLWNsZWFudXAtc3RhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJudXh0LWFwcC1hc3NldHMtY2xlYW51cC1zdGFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSw2Q0FBNEM7QUFFNUMsdURBQTJGO0FBQzNGLHVEQUFzRDtBQUV0RCxtREFBbUQ7QUFDbkQsdUVBQThEO0FBQzlELDZCQUE2QjtBQU83Qjs7R0FFRztBQUNILE1BQWEseUJBQTBCLFNBQVEsbUJBQUs7SUFRaEQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFnQztRQUN0RSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUV4QixJQUFJLENBQUMsZ0JBQWdCLEdBQUcsR0FBRyxLQUFLLENBQUMsT0FBTyxJQUFJLEtBQUssQ0FBQyxPQUFPLElBQUksS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2pGLElBQUksQ0FBQyxrQkFBa0IsR0FBRyxLQUFLLENBQUMsa0JBQWtCLENBQUM7UUFDbkQsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDaEMsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdkQsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFFTyxXQUFXO1FBQ2YsTUFBTSxTQUFTLEdBQUcsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLFFBQVEsQ0FBQztRQUVuRCxPQUFPLElBQUkseUJBQVksQ0FBQyxJQUFJLEVBQUUsU0FBUyxFQUFFO1lBQ3JDLGdCQUFnQixFQUFFLFNBQVM7WUFDM0IsSUFBSSxFQUFFLGlCQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLHlDQUF5QyxDQUFDLENBQUM7WUFDckYsa0JBQWtCLEVBQUUsQ0FBQyxvQkFBTyxDQUFDLFdBQVcsQ0FBQztTQUM1QyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRU8sb0JBQW9CLENBQUMsS0FBZ0M7UUFDekQsTUFBTSxZQUFZLEdBQVcsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLFdBQVcsQ0FBQztRQUVqRSxNQUFNLE1BQU0sR0FBYSxJQUFJLHFCQUFRLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRTtZQUN0RCxZQUFZLEVBQUUsWUFBWTtZQUMxQixPQUFPLEVBQUUsb0JBQU8sQ0FBQyxXQUFXO1lBQzVCLFlBQVksRUFBRSx5QkFBWSxDQUFDLE1BQU07WUFDakMsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztZQUNwQixPQUFPLEVBQUUsZUFBZTtZQUN4QixJQUFJLEVBQUUsaUJBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsdUNBQXVDLENBQUMsQ0FBQztZQUNuRixPQUFPLEVBQUUsc0JBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQzVCLFVBQVUsRUFBRSxHQUFHO1lBQ2YsWUFBWSxFQUFFLHdCQUFhLENBQUMsU0FBUztZQUNyQyxXQUFXLEVBQUU7Z0JBQ1Qsb0JBQW9CLEVBQUUsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFVBQVU7Z0JBQ3hELFVBQVUsRUFBRSxLQUFLLENBQUMsU0FBUztnQkFDM0IsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO2dCQUM5QixtQ0FBbUMsRUFBRSxHQUFHO2dCQUN4QyxZQUFZLEVBQUUsc0JBQXNCO2FBQ3ZDO1NBQ0osQ0FBQyxDQUFDO1FBRUgscUNBQXFDO1FBQ3JDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDMUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUU1QyxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRU8sVUFBVSxDQUFDLEtBQWdDO1FBQy9DLE1BQU0sUUFBUSxHQUFHLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixpQkFBaUIsQ0FBQztRQUUzRCx5Q0FBeUM7UUFDekMsT0FBTyxJQUFJLGlCQUFJLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRTtZQUM1QixRQUFRO1lBQ1IsV0FBVyxFQUFFLHVEQUF1RCxLQUFLLENBQUMsT0FBTyxPQUFPO1lBQ3hGLE9BQU8sRUFBRSxJQUFJO1lBQ2IsUUFBUSxFQUFFLHFCQUFRLENBQUMsSUFBSSxDQUFDLEVBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUMsQ0FBQztZQUNoRSxPQUFPLEVBQUUsQ0FBQyxJQUFJLG1DQUFjLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1NBQ3JELENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDSjtBQXJFRCw4REFxRUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0lCdWNrZXR9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtczNcIjtcbmltcG9ydCB7RHVyYXRpb24sIFN0YWNrfSBmcm9tIFwiYXdzLWNkay1saWJcIjtcbmltcG9ydCB7QXBwU3RhY2tQcm9wc30gZnJvbSBcIi4vYXBwLXN0YWNrLXByb3BzXCI7XG5pbXBvcnQge0FyY2hpdGVjdHVyZSwgQ29kZSwgTGF5ZXJWZXJzaW9uLCBSdW50aW1lLCBGdW5jdGlvbn0gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sYW1iZGFcIjtcbmltcG9ydCB7UnVsZSwgU2NoZWR1bGV9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZXZlbnRzXCI7XG5pbXBvcnQge0NvbnN0cnVjdH0gZnJvbSBcImNvbnN0cnVjdHNcIjtcbmltcG9ydCB7UmV0ZW50aW9uRGF5c30gZnJvbSBcImF3cy1jZGstbGliL2F3cy1sb2dzXCI7XG5pbXBvcnQge0xhbWJkYUZ1bmN0aW9ufSBmcm9tIFwiYXdzLWNkay1saWIvYXdzLWV2ZW50cy10YXJnZXRzXCI7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gXCJwYXRoXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgTnV4dEFwcEFzc2V0c0NsZWFudXBQcm9wcyBleHRlbmRzIEFwcFN0YWNrUHJvcHMge1xuICAgIHJlYWRvbmx5IHN0YXRpY0Fzc2V0c0J1Y2tldDogSUJ1Y2tldDtcbiAgICByZWFkb25seSBzZW50cnlEc246IHN0cmluZztcbn1cblxuLyoqXG4gKiBDb250YWlucyBhIHNjaGVkdWxlZCBsYW1iZGEgZnVuY3Rpb24sIHRoYXQgZGVsZXRlcyBvdXRkYXRlZCBzdGF0aWMgYXNzZXRzIG9mIHRoZSBQV0EgZnJvbSBTMy5cbiAqL1xuZXhwb3J0IGNsYXNzIE51eHRBcHBBc3NldHNDbGVhbnVwU3RhY2sgZXh0ZW5kcyBTdGFjayB7XG5cbiAgICBwcml2YXRlIHJlYWRvbmx5IHJlc291cmNlSWRQcmVmaXg6IHN0cmluZztcbiAgICBwcml2YXRlIHN0YXRpY0Fzc2V0c0J1Y2tldDogSUJ1Y2tldDtcbiAgICBwcml2YXRlIHJlYWRvbmx5IGxheWVyOiBMYXllclZlcnNpb247XG4gICAgcHJpdmF0ZSByZWFkb25seSBsYW1iZGFGdW5jdGlvbjogRnVuY3Rpb247XG4gICAgcHJpdmF0ZSBzY2hlZHVsZWRSdWxlOiBSdWxlO1xuXG4gICAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IE51eHRBcHBBc3NldHNDbGVhbnVwUHJvcHMpIHtcbiAgICAgICAgc3VwZXIoc2NvcGUsIGlkLCBwcm9wcyk7XG5cbiAgICAgICAgdGhpcy5yZXNvdXJjZUlkUHJlZml4ID0gYCR7cHJvcHMucHJvamVjdH0tJHtwcm9wcy5zZXJ2aWNlfS0ke3Byb3BzLmVudmlyb25tZW50fWA7XG4gICAgICAgIHRoaXMuc3RhdGljQXNzZXRzQnVja2V0ID0gcHJvcHMuc3RhdGljQXNzZXRzQnVja2V0O1xuICAgICAgICB0aGlzLmxheWVyID0gdGhpcy5jcmVhdGVMYXllcigpO1xuICAgICAgICB0aGlzLmxhbWJkYUZ1bmN0aW9uID0gdGhpcy5jcmVhdGVMYW1iZGFGdW5jdGlvbihwcm9wcyk7XG4gICAgICAgIHRoaXMuc2NoZWR1bGVkUnVsZSA9IHRoaXMuY3JlYXRlUnVsZShwcm9wcyk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBjcmVhdGVMYXllcigpOiBMYXllclZlcnNpb24ge1xuICAgICAgICBjb25zdCBsYXllck5hbWUgPSBgJHt0aGlzLnJlc291cmNlSWRQcmVmaXh9LWxheWVyYDtcblxuICAgICAgICByZXR1cm4gbmV3IExheWVyVmVyc2lvbih0aGlzLCBsYXllck5hbWUsIHtcbiAgICAgICAgICAgIGxheWVyVmVyc2lvbk5hbWU6IGxheWVyTmFtZSxcbiAgICAgICAgICAgIGNvZGU6IENvZGUuZnJvbUFzc2V0KHBhdGguam9pbihfX2Rpcm5hbWUsICcuLi9mdW5jdGlvbnMvYXNzZXRzX2NsZWFudXAvYnVpbGQvbGF5ZXInKSksXG4gICAgICAgICAgICBjb21wYXRpYmxlUnVudGltZXM6IFtSdW50aW1lLk5PREVKU18xNF9YXSxcbiAgICAgICAgfSk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBjcmVhdGVMYW1iZGFGdW5jdGlvbihwcm9wczogTnV4dEFwcEFzc2V0c0NsZWFudXBQcm9wcyk6IEZ1bmN0aW9uIHtcbiAgICAgICAgY29uc3QgZnVuY3Rpb25OYW1lOiBzdHJpbmcgPSBgJHt0aGlzLnJlc291cmNlSWRQcmVmaXh9LWZ1bmN0aW9uYDtcblxuICAgICAgICBjb25zdCByZXN1bHQ6IEZ1bmN0aW9uID0gbmV3IEZ1bmN0aW9uKHRoaXMsIGZ1bmN0aW9uTmFtZSwge1xuICAgICAgICAgICAgZnVuY3Rpb25OYW1lOiBmdW5jdGlvbk5hbWUsXG4gICAgICAgICAgICBydW50aW1lOiBSdW50aW1lLk5PREVKU18xNF9YLFxuICAgICAgICAgICAgYXJjaGl0ZWN0dXJlOiBBcmNoaXRlY3R1cmUuQVJNXzY0LFxuICAgICAgICAgICAgbGF5ZXJzOiBbdGhpcy5sYXllcl0sXG4gICAgICAgICAgICBoYW5kbGVyOiBgaW5kZXguaGFuZGxlcmAsXG4gICAgICAgICAgICBjb2RlOiBDb2RlLmZyb21Bc3NldChwYXRoLmpvaW4oX19kaXJuYW1lLCAnLi4vZnVuY3Rpb25zL2Fzc2V0c19jbGVhbnVwL2J1aWxkL2FwcCcpKSxcbiAgICAgICAgICAgIHRpbWVvdXQ6IER1cmF0aW9uLm1pbnV0ZXMoMSksXG4gICAgICAgICAgICBtZW1vcnlTaXplOiAxMjgsXG4gICAgICAgICAgICBsb2dSZXRlbnRpb246IFJldGVudGlvbkRheXMuVFdPX1dFRUtTLFxuICAgICAgICAgICAgZW52aXJvbm1lbnQ6IHtcbiAgICAgICAgICAgICAgICBTVEFUSUNfQVNTRVRTX0JVQ0tFVDogdGhpcy5zdGF0aWNBc3NldHNCdWNrZXQuYnVja2V0TmFtZSxcbiAgICAgICAgICAgICAgICBTRU5UUllfRFNOOiBwcm9wcy5zZW50cnlEc24sXG4gICAgICAgICAgICAgICAgRU5WSVJPTk1FTlQ6IHByb3BzLmVudmlyb25tZW50LFxuICAgICAgICAgICAgICAgIEFXU19OT0RFSlNfQ09OTkVDVElPTl9SRVVTRV9FTkFCTEVEOiAnMScsXG4gICAgICAgICAgICAgICAgTk9ERV9PUFRJT05TOiAnLS1lbmFibGUtc291cmNlLW1hcHMnLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgfSk7XG5cbiAgICAgICAgLy8gZ3JhbnQgZnVuY3Rpb24gYWNjZXNzIHRvIFMzIGJ1Y2tldFxuICAgICAgICB0aGlzLnN0YXRpY0Fzc2V0c0J1Y2tldC5ncmFudFJlYWQocmVzdWx0KTtcbiAgICAgICAgdGhpcy5zdGF0aWNBc3NldHNCdWNrZXQuZ3JhbnREZWxldGUocmVzdWx0KTtcblxuICAgICAgICByZXR1cm4gcmVzdWx0O1xuICAgIH1cblxuICAgIHByaXZhdGUgY3JlYXRlUnVsZShwcm9wczogTnV4dEFwcEFzc2V0c0NsZWFudXBQcm9wcyk6IFJ1bGUge1xuICAgICAgICBjb25zdCBydWxlTmFtZSA9IGAke3RoaXMucmVzb3VyY2VJZFByZWZpeH0tc2NoZWR1bGVkLXJ1bGVgO1xuXG4gICAgICAgIC8vIFNjaGVkdWxlIGV2ZXJ5IHR1ZXNkYXkgYXQgMDM6MzAgQU0gR01UXG4gICAgICAgIHJldHVybiBuZXcgUnVsZSh0aGlzLCBydWxlTmFtZSwge1xuICAgICAgICAgICAgcnVsZU5hbWUsXG4gICAgICAgICAgICBkZXNjcmlwdGlvbjogYFRyaWdnZXJzIGEgY2xlYW51cCBvZiBvdXRkYXRlZCBzdGF0aWMgYXNzZXRzIG9mIHRoZSAke3Byb3BzLnByb2plY3R9IGFwcC5gLFxuICAgICAgICAgICAgZW5hYmxlZDogdHJ1ZSxcbiAgICAgICAgICAgIHNjaGVkdWxlOiBTY2hlZHVsZS5jcm9uKHt3ZWVrRGF5OiAnMycsIGhvdXI6ICczJywgbWludXRlOiAnMzAnfSksXG4gICAgICAgICAgICB0YXJnZXRzOiBbbmV3IExhbWJkYUZ1bmN0aW9uKHRoaXMubGFtYmRhRnVuY3Rpb24pXSxcbiAgICAgICAgfSk7XG4gICAgfVxufSJdfQ==
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nuxt-app-assets-cleanup-stack.js","sourceRoot":"","sources":["nuxt-app-assets-cleanup-stack.ts"],"names":[],"mappings":"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","sourcesContent":["import {IBucket} from \"aws-cdk-lib/aws-s3\";\nimport {Duration, Stack} from \"aws-cdk-lib\";\nimport {AppStackProps} from \"./app-stack-props\";\nimport {Architecture, Code, LayerVersion, Runtime, Function} from \"aws-cdk-lib/aws-lambda\";\nimport {Rule, Schedule} from \"aws-cdk-lib/aws-events\";\nimport {Construct} from \"constructs\";\nimport {RetentionDays} from \"aws-cdk-lib/aws-logs\";\nimport {LambdaFunction} from \"aws-cdk-lib/aws-events-targets\";\nimport * as path from \"path\";\n\nexport interface NuxtAppAssetsCleanupProps extends AppStackProps {\n    readonly staticAssetsBucket: IBucket;\n    readonly sentryDsn: string;\n}\n\n/**\n * Contains a scheduled lambda function, that deletes outdated static assets of the PWA from S3.\n */\nexport class NuxtAppAssetsCleanupStack extends Stack {\n\n    private readonly resourceIdPrefix: string;\n    private staticAssetsBucket: IBucket;\n    private readonly layer: LayerVersion;\n    private readonly lambdaFunction: Function;\n    private scheduledRule: Rule;\n\n    constructor(scope: Construct, id: string, props: NuxtAppAssetsCleanupProps) {\n        super(scope, id, props);\n\n        // Note, that this stack can't be tagged independently of the NuxtAppStack, as both are sharing the\n        // same scope (CDK App). This would overwrite previous set tags for the CDK App (last one wins).\n\n        this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;\n        this.staticAssetsBucket = props.staticAssetsBucket;\n        this.layer = this.createLayer();\n        this.lambdaFunction = this.createLambdaFunction(props);\n        this.scheduledRule = this.createRule(props);\n    }\n\n    private createLayer(): LayerVersion {\n        const layerName = `${this.resourceIdPrefix}-layer`;\n\n        return new LayerVersion(this, layerName, {\n            layerVersionName: layerName,\n            code: Code.fromAsset(path.join(__dirname, '../functions/assets_cleanup/build/layer')),\n            compatibleRuntimes: [Runtime.NODEJS_14_X],\n        });\n    }\n\n    private createLambdaFunction(props: NuxtAppAssetsCleanupProps): Function {\n        const functionName: string = `${this.resourceIdPrefix}-function`;\n\n        const result: Function = new Function(this, functionName, {\n            functionName: functionName,\n            runtime: Runtime.NODEJS_14_X,\n            architecture: Architecture.ARM_64,\n            layers: [this.layer],\n            handler: 'index.handler',\n            code: Code.fromAsset(path.join(__dirname, '../functions/assets_cleanup/build/app')),\n            timeout: Duration.minutes(1),\n            memorySize: 128,\n            logRetention: RetentionDays.TWO_WEEKS,\n            environment: {\n                STATIC_ASSETS_BUCKET: this.staticAssetsBucket.bucketName,\n                SENTRY_DSN: props.sentryDsn,\n                ENVIRONMENT: props.environment,\n                AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',\n                NODE_OPTIONS: '--enable-source-maps',\n            },\n        });\n\n        // grant function access to S3 bucket\n        this.staticAssetsBucket.grantRead(result);\n        this.staticAssetsBucket.grantDelete(result);\n\n        return result;\n    }\n\n    private createRule(props: NuxtAppAssetsCleanupProps): Rule {\n        const ruleName = `${this.resourceIdPrefix}-scheduled-rule`;\n\n        // Schedule every tuesday at 03:30 AM GMT\n        return new Rule(this, ruleName, {\n            ruleName,\n            description: `Triggers a cleanup of outdated static assets of the ${props.project} app.`,\n            enabled: true,\n            schedule: Schedule.cron({weekDay: '3', hour: '3', minute: '30'}),\n            targets: [new LambdaFunction(this.lambdaFunction)],\n        });\n    }\n}"]}

package/lib/stack/nuxt-app-assets-cleanup-stack.ts

@@ -27,6 +27,9 @@ export class NuxtAppAssetsCleanupStack extends Stack {
     constructor(scope: Construct, id: string, props: NuxtAppAssetsCleanupProps) {
         super(scope, id, props);
 
+        // Note, that this stack can't be tagged independently of the NuxtAppStack, as both are sharing the
+        // same scope (CDK App). This would overwrite previous set tags for the CDK App (last one wins).
+
         this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;
         this.staticAssetsBucket = props.staticAssetsBucket;
         this.layer = this.createLayer();
@@ -52,7 +55,7 @@ export class NuxtAppAssetsCleanupStack extends Stack {
             runtime: Runtime.NODEJS_14_X,
             architecture: Architecture.ARM_64,
             layers: [this.layer],
-            handler: `index.handler`,
+            handler: 'index.handler',
             code: Code.fromAsset(path.join(__dirname, '../functions/assets_cleanup/build/app')),
             timeout: Duration.minutes(1),
             memorySize: 128,

package/lib/stack/nuxt-app-stack.d.ts

@@ -3,8 +3,7 @@ import { Construct } from 'constructs';
 import { IBucket } from "aws-cdk-lib/aws-s3";
 import { AppStackProps } from "./app-stack-props";
 export interface NuxtAppStackProps extends AppStackProps {
-    readonly baseDomain: string;
-    readonly subDomain?: string;
+    readonly domain: string;
     readonly globalTlsCertificateArn: string;
     readonly hostedZoneId: string;
 }

package/lib/stack/nuxt-app-stack.js

@@ -19,10 +19,6 @@ const fs = require("fs");
 class NuxtAppStack extends aws_cdk_lib_1.Stack {
     constructor(scope, id, props) {
         super(scope, id, props);
-        aws_cdk_lib_1.Tags.of(scope).add('project', props.project);
-        aws_cdk_lib_1.Tags.of(scope).add('domain', props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain);
-        aws_cdk_lib_1.Tags.of(scope).add('service', props.service);
-        aws_cdk_lib_1.Tags.of(scope).add('environment', props.environment);
         this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;
         this.deploymentRevision = new Date().toISOString();
         this.tlsCertificate = this.findTlsCertificate(props);
@@ -61,7 +57,7 @@ class NuxtAppStack extends aws_cdk_lib_1.Stack {
         const layerName = `${this.resourceIdPrefix}-ssr-layer`;
         return new aws_lambda_1.LayerVersion(this, layerName, {
             layerVersionName: layerName,
-            code: aws_lambda_1.Code.fromAsset('./server/layer'),
+            code: aws_lambda_1.Code.fromAsset('.nuxt/cdk-deployment/layer'),
             compatibleRuntimes: [aws_lambda_1.Runtime.NODEJS_12_X],
             description: `Contains node_modules required for server-side of ${this.resourceIdPrefix}.`,
         });
@@ -73,8 +69,8 @@ class NuxtAppStack extends aws_cdk_lib_1.Stack {
             runtime: aws_lambda_1.Runtime.NODEJS_12_X,
             architecture: aws_lambda_1.Architecture.ARM_64,
             layers: [this.layer],
-            handler: 'lambda-handler.render',
-            code: aws_lambda_1.Code.fromAsset('.nuxt/cdk-deployment', {
+            handler: 'index.handler',
+            code: aws_lambda_1.Code.fromAsset('.nuxt/cdk-deployment/src', {
                 exclude: ['**.svg', '**.ico', '**.png', '**.jpg', 'chunk.*.js*', 'bundle.*.js*', 'bundle.*.js*', 'sw.js*'],
             }),
             timeout: aws_cdk_lib_1.Duration.seconds(10),
@@ -142,7 +138,7 @@ class NuxtAppStack extends aws_cdk_lib_1.Stack {
     createCloudFrontDistribution(props) {
         const cdnName = `${this.resourceIdPrefix}-cdn`;
         return new aws_cloudfront_1.Distribution(this, cdnName, {
-            domainNames: props.subDomain ? [`${props.subDomain}.${props.baseDomain}`] : [props.baseDomain, `*.${props.baseDomain}`],
+            domainNames: [props.domain],
             comment: `${this.resourceIdPrefix}-redirect`,
             minimumProtocolVersion: aws_cloudfront_1.SecurityPolicyProtocol.TLS_V1_2_2018,
             certificate: this.tlsCertificate,
@@ -198,26 +194,27 @@ class NuxtAppStack extends aws_cdk_lib_1.Stack {
         });
     }
     findHostedZone(props) {
+        const domainParts = props.domain.split('.');
         return aws_route53_1.HostedZone.fromHostedZoneAttributes(this, `${this.resourceIdPrefix}-hosted-zone`, {
             hostedZoneId: props.hostedZoneId,
-            zoneName: props.baseDomain,
+            zoneName: domainParts[domainParts.length - 1],
         });
     }
     createDnsRecords(props) {
         const dnsTarget = aws_route53_1.RecordTarget.fromAlias(new aws_route53_targets_1.CloudFrontTarget(this.cdn));
         // Create a record for IPv4
         new aws_route53_1.ARecord(this, `${this.resourceIdPrefix}-ipv4-record`, {
-            recordName: props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain,
+            recordName: props.domain,
             zone: this.hostedZone,
             target: dnsTarget,
         });
         // Create a record for IPv6
         new aws_route53_1.AaaaRecord(this, `${this.resourceIdPrefix}-ipv6-record`, {
-            recordName: props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain,
+            recordName: props.domain,
             zone: this.hostedZone,
             target: dnsTarget,
         });
     }
 }
 exports.NuxtAppStack = NuxtAppStack;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nuxt-app-stack.js","sourceRoot":"","sources":["nuxt-app-stack.ts"],"names":[],"mappings":"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","sourcesContent":["import {Duration, RemovalPolicy, Stack, Tags} from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport {Certificate, ICertificate} from \"aws-cdk-lib/aws-certificatemanager\";\nimport {\n  AllowedMethods,\n  BehaviorOptions, CacheCookieBehavior,\n  CachedMethods, CacheHeaderBehavior,\n  CachePolicy, CacheQueryStringBehavior,\n  Distribution, ICachePolicy,\n  IOriginAccessIdentity, OriginAccessIdentity, OriginProtocolPolicy, PriceClass,\n  SecurityPolicyProtocol,\n  ViewerProtocolPolicy\n} from \"aws-cdk-lib/aws-cloudfront\";\nimport {Architecture, Code, LayerVersion, Runtime, Function} from \"aws-cdk-lib/aws-lambda\";\nimport {BlockPublicAccess, Bucket, BucketAccessControl, IBucket} from \"aws-cdk-lib/aws-s3\";\nimport {ARecord, AaaaRecord, HostedZone, IHostedZone, RecordTarget} from \"aws-cdk-lib/aws-route53\";\nimport {BucketDeployment, CacheControl, Source, StorageClass} from \"aws-cdk-lib/aws-s3-deployment\";\nimport {HttpOrigin, S3Origin} from \"aws-cdk-lib/aws-cloudfront-origins\";\nimport {CloudFrontTarget} from \"aws-cdk-lib/aws-route53-targets\";\nimport {HttpMethod} from \"aws-cdk-lib/aws-stepfunctions-tasks\";\nimport {RetentionDays} from \"aws-cdk-lib/aws-logs\";\nimport { HttpLambdaIntegration } from '@aws-cdk/aws-apigatewayv2-integrations-alpha';\nimport {HttpApi} from \"@aws-cdk/aws-apigatewayv2-alpha\";\nimport {NuxtAppStaticAssets} from \"./nuxt-app-static-assets\";\nimport {AppStackProps} from \"./app-stack-props\";\nimport * as fs from \"fs\";\n\nexport interface NuxtAppStackProps extends AppStackProps {\n  readonly baseDomain: string;\n  readonly subDomain?: string;\n\n  // Used by the CDN, must be issued in us-east-1 (global)\n  readonly globalTlsCertificateArn: string;\n\n  readonly hostedZoneId: string;\n}\n\nexport class NuxtAppStack extends Stack {\n  private readonly resourceIdPrefix: string;\n  private readonly deploymentRevision: string;\n  private readonly tlsCertificate: ICertificate;\n  private readonly cdnAccessIdentity: IOriginAccessIdentity;\n  public staticAssetsBucket: IBucket;\n  private readonly layer: LayerVersion;\n  private readonly lambdaFunction: Function;\n  private apiGateway: HttpApi;\n  private readonly httpsForwardingBehavior: BehaviorOptions;\n  private readonly cdn: Distribution;\n  private readonly hostedZone: IHostedZone;\n\n  constructor(scope: Construct, id: string, props: NuxtAppStackProps) {\n    super(scope, id, props);\n\n    Tags.of(scope).add('project', props.project);\n    Tags.of(scope).add('domain', props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain);\n    Tags.of(scope).add('service', props.service);\n    Tags.of(scope).add('environment', props.environment);\n\n    this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;\n    this.deploymentRevision = new Date().toISOString();\n    this.tlsCertificate = this.findTlsCertificate(props);\n    this.cdnAccessIdentity = this.createCdnAccessIdentity();\n    this.staticAssetsBucket = this.createStaticAssetsBucket();\n    this.layer = this.createSsrLambdaLayer();\n    this.lambdaFunction = this.createLambdaFunction();\n    this.apiGateway = this.createApiGateway();\n    this.httpsForwardingBehavior = this.createHttpsForwardingBehavior();\n    this.cdn = this.createCloudFrontDistribution(props);\n    this.configureDeployments();\n    this.hostedZone = this.findHostedZone(props);\n    this.createDnsRecords(props);\n  }\n\n  private findTlsCertificate(props: NuxtAppStackProps): ICertificate {\n    return Certificate.fromCertificateArn(this, `${this.resourceIdPrefix}-tls-certificate`, props.globalTlsCertificateArn);\n  }\n\n  private createCdnAccessIdentity(): IOriginAccessIdentity {\n    const originAccessIdentityName = `${this.resourceIdPrefix}-cdn-s3-access`;\n    return new OriginAccessIdentity(this, originAccessIdentityName);\n  }\n\n  private createStaticAssetsBucket(): IBucket {\n    const bucketName = `${this.resourceIdPrefix}-assets`;\n    const bucket = new Bucket(this, bucketName, {\n      accessControl: BucketAccessControl.AUTHENTICATED_READ,\n      blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n      bucketName,\n      // the bucket and all of its objects can be deleted, because all the content is managed in this project\n      removalPolicy: RemovalPolicy.DESTROY,\n      autoDeleteObjects: true,\n    });\n\n    bucket.grantReadWrite(this.cdnAccessIdentity);\n\n    return bucket;\n  }\n\n  private createSsrLambdaLayer(): LayerVersion {\n    const layerName = `${this.resourceIdPrefix}-ssr-layer`;\n    return new LayerVersion(this, layerName, {\n      layerVersionName: layerName,\n      code: Code.fromAsset('./server/layer'),\n      compatibleRuntimes: [Runtime.NODEJS_12_X],\n      description: `Contains node_modules required for server-side of ${this.resourceIdPrefix}.`,\n    });\n  }\n\n  private createLambdaFunction(): Function {\n    const funcName = `${this.resourceIdPrefix}-function`;\n\n    return new Function(this, funcName, {\n      functionName: funcName,\n      runtime: Runtime.NODEJS_12_X,\n      architecture: Architecture.ARM_64,\n      layers: [this.layer],\n      handler: 'lambda-handler.render',\n      code: Code.fromAsset('.nuxt/cdk-deployment', {\n        exclude: ['**.svg', '**.ico', '**.png', '**.jpg', 'chunk.*.js*', 'bundle.*.js*', 'bundle.*.js*', 'sw.js*'],\n      }),\n      timeout: Duration.seconds(10),\n      memorySize: 512,\n      logRetention: RetentionDays.ONE_MONTH,\n      environment: {},\n      allowPublicSubnet: false\n    });\n  }\n\n  private createApiGateway(): HttpApi {\n    const lambdaIntegration = new HttpLambdaIntegration(`${this.resourceIdPrefix}-lambda-integration`, this.lambdaFunction);\n    const apiName = `${this.resourceIdPrefix}-api`;\n    const apiGateway = new HttpApi(this, apiName, {\n      apiName,\n      // The app does not allow any cross-origin access by purpose: the app should not be embeddable anywhere\n      corsPreflight: undefined,\n      defaultIntegration: lambdaIntegration,\n    });\n\n    apiGateway.addRoutes({\n      integration: lambdaIntegration,\n      path: '/{proxy+}',\n      methods: [HttpMethod.GET, HttpMethod.HEAD],\n    });\n    return apiGateway;\n  }\n\n  private createHttpsForwardingBehavior(): BehaviorOptions {\n    return {\n      origin: new HttpOrigin(`${this.apiGateway.httpApiId}.execute-api.${this.region}.amazonaws.com`, {\n        connectionAttempts: 2,\n        connectionTimeout: Duration.seconds(2),\n        readTimeout: Duration.seconds(10),\n        protocolPolicy: OriginProtocolPolicy.HTTPS_ONLY,\n      }),\n      allowedMethods: AllowedMethods.ALLOW_GET_HEAD,\n      compress: true,\n      viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n      originRequestPolicy: undefined,\n      cachePolicy: this.createSsrCachePolicy(),\n    };\n  }\n\n  /**\n   * Eventhough we don't want to cache SSR requests, we still have to create a cache policy, in order to\n   * forward required cookies, query params and headers. This doesn't make any sense, because if nothing\n   * is cached, one would expect, that anything would/could be forwarded, but anyway...\n   */\n  private createSsrCachePolicy(): ICachePolicy {\n\n    // The headers to pass to the app\n    const headers = [\n      'User-Agent', // Required to distinguish between mobile and desktop template\n      'Authorization', // For authorization\n    ];\n\n    return new CachePolicy(this, `${this.resourceIdPrefix}-cache-policy`, {\n      cachePolicyName: `${this.resourceIdPrefix}-cdn-cache-policy`,\n      comment: `Passes all required request data to the ${this.resourceIdPrefix} origin.`,\n      defaultTtl: Duration.seconds(0),\n      minTtl: Duration.seconds(0),\n      maxTtl: Duration.seconds(1), // the max TTL must not be 0 for a cache policy\n      queryStringBehavior: CacheQueryStringBehavior.all(),\n      headerBehavior: CacheHeaderBehavior.allowList(...headers),\n      cookieBehavior: CacheCookieBehavior.all(),\n      enableAcceptEncodingBrotli: true,\n      enableAcceptEncodingGzip: true,\n    });\n  }\n\n  private createCloudFrontDistribution(props: NuxtAppStackProps): Distribution {\n    const cdnName = `${this.resourceIdPrefix}-cdn`;\n\n    return new Distribution(this, cdnName, {\n      domainNames: props.subDomain ? [`${props.subDomain}.${props.baseDomain}`] : [props.baseDomain, `*.${props.baseDomain}`],\n      comment: `${this.resourceIdPrefix}-redirect`,\n      minimumProtocolVersion: SecurityPolicyProtocol.TLS_V1_2_2018,\n      certificate: this.tlsCertificate,\n      defaultBehavior: this.httpsForwardingBehavior,\n      additionalBehaviors: this.createStaticAssetBehaviors(),\n      priceClass: PriceClass.PRICE_CLASS_100, // Use only North America and Europe\n    });\n  }\n\n  private createStaticAssetBehaviors(): Record<string, BehaviorOptions> {\n    const staticAssetsCacheConfig: BehaviorOptions = {\n      origin: new S3Origin(this.staticAssetsBucket, {\n        connectionAttempts: 2,\n        connectionTimeout: Duration.seconds(3),\n        originAccessIdentity: this.cdnAccessIdentity,\n        originPath: this.deploymentRevision,\n      }),\n      compress: true,\n      allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,\n      cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,\n      cachePolicy: CachePolicy.CACHING_OPTIMIZED,\n      viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n    };\n\n    const rules: Record<string, BehaviorOptions> = {};\n    NuxtAppStaticAssets.forEach(asset => {\n      rules[`${asset.target}${asset.pattern}`] = staticAssetsCacheConfig\n    })\n\n    return rules\n  }\n\n  /**\n   * In order to enable a zero-downtime deployment, we use a new subdirectory (revision) for every deployment.\n   * The previous versions are retained to allow clients to continue to work with an older revision.\n   */\n  private configureDeployments(): BucketDeployment[] {\n    const defaultCacheConfig = [\n      CacheControl.setPublic(),\n      CacheControl.maxAge(Duration.days(365)),\n      CacheControl.fromString('immutable'),\n    ];\n\n    // Returns a deployment for every configured static asset type to respect the different cache settings\n    return NuxtAppStaticAssets.filter(asset => fs.existsSync(asset.source)).map((asset, assetIndex) => {\n      return new BucketDeployment(this, `${this.resourceIdPrefix}-assets-deployment-${assetIndex}`, {\n        sources: [Source.asset(asset.source)],\n        destinationBucket: this.staticAssetsBucket,\n        destinationKeyPrefix: this.deploymentRevision + asset.target,\n        prune: false,\n        storageClass: StorageClass.STANDARD,\n        exclude: ['*'],\n        include: [asset.pattern],\n        cacheControl: asset.cacheControl ?? defaultCacheConfig,\n        contentType: asset.contentType,\n      })\n    });\n  }\n\n  private findHostedZone(props: NuxtAppStackProps): IHostedZone {\n    return HostedZone.fromHostedZoneAttributes(this, `${this.resourceIdPrefix}-hosted-zone`, {\n      hostedZoneId: props.hostedZoneId,\n      zoneName: props.baseDomain,\n    });\n  }\n\n  private createDnsRecords(props: NuxtAppStackProps): void {\n    const dnsTarget = RecordTarget.fromAlias(new CloudFrontTarget(this.cdn));\n\n    // Create a record for IPv4\n    new ARecord(this, `${this.resourceIdPrefix}-ipv4-record`, {\n      recordName: props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain,\n      zone: this.hostedZone,\n      target: dnsTarget,\n    });\n\n    // Create a record for IPv6\n    new AaaaRecord(this, `${this.resourceIdPrefix}-ipv6-record`, {\n      recordName: props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain,\n      zone: this.hostedZone,\n      target: dnsTarget,\n    });\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"nuxt-app-stack.js","sourceRoot":"","sources":["nuxt-app-stack.ts"],"names":[],"mappings":";;;AAAA,6CAAiE;AAEjE,+EAA6E;AAC7E,+DASoC;AACpC,uDAA2F;AAC3F,+CAA2F;AAC3F,yDAAmG;AACnG,qEAAmG;AACnG,+EAAwE;AACxE,yEAAiE;AACjE,iFAA+D;AAC/D,mDAAmD;AACnD,sGAAqF;AACrF,4EAAwD;AACxD,qEAA6D;AAE7D,yBAAyB;AAWzB,MAAa,YAAa,SAAQ,mBAAK;IAarC,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAwB;QAChE,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAExB,IAAI,CAAC,gBAAgB,GAAG,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;QACjF,IAAI,CAAC,kBAAkB,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACxD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC1D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1C,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACpE,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAEO,kBAAkB,CAAC,KAAwB;QACjD,OAAO,oCAAW,CAAC,kBAAkB,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,kBAAkB,EAAE,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACzH,CAAC;IAEO,uBAAuB;QAC7B,MAAM,wBAAwB,GAAG,GAAG,IAAI,CAAC,gBAAgB,gBAAgB,CAAC;QAC1E,OAAO,IAAI,qCAAoB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;IAClE,CAAC;IAEO,wBAAwB;QAC9B,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,gBAAgB,SAAS,CAAC;QACrD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,EAAE,UAAU,EAAE;YAC1C,aAAa,EAAE,4BAAmB,CAAC,kBAAkB;YACrD,iBAAiB,EAAE,0BAAiB,CAAC,SAAS;YAC9C,UAAU;YACV,uGAAuG;YACvG,aAAa,EAAE,2BAAa,CAAC,OAAO;YACpC,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE9C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,oBAAoB;QAC1B,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,gBAAgB,YAAY,CAAC;QACvD,OAAO,IAAI,yBAAY,CAAC,IAAI,EAAE,SAAS,EAAE;YACvC,gBAAgB,EAAE,SAAS;YAC3B,IAAI,EAAE,iBAAI,CAAC,SAAS,CAAC,4BAA4B,CAAC;YAClD,kBAAkB,EAAE,CAAC,oBAAO,CAAC,WAAW,CAAC;YACzC,WAAW,EAAE,qDAAqD,IAAI,CAAC,gBAAgB,GAAG;SAC3F,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB;QAC1B,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,gBAAgB,WAAW,CAAC;QAErD,OAAO,IAAI,qBAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE;YAClC,YAAY,EAAE,QAAQ;YACtB,OAAO,EAAE,oBAAO,CAAC,WAAW;YAC5B,YAAY,EAAE,yBAAY,CAAC,MAAM;YACjC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YACpB,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,iBAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE;gBAC/C,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,cAAc,EAAE,QAAQ,CAAC;aAC3G,CAAC;YACF,OAAO,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,UAAU,EAAE,GAAG;YACf,YAAY,EAAE,wBAAa,CAAC,SAAS;YACrC,WAAW,EAAE,EAAE;YACf,iBAAiB,EAAE,KAAK;SACzB,CAAC,CAAC;IACL,CAAC;IAEO,gBAAgB;QACtB,MAAM,iBAAiB,GAAG,IAAI,2DAAqB,CAAC,GAAG,IAAI,CAAC,gBAAgB,qBAAqB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACxH,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,gBAAgB,MAAM,CAAC;QAC/C,MAAM,UAAU,GAAG,IAAI,gCAAO,CAAC,IAAI,EAAE,OAAO,EAAE;YAC5C,OAAO;YACP,uGAAuG;YACvG,aAAa,EAAE,SAAS;YACxB,kBAAkB,EAAE,iBAAiB;SACtC,CAAC,CAAC;QAEH,UAAU,CAAC,SAAS,CAAC;YACnB,WAAW,EAAE,iBAAiB;YAC9B,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,oCAAU,CAAC,GAAG,EAAE,oCAAU,CAAC,IAAI,CAAC;SAC3C,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,6BAA6B;QACnC,OAAO;YACL,MAAM,EAAE,IAAI,mCAAU,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,gBAAgB,IAAI,CAAC,MAAM,gBAAgB,EAAE;gBAC9F,kBAAkB,EAAE,CAAC;gBACrB,iBAAiB,EAAE,sBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtC,WAAW,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,cAAc,EAAE,qCAAoB,CAAC,UAAU;aAChD,CAAC;YACF,cAAc,EAAE,+BAAc,CAAC,cAAc;YAC7C,QAAQ,EAAE,IAAI;YACd,oBAAoB,EAAE,qCAAoB,CAAC,iBAAiB;YAC5D,mBAAmB,EAAE,SAAS;YAC9B,WAAW,EAAE,IAAI,CAAC,oBAAoB,EAAE;SACzC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACK,oBAAoB;QAE1B,iCAAiC;QACjC,MAAM,OAAO,GAAG;YACd,YAAY;YACZ,eAAe;SAChB,CAAC;QAEF,OAAO,IAAI,4BAAW,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,eAAe,EAAE;YACpE,eAAe,EAAE,GAAG,IAAI,CAAC,gBAAgB,mBAAmB;YAC5D,OAAO,EAAE,2CAA2C,IAAI,CAAC,gBAAgB,UAAU;YACnF,UAAU,EAAE,sBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC/B,MAAM,EAAE,sBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3B,MAAM,EAAE,sBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3B,mBAAmB,EAAE,yCAAwB,CAAC,GAAG,EAAE;YACnD,cAAc,EAAE,oCAAmB,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;YACzD,cAAc,EAAE,oCAAmB,CAAC,GAAG,EAAE;YACzC,0BAA0B,EAAE,IAAI;YAChC,wBAAwB,EAAE,IAAI;SAC/B,CAAC,CAAC;IACL,CAAC;IAEO,4BAA4B,CAAC,KAAwB;QAC3D,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,gBAAgB,MAAM,CAAC;QAE/C,OAAO,IAAI,6BAAY,CAAC,IAAI,EAAE,OAAO,EAAE;YACrC,WAAW,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;YAC3B,OAAO,EAAE,GAAG,IAAI,CAAC,gBAAgB,WAAW;YAC5C,sBAAsB,EAAE,uCAAsB,CAAC,aAAa;YAC5D,WAAW,EAAE,IAAI,CAAC,cAAc;YAChC,eAAe,EAAE,IAAI,CAAC,uBAAuB;YAC7C,mBAAmB,EAAE,IAAI,CAAC,0BAA0B,EAAE;YACtD,UAAU,EAAE,2BAAU,CAAC,eAAe;SACvC,CAAC,CAAC;IACL,CAAC;IAEO,0BAA0B;QAChC,MAAM,uBAAuB,GAAoB;YAC/C,MAAM,EAAE,IAAI,iCAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC5C,kBAAkB,EAAE,CAAC;gBACrB,iBAAiB,EAAE,sBAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;gBACtC,oBAAoB,EAAE,IAAI,CAAC,iBAAiB;gBAC5C,UAAU,EAAE,IAAI,CAAC,kBAAkB;aACpC,CAAC;YACF,QAAQ,EAAE,IAAI;YACd,cAAc,EAAE,+BAAc,CAAC,sBAAsB;YACrD,aAAa,EAAE,8BAAa,CAAC,sBAAsB;YACnD,WAAW,EAAE,4BAAW,CAAC,iBAAiB;YAC1C,oBAAoB,EAAE,qCAAoB,CAAC,iBAAiB;SAC7D,CAAC;QAEF,MAAM,KAAK,GAAoC,EAAE,CAAC;QAClD,4CAAmB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAClC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,uBAAuB,CAAA;QACpE,CAAC,CAAC,CAAA;QAEF,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;;OAGG;IACK,oBAAoB;QAC1B,MAAM,kBAAkB,GAAG;YACzB,gCAAY,CAAC,SAAS,EAAE;YACxB,gCAAY,CAAC,MAAM,CAAC,sBAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvC,gCAAY,CAAC,UAAU,CAAC,WAAW,CAAC;SACrC,CAAC;QAEF,sGAAsG;QACtG,OAAO,4CAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;;YAChG,OAAO,IAAI,oCAAgB,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,sBAAsB,UAAU,EAAE,EAAE;gBAC5F,OAAO,EAAE,CAAC,0BAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBACrC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB;gBAC1C,oBAAoB,EAAE,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,MAAM;gBAC5D,KAAK,EAAE,KAAK;gBACZ,YAAY,EAAE,gCAAY,CAAC,QAAQ;gBACnC,OAAO,EAAE,CAAC,GAAG,CAAC;gBACd,OAAO,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;gBACxB,YAAY,QAAE,KAAK,CAAC,YAAY,mCAAI,kBAAkB;gBACtD,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAA;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,cAAc,CAAC,KAAwB;QAC7C,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE5C,OAAO,wBAAU,CAAC,wBAAwB,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,cAAc,EAAE;YACvF,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,QAAQ,EAAE,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,KAAwB;QAC/C,MAAM,SAAS,GAAG,0BAAY,CAAC,SAAS,CAAC,IAAI,sCAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAEzE,2BAA2B;QAC3B,IAAI,qBAAO,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,cAAc,EAAE;YACxD,UAAU,EAAE,KAAK,CAAC,MAAM;YACxB,IAAI,EAAE,IAAI,CAAC,UAAU;YACrB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;QAEH,2BAA2B;QAC3B,IAAI,wBAAU,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,cAAc,EAAE;YAC3D,UAAU,EAAE,KAAK,CAAC,MAAM;YACxB,IAAI,EAAE,IAAI,CAAC,UAAU;YACrB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAC;IACL,CAAC;CACF;AA7OD,oCA6OC","sourcesContent":["import {Duration, RemovalPolicy, Stack, Tags} from 'aws-cdk-lib';\nimport { Construct } from 'constructs';\nimport {Certificate, ICertificate} from \"aws-cdk-lib/aws-certificatemanager\";\nimport {\n  AllowedMethods,\n  BehaviorOptions, CacheCookieBehavior,\n  CachedMethods, CacheHeaderBehavior,\n  CachePolicy, CacheQueryStringBehavior,\n  Distribution, ICachePolicy,\n  IOriginAccessIdentity, OriginAccessIdentity, OriginProtocolPolicy, PriceClass,\n  SecurityPolicyProtocol,\n  ViewerProtocolPolicy\n} from \"aws-cdk-lib/aws-cloudfront\";\nimport {Architecture, Code, LayerVersion, Runtime, Function} from \"aws-cdk-lib/aws-lambda\";\nimport {BlockPublicAccess, Bucket, BucketAccessControl, IBucket} from \"aws-cdk-lib/aws-s3\";\nimport {ARecord, AaaaRecord, HostedZone, IHostedZone, RecordTarget} from \"aws-cdk-lib/aws-route53\";\nimport {BucketDeployment, CacheControl, Source, StorageClass} from \"aws-cdk-lib/aws-s3-deployment\";\nimport {HttpOrigin, S3Origin} from \"aws-cdk-lib/aws-cloudfront-origins\";\nimport {CloudFrontTarget} from \"aws-cdk-lib/aws-route53-targets\";\nimport {HttpMethod} from \"aws-cdk-lib/aws-stepfunctions-tasks\";\nimport {RetentionDays} from \"aws-cdk-lib/aws-logs\";\nimport { HttpLambdaIntegration } from '@aws-cdk/aws-apigatewayv2-integrations-alpha';\nimport {HttpApi} from \"@aws-cdk/aws-apigatewayv2-alpha\";\nimport {NuxtAppStaticAssets} from \"./nuxt-app-static-assets\";\nimport {AppStackProps} from \"./app-stack-props\";\nimport * as fs from \"fs\";\n\nexport interface NuxtAppStackProps extends AppStackProps {\n  readonly domain: string;\n\n  // Used by the CDN, must be issued in us-east-1 (global)\n  readonly globalTlsCertificateArn: string;\n\n  readonly hostedZoneId: string;\n}\n\nexport class NuxtAppStack extends Stack {\n  private readonly resourceIdPrefix: string;\n  private readonly deploymentRevision: string;\n  private readonly tlsCertificate: ICertificate;\n  private readonly cdnAccessIdentity: IOriginAccessIdentity;\n  public staticAssetsBucket: IBucket;\n  private readonly layer: LayerVersion;\n  private readonly lambdaFunction: Function;\n  private apiGateway: HttpApi;\n  private readonly httpsForwardingBehavior: BehaviorOptions;\n  private readonly cdn: Distribution;\n  private readonly hostedZone: IHostedZone;\n\n  constructor(scope: Construct, id: string, props: NuxtAppStackProps) {\n    super(scope, id, props);\n\n    this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;\n    this.deploymentRevision = new Date().toISOString();\n    this.tlsCertificate = this.findTlsCertificate(props);\n    this.cdnAccessIdentity = this.createCdnAccessIdentity();\n    this.staticAssetsBucket = this.createStaticAssetsBucket();\n    this.layer = this.createSsrLambdaLayer();\n    this.lambdaFunction = this.createLambdaFunction();\n    this.apiGateway = this.createApiGateway();\n    this.httpsForwardingBehavior = this.createHttpsForwardingBehavior();\n    this.cdn = this.createCloudFrontDistribution(props);\n    this.configureDeployments();\n    this.hostedZone = this.findHostedZone(props);\n    this.createDnsRecords(props);\n  }\n\n  private findTlsCertificate(props: NuxtAppStackProps): ICertificate {\n    return Certificate.fromCertificateArn(this, `${this.resourceIdPrefix}-tls-certificate`, props.globalTlsCertificateArn);\n  }\n\n  private createCdnAccessIdentity(): IOriginAccessIdentity {\n    const originAccessIdentityName = `${this.resourceIdPrefix}-cdn-s3-access`;\n    return new OriginAccessIdentity(this, originAccessIdentityName);\n  }\n\n  private createStaticAssetsBucket(): IBucket {\n    const bucketName = `${this.resourceIdPrefix}-assets`;\n    const bucket = new Bucket(this, bucketName, {\n      accessControl: BucketAccessControl.AUTHENTICATED_READ,\n      blockPublicAccess: BlockPublicAccess.BLOCK_ALL,\n      bucketName,\n      // the bucket and all of its objects can be deleted, because all the content is managed in this project\n      removalPolicy: RemovalPolicy.DESTROY,\n      autoDeleteObjects: true,\n    });\n\n    bucket.grantReadWrite(this.cdnAccessIdentity);\n\n    return bucket;\n  }\n\n  private createSsrLambdaLayer(): LayerVersion {\n    const layerName = `${this.resourceIdPrefix}-ssr-layer`;\n    return new LayerVersion(this, layerName, {\n      layerVersionName: layerName,\n      code: Code.fromAsset('.nuxt/cdk-deployment/layer'),\n      compatibleRuntimes: [Runtime.NODEJS_12_X],\n      description: `Contains node_modules required for server-side of ${this.resourceIdPrefix}.`,\n    });\n  }\n\n  private createLambdaFunction(): Function {\n    const funcName = `${this.resourceIdPrefix}-function`;\n\n    return new Function(this, funcName, {\n      functionName: funcName,\n      runtime: Runtime.NODEJS_12_X,\n      architecture: Architecture.ARM_64,\n      layers: [this.layer],\n      handler: 'index.handler',\n      code: Code.fromAsset('.nuxt/cdk-deployment/src', {\n        exclude: ['**.svg', '**.ico', '**.png', '**.jpg', 'chunk.*.js*', 'bundle.*.js*', 'bundle.*.js*', 'sw.js*'],\n      }),\n      timeout: Duration.seconds(10),\n      memorySize: 512,\n      logRetention: RetentionDays.ONE_MONTH,\n      environment: {},\n      allowPublicSubnet: false\n    });\n  }\n\n  private createApiGateway(): HttpApi {\n    const lambdaIntegration = new HttpLambdaIntegration(`${this.resourceIdPrefix}-lambda-integration`, this.lambdaFunction);\n    const apiName = `${this.resourceIdPrefix}-api`;\n    const apiGateway = new HttpApi(this, apiName, {\n      apiName,\n      // The app does not allow any cross-origin access by purpose: the app should not be embeddable anywhere\n      corsPreflight: undefined,\n      defaultIntegration: lambdaIntegration,\n    });\n\n    apiGateway.addRoutes({\n      integration: lambdaIntegration,\n      path: '/{proxy+}',\n      methods: [HttpMethod.GET, HttpMethod.HEAD],\n    });\n    return apiGateway;\n  }\n\n  private createHttpsForwardingBehavior(): BehaviorOptions {\n    return {\n      origin: new HttpOrigin(`${this.apiGateway.httpApiId}.execute-api.${this.region}.amazonaws.com`, {\n        connectionAttempts: 2,\n        connectionTimeout: Duration.seconds(2),\n        readTimeout: Duration.seconds(10),\n        protocolPolicy: OriginProtocolPolicy.HTTPS_ONLY,\n      }),\n      allowedMethods: AllowedMethods.ALLOW_GET_HEAD,\n      compress: true,\n      viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n      originRequestPolicy: undefined,\n      cachePolicy: this.createSsrCachePolicy(),\n    };\n  }\n\n  /**\n   * Eventhough we don't want to cache SSR requests, we still have to create a cache policy, in order to\n   * forward required cookies, query params and headers. This doesn't make any sense, because if nothing\n   * is cached, one would expect, that anything would/could be forwarded, but anyway...\n   */\n  private createSsrCachePolicy(): ICachePolicy {\n\n    // The headers to pass to the app\n    const headers = [\n      'User-Agent', // Required to distinguish between mobile and desktop template\n      'Authorization', // For authorization\n    ];\n\n    return new CachePolicy(this, `${this.resourceIdPrefix}-cache-policy`, {\n      cachePolicyName: `${this.resourceIdPrefix}-cdn-cache-policy`,\n      comment: `Passes all required request data to the ${this.resourceIdPrefix} origin.`,\n      defaultTtl: Duration.seconds(0),\n      minTtl: Duration.seconds(0),\n      maxTtl: Duration.seconds(1), // the max TTL must not be 0 for a cache policy\n      queryStringBehavior: CacheQueryStringBehavior.all(),\n      headerBehavior: CacheHeaderBehavior.allowList(...headers),\n      cookieBehavior: CacheCookieBehavior.all(),\n      enableAcceptEncodingBrotli: true,\n      enableAcceptEncodingGzip: true,\n    });\n  }\n\n  private createCloudFrontDistribution(props: NuxtAppStackProps): Distribution {\n    const cdnName = `${this.resourceIdPrefix}-cdn`;\n\n    return new Distribution(this, cdnName, {\n      domainNames: [props.domain],\n      comment: `${this.resourceIdPrefix}-redirect`,\n      minimumProtocolVersion: SecurityPolicyProtocol.TLS_V1_2_2018,\n      certificate: this.tlsCertificate,\n      defaultBehavior: this.httpsForwardingBehavior,\n      additionalBehaviors: this.createStaticAssetBehaviors(),\n      priceClass: PriceClass.PRICE_CLASS_100, // Use only North America and Europe\n    });\n  }\n\n  private createStaticAssetBehaviors(): Record<string, BehaviorOptions> {\n    const staticAssetsCacheConfig: BehaviorOptions = {\n      origin: new S3Origin(this.staticAssetsBucket, {\n        connectionAttempts: 2,\n        connectionTimeout: Duration.seconds(3),\n        originAccessIdentity: this.cdnAccessIdentity,\n        originPath: this.deploymentRevision,\n      }),\n      compress: true,\n      allowedMethods: AllowedMethods.ALLOW_GET_HEAD_OPTIONS,\n      cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,\n      cachePolicy: CachePolicy.CACHING_OPTIMIZED,\n      viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,\n    };\n\n    const rules: Record<string, BehaviorOptions> = {};\n    NuxtAppStaticAssets.forEach(asset => {\n      rules[`${asset.target}${asset.pattern}`] = staticAssetsCacheConfig\n    })\n\n    return rules\n  }\n\n  /**\n   * In order to enable a zero-downtime deployment, we use a new subdirectory (revision) for every deployment.\n   * The previous versions are retained to allow clients to continue to work with an older revision.\n   */\n  private configureDeployments(): BucketDeployment[] {\n    const defaultCacheConfig = [\n      CacheControl.setPublic(),\n      CacheControl.maxAge(Duration.days(365)),\n      CacheControl.fromString('immutable'),\n    ];\n\n    // Returns a deployment for every configured static asset type to respect the different cache settings\n    return NuxtAppStaticAssets.filter(asset => fs.existsSync(asset.source)).map((asset, assetIndex) => {\n      return new BucketDeployment(this, `${this.resourceIdPrefix}-assets-deployment-${assetIndex}`, {\n        sources: [Source.asset(asset.source)],\n        destinationBucket: this.staticAssetsBucket,\n        destinationKeyPrefix: this.deploymentRevision + asset.target,\n        prune: false,\n        storageClass: StorageClass.STANDARD,\n        exclude: ['*'],\n        include: [asset.pattern],\n        cacheControl: asset.cacheControl ?? defaultCacheConfig,\n        contentType: asset.contentType,\n      })\n    });\n  }\n\n  private findHostedZone(props: NuxtAppStackProps): IHostedZone {\n    const domainParts = props.domain.split('.');\n\n    return HostedZone.fromHostedZoneAttributes(this, `${this.resourceIdPrefix}-hosted-zone`, {\n      hostedZoneId: props.hostedZoneId,\n      zoneName: domainParts[domainParts.length - 1], // Support subdomains\n    });\n  }\n\n  private createDnsRecords(props: NuxtAppStackProps): void {\n    const dnsTarget = RecordTarget.fromAlias(new CloudFrontTarget(this.cdn));\n\n    // Create a record for IPv4\n    new ARecord(this, `${this.resourceIdPrefix}-ipv4-record`, {\n      recordName: props.domain,\n      zone: this.hostedZone,\n      target: dnsTarget,\n    });\n\n    // Create a record for IPv6\n    new AaaaRecord(this, `${this.resourceIdPrefix}-ipv6-record`, {\n      recordName: props.domain,\n      zone: this.hostedZone,\n      target: dnsTarget,\n    });\n  }\n}\n"]}

package/lib/stack/nuxt-app-stack.ts

@@ -26,8 +26,7 @@ import {AppStackProps} from "./app-stack-props";
 import * as fs from "fs";
 
 export interface NuxtAppStackProps extends AppStackProps {
-  readonly baseDomain: string;
-  readonly subDomain?: string;
+  readonly domain: string;
 
   // Used by the CDN, must be issued in us-east-1 (global)
   readonly globalTlsCertificateArn: string;
@@ -51,11 +50,6 @@ export class NuxtAppStack extends Stack {
   constructor(scope: Construct, id: string, props: NuxtAppStackProps) {
     super(scope, id, props);
 
-    Tags.of(scope).add('project', props.project);
-    Tags.of(scope).add('domain', props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain);
-    Tags.of(scope).add('service', props.service);
-    Tags.of(scope).add('environment', props.environment);
-
     this.resourceIdPrefix = `${props.project}-${props.service}-${props.environment}`;
     this.deploymentRevision = new Date().toISOString();
     this.tlsCertificate = this.findTlsCertificate(props);
@@ -100,7 +94,7 @@ export class NuxtAppStack extends Stack {
     const layerName = `${this.resourceIdPrefix}-ssr-layer`;
     return new LayerVersion(this, layerName, {
       layerVersionName: layerName,
-      code: Code.fromAsset('./server/layer'),
+      code: Code.fromAsset('.nuxt/cdk-deployment/layer'),
       compatibleRuntimes: [Runtime.NODEJS_12_X],
       description: `Contains node_modules required for server-side of ${this.resourceIdPrefix}.`,
     });
@@ -114,8 +108,8 @@ export class NuxtAppStack extends Stack {
       runtime: Runtime.NODEJS_12_X,
       architecture: Architecture.ARM_64,
       layers: [this.layer],
-      handler: 'lambda-handler.render',
-      code: Code.fromAsset('.nuxt/cdk-deployment', {
+      handler: 'index.handler',
+      code: Code.fromAsset('.nuxt/cdk-deployment/src', {
         exclude: ['**.svg', '**.ico', '**.png', '**.jpg', 'chunk.*.js*', 'bundle.*.js*', 'bundle.*.js*', 'sw.js*'],
       }),
       timeout: Duration.seconds(10),
@@ -191,7 +185,7 @@ export class NuxtAppStack extends Stack {
     const cdnName = `${this.resourceIdPrefix}-cdn`;
 
     return new Distribution(this, cdnName, {
-      domainNames: props.subDomain ? [`${props.subDomain}.${props.baseDomain}`] : [props.baseDomain, `*.${props.baseDomain}`],
+      domainNames: [props.domain],
       comment: `${this.resourceIdPrefix}-redirect`,
       minimumProtocolVersion: SecurityPolicyProtocol.TLS_V1_2_2018,
       certificate: this.tlsCertificate,
@@ -252,9 +246,11 @@ export class NuxtAppStack extends Stack {
   }
 
   private findHostedZone(props: NuxtAppStackProps): IHostedZone {
+    const domainParts = props.domain.split('.');
+
     return HostedZone.fromHostedZoneAttributes(this, `${this.resourceIdPrefix}-hosted-zone`, {
       hostedZoneId: props.hostedZoneId,
-      zoneName: props.baseDomain,
+      zoneName: domainParts[domainParts.length - 1], // Support subdomains
     });
   }
 
@@ -263,14 +259,14 @@ export class NuxtAppStack extends Stack {
 
     // Create a record for IPv4
     new ARecord(this, `${this.resourceIdPrefix}-ipv4-record`, {
-      recordName: props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain,
+      recordName: props.domain,
       zone: this.hostedZone,
       target: dnsTarget,
     });
 
     // Create a record for IPv6
     new AaaaRecord(this, `${this.resourceIdPrefix}-ipv6-record`, {
-      recordName: props.subDomain ? `${props.subDomain}.${props.baseDomain}` : props.baseDomain,
+      recordName: props.domain,
       zone: this.hostedZone,
       target: dnsTarget,
     });

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "cdk-nuxt",
-  "version": "0.2.3",
+  "version": "0.2.7",
   "license": "MIT",
   "files": [
-    "lib"
+    "lib",
+    "index.d.ts"
   ],
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "index.js",
+  "types": "index.d.ts",
   "bin": {
     "nuxt-deploy": "./lib/cli/deploy.js"
   },
@@ -16,7 +17,6 @@
   "devDependencies": {
     "@types/node": "10.17.27",
     "aws-cdk": "2.10.0",
-    "dotenv": "^16.0.0",
     "fs": "^0.0.1-security",
     "ts-node": "^9.0.0",
     "typescript": "~3.9.7"
@@ -28,5 +28,12 @@
     "constructs": "^10.0.0",
     "shelljs": "^0.8.5",
     "source-map-support": "^0.5.16"
+  },
+  "peerDependencies": {
+    "aws-cdk": "^2.10.0",
+    "nuxt-aws-lambda": "^1.5.0",
+    "nuxt-start": "^2.15.8",
+    "ts-node": "^9.0.0",
+    "typescript": "~3.9.7"
   }
 }