@inizioevoke/evosynth 2.1.0 → 2.1.2

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.
@@ -37,14 +37,23 @@ export async function evosynth(cmd, env, props) {
37
37
  if (configIndex != -1) {
38
38
  const configFile = configFiles[configIndex];
39
39
  const tsxUnregister = /^\.m?ts$/.test(extname(configFile.name)) ? register() : undefined;
40
- const module = await import(__rewriteRelativeImportExtension(pathToFileURL(join(configFile.dir, configFile.name)).toString()));
41
- tsxUnregister && tsxUnregister();
40
+ let module;
41
+ try {
42
+ module = await import(__rewriteRelativeImportExtension(pathToFileURL(join(configFile.dir, configFile.name)).toString()));
43
+ }
44
+ catch (err) {
45
+ console.error(`Failed to load config "${configFile.name}":`, err.message);
46
+ process.exit(1);
47
+ }
48
+ finally {
49
+ tsxUnregister?.();
50
+ }
42
51
  let config = undefined;
43
52
  if (configFile.env) {
44
- config = await module.default();
53
+ config = await module.default?.();
45
54
  }
46
55
  else {
47
- config = await module[env]?.();
56
+ config = await module[env.toLowerCase()]?.();
48
57
  }
49
58
  if (config) {
50
59
  if (props.profile) {
@@ -54,11 +63,19 @@ export async function evosynth(cmd, env, props) {
54
63
  case 'web-static-serverless':
55
64
  await runWebStaticServerlessApp(cmd, config);
56
65
  break;
66
+ default:
67
+ console.error(`Unsupported evosynth app type: "${config.type}"`);
68
+ process.exit(1);
69
+ break;
57
70
  }
58
71
  }
72
+ else {
73
+ console.error(`Config environment "${env}" not found`);
74
+ process.exit(1);
75
+ }
59
76
  }
60
77
  else {
61
78
  console.error('evosynth config not found!');
62
79
  }
63
80
  }
64
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZvc3ludGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2V2b3N5bnRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDekMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV2QyxPQUFPLEVBQUUseUJBQXlCLEVBQWdDLE1BQU0sNEJBQTRCLENBQUM7QUFtQnJHLE1BQU0sQ0FBQyxLQUFLLFVBQVUsUUFBUSxDQUFDLEdBQWUsRUFBRSxHQUFXLEVBQUUsS0FBb0I7SUFDL0UsTUFBTSxLQUFLLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFFcEUsTUFBTSxXQUFXLEdBQUcsS0FBSztTQUN0QixNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtRQUNqQixJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1lBQ3BCLE9BQU8sdUNBQXVDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRSxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUMsQ0FBQztTQUNELEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQzNELE9BQU87WUFDTCxJQUFJLEVBQUUsTUFBTSxDQUFDLElBQUk7WUFDakIsR0FBRyxFQUFFLEtBQUssQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVM7WUFDNUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxVQUFVO1NBQ3ZCLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVMLElBQUksV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLEdBQUcsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxLQUFLLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3hHLElBQUksV0FBVyxLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDdkIsV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLFNBQVMsQ0FBQyxDQUFDO0lBQ2hFLENBQUM7SUFDRCxJQUFJLFdBQVcsSUFBSSxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3RCLE1BQU0sVUFBVSxHQUFHLFdBQVcsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUM1QyxNQUFNLGFBQWEsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztRQUN6RixNQUFNLE1BQU0sR0FBRyxNQUFNLE1BQU0sa0NBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxFQUFDLENBQUM7UUFDN0YsYUFBYSxJQUFJLGFBQWEsRUFBRSxDQUFDO1FBQ2pDLElBQUksTUFBTSxHQUFrQyxTQUFTLENBQUM7UUFDdEQsSUFBSSxVQUFVLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDbkIsTUFBTSxHQUFHLE1BQU0sTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2xDLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxHQUFHLE1BQU0sTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNqQyxDQUFDO1FBRUQsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNYLElBQUksS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO2dCQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDO1lBQzFDLENBQUM7WUFDRCxRQUFRLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDcEIsS0FBSyx1QkFBdUI7b0JBQzFCLE1BQU0seUJBQXlCLENBQUMsR0FBRyxFQUFFLE1BQXNDLENBQUMsQ0FBQztvQkFDN0UsTUFBTTtZQUNWLENBQUM7UUFDSCxDQUFDO0lBRUgsQ0FBQztTQUFNLENBQUM7UUFDTixPQUFPLENBQUMsS0FBSyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDOUMsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyByZWFkZGlyIH0gZnJvbSAnbm9kZTpmcy9wcm9taXNlcyc7XG5pbXBvcnQgeyBqb2luLCBleHRuYW1lIH0gZnJvbSAnbm9kZTpwYXRoJztcbmltcG9ydCB7IHBhdGhUb0ZpbGVVUkwgfSBmcm9tICdub2RlOnVybCc7XG5pbXBvcnQgeyByZWdpc3RlciB9IGZyb20gJ3RzeC9lc20vYXBpJztcbmltcG9ydCB0eXBlIHsgRXZvc3ludGhUYWdLZXkgfSBmcm9tICcuLi90eXBlcy5qcyc7XG5pbXBvcnQgeyBydW5XZWJTdGF0aWNTZXJ2ZXJsZXNzQXBwLCBXZWJTdGF0aWNTZXJ2ZXJsZXNzQXBwQ29uZmlnIH0gZnJvbSAnLi93ZWItc3RhdGljLXNlcnZlcmxlc3MuanMnO1xuXG5leHBvcnQgeyBXZWJTdGF0aWNTZXJ2ZXJsZXNzQXBwQ29uZmlnIH07XG5cbmV4cG9ydCB0eXBlIEVudmlyb25tZW50VHlwZSA9ICdkZXYnIHwgJ3Rlc3QnIHwgJ3N0YWdlJyB8ICd1YXQnIHwgJ3ByZXByb2QnICB8ICdwcm9kJyB8IChzdHJpbmcgJiB7fSk7XG5leHBvcnQgdHlwZSBDZGtDb21tYW5kID0gJ2RlcGxveScgfCAnZGVzdHJveScgfCAnZGlmZicgfCAnZHJpZnQnIHwgJ3JvbGxiYWNrJyB8ICdzeW50aCc7IC8vICdib290c3RyYXAnIHwgXG5leHBvcnQgdHlwZSBFdm9zeW50aEFwcFR5cGUgPSAnc3RyOHItY2xtJyB8ICd3ZWItc3RhdGljLXNlcnZlcmxlc3MnO1xuXG5leHBvcnQgaW50ZXJmYWNlIEV2b3N5bnRoQXBwQ29uZmlnIHtcbiAgdHlwZTogRXZvc3ludGhBcHBUeXBlO1xuICBlbnZUeXBlPzogRW52aXJvbm1lbnRUeXBlO1xuICBuYW1lOiBzdHJpbmc7XG4gIHJlZ2lvbjogJ3VzLWVhc3QtMScgfCAndXMtZWFzdC0yJyB8ICd1cy13ZXN0LTEnIHwgJ3VzLXdlc3QtMicgfCAoc3RyaW5nICYge30pO1xuICB0YWdzPzogUmVjb3JkPEV2b3N5bnRoVGFnS2V5LCBzdHJpbmc+LFxufVxuXG5leHBvcnQgaW50ZXJmYWNlIEV2b3N5bnRoUHJvcHMge1xuICBwcm9maWxlPzogc3RyaW5nO1xufVxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGV2b3N5bnRoKGNtZDogQ2RrQ29tbWFuZCwgZW52OiBzdHJpbmcsIHByb3BzOiBFdm9zeW50aFByb3BzKSB7XG4gIGNvbnN0IGZpbGVzID0gYXdhaXQgcmVhZGRpcihwcm9jZXNzLmN3ZCgpLCB7IHdpdGhGaWxlVHlwZXM6IHRydWUgfSk7XG5cbiAgY29uc3QgY29uZmlnRmlsZXMgPSBmaWxlc1xuICAgIC5maWx0ZXIoKGRpcmVudCkgPT4ge1xuICAgICAgaWYgKGRpcmVudC5pc0ZpbGUoKSkge1xuICAgICAgICByZXR1cm4gL15cXC5ldm9zeW50aCguKj8pXFwuKD86anN8bWpzfHRzfG10cykkL2kudGVzdChkaXJlbnQubmFtZSk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgICB9XG4gICAgfSlcbiAgICAubWFwKChkaXJlbnQpID0+IHtcbiAgICAgIGNvbnN0IHBhcnRzID0gZGlyZW50Lm5hbWUuc3BsaXQoJy4nKS5maWx0ZXIocCA9PiBwICE9PSAnJyk7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBuYW1lOiBkaXJlbnQubmFtZSxcbiAgICAgICAgZW52OiBwYXJ0cy5sZW5ndGggPiAyID8gcGFydHNbMV0gOiB1bmRlZmluZWQsXG4gICAgICAgIGRpcjogZGlyZW50LnBhcmVudFBhdGhcbiAgICAgIH1cbiAgICB9KTtcbiAgXG4gIGxldCBjb25maWdJbmRleCA9IGNvbmZpZ0ZpbGVzLmZpbmRJbmRleChjID0+IGMuZW52ICYmIGVudiAmJiBjLmVudi50b0xvd2VyQ2FzZSgpID09PSBlbnYudG9Mb3dlckNhc2UoKSk7XG4gIGlmIChjb25maWdJbmRleCA9PT0gLTEpIHtcbiAgICBjb25maWdJbmRleCA9IGNvbmZpZ0ZpbGVzLmZpbmRJbmRleChjID0+IGMuZW52ID09PSB1bmRlZmluZWQpO1xuICB9XG4gIGlmIChjb25maWdJbmRleCAhPSAtMSkge1xuICAgIGNvbnN0IGNvbmZpZ0ZpbGUgPSBjb25maWdGaWxlc1tjb25maWdJbmRleF07XG4gICAgY29uc3QgdHN4VW5yZWdpc3RlciA9IC9eXFwubT90cyQvLnRlc3QoZXh0bmFtZShjb25maWdGaWxlLm5hbWUpKSA/IHJlZ2lzdGVyKCkgOiB1bmRlZmluZWQ7XG4gICAgY29uc3QgbW9kdWxlID0gYXdhaXQgaW1wb3J0KHBhdGhUb0ZpbGVVUkwoam9pbihjb25maWdGaWxlLmRpciwgY29uZmlnRmlsZS5uYW1lKSkudG9TdHJpbmcoKSk7XG4gICAgdHN4VW5yZWdpc3RlciAmJiB0c3hVbnJlZ2lzdGVyKCk7XG4gICAgbGV0IGNvbmZpZzogRXZvc3ludGhBcHBDb25maWcgfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XG4gICAgaWYgKGNvbmZpZ0ZpbGUuZW52KSB7XG4gICAgICBjb25maWcgPSBhd2FpdCBtb2R1bGUuZGVmYXVsdCgpO1xuICAgIH0gZWxzZSB7XG4gICAgICBjb25maWcgPSBhd2FpdCBtb2R1bGVbZW52XT8uKCk7XG4gICAgfVxuXG4gICAgaWYgKGNvbmZpZykge1xuICAgICAgaWYgKHByb3BzLnByb2ZpbGUpIHtcbiAgICAgICAgcHJvY2Vzcy5lbnYuQVdTX1BST0ZJTEUgPSBwcm9wcy5wcm9maWxlO1xuICAgICAgfVxuICAgICAgc3dpdGNoIChjb25maWcudHlwZSkge1xuICAgICAgICBjYXNlICd3ZWItc3RhdGljLXNlcnZlcmxlc3MnOlxuICAgICAgICAgIGF3YWl0IHJ1bldlYlN0YXRpY1NlcnZlcmxlc3NBcHAoY21kLCBjb25maWcgYXMgV2ViU3RhdGljU2VydmVybGVzc0FwcENvbmZpZyk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICB9XG4gICAgfVxuICAgIFxuICB9IGVsc2Uge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2V2b3N5bnRoIGNvbmZpZyBub3QgZm91bmQhJyk7XG4gIH1cbn0iXX0=
81
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZvc3ludGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2V2b3N5bnRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDekMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUV2QyxPQUFPLEVBQUUseUJBQXlCLEVBQWdDLE1BQU0sNEJBQTRCLENBQUM7QUFtQnJHLE1BQU0sQ0FBQyxLQUFLLFVBQVUsUUFBUSxDQUFDLEdBQWUsRUFBRSxHQUFXLEVBQUUsS0FBb0I7SUFDL0UsTUFBTSxLQUFLLEdBQUcsTUFBTSxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7SUFFcEUsTUFBTSxXQUFXLEdBQUcsS0FBSztTQUN0QixNQUFNLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtRQUNqQixJQUFJLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1lBQ3BCLE9BQU8sdUNBQXVDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRSxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sS0FBSyxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUMsQ0FBQztTQUNELEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO1FBQ2QsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQzNELE9BQU87WUFDTCxJ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QU0sQ0FBQztRQUNOLE9BQU8sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUM5QyxDQUFDO0FBQ0gsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHJlYWRkaXIgfSBmcm9tICdub2RlOmZzL3Byb21pc2VzJztcbmltcG9ydCB7IGpvaW4sIGV4dG5hbWUgfSBmcm9tICdub2RlOnBhdGgnO1xuaW1wb3J0IHsgcGF0aFRvRmlsZVVSTCB9IGZyb20gJ25vZGU6dXJsJztcbmltcG9ydCB7IHJlZ2lzdGVyIH0gZnJvbSAndHN4L2VzbS9hcGknO1xuaW1wb3J0IHR5cGUgeyBFdm9zeW50aFRhZ0tleSB9IGZyb20gJy4uL3R5cGVzLmpzJztcbmltcG9ydCB7IHJ1bldlYlN0YXRpY1NlcnZlcmxlc3NBcHAsIFdlYlN0YXRpY1NlcnZlcmxlc3NBcHBDb25maWcgfSBmcm9tICcuL3dlYi1zdGF0aWMtc2VydmVybGVzcy5qcyc7XG5cbmV4cG9ydCB7IFdlYlN0YXRpY1NlcnZlcmxlc3NBcHBDb25maWcgfTtcblxuZXhwb3J0IHR5cGUgRW52aXJvbm1lbnRUeXBlID0gJ2RldicgfCAndGVzdCcgfCAnc3RhZ2UnIHwgJ3VhdCcgfCAncHJlcHJvZCcgIHwgJ3Byb2QnIHwgKHN0cmluZyAmIHt9KTtcbmV4cG9ydCB0eXBlIENka0NvbW1hbmQgPSAnZGVwbG95JyB8ICdkZXN0cm95JyB8ICdkaWZmJyB8ICdkcmlmdCcgfCAncm9sbGJhY2snIHwgJ3N5bnRoJzsgLy8gJ2Jvb3RzdHJhcCcgfCBcbmV4cG9ydCB0eXBlIEV2b3N5bnRoQXBwVHlwZSA9ICdzdHI4ci1jbG0nIHwgJ3dlYi1zdGF0aWMtc2VydmVybGVzcyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgRXZvc3ludGhBcHBDb25maWcge1xuICB0eXBlOiBFdm9zeW50aEFwcFR5cGU7XG4gIGVudlR5cGU/OiBFbnZpcm9ubWVudFR5cGU7XG4gIG5hbWU6IHN0cmluZztcbiAgcmVnaW9uOiAndXMtZWFzdC0xJyB8ICd1cy1lYXN0LTInIHwgJ3VzLXdlc3QtMScgfCAndXMtd2VzdC0yJyB8IChzdHJpbmcgJiB7fSk7XG4gIHRhZ3M/OiBSZWNvcmQ8RXZvc3ludGhUYWdLZXksIHN0cmluZz4sXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRXZvc3ludGhQcm9wcyB7XG4gIHByb2ZpbGU/OiBzdHJpbmc7XG59XG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gZXZvc3ludGgoY21kOiBDZGtDb21tYW5kLCBlbnY6IHN0cmluZywgcHJvcHM6IEV2b3N5bnRoUHJvcHMpIHtcbiAgY29uc3QgZmlsZXMgPSBhd2FpdCByZWFkZGlyKHByb2Nlc3MuY3dkKCksIHsgd2l0aEZpbGVUeXBlczogdHJ1ZSB9KTtcblxuICBjb25zdCBjb25maWdGaWxlcyA9IGZpbGVzXG4gICAgLmZpbHRlcigoZGlyZW50KSA9PiB7XG4gICAgICBpZiAoZGlyZW50LmlzRmlsZSgpKSB7XG4gICAgICAgIHJldHVybiAvXlxcLmV2b3N5bnRoKC4qPylcXC4oPzpqc3xtanN8dHN8bXRzKSQvaS50ZXN0KGRpcmVudC5uYW1lKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgIH1cbiAgICB9KVxuICAgIC5tYXAoKGRpcmVudCkgPT4ge1xuICAgICAgY29uc3QgcGFydHMgPSBkaXJlbnQubmFtZS5zcGxpdCgnLicpLmZpbHRlcihwID0+IHAgIT09ICcnKTtcbiAgICAgIHJldHVybiB7XG4gICAgICAgIG5hbWU6IGRpcmVudC5uYW1lLFxuICAgICAgICBlbnY6IHBhcnRzLmxlbmd0aCA+IDIgPyBwYXJ0c1sxXSA6IHVuZGVmaW5lZCxcbiAgICAgICAgZGlyOiBkaXJlbnQucGFyZW50UGF0aFxuICAgICAgfVxuICAgIH0pO1xuICBcbiAgbGV0IGNvbmZpZ0luZGV4ID0gY29uZmlnRmlsZXMuZmluZEluZGV4KGMgPT4gYy5lbnYgJiYgZW52ICYmIGMuZW52LnRvTG93ZXJDYXNlKCkgPT09IGVudi50b0xvd2VyQ2FzZSgpKTtcbiAgaWYgKGNvbmZpZ0luZGV4ID09PSAtMSkge1xuICAgIGNvbmZpZ0luZGV4ID0gY29uZmlnRmlsZXMuZmluZEluZGV4KGMgPT4gYy5lbnYgPT09IHVuZGVmaW5lZCk7XG4gIH1cbiAgaWYgKGNvbmZpZ0luZGV4ICE9IC0xKSB7XG4gICAgY29uc3QgY29uZmlnRmlsZSA9IGNvbmZpZ0ZpbGVzW2NvbmZpZ0luZGV4XTtcbiAgICBjb25zdCB0c3hVbnJlZ2lzdGVyID0gL15cXC5tP3RzJC8udGVzdChleHRuYW1lKGNvbmZpZ0ZpbGUubmFtZSkpID8gcmVnaXN0ZXIoKSA6IHVuZGVmaW5lZDtcbiAgICBsZXQgbW9kdWxlOiBhbnk7XG4gICAgdHJ5IHtcbiAgICAgIG1vZHVsZSA9IGF3YWl0IGltcG9ydChwYXRoVG9GaWxlVVJMKGpvaW4oY29uZmlnRmlsZS5kaXIsIGNvbmZpZ0ZpbGUubmFtZSkpLnRvU3RyaW5nKCkpO1xuICAgIH0gY2F0Y2ggKGVycikge1xuICAgICAgY29uc29sZS5lcnJvcihgRmFpbGVkIHRvIGxvYWQgY29uZmlnIFwiJHtjb25maWdGaWxlLm5hbWV9XCI6YCwgKGVyciBhcyBFcnJvcikubWVzc2FnZSk7XG4gICAgICBwcm9jZXNzLmV4aXQoMSk7XG4gICAgfSBmaW5hbGx5IHtcbiAgICAgIHRzeFVucmVnaXN0ZXI/LigpO1xuICAgIH1cbiAgICBsZXQgY29uZmlnOiBFdm9zeW50aEFwcENvbmZpZyB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcbiAgICBpZiAoY29uZmlnRmlsZS5lbnYpIHtcbiAgICAgIGNvbmZpZyA9IGF3YWl0IG1vZHVsZS5kZWZhdWx0Py4oKTtcbiAgICB9IGVsc2Uge1xuICAgICAgY29uZmlnID0gYXdhaXQgbW9kdWxlW2Vudi50b0xvd2VyQ2FzZSgpXT8uKCk7XG4gICAgfVxuXG4gICAgaWYgKGNvbmZpZykge1xuICAgICAgaWYgKHByb3BzLnByb2ZpbGUpIHtcbiAgICAgICAgcHJvY2Vzcy5lbnYuQVdTX1BST0ZJTEUgPSBwcm9wcy5wcm9maWxlO1xuICAgICAgfVxuICAgICAgc3dpdGNoIChjb25maWcudHlwZSkge1xuICAgICAgICBjYXNlICd3ZWItc3RhdGljLXNlcnZlcmxlc3MnOlxuICAgICAgICAgIGF3YWl0IHJ1bldlYlN0YXRpY1NlcnZlcmxlc3NBcHAoY21kLCBjb25maWcgYXMgV2ViU3RhdGljU2VydmVybGVzc0FwcENvbmZpZyk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICAgIGRlZmF1bHQ6XG4gICAgICAgICAgY29uc29sZS5lcnJvcihgVW5zdXBwb3J0ZWQgZXZvc3ludGggYXBwIHR5cGU6IFwiJHtjb25maWcudHlwZX1cImApO1xuICAgICAgICAgIHByb2Nlc3MuZXhpdCgxKTtcbiAgICAgICAgICBicmVhaztcbiAgICAgIH1cbiAgICB9IGVsc2Uge1xuICAgICAgY29uc29sZS5lcnJvcihgQ29uZmlnIGVudmlyb25tZW50IFwiJHtlbnZ9XCIgbm90IGZvdW5kYCk7XG4gICAgICBwcm9jZXNzLmV4aXQoMSk7XG4gICAgfVxuICAgIFxuICB9IGVsc2Uge1xuICAgIGNvbnNvbGUuZXJyb3IoJ2V2b3N5bnRoIGNvbmZpZyBub3QgZm91bmQhJyk7XG4gIH1cbn0iXX0=
@@ -4,50 +4,58 @@ import { CloudFrontErrorResponse, CloudFrontFunctionRedirects } from '../constru
4
4
  import { CodeBuildImageId, EcrBuildImage, CodeBuildSsmParameter, CodeBuildComputeType, CodeBuildNodeJs, EnvironmentVariables } from '../constructs/codebuild.ts';
5
5
  import type { EvosynthAppConfig, CdkCommand, EvosynthAppType } from './evosynth.ts';
6
6
  import type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseHeadersPolicy } from '../types.d.ts';
7
- export interface WebStaticServerlessAppConfig extends EvosynthAppConfig {
8
- type: Extract<EvosynthAppType, 'web-static-serverless'>;
9
- description?: string;
10
- dns: {
11
- record: string;
12
- zone: string;
13
- };
14
- security?: {
15
- basicAuth?: string;
16
- basicAuthParam?: string;
17
- webAcl?: string | false;
18
- webAclParam?: string;
7
+ export interface AppConfigDnsProps {
8
+ record: string;
9
+ zone: string;
10
+ }
11
+ export interface AppConfigSecurityProps {
12
+ basicAuth?: string;
13
+ basicAuthParam?: string;
14
+ webAcl?: string | boolean;
15
+ webAclParam?: string | {
16
+ path: string;
17
+ version?: number;
19
18
  };
20
- cloudfront?: {
21
- responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;
22
- responseHeadersParam?: string;
23
- responseHeadersPolicy?: ResponseHeadersPolicyProps;
24
- cspHeaders?: CspHeaders;
25
- redirects?: CloudFrontFunctionRedirects;
26
- function?: string | {
27
- code: string;
28
- eventType: CloudFrontFunctionEventType[];
29
- };
30
- errors?: CloudFrontErrorResponse[];
19
+ }
20
+ export interface AppConfigCloudFrontProps {
21
+ responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;
22
+ responseHeadersParam?: string;
23
+ responseHeadersPolicy?: ResponseHeadersPolicyProps;
24
+ cspHeaders?: CspHeaders;
25
+ redirects?: CloudFrontFunctionRedirects;
26
+ function?: string | {
27
+ code: string;
28
+ eventType: CloudFrontFunctionEventType[];
31
29
  };
30
+ errorResponses?: CloudFrontErrorResponse[];
31
+ }
32
+ export interface AppConfigPipelineSourceProps {
33
+ codestarConnection?: string;
34
+ codestarConnectionParam?: string;
35
+ owner: 'evokegroup' | 'meltmedia' | (string & {});
36
+ repo: string;
37
+ branch: string;
38
+ fullClone?: boolean;
39
+ }
40
+ export interface AppConfigPipelineBuildProps {
41
+ buildSpec?: string | object;
42
+ buildImage?: IBuildImage;
43
+ buildImageEcr?: EcrBuildImage;
44
+ buildImageNodeJS?: CodeBuildNodeJs;
45
+ buildImageId?: CodeBuildImageId;
46
+ computeType?: CodeBuildComputeType;
47
+ environmentVariables?: EnvironmentVariables;
48
+ ssmParameters?: CodeBuildSsmParameter[];
49
+ }
50
+ export interface WebStaticServerlessAppConfig extends EvosynthAppConfig {
51
+ type: Extract<EvosynthAppType, 'web-static-serverless'>;
52
+ description: string;
53
+ dns: AppConfigDnsProps;
54
+ security?: AppConfigSecurityProps;
55
+ cloudfront?: AppConfigCloudFrontProps;
32
56
  pipeline?: {
33
- source: {
34
- codestarConnection?: string;
35
- codestarConnectionParam?: string;
36
- owner: 'evokegroup' | 'meltmedia' | (string & {});
37
- repo: string;
38
- branch: string;
39
- fullClone?: boolean;
40
- };
41
- build?: {
42
- buildSpec?: string | object;
43
- buildImage?: IBuildImage;
44
- buildImageEcr?: EcrBuildImage;
45
- buildImageNodeJS?: CodeBuildNodeJs;
46
- buildImageId?: CodeBuildImageId;
47
- computeType?: CodeBuildComputeType;
48
- environmentVariables?: EnvironmentVariables;
49
- ssmParameters?: CodeBuildSsmParameter[];
50
- };
57
+ source: AppConfigPipelineSourceProps;
58
+ build?: AppConfigPipelineBuildProps;
51
59
  };
52
60
  }
53
61
  export declare function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig): Promise<void>;
@@ -3,8 +3,8 @@ import * as core from 'aws-cdk-lib/core';
3
3
  import { Toolkit } from '@aws-cdk/toolkit-lib';
4
4
  import { getEnv } from '../index.js';
5
5
  import { WebStaticServerlessStage } from '../stages/web-static-serverless-stage.js';
6
- const cdk = new Toolkit();
7
6
  export async function runWebStaticServerlessApp(cmd, config) {
7
+ const cdk = new Toolkit();
8
8
  const cx = await cdk.fromAssemblyBuilder(async (props) => {
9
9
  const app = new core.App({
10
10
  outdir: join(process.cwd(), '.evosynth'),
@@ -18,7 +18,7 @@ export async function runWebStaticServerlessApp(cmd, config) {
18
18
  hostedZone: config.dns.zone,
19
19
  domainName: `${config.dns.record}.${config.dns.zone}`,
20
20
  basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,
21
- webAcl: config.security?.webAclParam ? { path: config.security.webAclParam } : config.security?.webAcl,
21
+ webAcl: config.security?.webAclParam ? config.security.webAclParam.path ? config.security.webAclParam : { path: config.security.webAclParam } : config.security?.webAcl,
22
22
  redirects: config.cloudfront?.redirects,
23
23
  responseCspHeaders: config.cloudfront?.cspHeaders,
24
24
  responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,
@@ -26,7 +26,8 @@ export async function runWebStaticServerlessApp(cmd, config) {
26
26
  cloudfrontFunction: config.cloudfront?.function && typeof config.cloudfront.function == 'string' ? {
27
27
  code: config.cloudfront.function,
28
28
  eventType: ['VIEWER_REQUEST', 'VIEWER_RESPONSE'],
29
- } : config.cloudfront?.function
29
+ } : config.cloudfront?.function,
30
+ errorResponses: config.cloudfront?.errorResponses
30
31
  };
31
32
  if (config.pipeline) {
32
33
  stageProps.pipeline = {
@@ -70,4 +71,4 @@ export async function runWebStaticServerlessApp(cmd, config) {
70
71
  break;
71
72
  }
72
73
  }
73
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web-static-serverless.js","sourceRoot":"","sources":["../../src/cli/web-static-serverless.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'node:path';\nimport * as core from 'aws-cdk-lib/core';\nimport { Toolkit } from '@aws-cdk/toolkit-lib';\nimport { ResponseHeadersPolicyProps } from 'aws-cdk-lib/aws-cloudfront';\nimport { IBuildImage } from 'aws-cdk-lib/aws-codebuild';\nimport { CloudFrontErrorResponse, CloudFrontFunctionRedirects } from '../constructs/cloudfront.js';\nimport { CodeBuildImageId, EcrBuildImage, CodeBuildSsmParameter, CodeBuildComputeType, CodeBuildNodeJs, EnvironmentVariables } from '../constructs/codebuild.ts';\nimport type { EvosynthAppConfig, CdkCommand, EvosynthAppType } from './evosynth.ts';\nimport type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseHeadersPolicy } from '../types.d.ts';\nimport { getEnv } from '../index.js';\nimport { WebStaticServerlessStage, WebStaticServerlessStageProps } from '../stages/web-static-serverless-stage.js';\n\nconst cdk = new Toolkit();\n\nexport interface WebStaticServerlessAppConfig extends EvosynthAppConfig {\n  type: Extract<EvosynthAppType, 'web-static-serverless'>,\n  description?: string;\n  dns: {\n    record: string;\n    zone: string;\n  },\n  security?: {\n    basicAuth?: string;\n    basicAuthParam?: string;\n    webAcl?: string | false;\n    webAclParam?: string;\n  },\n  cloudfront?: {\n    responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;\n    responseHeadersParam?: string;\n    responseHeadersPolicy?: ResponseHeadersPolicyProps;\n    cspHeaders?: CspHeaders;\n    redirects?: CloudFrontFunctionRedirects;\n    function?: string | {\n      code: string;\n      eventType: CloudFrontFunctionEventType[];\n    },\n    errors?: CloudFrontErrorResponse[]\n  },\n  pipeline?: {\n    source: {\n      codestarConnection?: string;\n      codestarConnectionParam?: string;\n      owner: 'evokegroup' | 'meltmedia' | (string & {});\n      repo: string;\n      branch: string;\n      fullClone?: boolean;\n    },\n    build?: {\n      buildSpec?: string | object;\n      buildImage?: IBuildImage;\n      buildImageEcr?: EcrBuildImage;\n      buildImageNodeJS?: CodeBuildNodeJs;\n      buildImageId?: CodeBuildImageId;\n      computeType?: CodeBuildComputeType;\n      environmentVariables?: EnvironmentVariables;\n      ssmParameters?: CodeBuildSsmParameter[]\n    }\n  }\n}\n\nexport async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig) {\n  const cx = await cdk.fromAssemblyBuilder(async (props) => {\n    const app = new core.App({\n      outdir: join(process.cwd(), '.evosynth'),\n    });\n\n    const stageProps: WebStaticServerlessStageProps & core.StageProps = {\n      env: getEnv(config.region),\n      stageName: `${config.name}${config.envType ? `-${config.envType}` : ''}`,\n      tags: config.tags,\n      envType: config.envType === 'prod' ? 'PROD' : 'NOT_PROD',\n      description: `${config.description}${config.envType ? ` ${config.envType.toUpperCase()}` : ''}`,\n      hostedZone: config.dns.zone,\n      domainName: `${config.dns.record}.${config.dns.zone}`,\n      basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,\n      webAcl: config.security?.webAclParam ? { path: config.security.webAclParam } : config.security?.webAcl,\n      redirects: config.cloudfront?.redirects,\n      responseCspHeaders: config.cloudfront?.cspHeaders,\n      responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,\n      responseHeadersPolicyProps: config.cloudfront?.responseHeadersPolicy,\n      cloudfrontFunction: config.cloudfront?.function && typeof config.cloudfront.function == 'string' ? {\n        code: config.cloudfront.function,\n        eventType: ['VIEWER_REQUEST','VIEWER_RESPONSE'],\n      } : config.cloudfront?.function as any\n    }\n    if (config.pipeline) {\n      stageProps.pipeline = {\n        sourceStage: {\n          codestarConnection: config.pipeline.source.codestarConnectionParam ? { path: config.pipeline.source.codestarConnectionParam } : config.pipeline.source.codestarConnection as string,\n          repoOwner: config.pipeline.source.owner,\n          repo: config.pipeline.source.repo,\n          branch: config.pipeline.source.branch,\n          fullClone: config.pipeline.source.fullClone\n        }\n      }\n      if (config.pipeline.build) {\n        stageProps.pipeline.buildStage = {\n          environmentVariables: config.pipeline.build.environmentVariables\n        };\n        stageProps.pipeline.codeBuildProject = {\n          buildImage: config.pipeline.build.buildImage,\n          buildImageId: config.pipeline.build.buildImageId,\n          buildImageNodeJS: config.pipeline.build.buildImageNodeJS,\n          buildSpec: config.pipeline.build.buildSpec,\n          computeType: config.pipeline.build.computeType,\n          ecrBuildImage: config.pipeline.build.buildImageEcr,\n          ssmParameters: config.pipeline.build.ssmParameters\n        };\n      }\n    }\n\n    new WebStaticServerlessStage(app, config.type, stageProps);\n\n    return app.synth();\n  });\n\n  switch (cmd) {\n    // case 'bootstrap':\n    //   await cdk.bootstrap(BootstrapEnvironments.fromList([`aws://${process.env.CDK_DEFAULT_ACCOUNT}/${config.region}`]));\n    //   break;\n    case 'deploy':\n    case 'destroy':\n    case 'diff':\n    case 'drift':\n    case 'rollback':\n    case 'synth':\n      await cdk[cmd](cx);\n      break;\n  }\n}\n"]}
74
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"web-static-serverless.js","sourceRoot":"","sources":["../../src/cli/web-static-serverless.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from 'node:path';\nimport * as core from 'aws-cdk-lib/core';\nimport { Toolkit } from '@aws-cdk/toolkit-lib';\nimport { ResponseHeadersPolicyProps } from 'aws-cdk-lib/aws-cloudfront';\nimport { IBuildImage } from 'aws-cdk-lib/aws-codebuild';\nimport { CloudFrontErrorResponse, CloudFrontFunctionRedirects } from '../constructs/cloudfront.js';\nimport { CodeBuildImageId, EcrBuildImage, CodeBuildSsmParameter, CodeBuildComputeType, CodeBuildNodeJs, EnvironmentVariables } from '../constructs/codebuild.ts';\nimport type { EvosynthAppConfig, CdkCommand, EvosynthAppType } from './evosynth.ts';\nimport type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseHeadersPolicy } from '../types.d.ts';\nimport { getEnv } from '../index.js';\nimport { WebStaticServerlessStage, WebStaticServerlessStageProps } from '../stages/web-static-serverless-stage.js';\n\nexport interface AppConfigDnsProps {\n  record: string;\n  zone: string;\n}\n\nexport interface AppConfigSecurityProps {\n  basicAuth?: string;\n  basicAuthParam?: string;\n  webAcl?: string | boolean;\n  webAclParam?: string | { path: string, version?: number };\n}\n\nexport interface AppConfigCloudFrontProps {\n  responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;\n  responseHeadersParam?: string;\n  responseHeadersPolicy?: ResponseHeadersPolicyProps;\n  cspHeaders?: CspHeaders;\n  redirects?: CloudFrontFunctionRedirects;\n  function?: string | {\n    code: string;\n    eventType: CloudFrontFunctionEventType[];\n  },\n  errorResponses?: CloudFrontErrorResponse[]\n}\n\nexport interface AppConfigPipelineSourceProps {\n  codestarConnection?: string;\n  codestarConnectionParam?: string;\n  owner: 'evokegroup' | 'meltmedia' | (string & {});\n  repo: string;\n  branch: string;\n  fullClone?: boolean;\n}\n\nexport interface AppConfigPipelineBuildProps {\n  buildSpec?: string | object;\n  buildImage?: IBuildImage;\n  buildImageEcr?: EcrBuildImage;\n  buildImageNodeJS?: CodeBuildNodeJs;\n  buildImageId?: CodeBuildImageId;\n  computeType?: CodeBuildComputeType;\n  environmentVariables?: EnvironmentVariables;\n  ssmParameters?: CodeBuildSsmParameter[]\n}\n\nexport interface WebStaticServerlessAppConfig extends EvosynthAppConfig {\n  type: Extract<EvosynthAppType, 'web-static-serverless'>,\n  description: string;\n  dns: AppConfigDnsProps,\n  security?: AppConfigSecurityProps,\n  cloudfront?: AppConfigCloudFrontProps,\n  pipeline?: {\n    source: AppConfigPipelineSourceProps,\n    build?: AppConfigPipelineBuildProps\n  }\n}\n\nexport async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig) {\n  const cdk = new Toolkit();\n  const cx = await cdk.fromAssemblyBuilder(async (props) => {\n    const app = new core.App({\n      outdir: join(process.cwd(), '.evosynth'),\n    });\n\n    const stageProps: WebStaticServerlessStageProps & core.StageProps = {\n      env: getEnv(config.region),\n      stageName: `${config.name}${config.envType ? `-${config.envType}` : ''}`,\n      tags: config.tags,\n      envType: config.envType === 'prod' ? 'PROD' : 'NOT_PROD',\n      description: `${config.description}${config.envType ? ` ${config.envType.toUpperCase()}` : ''}`,\n      hostedZone: config.dns.zone,\n      domainName: `${config.dns.record}.${config.dns.zone}`,\n      basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,\n      webAcl: config.security?.webAclParam ? (config.security.webAclParam as any).path ? config.security.webAclParam : { path: config.security.webAclParam as string } : config.security?.webAcl,\n      redirects: config.cloudfront?.redirects,\n      responseCspHeaders: config.cloudfront?.cspHeaders,\n      responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,\n      responseHeadersPolicyProps: config.cloudfront?.responseHeadersPolicy,\n      cloudfrontFunction: config.cloudfront?.function && typeof config.cloudfront.function == 'string' ? {\n        code: config.cloudfront.function,\n        eventType: ['VIEWER_REQUEST','VIEWER_RESPONSE'],\n      } : config.cloudfront?.function as any,\n      errorResponses: config.cloudfront?.errorResponses\n    }\n    if (config.pipeline) {\n      stageProps.pipeline = {\n        sourceStage: {\n          codestarConnection: config.pipeline.source.codestarConnectionParam ? { path: config.pipeline.source.codestarConnectionParam } : config.pipeline.source.codestarConnection as string,\n          repoOwner: config.pipeline.source.owner,\n          repo: config.pipeline.source.repo,\n          branch: config.pipeline.source.branch,\n          fullClone: config.pipeline.source.fullClone\n        }\n      }\n      if (config.pipeline.build) {\n        stageProps.pipeline.buildStage = {\n          environmentVariables: config.pipeline.build.environmentVariables\n        };\n        stageProps.pipeline.codeBuildProject = {\n          buildImage: config.pipeline.build.buildImage,\n          buildImageId: config.pipeline.build.buildImageId,\n          buildImageNodeJS: config.pipeline.build.buildImageNodeJS,\n          buildSpec: config.pipeline.build.buildSpec,\n          computeType: config.pipeline.build.computeType,\n          ecrBuildImage: config.pipeline.build.buildImageEcr,\n          ssmParameters: config.pipeline.build.ssmParameters\n        };\n      }\n    }\n\n    new WebStaticServerlessStage(app, config.type, stageProps);\n\n    return app.synth();\n  });\n\n  switch (cmd) {\n    // case 'bootstrap':\n    //   await cdk.bootstrap(BootstrapEnvironments.fromList([`aws://${process.env.CDK_DEFAULT_ACCOUNT}/${config.region}`]));\n    //   break;\n    case 'deploy':\n    case 'destroy':\n    case 'diff':\n    case 'drift':\n    case 'rollback':\n    case 'synth':\n      await cdk[cmd](cx);\n      break;\n  }\n}\n"]}
@@ -2,7 +2,7 @@ import { Construct } from 'constructs';
2
2
  import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';
3
3
  import { BehaviorOptions, Distribution, ErrorResponse, Function } from 'aws-cdk-lib/aws-cloudfront';
4
4
  import type { ResourceProps } from '../types.d.ts';
5
- export interface CloudFrontErrorResponse extends ErrorResponse {
5
+ export interface CloudFrontErrorResponse {
6
6
  httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;
7
7
  ttlSeconds?: number;
8
8
  responseStatus?: number;
@@ -75,11 +75,22 @@ export class CloudFrontFunction extends Construct {
75
75
  static createFunction(scope, id, props) {
76
76
  const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;
77
77
  const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});
78
- const hasRedirects = Object.keys(redirectPaths).length > 0;
78
+ const redirects = {};
79
+ const redirectsStartsWith = {};
80
+ const redirectKeys = Object.keys(redirectPaths);
81
+ for (const key of redirectKeys) {
82
+ if (key.endsWith('*')) {
83
+ redirectsStartsWith[key.substring(0, key.length - 1)] = redirectPaths[key];
84
+ }
85
+ else {
86
+ redirects[key] = redirectPaths[key];
87
+ }
88
+ }
79
89
  props.code = props.code
80
90
  .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')
81
91
  .replace('__CREDENTIALS__', props.credentials ?? 'Og==')
82
- .replace('__REDIRECTS__', hasRedirects ? JSON.stringify(redirectPaths) : 'null')
92
+ .replace('__REDIRECTS__', Object.keys(redirects).length > 0 ? JSON.stringify(redirects) : 'null')
93
+ .replace('__REDIRECTS_START_WITH__', Object.keys(redirectsStartsWith).length > 0 ? JSON.stringify(redirectsStartsWith) : 'null')
83
94
  .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')
84
95
  .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');
85
96
  return new CloudFrontFunction(scope, id || 'ViewerRequestResponseFunction', {
@@ -89,4 +100,4 @@ export class CloudFrontFunction extends Construct {
89
100
  });
90
101
  }
91
102
  }
92
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudfront.js","sourceRoot":"","sources":["../../src/constructs/cloudfront.ts"],"names":[],"mappings":"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","sourcesContent":["import { resolve } from 'node:path';\nimport { readFileSync } from 'node:fs';\nimport { Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport { Construct } from 'constructs';\nimport { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';\nimport { BehaviorOptions, Distribution, ErrorResponse, Function, FunctionCode, FunctionRuntime, PriceClass } from 'aws-cdk-lib/aws-cloudfront';\nimport { tagResource } from '../lib/tags.js';\nimport { parseCsvRedirects } from '../lib/csv-redirects.js';\nimport type { ResourceProps } from '../types.d.ts';\n\nconst __dirname = import.meta.dirname;\n\nexport interface CloudFrontErrorResponse extends ErrorResponse {\n  httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;\n  ttlSeconds?: number;\n  responseStatus?: number;\n  responsePath?: string;\n}\nexport interface CloudFrontDistributionProps extends ResourceProps {\n  domainName: string;\n  description?: string;\n  defaultBehavior: BehaviorOptions;\n  additionalBehaviors?: Record<string, BehaviorOptions>;\n  priceClass?: 'PRICE_CLASS_ALL' | 'PRICE_CLASS_100' | 'PRICE_CLASS_200' | 'NOT_PROD' | 'PROD';\n  certificate: ICertificate;\n  webAclId?: string;\n  errorResponses?: (CloudFrontErrorResponse | ErrorResponse)[]\n}\nexport class CloudFrontDistribution extends Construct {\n  public readonly distribution: Distribution;\n\n  constructor(scope: Construct, id: string, props: CloudFrontDistributionProps) {\n    super(scope, id);\n\n    let priceClass = PriceClass.PRICE_CLASS_ALL;\n    switch (props.priceClass) {\n      case 'NOT_PROD':\n      case 'PRICE_CLASS_100':\n        priceClass = PriceClass.PRICE_CLASS_100;\n        break;\n      case 'PRICE_CLASS_200':\n        priceClass = PriceClass.PRICE_CLASS_200;\n        break;\n    }\n\n    this.distribution = new Distribution(this, `${id}|CloudFrontDistribution`, {\n      comment: props.description,\n      defaultBehavior: props.defaultBehavior,\n      additionalBehaviors: props.additionalBehaviors,\n      domainNames: [props.domainName],\n      certificate: props.certificate,\n      priceClass,\n      webAclId: props.webAclId,\n      errorResponses: props.errorResponses?.map((r) => {\n        return {\n          httpStatus: r.httpStatus,\n          ttl: (r as CloudFrontErrorResponse).ttlSeconds !== undefined ? Duration.seconds((r as CloudFrontErrorResponse).ttlSeconds!) : (r as ErrorResponse).ttl,\n          responseHttpStatus: (r as CloudFrontErrorResponse).responseStatus ?? (r as ErrorResponse).responseHttpStatus,\n          responsePagePath: (r as CloudFrontErrorResponse).responsePath ?? (r as ErrorResponse).responsePagePath\n        };\n      })\n    });\n    tagResource(this.distribution, props.tags);\n    if (typeof props.destroy == 'boolean') {\n      this.distribution.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n}\n\nexport type HttpRedirectCode = 301 | 302 | 303 | 307 | 308;\nexport type CloudFrontFunctionRedirectPaths = Record<string, string | [string, HttpRedirectCode]>;\n\nexport interface CloudFrontFunctionRedirects {\n  trailingSlash?: boolean;\n  defaultDocument?: string;\n  redirectDefaultDocument?: boolean;\n  paths?: CloudFrontFunctionRedirectPaths;\n  pathsCsvFile?: string;\n}\n\nexport interface ViewerEventFunctionProps extends ResourceProps {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n  credentials?: string;\n  code: string;\n}\n\nexport interface DefaultDocFunctionProps extends ResourceProps, Pick<ViewerEventFunctionProps, 'functionName' | 'defaultDocument' | 'redirects' | 'redirectsCsvPath'> {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n}\n\nexport interface BasicAuthDefaultDocFunctionProps extends DefaultDocFunctionProps {\n  credentials: string;\n}\n\n\nexport interface CloudFrontFunctionProps extends ResourceProps {\n  code: string;\n  functionName?: string;\n  runtime?: 'JS_1_0' | 'JS_2_0';\n}\nexport class CloudFrontFunction extends Construct {\n  public readonly fn: Function;\n\n  constructor(scope: Construct, id: string, props: CloudFrontFunctionProps) {\n    super(scope, id);\n\n    this.fn = new Function(this, 'CloudFrontFunction', {\n      functionName: props.functionName,\n      runtime: FunctionRuntime[props.runtime ?? 'JS_2_0'],\n      code: FunctionCode.fromInline(props.code)\n    });\n    tagResource(this.fn, props.tags);\n\n    if (typeof props.destroy == 'boolean') {\n      this.fn.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n\n  static createDefaultDoc(scope: Construct, props: DefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc.js'), 'utf8');\n\n    return this.createFunction(scope, 'DefaultDocFunction', {\n      ...props,\n      credentials: '',\n      code\n    });\n  }\n\n  static createBasicAuthDefaultDoc(scope: Construct, props: BasicAuthDefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc-basic-auth.js'), 'utf8');\n\n    return this.createFunction(scope, 'BasicAuthDefaultDocFunction', {\n      ...props,\n      code\n    });\n\n  }\n\n  static createFunction(scope: Construct, id: string | null, props: ViewerEventFunctionProps) {\n    const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;\n    const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});\n    const hasRedirects = Object.keys(redirectPaths).length > 0;\n\n    props.code = props.code\n      .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')\n      .replace('__CREDENTIALS__', props.credentials ?? 'Og==')\n      .replace('__REDIRECTS__', hasRedirects ? JSON.stringify(redirectPaths) : 'null')\n      .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')\n      .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');\n\n    return new CloudFrontFunction(scope, id || 'ViewerRequestResponseFunction', {\n      functionName: props.functionName,\n      runtime: 'JS_2_0',\n      code: props.code\n    });\n  }\n}\n"]}
103
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cloudfront.js","sourceRoot":"","sources":["../../src/constructs/cloudfront.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAmB,YAAY,EAAiB,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC/I,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AAkBtC,MAAM,OAAO,sBAAuB,SAAQ,SAAS;IACnC,YAAY,CAAe;IAE3C,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAkC;QAC1E,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,IAAI,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC;QAC5C,QAAQ,KAAK,CAAC,UAAU,EAAE,CAAC;YACzB,KAAK,UAAU,CAAC;YAChB,KAAK,iBAAiB;gBACpB,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC;gBACxC,MAAM;YACR,KAAK,iBAAiB;gBACpB,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC;gBACxC,MAAM;QACV,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,yBAAyB,EAAE;YACzE,OAAO,EAAE,KAAK,CAAC,WAAW;YAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,WAAW,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,UAAU;YACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9C,OAAO;oBACL,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,GAAG,EAAG,CAA6B,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAE,CAA6B,CAAC,UAAW,CAAC,CAAC,CAAC,CAAE,CAAmB,CAAC,GAAG;oBACtJ,kBAAkB,EAAG,CAA6B,CAAC,cAAc,IAAK,CAAmB,CAAC,kBAAkB;oBAC5G,gBAAgB,EAAG,CAA6B,CAAC,YAAY,IAAK,CAAmB,CAAC,gBAAgB;iBACvG,CAAC;YACJ,CAAC,CAAC;SACH,CAAC,CAAC;QACH,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,OAAO,KAAK,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACrG,CAAC;IACH,CAAC;CACF;AAuCD,MAAM,OAAO,kBAAmB,SAAQ,SAAS;IAC/B,EAAE,CAAW;IAE7B,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA8B;QACtE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEjB,IAAI,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,oBAAoB,EAAE;YACjD,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,OAAO,IAAI,QAAQ,CAAC;YACnD,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;SAC1C,CAAC,CAAC;QACH,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEjC,IAAI,OAAO,KAAK,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,KAAgB,EAAE,KAA8B;QACtE,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,kCAAkC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE1F,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,oBAAoB,EAAE;YACtD,GAAG,KAAK;YACR,WAAW,EAAE,EAAE;YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,yBAAyB,CAAC,KAAgB,EAAE,KAAuC;QACxF,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,6CAA6C,CAAC,EAAE,MAAM,CAAC,CAAC;QAErG,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,6BAA6B,EAAE;YAC/D,GAAG,KAAK;YACR,IAAI;SACL,CAAC,CAAC;IAEL,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,KAAgB,EAAE,EAAiB,EAAE,KAA+B;QACxF,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,EAAE,YAAY,IAAI,KAAK,CAAC,gBAAgB,CAAC;QACxE,MAAM,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;QAE5F,MAAM,SAAS,GAAoC,EAAE,CAAC;QACtD,MAAM,mBAAmB,GAAoC,EAAE,CAAC;QAChE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;YAC/B,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YAC7E,CAAC;iBAAM,CAAC;gBACN,SAAS,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI;aACpB,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,eAAe,IAAI,YAAY,CAAC;aACtE,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,WAAW,IAAI,MAAM,CAAC;aACvD,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;aAChG,OAAO,CAAC,0BAA0B,EAAE,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;aAC/H,OAAO,CAAC,oBAAoB,EAAE,KAAK,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC;aACnF,OAAO,CAAC,mBAAmB,EAAE,KAAK,CAAC,SAAS,EAAE,uBAAuB,EAAE,QAAQ,EAAE,IAAI,OAAO,CAAC,CAAC;QAEjG,OAAO,IAAI,kBAAkB,CAAC,KAAK,EAAE,EAAE,IAAI,+BAA+B,EAAE;YAC1E,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,OAAO,EAAE,QAAQ;YACjB,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { resolve } from 'node:path';\nimport { readFileSync } from 'node:fs';\nimport { Duration, RemovalPolicy } from \"aws-cdk-lib\";\nimport { Construct } from 'constructs';\nimport { ICertificate } from 'aws-cdk-lib/aws-certificatemanager';\nimport { BehaviorOptions, Distribution, ErrorResponse, Function, FunctionCode, FunctionRuntime, PriceClass } from 'aws-cdk-lib/aws-cloudfront';\nimport { tagResource } from '../lib/tags.js';\nimport { parseCsvRedirects } from '../lib/csv-redirects.js';\nimport type { ResourceProps } from '../types.d.ts';\n\nconst __dirname = import.meta.dirname;\n\nexport interface CloudFrontErrorResponse {\n  httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;\n  ttlSeconds?: number;\n  responseStatus?: number;\n  responsePath?: string;\n}\nexport interface CloudFrontDistributionProps extends ResourceProps {\n  domainName: string;\n  description?: string;\n  defaultBehavior: BehaviorOptions;\n  additionalBehaviors?: Record<string, BehaviorOptions>;\n  priceClass?: 'PRICE_CLASS_ALL' | 'PRICE_CLASS_100' | 'PRICE_CLASS_200' | 'NOT_PROD' | 'PROD';\n  certificate: ICertificate;\n  webAclId?: string;\n  errorResponses?: (CloudFrontErrorResponse | ErrorResponse)[]\n}\nexport class CloudFrontDistribution extends Construct {\n  public readonly distribution: Distribution;\n\n  constructor(scope: Construct, id: string, props: CloudFrontDistributionProps) {\n    super(scope, id);\n\n    let priceClass = PriceClass.PRICE_CLASS_ALL;\n    switch (props.priceClass) {\n      case 'NOT_PROD':\n      case 'PRICE_CLASS_100':\n        priceClass = PriceClass.PRICE_CLASS_100;\n        break;\n      case 'PRICE_CLASS_200':\n        priceClass = PriceClass.PRICE_CLASS_200;\n        break;\n    }\n\n    this.distribution = new Distribution(this, `${id}|CloudFrontDistribution`, {\n      comment: props.description,\n      defaultBehavior: props.defaultBehavior,\n      additionalBehaviors: props.additionalBehaviors,\n      domainNames: [props.domainName],\n      certificate: props.certificate,\n      priceClass,\n      webAclId: props.webAclId,\n      errorResponses: props.errorResponses?.map((r) => {\n        return {\n          httpStatus: r.httpStatus,\n          ttl: (r as CloudFrontErrorResponse).ttlSeconds !== undefined ? Duration.seconds((r as CloudFrontErrorResponse).ttlSeconds!) : (r as ErrorResponse).ttl,\n          responseHttpStatus: (r as CloudFrontErrorResponse).responseStatus ?? (r as ErrorResponse).responseHttpStatus,\n          responsePagePath: (r as CloudFrontErrorResponse).responsePath ?? (r as ErrorResponse).responsePagePath\n        };\n      })\n    });\n    tagResource(this.distribution, props.tags);\n    if (typeof props.destroy == 'boolean') {\n      this.distribution.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n}\n\nexport type HttpRedirectCode = 301 | 302 | 303 | 307 | 308;\nexport type CloudFrontFunctionRedirectPaths = Record<string, string | [string, HttpRedirectCode]>;\n\nexport interface CloudFrontFunctionRedirects {\n  trailingSlash?: boolean;\n  defaultDocument?: string;\n  redirectDefaultDocument?: boolean;\n  paths?: CloudFrontFunctionRedirectPaths;\n  pathsCsvFile?: string;\n}\n\nexport interface ViewerEventFunctionProps extends ResourceProps {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n  credentials?: string;\n  code: string;\n}\n\nexport interface DefaultDocFunctionProps extends ResourceProps, Pick<ViewerEventFunctionProps, 'functionName' | 'defaultDocument' | 'redirects' | 'redirectsCsvPath'> {\n  functionName?: string;\n  defaultDocument?: string;\n  redirects?: CloudFrontFunctionRedirects;\n  redirectsCsvPath?: string;\n}\n\nexport interface BasicAuthDefaultDocFunctionProps extends DefaultDocFunctionProps {\n  credentials: string;\n}\n\n\nexport interface CloudFrontFunctionProps extends ResourceProps {\n  code: string;\n  functionName?: string;\n  runtime?: 'JS_1_0' | 'JS_2_0';\n}\nexport class CloudFrontFunction extends Construct {\n  public readonly fn: Function;\n\n  constructor(scope: Construct, id: string, props: CloudFrontFunctionProps) {\n    super(scope, id);\n\n    this.fn = new Function(this, 'CloudFrontFunction', {\n      functionName: props.functionName,\n      runtime: FunctionRuntime[props.runtime ?? 'JS_2_0'],\n      code: FunctionCode.fromInline(props.code)\n    });\n    tagResource(this.fn, props.tags);\n\n    if (typeof props.destroy == 'boolean') {\n      this.fn.applyRemovalPolicy(props.destroy ? RemovalPolicy.DESTROY : RemovalPolicy.RETAIN);\n    }\n  }\n\n  static createDefaultDoc(scope: Construct, props: DefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc.js'), 'utf8');\n\n    return this.createFunction(scope, 'DefaultDocFunction', {\n      ...props,\n      credentials: '',\n      code\n    });\n  }\n\n  static createBasicAuthDefaultDoc(scope: Construct, props: BasicAuthDefaultDocFunctionProps) {\n    const code = readFileSync(resolve(__dirname, '../templates/cffn-default-doc-basic-auth.js'), 'utf8');\n\n    return this.createFunction(scope, 'BasicAuthDefaultDocFunction', {\n      ...props,\n      code\n    });\n\n  }\n\n  static createFunction(scope: Construct, id: string | null, props: ViewerEventFunctionProps) {\n    const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;\n    const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});\n\n    const redirects: CloudFrontFunctionRedirectPaths = {};\n    const redirectsStartsWith: CloudFrontFunctionRedirectPaths = {};\n    const redirectKeys = Object.keys(redirectPaths);\n    for (const key of redirectKeys) {\n      if (key.endsWith('*')) {\n        redirectsStartsWith[key.substring(0, key.length - 1)] = redirectPaths[key];\n      } else {\n        redirects[key] = redirectPaths[key];\n      }\n    }\n\n    props.code = props.code\n      .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')\n      .replace('__CREDENTIALS__', props.credentials ?? 'Og==')\n      .replace('__REDIRECTS__', Object.keys(redirects).length > 0 ? JSON.stringify(redirects) : 'null')\n      .replace('__REDIRECTS_START_WITH__', Object.keys(redirectsStartsWith).length > 0 ? JSON.stringify(redirectsStartsWith) : 'null')\n      .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')\n      .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');\n\n    return new CloudFrontFunction(scope, id || 'ViewerRequestResponseFunction', {\n      functionName: props.functionName,\n      runtime: 'JS_2_0',\n      code: props.code\n    });\n  }\n}\n"]}
@@ -9,7 +9,13 @@ const BASIC_AUTH = ["Basic __CREDENTIALS__"];
9
9
  /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
10
10
  const redirects = __REDIRECTS__;
11
11
 
12
+ /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
13
+ const redirectsStartsWith = __REDIRECTS_START_WITH__;
14
+
15
+ /** @type {boolean | null} */
12
16
  const useTrailingSlash = __TRAILING_SLASH__;
17
+
18
+ /** @type {boolean | null} */
13
19
  const shouldRedirDefDoc = __REDIR_DEF_DOC__;
14
20
 
15
21
 
@@ -32,7 +38,19 @@ function handleRequest(event) {
32
38
  const request = event.request;
33
39
  const uri = request.uri;
34
40
 
35
- const redirect = redirects ? redirects[uri] : null;
41
+ let redirect = null;
42
+ if (redirects) {
43
+ redirect = redirects[uri];
44
+ }
45
+ if (!redirect && redirectsStartsWith) {
46
+ const keys = Object.keys(redirectsStartsWith);
47
+ for (let i=0; i<keys.length; i++) {
48
+ if (uri.startsWith(keys[i])) {
49
+ redirect = redirectsStartsWith[keys[i]];
50
+ break;
51
+ }
52
+ }
53
+ }
36
54
  if (redirect) {
37
55
  const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
38
56
  return redirectResponse(event, redir[0], redir[1]);
@@ -8,7 +8,13 @@ const DEFAULT_DOCUMENT = "__DEFAULT_DOCUMENT__";
8
8
  /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
9
9
  const redirects = __REDIRECTS__;
10
10
 
11
+ /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
12
+ const redirectsStartsWith = __REDIRECTS_START_WITH__;
13
+
14
+ /** @type {boolean | null} */
11
15
  const useTrailingSlash = __TRAILING_SLASH__;
16
+
17
+ /** @type {boolean | null} */
12
18
  const shouldRedirDefDoc = __REDIR_DEF_DOC__;
13
19
 
14
20
 
@@ -30,7 +36,19 @@ function handleRequest(event) {
30
36
  const request = event.request;
31
37
  const uri = request.uri;
32
38
 
33
- const redirect = redirects ? redirects[uri] : null;
39
+ let redirect = null;
40
+ if (redirects) {
41
+ redirect = redirects[uri];
42
+ }
43
+ if (!redirect && redirectsStartsWith) {
44
+ const keys = Object.keys(redirectsStartsWith);
45
+ for (let i=0; i<keys.length; i++) {
46
+ if (uri.startsWith(keys[i])) {
47
+ redirect = redirectsStartsWith[keys[i]];
48
+ break;
49
+ }
50
+ }
51
+ }
34
52
  if (redirect) {
35
53
  const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
36
54
  return redirectResponse(event, redir[0], redir[1]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@inizioevoke/evosynth",
3
- "version": "2.1.0",
3
+ "version": "2.1.2",
4
4
  "author": "",
5
5
  "license": "ISC",
6
6
  "description": "",
@@ -10,11 +10,14 @@
10
10
  "./constructs/*": "./dist/constructs/*.js",
11
11
  "./stacks/*": "./dist/stacks/*.js",
12
12
  "./stages/*": "./dist/stages/*.js",
13
- "./types/*": "./dist/types.d.ts"
13
+ "./types": "./dist/types.d.ts"
14
14
  },
15
15
  "bin": {
16
16
  "evosynth": "./dist/cli/cli.js"
17
17
  },
18
+ "engines": {
19
+ "node": ">=22.0.0"
20
+ },
18
21
  "scripts": {
19
22
  "prepublishOnly": "npm run build",
20
23
  "build": "node ./tasks/clean.js && npx tsc && node ./tasks/dist.js"
package/readme.md CHANGED
@@ -3,7 +3,6 @@
3
3
  EvoSynth is an npm package providing reusable AWS CDK stacks for deploying static serverless websites. It targets S3 + CloudFront + Route53 + ACM + WAF + CodePipeline architectures.
4
4
 
5
5
  ## Prerequisites
6
- - [CDK v2.238.x](https://docs.aws.amazon.com/cdk/v2/guide/home.html)
7
6
  - Node version 22+
8
7
  - AWS Account ID, a configured profile, or other credentials
9
8
  - CodeConnection ARN or SSM Parameter Store path of a shared connection ARN
@@ -15,8 +14,153 @@ EvoSynth is an npm package providing reusable AWS CDK stacks for deploying stati
15
14
  - Copy the buildspec.yml on your Bitbucket Repo and the build configuration
16
15
  - Update/Configure the Stack example below
17
16
 
17
+ ## CLI - evosynth (preferred)
18
18
 
19
- ## Example App
19
+ This library includes a cli tool `evosynth` to support a more streamlined configuration approach than the version 1 process, although the version 1 process is still supported.
20
+
21
+ ### Instructions
22
+
23
+ In your project:
24
+
25
+ 1. **Install the library**
26
+ ```bash
27
+ > npm install @inizioevoke/evosynth
28
+ ```
29
+ 2. **Create the config file in your project root directory.** `[ENV]` should be your environment name *(e.g. `.evosynth.dev.ts`)*
30
+ ```bash
31
+ .evosynth.[ENV].(js|mjs|ts|mts)
32
+ ```
33
+ It is also possible to use 1 config file for multiple environments. Named exports should match your environment names.
34
+ ```bash
35
+ .evosynth.(js|mjs|ts|mts)
36
+ ```
37
+
38
+ 3. **Compile your config.** Add standard AWS flags like `--profile` if necessary.
39
+ ```bash
40
+ > npx evosynth synth [ENV]
41
+ ```
42
+ ```bash
43
+ > npx evosynth synth [ENV] --profile my-profile
44
+ ```
45
+ 4. **Deploy**
46
+ ```bash
47
+ > npx evosynth deploy [ENV]
48
+ ```
49
+ 5. **Destroy**
50
+ ```bash
51
+ > npx evosynth destroy [ENV]
52
+ ```
53
+
54
+ ### Example config file - single environment
55
+
56
+ ```typescript
57
+ // .evosynth.dev.ts
58
+ import type { WebStaticServerlessAppConfig } from '@inizioevoke/evosynth';
59
+
60
+ export default async function(): Promise<WebStaticServerlessAppConfig> {
61
+ return {
62
+ type: 'web-static-serverless',
63
+ envType: 'dev',
64
+ name: 'my-project',
65
+ description: 'My Project',
66
+ region: 'us-east-1',
67
+ tags: {
68
+ Account: 'Account Name',
69
+ Brand: 'Brand Name'
70
+ },
71
+ dns: {
72
+ record: 'my-project.dev.client',
73
+ zone: 'evodev.net'
74
+ },
75
+ security: {
76
+ basicAuthParam: '/evosynth/web/security/basicauth',
77
+ webAclParam: '/evosynth/web/security/webacl'
78
+ },
79
+ pipeline: {
80
+ source: {
81
+ codestarConnectionParam: '/evosynth/bitbucket/codeconnection',
82
+ owner: 'evokegroup',
83
+ repo: 'my-project',
84
+ branch: 'develop'
85
+ }
86
+ }
87
+ }
88
+ }
89
+ ```
90
+
91
+ ### Example config file - multiple environments
92
+
93
+ ```typescript
94
+ // .evosynth.dev.ts
95
+ import type { WebStaticServerlessAppConfig } from '@inizioevoke/evosynth';
96
+
97
+ const config: Omit<WebStaticServerlessAppConfig, 'dns'> = {
98
+ type: 'web-static-serverless',
99
+ name: 'my-project',
100
+ description: 'My Project',
101
+ region: 'us-east-1',
102
+ tags: {
103
+ Account: 'Account Name',
104
+ Brand: 'Brand Name'
105
+ },
106
+ security: {
107
+ basicAuthParam: '/evosynth/web/security/basicauth',
108
+ webAclParam: '/evosynth/web/security/webacl'
109
+ },
110
+ pipeline: {
111
+ source: {
112
+ codestarConnectionParam: '/evosynth/bitbucket/codeconnection',
113
+ owner: 'evokegroup',
114
+ repo: 'my-project',
115
+ branch: ''
116
+ }
117
+ }
118
+ };
119
+
120
+ // dev environment
121
+ export async function dev(): Promise<WebStaticServerlessAppConfig> {
122
+ return {
123
+ ...config,
124
+ envType: 'dev',
125
+ dns: {
126
+ record: 'my-project.dev.client',
127
+ zone: 'evodev.net'
128
+ },
129
+ pipeline: {
130
+ source: {
131
+ ...config.pipeline!.source,
132
+ branch: 'develop'
133
+ }
134
+ }
135
+ }
136
+ }
137
+
138
+ // uat environment
139
+ export async function uat(): Promise<WebStaticServerlessAppConfig> {
140
+ return {
141
+ ...config,
142
+ envType: 'uat',
143
+ dns: {
144
+ record: 'my-project.uat.client',
145
+ zone: 'evodev.net'
146
+ },
147
+ pipeline: {
148
+ source: {
149
+ ...config.pipeline!.source,
150
+ branch: 'uat'
151
+ }
152
+ }
153
+ }
154
+ }
155
+ ```
156
+
157
+ ## CDK App
158
+
159
+ Use evosynth in a traditional CDK app script by instantiating a stage or stack. Use individual constructs for custom apps.
160
+
161
+ *Requires [CDK v2.238.x](https://docs.aws.amazon.com/cdk/v2/guide/home.html) installed locally*
162
+
163
+ ### Example App
20
164
 
21
165
  ```typescript
22
166
  import * as cdk from 'aws-cdk-lib/core';
@@ -1,39 +1,76 @@
1
1
  import type { WebStaticServerlessAppConfig } from '@inizioevoke/evosynth';
2
2
 
3
+ const config: Omit<WebStaticServerlessAppConfig, 'dns'> = {
4
+ type: 'web-static-serverless',
5
+ name: 'my-project',
6
+ description: 'My Project',
7
+ region: 'us-east-1',
8
+ tags: {
9
+ Account: 'Account Name',
10
+ Brand: 'Brand Name'
11
+ },
12
+ cloudfront: {
13
+ redirects: {
14
+ paths: {
15
+ '/old': '/new/',
16
+ '/hello': ['/world/', 302]
17
+ }
18
+ },
19
+ cspHeaders: {
20
+ 'default-src': [
21
+ "'self'"
22
+ ],
23
+ 'script-src': [
24
+ "'self'"
25
+ ]
26
+ }
27
+ },
28
+ security: {
29
+ basicAuthParam: '/evosynth/web/security/basicauth',
30
+ webAclParam: '/evosynth/web/security/webacl'
31
+ },
32
+ pipeline: {
33
+ source: {
34
+ codestarConnectionParam: '/evosynth/bitbucket/codeconnection',
35
+ owner: 'evokegroup',
36
+ repo: 'my-project',
37
+ branch: ''
38
+ }
39
+ }
40
+ };
41
+
42
+ // dev environment
3
43
  export async function dev(): Promise<WebStaticServerlessAppConfig> {
4
44
  return {
5
- type: 'web-static-serverless',
45
+ ...config,
6
46
  envType: 'dev',
7
- name: 'myproject-v1',
8
- description: 'My Project',
9
- region: 'us-east-1',
10
- tags: {
11
- Account: 'Account Name',
12
- Brand: 'Brand Name'
13
- },
14
47
  dns: {
15
- record: 'livdelzi-hcp-iva-v2.gilead',
48
+ record: 'my-project.dev.client',
16
49
  zone: 'evodev.net'
17
50
  },
18
- security: {
19
- basicAuthParam: '/evosynth/web/security/basicauth',
20
- webAclParam: '/evosynth/web/security/webacl'
21
- },
22
- // cloudfront: {
23
- // redirects: {
24
- // paths: {
25
- // '/hello': '/world',
26
- // '/redirect': ['/here', 302]
27
- // }
28
- // }
29
- // },
30
51
  pipeline: {
31
52
  source: {
32
- codestarConnectionParam: '/evosynth/provider/codeconnection',
33
- owner: 'orgname',
34
- repo: 'myproject-v1',
53
+ ...config.pipeline!.source,
35
54
  branch: 'develop'
36
55
  }
37
56
  }
38
57
  }
39
58
  }
59
+
60
+ // uat environment
61
+ export async function uat(): Promise<WebStaticServerlessAppConfig> {
62
+ return {
63
+ ...config,
64
+ envType: 'uat',
65
+ dns: {
66
+ record: 'my-project.uat.client',
67
+ zone: 'evodev.net'
68
+ },
69
+ pipeline: {
70
+ source: {
71
+ ...config.pipeline!.source,
72
+ branch: 'uat'
73
+ }
74
+ }
75
+ }
76
+ }
package/samples/csp.ts CHANGED
@@ -3,6 +3,9 @@ import type { CspHeaders } from '@inizioevoke/evosynth/types';
3
3
  const cspHeaders: CspHeaders = {
4
4
  'default-src': [
5
5
  "'self'"
6
+ ],
7
+ 'script-src': [
8
+ "'self'"
6
9
  ]
7
10
  }
8
11
 
@@ -49,13 +49,20 @@ export async function evosynth(cmd: CdkCommand, env: string, props: EvosynthProp
49
49
  if (configIndex != -1) {
50
50
  const configFile = configFiles[configIndex];
51
51
  const tsxUnregister = /^\.m?ts$/.test(extname(configFile.name)) ? register() : undefined;
52
- const module = await import(pathToFileURL(join(configFile.dir, configFile.name)).toString());
53
- tsxUnregister && tsxUnregister();
52
+ let module: any;
53
+ try {
54
+ module = await import(pathToFileURL(join(configFile.dir, configFile.name)).toString());
55
+ } catch (err) {
56
+ console.error(`Failed to load config "${configFile.name}":`, (err as Error).message);
57
+ process.exit(1);
58
+ } finally {
59
+ tsxUnregister?.();
60
+ }
54
61
  let config: EvosynthAppConfig | undefined = undefined;
55
62
  if (configFile.env) {
56
- config = await module.default();
63
+ config = await module.default?.();
57
64
  } else {
58
- config = await module[env]?.();
65
+ config = await module[env.toLowerCase()]?.();
59
66
  }
60
67
 
61
68
  if (config) {
@@ -66,7 +73,14 @@ export async function evosynth(cmd: CdkCommand, env: string, props: EvosynthProp
66
73
  case 'web-static-serverless':
67
74
  await runWebStaticServerlessApp(cmd, config as WebStaticServerlessAppConfig);
68
75
  break;
76
+ default:
77
+ console.error(`Unsupported evosynth app type: "${config.type}"`);
78
+ process.exit(1);
79
+ break;
69
80
  }
81
+ } else {
82
+ console.error(`Config environment "${env}" not found`);
83
+ process.exit(1);
70
84
  }
71
85
 
72
86
  } else {
@@ -10,56 +10,65 @@ import type { CloudFrontFunctionEventType, CspHeaders, UUID, AWSManagedResponseH
10
10
  import { getEnv } from '../index.js';
11
11
  import { WebStaticServerlessStage, WebStaticServerlessStageProps } from '../stages/web-static-serverless-stage.js';
12
12
 
13
- const cdk = new Toolkit();
13
+ export interface AppConfigDnsProps {
14
+ record: string;
15
+ zone: string;
16
+ }
17
+
18
+ export interface AppConfigSecurityProps {
19
+ basicAuth?: string;
20
+ basicAuthParam?: string;
21
+ webAcl?: string | boolean;
22
+ webAclParam?: string | { path: string, version?: number };
23
+ }
24
+
25
+ export interface AppConfigCloudFrontProps {
26
+ responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;
27
+ responseHeadersParam?: string;
28
+ responseHeadersPolicy?: ResponseHeadersPolicyProps;
29
+ cspHeaders?: CspHeaders;
30
+ redirects?: CloudFrontFunctionRedirects;
31
+ function?: string | {
32
+ code: string;
33
+ eventType: CloudFrontFunctionEventType[];
34
+ },
35
+ errorResponses?: CloudFrontErrorResponse[]
36
+ }
37
+
38
+ export interface AppConfigPipelineSourceProps {
39
+ codestarConnection?: string;
40
+ codestarConnectionParam?: string;
41
+ owner: 'evokegroup' | 'meltmedia' | (string & {});
42
+ repo: string;
43
+ branch: string;
44
+ fullClone?: boolean;
45
+ }
46
+
47
+ export interface AppConfigPipelineBuildProps {
48
+ buildSpec?: string | object;
49
+ buildImage?: IBuildImage;
50
+ buildImageEcr?: EcrBuildImage;
51
+ buildImageNodeJS?: CodeBuildNodeJs;
52
+ buildImageId?: CodeBuildImageId;
53
+ computeType?: CodeBuildComputeType;
54
+ environmentVariables?: EnvironmentVariables;
55
+ ssmParameters?: CodeBuildSsmParameter[]
56
+ }
14
57
 
15
58
  export interface WebStaticServerlessAppConfig extends EvosynthAppConfig {
16
59
  type: Extract<EvosynthAppType, 'web-static-serverless'>,
17
- description?: string;
18
- dns: {
19
- record: string;
20
- zone: string;
21
- },
22
- security?: {
23
- basicAuth?: string;
24
- basicAuthParam?: string;
25
- webAcl?: string | false;
26
- webAclParam?: string;
27
- },
28
- cloudfront?: {
29
- responseHeaders?: AWSManagedResponseHeadersPolicy | UUID | false;
30
- responseHeadersParam?: string;
31
- responseHeadersPolicy?: ResponseHeadersPolicyProps;
32
- cspHeaders?: CspHeaders;
33
- redirects?: CloudFrontFunctionRedirects;
34
- function?: string | {
35
- code: string;
36
- eventType: CloudFrontFunctionEventType[];
37
- },
38
- errors?: CloudFrontErrorResponse[]
39
- },
60
+ description: string;
61
+ dns: AppConfigDnsProps,
62
+ security?: AppConfigSecurityProps,
63
+ cloudfront?: AppConfigCloudFrontProps,
40
64
  pipeline?: {
41
- source: {
42
- codestarConnection?: string;
43
- codestarConnectionParam?: string;
44
- owner: 'evokegroup' | 'meltmedia' | (string & {});
45
- repo: string;
46
- branch: string;
47
- fullClone?: boolean;
48
- },
49
- build?: {
50
- buildSpec?: string | object;
51
- buildImage?: IBuildImage;
52
- buildImageEcr?: EcrBuildImage;
53
- buildImageNodeJS?: CodeBuildNodeJs;
54
- buildImageId?: CodeBuildImageId;
55
- computeType?: CodeBuildComputeType;
56
- environmentVariables?: EnvironmentVariables;
57
- ssmParameters?: CodeBuildSsmParameter[]
58
- }
65
+ source: AppConfigPipelineSourceProps,
66
+ build?: AppConfigPipelineBuildProps
59
67
  }
60
68
  }
61
69
 
62
70
  export async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStaticServerlessAppConfig) {
71
+ const cdk = new Toolkit();
63
72
  const cx = await cdk.fromAssemblyBuilder(async (props) => {
64
73
  const app = new core.App({
65
74
  outdir: join(process.cwd(), '.evosynth'),
@@ -74,7 +83,7 @@ export async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStat
74
83
  hostedZone: config.dns.zone,
75
84
  domainName: `${config.dns.record}.${config.dns.zone}`,
76
85
  basicAuth: config.security?.basicAuthParam ? { path: config.security?.basicAuthParam } : config.security?.basicAuth,
77
- webAcl: config.security?.webAclParam ? { path: config.security.webAclParam } : config.security?.webAcl,
86
+ webAcl: config.security?.webAclParam ? (config.security.webAclParam as any).path ? config.security.webAclParam : { path: config.security.webAclParam as string } : config.security?.webAcl,
78
87
  redirects: config.cloudfront?.redirects,
79
88
  responseCspHeaders: config.cloudfront?.cspHeaders,
80
89
  responseHeadersPolicy: config.cloudfront?.responseHeadersParam ? { path: config.cloudfront.responseHeadersParam } : config.cloudfront?.responseHeaders,
@@ -82,7 +91,8 @@ export async function runWebStaticServerlessApp(cmd: CdkCommand, config: WebStat
82
91
  cloudfrontFunction: config.cloudfront?.function && typeof config.cloudfront.function == 'string' ? {
83
92
  code: config.cloudfront.function,
84
93
  eventType: ['VIEWER_REQUEST','VIEWER_RESPONSE'],
85
- } : config.cloudfront?.function as any
94
+ } : config.cloudfront?.function as any,
95
+ errorResponses: config.cloudfront?.errorResponses
86
96
  }
87
97
  if (config.pipeline) {
88
98
  stageProps.pipeline = {
@@ -10,7 +10,7 @@ import type { ResourceProps } from '../types.d.ts';
10
10
 
11
11
  const __dirname = import.meta.dirname;
12
12
 
13
- export interface CloudFrontErrorResponse extends ErrorResponse {
13
+ export interface CloudFrontErrorResponse {
14
14
  httpStatus: 400 | 403 | 404 | 405 | 414 | 416 | 500 | 501 | 502 | 503 | 504;
15
15
  ttlSeconds?: number;
16
16
  responseStatus?: number;
@@ -145,12 +145,23 @@ export class CloudFrontFunction extends Construct {
145
145
  static createFunction(scope: Construct, id: string | null, props: ViewerEventFunctionProps) {
146
146
  const csvPath = props.redirects?.pathsCsvFile ?? props.redirectsCsvPath;
147
147
  const redirectPaths = csvPath ? parseCsvRedirects(csvPath) : (props.redirects?.paths ?? {});
148
- const hasRedirects = Object.keys(redirectPaths).length > 0;
148
+
149
+ const redirects: CloudFrontFunctionRedirectPaths = {};
150
+ const redirectsStartsWith: CloudFrontFunctionRedirectPaths = {};
151
+ const redirectKeys = Object.keys(redirectPaths);
152
+ for (const key of redirectKeys) {
153
+ if (key.endsWith('*')) {
154
+ redirectsStartsWith[key.substring(0, key.length - 1)] = redirectPaths[key];
155
+ } else {
156
+ redirects[key] = redirectPaths[key];
157
+ }
158
+ }
149
159
 
150
160
  props.code = props.code
151
161
  .replace('__DEFAULT_DOCUMENT__', props.defaultDocument ?? 'index.html')
152
162
  .replace('__CREDENTIALS__', props.credentials ?? 'Og==')
153
- .replace('__REDIRECTS__', hasRedirects ? JSON.stringify(redirectPaths) : 'null')
163
+ .replace('__REDIRECTS__', Object.keys(redirects).length > 0 ? JSON.stringify(redirects) : 'null')
164
+ .replace('__REDIRECTS_START_WITH__', Object.keys(redirectsStartsWith).length > 0 ? JSON.stringify(redirectsStartsWith) : 'null')
154
165
  .replace('__TRAILING_SLASH__', props.redirects?.trailingSlash?.toString() ?? 'null')
155
166
  .replace('__REDIR_DEF_DOC__', props.redirects?.redirectDefaultDocument?.toString() ?? 'false');
156
167
 
@@ -9,7 +9,13 @@ const BASIC_AUTH = ["Basic __CREDENTIALS__"];
9
9
  /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
10
10
  const redirects = __REDIRECTS__;
11
11
 
12
+ /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
13
+ const redirectsStartsWith = __REDIRECTS_START_WITH__;
14
+
15
+ /** @type {boolean | null} */
12
16
  const useTrailingSlash = __TRAILING_SLASH__;
17
+
18
+ /** @type {boolean | null} */
13
19
  const shouldRedirDefDoc = __REDIR_DEF_DOC__;
14
20
 
15
21
 
@@ -32,7 +38,19 @@ function handleRequest(event) {
32
38
  const request = event.request;
33
39
  const uri = request.uri;
34
40
 
35
- const redirect = redirects ? redirects[uri] : null;
41
+ let redirect = null;
42
+ if (redirects) {
43
+ redirect = redirects[uri];
44
+ }
45
+ if (!redirect && redirectsStartsWith) {
46
+ const keys = Object.keys(redirectsStartsWith);
47
+ for (let i=0; i<keys.length; i++) {
48
+ if (uri.startsWith(keys[i])) {
49
+ redirect = redirectsStartsWith[keys[i]];
50
+ break;
51
+ }
52
+ }
53
+ }
36
54
  if (redirect) {
37
55
  const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
38
56
  return redirectResponse(event, redir[0], redir[1]);
@@ -8,7 +8,13 @@ const DEFAULT_DOCUMENT = "__DEFAULT_DOCUMENT__";
8
8
  /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
9
9
  const redirects = __REDIRECTS__;
10
10
 
11
+ /** @type {Record<string, string | [string, 301|302|303|307|308]>} */
12
+ const redirectsStartsWith = __REDIRECTS_START_WITH__;
13
+
14
+ /** @type {boolean | null} */
11
15
  const useTrailingSlash = __TRAILING_SLASH__;
16
+
17
+ /** @type {boolean | null} */
12
18
  const shouldRedirDefDoc = __REDIR_DEF_DOC__;
13
19
 
14
20
 
@@ -30,7 +36,19 @@ function handleRequest(event) {
30
36
  const request = event.request;
31
37
  const uri = request.uri;
32
38
 
33
- const redirect = redirects ? redirects[uri] : null;
39
+ let redirect = null;
40
+ if (redirects) {
41
+ redirect = redirects[uri];
42
+ }
43
+ if (!redirect && redirectsStartsWith) {
44
+ const keys = Object.keys(redirectsStartsWith);
45
+ for (let i=0; i<keys.length; i++) {
46
+ if (uri.startsWith(keys[i])) {
47
+ redirect = redirectsStartsWith[keys[i]];
48
+ break;
49
+ }
50
+ }
51
+ }
34
52
  if (redirect) {
35
53
  const redir = Array.isArray(redirect) ? redirect : [redirect, 301];
36
54
  return redirectResponse(event, redir[0], redir[1]);