From 57ef7f04edab25eacdabce44e9df5612cc19bfaa Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Thu, 31 Oct 2024 09:24:52 -0500 Subject: [PATCH 1/2] chore(deps): upgrade dependencies (#22) Upgrades project dependencies. The following changes were made: ```diff diff --git a/diff.txt b/diff.txt index fba735d..e69de29 100644 --- a/diff.txt +++ b/diff.txt @@ -1,405 +0,0 @@ -diff --git a/diff.txt b/diff.txt -index d24a6c9..e69de29 100644 ---- a/diff.txt -+++ b/diff.txt -@@ -1,294 +0,0 @@ --diff --git a/package.json b/package.json --index 08b60ea..684a751 100644 ----- a/package.json --+++ b/package.json --@@ -40,7 +40,7 @@ -- "aws-cdk-lib": "2.164.1", -- "constructs": "^10.4.2", -- "js-yaml": "^4.1.0", --- "p6-cdk-website-plus": "^0.3.5", --+ "p6-cdk-website-plus": "^1.0.0", -- "source-map-support": "^0.5.21" -- }, -- "keywords": [ --diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml --index 3d144f8..010348b 100644 ----- a/pnpm-lock.yaml --+++ b/pnpm-lock.yaml --@@ -18,8 +18,8 @@ importers: -- specifier: ^4.1.0 -- version: 4.1.0 -- p6-cdk-website-plus: --- specifier: ^0.3.5 --- version: 0.3.5(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) --+ specifier: ^1.0.0 --+ version: 1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) -- source-map-support: -- specifier: ^0.5.21 -- version: 0.5.21 --@@ -137,20 +137,20 @@ packages: -- - jsonschema -- - semver -- --- '@babel/code-frame@7.26.0': --- resolution: {integrity: sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==} --+ '@babel/code-frame@7.26.2': --+ resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} -- engines: {node: '>=6.9.0'} -- --- '@babel/compat-data@7.26.0': --- resolution: {integrity: sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==} --+ '@babel/compat-data@7.26.2': --+ resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} -- engines: {node: '>=6.9.0'} -- -- '@babel/core@7.26.0': -- resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} -- engines: {node: '>=6.9.0'} -- --- '@babel/generator@7.26.0': --- resolution: {integrity: sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==} --+ '@babel/generator@7.26.2': --+ resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} -- engines: {node: '>=6.9.0'} -- -- '@babel/helper-compilation-targets@7.25.9': --@@ -187,8 +187,8 @@ packages: -- resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} -- engines: {node: '>=6.9.0'} -- --- '@babel/parser@7.26.1': --- resolution: {integrity: sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==} --+ '@babel/parser@7.26.2': --+ resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} -- engines: {node: '>=6.0.0'} -- hasBin: true -- --@@ -2150,8 +2150,8 @@ packages: -- resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} -- engines: {node: '>=6'} -- --- p6-cdk-website-plus@0.3.5: --- resolution: {integrity: sha512-NN3g+5+Hrr8yMRiqRvVoblT1dRXEa0vpIXwiilT+as0wP4rJMZ0f+aU8M8+YePxjO9phaPPgEsEo38QBGV8Efw==} --+ p6-cdk-website-plus@1.0.0: --+ resolution: {integrity: sha512-UUHIQPUzEMrThQLTnTRhfQmIJhMFg21ihlc9QJ+zjqdr5OA1fH+VjwA2DzMgAzXL+hoZDOlWIVOZq2NYE2j9Ww==} -- peerDependencies: -- aws-cdk-lib: 2.164.1 -- constructs: ^10.4.2 --@@ -2503,8 +2503,8 @@ packages: -- resolution: {integrity: sha512-khrZo4buq4qVmsGzS5yQjKe/WsFvV8fGfOjDQN0q4iy9FjRfPWRgTFrU8u1R2iu/SfWLhY9WnCi4Jhdrcbtg+g==} -- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -- --- ts-api-utils@1.3.0: --- resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} --+ ts-api-utils@1.4.0: --+ resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==} -- engines: {node: '>=16'} -- peerDependencies: -- typescript: '>=4.2.0' --@@ -2784,23 +2784,23 @@ snapshots: -- -- '@aws-cdk/cloud-assembly-schema@38.0.1': {} -- --- '@babel/code-frame@7.26.0': --+ '@babel/code-frame@7.26.2': -- dependencies: -- '@babel/helper-validator-identifier': 7.25.9 -- js-tokens: 4.0.0 -- picocolors: 1.1.1 -- --- '@babel/compat-data@7.26.0': {} --+ '@babel/compat-data@7.26.2': {} -- -- '@babel/core@7.26.0': -- dependencies: -- '@ampproject/remapping': 2.3.0 --- '@babel/code-frame': 7.26.0 --- '@babel/generator': 7.26.0 --+ '@babel/code-frame': 7.26.2 --+ '@babel/generator': 7.26.2 -- '@babel/helper-compilation-targets': 7.25.9 -- '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) -- '@babel/helpers': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/template': 7.25.9 -- '@babel/traverse': 7.25.9 -- '@babel/types': 7.26.0 --@@ -2812,9 +2812,9 @@ snapshots: -- transitivePeerDependencies: -- - supports-color -- --- '@babel/generator@7.26.0': --+ '@babel/generator@7.26.2': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- '@jridgewell/gen-mapping': 0.3.5 -- '@jridgewell/trace-mapping': 0.3.25 --@@ -2822,7 +2822,7 @@ snapshots: -- -- '@babel/helper-compilation-targets@7.25.9': -- dependencies: --- '@babel/compat-data': 7.26.0 --+ '@babel/compat-data': 7.26.2 -- '@babel/helper-validator-option': 7.25.9 -- browserslist: 4.24.2 -- lru-cache: 5.1.1 --@@ -2857,7 +2857,7 @@ snapshots: -- '@babel/template': 7.25.9 -- '@babel/types': 7.26.0 -- --- '@babel/parser@7.26.1': --+ '@babel/parser@7.26.2': -- dependencies: -- '@babel/types': 7.26.0 -- --@@ -2948,15 +2948,15 @@ snapshots: -- -- '@babel/template@7.25.9': -- dependencies: --- '@babel/code-frame': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/code-frame': 7.26.2 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- -- '@babel/traverse@7.25.9': -- dependencies: --- '@babel/code-frame': 7.26.0 --- '@babel/generator': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/code-frame': 7.26.2 --+ '@babel/generator': 7.26.2 --+ '@babel/parser': 7.26.2 -- '@babel/template': 7.25.9 -- '@babel/types': 7.26.0 -- debug: 4.3.7 --@@ -3309,7 +3309,7 @@ snapshots: -- -- '@types/babel__core@7.20.5': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- '@types/babel__generator': 7.6.8 -- '@types/babel__template': 7.4.4 --@@ -3321,7 +3321,7 @@ snapshots: -- -- '@types/babel__template@7.4.4': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- -- '@types/babel__traverse@7.20.6': --@@ -3393,7 +3393,7 @@ snapshots: -- graphemer: 1.4.0 -- ignore: 5.3.2 -- natural-compare: 1.4.0 --- ts-api-utils: 1.3.0(typescript@5.6.3) --+ ts-api-utils: 1.4.0(typescript@5.6.3) -- optionalDependencies: -- typescript: 5.6.3 -- transitivePeerDependencies: --@@ -3422,7 +3422,7 @@ snapshots: -- '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) -- '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) -- debug: 4.3.7 --- ts-api-utils: 1.3.0(typescript@5.6.3) --+ ts-api-utils: 1.4.0(typescript@5.6.3) -- optionalDependencies: -- typescript: 5.6.3 -- transitivePeerDependencies: --@@ -3440,7 +3440,7 @@ snapshots: -- is-glob: 4.0.3 -- minimatch: 9.0.5 -- semver: 7.6.3 --- ts-api-utils: 1.3.0(typescript@5.6.3) --+ ts-api-utils: 1.4.0(typescript@5.6.3) -- optionalDependencies: -- typescript: 5.6.3 -- transitivePeerDependencies: --@@ -3471,7 +3471,7 @@ snapshots: -- -- '@vue/compiler-core@3.5.12': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@vue/shared': 3.5.12 -- entities: 4.5.0 -- estree-walker: 2.0.2 --@@ -3484,7 +3484,7 @@ snapshots: -- -- '@vue/compiler-sfc@3.5.12': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@vue/compiler-core': 3.5.12 -- '@vue/compiler-dom': 3.5.12 -- '@vue/compiler-ssr': 3.5.12 --@@ -4591,7 +4591,7 @@ snapshots: -- istanbul-lib-instrument@5.2.1: -- dependencies: -- '@babel/core': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@istanbuljs/schema': 0.1.3 -- istanbul-lib-coverage: 3.2.2 -- semver: 6.3.1 --@@ -4601,7 +4601,7 @@ snapshots: -- istanbul-lib-instrument@6.0.3: -- dependencies: -- '@babel/core': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@istanbuljs/schema': 0.1.3 -- istanbul-lib-coverage: 3.2.2 -- semver: 7.6.3 --@@ -4776,7 +4776,7 @@ snapshots: -- -- jest-message-util@29.7.0: -- dependencies: --- '@babel/code-frame': 7.26.0 --+ '@babel/code-frame': 7.26.2 -- '@jest/types': 29.6.3 -- '@types/stack-utils': 2.0.3 -- chalk: 4.1.2 --@@ -4873,7 +4873,7 @@ snapshots: -- jest-snapshot@29.7.0: -- dependencies: -- '@babel/core': 7.26.0 --- '@babel/generator': 7.26.0 --+ '@babel/generator': 7.26.2 -- '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0) -- '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0) -- '@babel/types': 7.26.0 --@@ -5458,7 +5458,7 @@ snapshots: -- -- p-try@2.2.0: {} -- --- p6-cdk-website-plus@0.3.5(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): --+ p6-cdk-website-plus@1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): -- dependencies: -- aws-cdk-lib: 2.164.1(constructs@10.4.2) -- constructs: 10.4.2 --@@ -5478,7 +5478,7 @@ snapshots: -- -- parse-json@5.2.0: -- dependencies: --- '@babel/code-frame': 7.26.0 --+ '@babel/code-frame': 7.26.2 -- error-ex: 1.3.2 -- json-parse-even-better-errors: 2.3.1 -- lines-and-columns: 1.2.4 --@@ -5798,7 +5798,7 @@ snapshots: -- dependencies: -- eslint-visitor-keys: 3.4.3 -- --- ts-api-utils@1.3.0(typescript@5.6.3): --+ ts-api-utils@1.4.0(typescript@5.6.3): -- dependencies: -- typescript: 5.6.3 -- -diff --git a/package.json b/package.json -index 684a751..ffd8a5e 100644 ---- a/package.json -+++ b/package.json -@@ -40,7 +40,7 @@ - "aws-cdk-lib": "2.164.1", - "constructs": "^10.4.2", - "js-yaml": "^4.1.0", -- "p6-cdk-website-plus": "^1.0.0", -+ "p6-cdk-website-plus": "^1.0.1", - "source-map-support": "^0.5.21" - }, - "keywords": [ -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index 010348b..49f89f4 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -18,8 +18,8 @@ importers: - specifier: ^4.1.0 - version: 4.1.0 - p6-cdk-website-plus: -- specifier: ^1.0.0 -- version: 1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) -+ specifier: ^1.0.1 -+ version: 1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) - source-map-support: - specifier: ^0.5.21 - version: 0.5.21 -@@ -510,8 +510,8 @@ packages: - '@sinonjs/fake-timers@10.3.0': - resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==} - -- '@stylistic/eslint-plugin@2.9.0': -- resolution: {integrity: sha512-OrDyFAYjBT61122MIY1a3SfEgy3YCMgt2vL4eoPmvTwDBwyQhAXurxNQznlRD/jESNfYWfID8Ej+31LljvF7Xg==} -+ '@stylistic/eslint-plugin@2.10.0': -+ resolution: {integrity: sha512-neWEgjp0qKxutbrKac5g23V5LX2c2Clyiz3zFxxybY8VSMfr+MmvwM204zg8YFbe9n2zcTwkpppCL2luwYcMhg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: '>=8.40.0' -@@ -925,8 +925,8 @@ packages: - convert-source-map@2.0.0: - resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - -- core-js-compat@3.38.1: -- resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} -+ core-js-compat@3.39.0: -+ resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==} - - create-jest@29.7.0: - resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} -@@ -2150,8 +2150,8 @@ packages: - resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} - engines: {node: '>=6'} - -- p6-cdk-website-plus@1.0.0: -- resolution: {integrity: sha512-UUHIQPUzEMrThQLTnTRhfQmIJhMFg21ihlc9QJ+zjqdr5OA1fH+VjwA2DzMgAzXL+hoZDOlWIVOZq2NYE2j9Ww==} -+ p6-cdk-website-plus@1.0.1: -+ resolution: {integrity: sha512-VL6Stbg7Fo8Xk6Rrlt1DY8pHLMmsxD7gA/FA7ZUA6IIjwXfYpkZyIuvHx5GcMxXwDBjzHiozYUzxcj0xGbJt4Q==} - peerDependencies: - aws-cdk-lib: 2.164.1 - constructs: ^10.4.2 -@@ -2729,7 +2729,7 @@ snapshots: - '@clack/prompts': 0.7.0 - '@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.13.0) - '@eslint/markdown': 6.2.1 -- '@stylistic/eslint-plugin': 2.9.0(eslint@9.13.0)(typescript@5.6.3) -+ '@stylistic/eslint-plugin': 2.10.0(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/parser': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - '@vitest/eslint-plugin': 1.1.7(@typescript-eslint/utils@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) -@@ -3287,7 +3287,7 @@ snapshots: - dependencies: - '@sinonjs/commons': 3.0.1 - -- '@stylistic/eslint-plugin@2.9.0(eslint@9.13.0)(typescript@5.6.3)': -+ '@stylistic/eslint-plugin@2.10.0(eslint@9.13.0)(typescript@5.6.3)': - dependencies: - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - eslint: 9.13.0 -@@ -3765,7 +3765,7 @@ snapshots: - - convert-source-map@2.0.0: {} - -- core-js-compat@3.38.1: -+ core-js-compat@3.39.0: - dependencies: - browserslist: 4.24.2 - -@@ -4152,7 +4152,7 @@ snapshots: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.13.0) - ci-info: 4.0.0 - clean-regexp: 1.0.0 -- core-js-compat: 3.38.1 -+ core-js-compat: 3.39.0 - eslint: 9.13.0 - esquery: 1.6.0 - globals: 15.11.0 -@@ -5458,7 +5458,7 @@ snapshots: - - p-try@2.2.0: {} - -- p6-cdk-website-plus@1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): -+ p6-cdk-website-plus@1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): - dependencies: - aws-cdk-lib: 2.164.1(constructs@10.4.2) - constructs: 10.4.2 diff --git a/package.json b/package.json index e0ad6b8..41a199e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "aws-cdk-lib": "2.164.1", "constructs": "^10.4.2", "js-yaml": "^4.1.0", - "p6-cdk-website-plus": "^1.0.1", + "p6-cdk-website-plus": "^1.0.2", "source-map-support": "^0.5.21" }, "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 529f8a0..531a872 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^4.1.0 version: 4.1.0 p6-cdk-website-plus: - specifier: ^1.0.1 - version: 1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) + specifier: ^1.0.2 + version: 1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -2150,8 +2150,8 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - p6-cdk-website-plus@1.0.1: - resolution: {integrity: sha512-VL6Stbg7Fo8Xk6Rrlt1DY8pHLMmsxD7gA/FA7ZUA6IIjwXfYpkZyIuvHx5GcMxXwDBjzHiozYUzxcj0xGbJt4Q==} + p6-cdk-website-plus@1.0.2: + resolution: {integrity: sha512-0rsDeSf2RRSchQpbvTZeM1u/0QuhtG08dX8+kgjBZlSJ2EqjDIdGNCgu63y5RRQhqHWfqO7Bz5gmwyVaegDO2A==} peerDependencies: aws-cdk-lib: 2.164.1 constructs: ^10.4.2 @@ -5458,7 +5458,7 @@ snapshots: p-try@2.2.0: {} - p6-cdk-website-plus@1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): + p6-cdk-website-plus@1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): dependencies: aws-cdk-lib: 2.164.1(constructs@10.4.2) constructs: 10.4.2 ``` --- diff.txt | 699 ++++++++++++++++++++++++++----------------------- package.json | 2 +- pnpm-lock.yaml | 10 +- 3 files changed, 382 insertions(+), 329 deletions(-) diff --git a/diff.txt b/diff.txt index fba735d..1e3ff54 100644 --- a/diff.txt +++ b/diff.txt @@ -1,405 +1,458 @@ diff --git a/diff.txt b/diff.txt -index d24a6c9..e69de29 100644 +index fba735d..e69de29 100644 --- a/diff.txt +++ b/diff.txt -@@ -1,294 +0,0 @@ +@@ -1,405 +0,0 @@ +-diff --git a/diff.txt b/diff.txt +-index d24a6c9..e69de29 100644 +---- a/diff.txt +-+++ b/diff.txt +-@@ -1,294 +0,0 @@ +--diff --git a/package.json b/package.json +--index 08b60ea..684a751 100644 +----- a/package.json +--+++ b/package.json +--@@ -40,7 +40,7 @@ +-- "aws-cdk-lib": "2.164.1", +-- "constructs": "^10.4.2", +-- "js-yaml": "^4.1.0", +--- "p6-cdk-website-plus": "^0.3.5", +--+ "p6-cdk-website-plus": "^1.0.0", +-- "source-map-support": "^0.5.21" +-- }, +-- "keywords": [ +--diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml +--index 3d144f8..010348b 100644 +----- a/pnpm-lock.yaml +--+++ b/pnpm-lock.yaml +--@@ -18,8 +18,8 @@ importers: +-- specifier: ^4.1.0 +-- version: 4.1.0 +-- p6-cdk-website-plus: +--- specifier: ^0.3.5 +--- version: 0.3.5(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) +--+ specifier: ^1.0.0 +--+ version: 1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) +-- source-map-support: +-- specifier: ^0.5.21 +-- version: 0.5.21 +--@@ -137,20 +137,20 @@ packages: +-- - jsonschema +-- - semver +-- +--- '@babel/code-frame@7.26.0': +--- resolution: {integrity: sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==} +--+ '@babel/code-frame@7.26.2': +--+ resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} +-- engines: {node: '>=6.9.0'} +-- +--- '@babel/compat-data@7.26.0': +--- resolution: {integrity: sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==} +--+ '@babel/compat-data@7.26.2': +--+ resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} +-- engines: {node: '>=6.9.0'} +-- +-- '@babel/core@7.26.0': +-- resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} +-- engines: {node: '>=6.9.0'} +-- +--- '@babel/generator@7.26.0': +--- resolution: {integrity: sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==} +--+ '@babel/generator@7.26.2': +--+ resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} +-- engines: {node: '>=6.9.0'} +-- +-- '@babel/helper-compilation-targets@7.25.9': +--@@ -187,8 +187,8 @@ packages: +-- resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} +-- engines: {node: '>=6.9.0'} +-- +--- '@babel/parser@7.26.1': +--- resolution: {integrity: sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==} +--+ '@babel/parser@7.26.2': +--+ resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} +-- engines: {node: '>=6.0.0'} +-- hasBin: true +-- +--@@ -2150,8 +2150,8 @@ packages: +-- resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} +-- engines: {node: '>=6'} +-- +--- p6-cdk-website-plus@0.3.5: +--- resolution: {integrity: sha512-NN3g+5+Hrr8yMRiqRvVoblT1dRXEa0vpIXwiilT+as0wP4rJMZ0f+aU8M8+YePxjO9phaPPgEsEo38QBGV8Efw==} +--+ p6-cdk-website-plus@1.0.0: +--+ resolution: {integrity: sha512-UUHIQPUzEMrThQLTnTRhfQmIJhMFg21ihlc9QJ+zjqdr5OA1fH+VjwA2DzMgAzXL+hoZDOlWIVOZq2NYE2j9Ww==} +-- peerDependencies: +-- aws-cdk-lib: 2.164.1 +-- constructs: ^10.4.2 +--@@ -2503,8 +2503,8 @@ packages: +-- resolution: {integrity: sha512-khrZo4buq4qVmsGzS5yQjKe/WsFvV8fGfOjDQN0q4iy9FjRfPWRgTFrU8u1R2iu/SfWLhY9WnCi4Jhdrcbtg+g==} +-- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} +-- +--- ts-api-utils@1.3.0: +--- resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} +--+ ts-api-utils@1.4.0: +--+ resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==} +-- engines: {node: '>=16'} +-- peerDependencies: +-- typescript: '>=4.2.0' +--@@ -2784,23 +2784,23 @@ snapshots: +-- +-- '@aws-cdk/cloud-assembly-schema@38.0.1': {} +-- +--- '@babel/code-frame@7.26.0': +--+ '@babel/code-frame@7.26.2': +-- dependencies: +-- '@babel/helper-validator-identifier': 7.25.9 +-- js-tokens: 4.0.0 +-- picocolors: 1.1.1 +-- +--- '@babel/compat-data@7.26.0': {} +--+ '@babel/compat-data@7.26.2': {} +-- +-- '@babel/core@7.26.0': +-- dependencies: +-- '@ampproject/remapping': 2.3.0 +--- '@babel/code-frame': 7.26.0 +--- '@babel/generator': 7.26.0 +--+ '@babel/code-frame': 7.26.2 +--+ '@babel/generator': 7.26.2 +-- '@babel/helper-compilation-targets': 7.25.9 +-- '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) +-- '@babel/helpers': 7.26.0 +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@babel/template': 7.25.9 +-- '@babel/traverse': 7.25.9 +-- '@babel/types': 7.26.0 +--@@ -2812,9 +2812,9 @@ snapshots: +-- transitivePeerDependencies: +-- - supports-color +-- +--- '@babel/generator@7.26.0': +--+ '@babel/generator@7.26.2': +-- dependencies: +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@babel/types': 7.26.0 +-- '@jridgewell/gen-mapping': 0.3.5 +-- '@jridgewell/trace-mapping': 0.3.25 +--@@ -2822,7 +2822,7 @@ snapshots: +-- +-- '@babel/helper-compilation-targets@7.25.9': +-- dependencies: +--- '@babel/compat-data': 7.26.0 +--+ '@babel/compat-data': 7.26.2 +-- '@babel/helper-validator-option': 7.25.9 +-- browserslist: 4.24.2 +-- lru-cache: 5.1.1 +--@@ -2857,7 +2857,7 @@ snapshots: +-- '@babel/template': 7.25.9 +-- '@babel/types': 7.26.0 +-- +--- '@babel/parser@7.26.1': +--+ '@babel/parser@7.26.2': +-- dependencies: +-- '@babel/types': 7.26.0 +-- +--@@ -2948,15 +2948,15 @@ snapshots: +-- +-- '@babel/template@7.25.9': +-- dependencies: +--- '@babel/code-frame': 7.26.0 +--- '@babel/parser': 7.26.1 +--+ '@babel/code-frame': 7.26.2 +--+ '@babel/parser': 7.26.2 +-- '@babel/types': 7.26.0 +-- +-- '@babel/traverse@7.25.9': +-- dependencies: +--- '@babel/code-frame': 7.26.0 +--- '@babel/generator': 7.26.0 +--- '@babel/parser': 7.26.1 +--+ '@babel/code-frame': 7.26.2 +--+ '@babel/generator': 7.26.2 +--+ '@babel/parser': 7.26.2 +-- '@babel/template': 7.25.9 +-- '@babel/types': 7.26.0 +-- debug: 4.3.7 +--@@ -3309,7 +3309,7 @@ snapshots: +-- +-- '@types/babel__core@7.20.5': +-- dependencies: +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@babel/types': 7.26.0 +-- '@types/babel__generator': 7.6.8 +-- '@types/babel__template': 7.4.4 +--@@ -3321,7 +3321,7 @@ snapshots: +-- +-- '@types/babel__template@7.4.4': +-- dependencies: +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@babel/types': 7.26.0 +-- +-- '@types/babel__traverse@7.20.6': +--@@ -3393,7 +3393,7 @@ snapshots: +-- graphemer: 1.4.0 +-- ignore: 5.3.2 +-- natural-compare: 1.4.0 +--- ts-api-utils: 1.3.0(typescript@5.6.3) +--+ ts-api-utils: 1.4.0(typescript@5.6.3) +-- optionalDependencies: +-- typescript: 5.6.3 +-- transitivePeerDependencies: +--@@ -3422,7 +3422,7 @@ snapshots: +-- '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) +-- '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) +-- debug: 4.3.7 +--- ts-api-utils: 1.3.0(typescript@5.6.3) +--+ ts-api-utils: 1.4.0(typescript@5.6.3) +-- optionalDependencies: +-- typescript: 5.6.3 +-- transitivePeerDependencies: +--@@ -3440,7 +3440,7 @@ snapshots: +-- is-glob: 4.0.3 +-- minimatch: 9.0.5 +-- semver: 7.6.3 +--- ts-api-utils: 1.3.0(typescript@5.6.3) +--+ ts-api-utils: 1.4.0(typescript@5.6.3) +-- optionalDependencies: +-- typescript: 5.6.3 +-- transitivePeerDependencies: +--@@ -3471,7 +3471,7 @@ snapshots: +-- +-- '@vue/compiler-core@3.5.12': +-- dependencies: +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@vue/shared': 3.5.12 +-- entities: 4.5.0 +-- estree-walker: 2.0.2 +--@@ -3484,7 +3484,7 @@ snapshots: +-- +-- '@vue/compiler-sfc@3.5.12': +-- dependencies: +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@vue/compiler-core': 3.5.12 +-- '@vue/compiler-dom': 3.5.12 +-- '@vue/compiler-ssr': 3.5.12 +--@@ -4591,7 +4591,7 @@ snapshots: +-- istanbul-lib-instrument@5.2.1: +-- dependencies: +-- '@babel/core': 7.26.0 +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@istanbuljs/schema': 0.1.3 +-- istanbul-lib-coverage: 3.2.2 +-- semver: 6.3.1 +--@@ -4601,7 +4601,7 @@ snapshots: +-- istanbul-lib-instrument@6.0.3: +-- dependencies: +-- '@babel/core': 7.26.0 +--- '@babel/parser': 7.26.1 +--+ '@babel/parser': 7.26.2 +-- '@istanbuljs/schema': 0.1.3 +-- istanbul-lib-coverage: 3.2.2 +-- semver: 7.6.3 +--@@ -4776,7 +4776,7 @@ snapshots: +-- +-- jest-message-util@29.7.0: +-- dependencies: +--- '@babel/code-frame': 7.26.0 +--+ '@babel/code-frame': 7.26.2 +-- '@jest/types': 29.6.3 +-- '@types/stack-utils': 2.0.3 +-- chalk: 4.1.2 +--@@ -4873,7 +4873,7 @@ snapshots: +-- jest-snapshot@29.7.0: +-- dependencies: +-- '@babel/core': 7.26.0 +--- '@babel/generator': 7.26.0 +--+ '@babel/generator': 7.26.2 +-- '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0) +-- '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0) +-- '@babel/types': 7.26.0 +--@@ -5458,7 +5458,7 @@ snapshots: +-- +-- p-try@2.2.0: {} +-- +--- p6-cdk-website-plus@0.3.5(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): +--+ p6-cdk-website-plus@1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): +-- dependencies: +-- aws-cdk-lib: 2.164.1(constructs@10.4.2) +-- constructs: 10.4.2 +--@@ -5478,7 +5478,7 @@ snapshots: +-- +-- parse-json@5.2.0: +-- dependencies: +--- '@babel/code-frame': 7.26.0 +--+ '@babel/code-frame': 7.26.2 +-- error-ex: 1.3.2 +-- json-parse-even-better-errors: 2.3.1 +-- lines-and-columns: 1.2.4 +--@@ -5798,7 +5798,7 @@ snapshots: +-- dependencies: +-- eslint-visitor-keys: 3.4.3 +-- +--- ts-api-utils@1.3.0(typescript@5.6.3): +--+ ts-api-utils@1.4.0(typescript@5.6.3): +-- dependencies: +-- typescript: 5.6.3 +-- -diff --git a/package.json b/package.json --index 08b60ea..684a751 100644 +-index 684a751..ffd8a5e 100644 ---- a/package.json -+++ b/package.json -@@ -40,7 +40,7 @@ - "aws-cdk-lib": "2.164.1", - "constructs": "^10.4.2", - "js-yaml": "^4.1.0", --- "p6-cdk-website-plus": "^0.3.5", --+ "p6-cdk-website-plus": "^1.0.0", +-- "p6-cdk-website-plus": "^1.0.0", +-+ "p6-cdk-website-plus": "^1.0.1", - "source-map-support": "^0.5.21" - }, - "keywords": [ -diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml --index 3d144f8..010348b 100644 +-index 010348b..49f89f4 100644 ---- a/pnpm-lock.yaml -+++ b/pnpm-lock.yaml -@@ -18,8 +18,8 @@ importers: - specifier: ^4.1.0 - version: 4.1.0 - p6-cdk-website-plus: --- specifier: ^0.3.5 --- version: 0.3.5(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) --+ specifier: ^1.0.0 --+ version: 1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) +-- specifier: ^1.0.0 +-- version: 1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) +-+ specifier: ^1.0.1 +-+ version: 1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) - source-map-support: - specifier: ^0.5.21 - version: 0.5.21 --@@ -137,20 +137,20 @@ packages: -- - jsonschema -- - semver +-@@ -510,8 +510,8 @@ packages: +- '@sinonjs/fake-timers@10.3.0': +- resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==} - --- '@babel/code-frame@7.26.0': --- resolution: {integrity: sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==} --+ '@babel/code-frame@7.26.2': --+ resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} -- engines: {node: '>=6.9.0'} -- --- '@babel/compat-data@7.26.0': --- resolution: {integrity: sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==} --+ '@babel/compat-data@7.26.2': --+ resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} -- engines: {node: '>=6.9.0'} -- -- '@babel/core@7.26.0': -- resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} -- engines: {node: '>=6.9.0'} -- --- '@babel/generator@7.26.0': --- resolution: {integrity: sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==} --+ '@babel/generator@7.26.2': --+ resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} -- engines: {node: '>=6.9.0'} -- -- '@babel/helper-compilation-targets@7.25.9': --@@ -187,8 +187,8 @@ packages: -- resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} -- engines: {node: '>=6.9.0'} +-- '@stylistic/eslint-plugin@2.9.0': +-- resolution: {integrity: sha512-OrDyFAYjBT61122MIY1a3SfEgy3YCMgt2vL4eoPmvTwDBwyQhAXurxNQznlRD/jESNfYWfID8Ej+31LljvF7Xg==} +-+ '@stylistic/eslint-plugin@2.10.0': +-+ resolution: {integrity: sha512-neWEgjp0qKxutbrKac5g23V5LX2c2Clyiz3zFxxybY8VSMfr+MmvwM204zg8YFbe9n2zcTwkpppCL2luwYcMhg==} +- engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} +- peerDependencies: +- eslint: '>=8.40.0' +-@@ -925,8 +925,8 @@ packages: +- convert-source-map@2.0.0: +- resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - --- '@babel/parser@7.26.1': --- resolution: {integrity: sha512-reoQYNiAJreZNsJzyrDNzFQ+IQ5JFiIzAHJg9bn94S3l+4++J7RsIhNMoB+lgP/9tpmiAQqspv+xfdxTSzREOw==} --+ '@babel/parser@7.26.2': --+ resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} -- engines: {node: '>=6.0.0'} -- hasBin: true +-- core-js-compat@3.38.1: +-- resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} +-+ core-js-compat@3.39.0: +-+ resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==} - +- create-jest@29.7.0: +- resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} -@@ -2150,8 +2150,8 @@ packages: - resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} - engines: {node: '>=6'} - --- p6-cdk-website-plus@0.3.5: --- resolution: {integrity: sha512-NN3g+5+Hrr8yMRiqRvVoblT1dRXEa0vpIXwiilT+as0wP4rJMZ0f+aU8M8+YePxjO9phaPPgEsEo38QBGV8Efw==} --+ p6-cdk-website-plus@1.0.0: --+ resolution: {integrity: sha512-UUHIQPUzEMrThQLTnTRhfQmIJhMFg21ihlc9QJ+zjqdr5OA1fH+VjwA2DzMgAzXL+hoZDOlWIVOZq2NYE2j9Ww==} +-- p6-cdk-website-plus@1.0.0: +-- resolution: {integrity: sha512-UUHIQPUzEMrThQLTnTRhfQmIJhMFg21ihlc9QJ+zjqdr5OA1fH+VjwA2DzMgAzXL+hoZDOlWIVOZq2NYE2j9Ww==} +-+ p6-cdk-website-plus@1.0.1: +-+ resolution: {integrity: sha512-VL6Stbg7Fo8Xk6Rrlt1DY8pHLMmsxD7gA/FA7ZUA6IIjwXfYpkZyIuvHx5GcMxXwDBjzHiozYUzxcj0xGbJt4Q==} - peerDependencies: - aws-cdk-lib: 2.164.1 - constructs: ^10.4.2 --@@ -2503,8 +2503,8 @@ packages: -- resolution: {integrity: sha512-khrZo4buq4qVmsGzS5yQjKe/WsFvV8fGfOjDQN0q4iy9FjRfPWRgTFrU8u1R2iu/SfWLhY9WnCi4Jhdrcbtg+g==} -- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} -- --- ts-api-utils@1.3.0: --- resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} --+ ts-api-utils@1.4.0: --+ resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==} -- engines: {node: '>=16'} -- peerDependencies: -- typescript: '>=4.2.0' --@@ -2784,23 +2784,23 @@ snapshots: -- -- '@aws-cdk/cloud-assembly-schema@38.0.1': {} -- --- '@babel/code-frame@7.26.0': --+ '@babel/code-frame@7.26.2': -- dependencies: -- '@babel/helper-validator-identifier': 7.25.9 -- js-tokens: 4.0.0 -- picocolors: 1.1.1 -- --- '@babel/compat-data@7.26.0': {} --+ '@babel/compat-data@7.26.2': {} -- -- '@babel/core@7.26.0': -- dependencies: -- '@ampproject/remapping': 2.3.0 --- '@babel/code-frame': 7.26.0 --- '@babel/generator': 7.26.0 --+ '@babel/code-frame': 7.26.2 --+ '@babel/generator': 7.26.2 -- '@babel/helper-compilation-targets': 7.25.9 -- '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) -- '@babel/helpers': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/template': 7.25.9 -- '@babel/traverse': 7.25.9 -- '@babel/types': 7.26.0 --@@ -2812,9 +2812,9 @@ snapshots: -- transitivePeerDependencies: -- - supports-color -- --- '@babel/generator@7.26.0': --+ '@babel/generator@7.26.2': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- '@jridgewell/gen-mapping': 0.3.5 -- '@jridgewell/trace-mapping': 0.3.25 --@@ -2822,7 +2822,7 @@ snapshots: -- -- '@babel/helper-compilation-targets@7.25.9': -- dependencies: --- '@babel/compat-data': 7.26.0 --+ '@babel/compat-data': 7.26.2 -- '@babel/helper-validator-option': 7.25.9 -- browserslist: 4.24.2 -- lru-cache: 5.1.1 --@@ -2857,7 +2857,7 @@ snapshots: -- '@babel/template': 7.25.9 -- '@babel/types': 7.26.0 -- --- '@babel/parser@7.26.1': --+ '@babel/parser@7.26.2': -- dependencies: -- '@babel/types': 7.26.0 -- --@@ -2948,15 +2948,15 @@ snapshots: -- -- '@babel/template@7.25.9': -- dependencies: --- '@babel/code-frame': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/code-frame': 7.26.2 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- -- '@babel/traverse@7.25.9': -- dependencies: --- '@babel/code-frame': 7.26.0 --- '@babel/generator': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/code-frame': 7.26.2 --+ '@babel/generator': 7.26.2 --+ '@babel/parser': 7.26.2 -- '@babel/template': 7.25.9 -- '@babel/types': 7.26.0 -- debug: 4.3.7 --@@ -3309,7 +3309,7 @@ snapshots: -- -- '@types/babel__core@7.20.5': +-@@ -2729,7 +2729,7 @@ snapshots: +- '@clack/prompts': 0.7.0 +- '@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.13.0) +- '@eslint/markdown': 6.2.1 +-- '@stylistic/eslint-plugin': 2.9.0(eslint@9.13.0)(typescript@5.6.3) +-+ '@stylistic/eslint-plugin': 2.10.0(eslint@9.13.0)(typescript@5.6.3) +- '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) +- '@typescript-eslint/parser': 8.12.2(eslint@9.13.0)(typescript@5.6.3) +- '@vitest/eslint-plugin': 1.1.7(@typescript-eslint/utils@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) +-@@ -3287,7 +3287,7 @@ snapshots: - dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- '@types/babel__generator': 7.6.8 -- '@types/babel__template': 7.4.4 --@@ -3321,7 +3321,7 @@ snapshots: +- '@sinonjs/commons': 3.0.1 - -- '@types/babel__template@7.4.4': +-- '@stylistic/eslint-plugin@2.9.0(eslint@9.13.0)(typescript@5.6.3)': +-+ '@stylistic/eslint-plugin@2.10.0(eslint@9.13.0)(typescript@5.6.3)': - dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@babel/types': 7.26.0 -- -- '@types/babel__traverse@7.20.6': --@@ -3393,7 +3393,7 @@ snapshots: -- graphemer: 1.4.0 -- ignore: 5.3.2 -- natural-compare: 1.4.0 --- ts-api-utils: 1.3.0(typescript@5.6.3) --+ ts-api-utils: 1.4.0(typescript@5.6.3) -- optionalDependencies: -- typescript: 5.6.3 -- transitivePeerDependencies: --@@ -3422,7 +3422,7 @@ snapshots: -- '@typescript-eslint/typescript-estree': 8.12.2(typescript@5.6.3) - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) -- debug: 4.3.7 --- ts-api-utils: 1.3.0(typescript@5.6.3) --+ ts-api-utils: 1.4.0(typescript@5.6.3) -- optionalDependencies: -- typescript: 5.6.3 -- transitivePeerDependencies: --@@ -3440,7 +3440,7 @@ snapshots: -- is-glob: 4.0.3 -- minimatch: 9.0.5 -- semver: 7.6.3 --- ts-api-utils: 1.3.0(typescript@5.6.3) --+ ts-api-utils: 1.4.0(typescript@5.6.3) -- optionalDependencies: -- typescript: 5.6.3 -- transitivePeerDependencies: --@@ -3471,7 +3471,7 @@ snapshots: +- eslint: 9.13.0 +-@@ -3765,7 +3765,7 @@ snapshots: - -- '@vue/compiler-core@3.5.12': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@vue/shared': 3.5.12 -- entities: 4.5.0 -- estree-walker: 2.0.2 --@@ -3484,7 +3484,7 @@ snapshots: +- convert-source-map@2.0.0: {} - -- '@vue/compiler-sfc@3.5.12': -- dependencies: --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@vue/compiler-core': 3.5.12 -- '@vue/compiler-dom': 3.5.12 -- '@vue/compiler-ssr': 3.5.12 --@@ -4591,7 +4591,7 @@ snapshots: -- istanbul-lib-instrument@5.2.1: +-- core-js-compat@3.38.1: +-+ core-js-compat@3.39.0: - dependencies: -- '@babel/core': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@istanbuljs/schema': 0.1.3 -- istanbul-lib-coverage: 3.2.2 -- semver: 6.3.1 --@@ -4601,7 +4601,7 @@ snapshots: -- istanbul-lib-instrument@6.0.3: -- dependencies: -- '@babel/core': 7.26.0 --- '@babel/parser': 7.26.1 --+ '@babel/parser': 7.26.2 -- '@istanbuljs/schema': 0.1.3 -- istanbul-lib-coverage: 3.2.2 -- semver: 7.6.3 --@@ -4776,7 +4776,7 @@ snapshots: +- browserslist: 4.24.2 - -- jest-message-util@29.7.0: -- dependencies: --- '@babel/code-frame': 7.26.0 --+ '@babel/code-frame': 7.26.2 -- '@jest/types': 29.6.3 -- '@types/stack-utils': 2.0.3 -- chalk: 4.1.2 --@@ -4873,7 +4873,7 @@ snapshots: -- jest-snapshot@29.7.0: -- dependencies: -- '@babel/core': 7.26.0 --- '@babel/generator': 7.26.0 --+ '@babel/generator': 7.26.2 -- '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0) -- '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0) -- '@babel/types': 7.26.0 +-@@ -4152,7 +4152,7 @@ snapshots: +- '@eslint-community/eslint-utils': 4.4.1(eslint@9.13.0) +- ci-info: 4.0.0 +- clean-regexp: 1.0.0 +-- core-js-compat: 3.38.1 +-+ core-js-compat: 3.39.0 +- eslint: 9.13.0 +- esquery: 1.6.0 +- globals: 15.11.0 -@@ -5458,7 +5458,7 @@ snapshots: - - p-try@2.2.0: {} - --- p6-cdk-website-plus@0.3.5(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): --+ p6-cdk-website-plus@1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): +-- p6-cdk-website-plus@1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): +-+ p6-cdk-website-plus@1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): - dependencies: - aws-cdk-lib: 2.164.1(constructs@10.4.2) - constructs: 10.4.2 --@@ -5478,7 +5478,7 @@ snapshots: -- -- parse-json@5.2.0: -- dependencies: --- '@babel/code-frame': 7.26.0 --+ '@babel/code-frame': 7.26.2 -- error-ex: 1.3.2 -- json-parse-even-better-errors: 2.3.1 -- lines-and-columns: 1.2.4 --@@ -5798,7 +5798,7 @@ snapshots: -- dependencies: -- eslint-visitor-keys: 3.4.3 -- --- ts-api-utils@1.3.0(typescript@5.6.3): --+ ts-api-utils@1.4.0(typescript@5.6.3): -- dependencies: -- typescript: 5.6.3 -- diff --git a/package.json b/package.json -index 684a751..ffd8a5e 100644 +index e0ad6b8..41a199e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "aws-cdk-lib": "2.164.1", "constructs": "^10.4.2", "js-yaml": "^4.1.0", -- "p6-cdk-website-plus": "^1.0.0", -+ "p6-cdk-website-plus": "^1.0.1", +- "p6-cdk-website-plus": "^1.0.1", ++ "p6-cdk-website-plus": "^1.0.2", "source-map-support": "^0.5.21" }, "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index 010348b..49f89f4 100644 +index 529f8a0..531a872 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^4.1.0 version: 4.1.0 p6-cdk-website-plus: -- specifier: ^1.0.0 -- version: 1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) -+ specifier: ^1.0.1 -+ version: 1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) +- specifier: ^1.0.1 +- version: 1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) ++ specifier: ^1.0.2 ++ version: 1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) source-map-support: specifier: ^0.5.21 version: 0.5.21 -@@ -510,8 +510,8 @@ packages: - '@sinonjs/fake-timers@10.3.0': - resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==} - -- '@stylistic/eslint-plugin@2.9.0': -- resolution: {integrity: sha512-OrDyFAYjBT61122MIY1a3SfEgy3YCMgt2vL4eoPmvTwDBwyQhAXurxNQznlRD/jESNfYWfID8Ej+31LljvF7Xg==} -+ '@stylistic/eslint-plugin@2.10.0': -+ resolution: {integrity: sha512-neWEgjp0qKxutbrKac5g23V5LX2c2Clyiz3zFxxybY8VSMfr+MmvwM204zg8YFbe9n2zcTwkpppCL2luwYcMhg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - peerDependencies: - eslint: '>=8.40.0' -@@ -925,8 +925,8 @@ packages: - convert-source-map@2.0.0: - resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - -- core-js-compat@3.38.1: -- resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} -+ core-js-compat@3.39.0: -+ resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==} - - create-jest@29.7.0: - resolution: {integrity: sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==} @@ -2150,8 +2150,8 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} -- p6-cdk-website-plus@1.0.0: -- resolution: {integrity: sha512-UUHIQPUzEMrThQLTnTRhfQmIJhMFg21ihlc9QJ+zjqdr5OA1fH+VjwA2DzMgAzXL+hoZDOlWIVOZq2NYE2j9Ww==} -+ p6-cdk-website-plus@1.0.1: -+ resolution: {integrity: sha512-VL6Stbg7Fo8Xk6Rrlt1DY8pHLMmsxD7gA/FA7ZUA6IIjwXfYpkZyIuvHx5GcMxXwDBjzHiozYUzxcj0xGbJt4Q==} +- p6-cdk-website-plus@1.0.1: +- resolution: {integrity: sha512-VL6Stbg7Fo8Xk6Rrlt1DY8pHLMmsxD7gA/FA7ZUA6IIjwXfYpkZyIuvHx5GcMxXwDBjzHiozYUzxcj0xGbJt4Q==} ++ p6-cdk-website-plus@1.0.2: ++ resolution: {integrity: sha512-0rsDeSf2RRSchQpbvTZeM1u/0QuhtG08dX8+kgjBZlSJ2EqjDIdGNCgu63y5RRQhqHWfqO7Bz5gmwyVaegDO2A==} peerDependencies: aws-cdk-lib: 2.164.1 constructs: ^10.4.2 -@@ -2729,7 +2729,7 @@ snapshots: - '@clack/prompts': 0.7.0 - '@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.13.0) - '@eslint/markdown': 6.2.1 -- '@stylistic/eslint-plugin': 2.9.0(eslint@9.13.0)(typescript@5.6.3) -+ '@stylistic/eslint-plugin': 2.10.0(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/eslint-plugin': 8.12.2(@typescript-eslint/parser@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) - '@typescript-eslint/parser': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - '@vitest/eslint-plugin': 1.1.7(@typescript-eslint/utils@8.12.2(eslint@9.13.0)(typescript@5.6.3))(eslint@9.13.0)(typescript@5.6.3) -@@ -3287,7 +3287,7 @@ snapshots: - dependencies: - '@sinonjs/commons': 3.0.1 - -- '@stylistic/eslint-plugin@2.9.0(eslint@9.13.0)(typescript@5.6.3)': -+ '@stylistic/eslint-plugin@2.10.0(eslint@9.13.0)(typescript@5.6.3)': - dependencies: - '@typescript-eslint/utils': 8.12.2(eslint@9.13.0)(typescript@5.6.3) - eslint: 9.13.0 -@@ -3765,7 +3765,7 @@ snapshots: - - convert-source-map@2.0.0: {} - -- core-js-compat@3.38.1: -+ core-js-compat@3.39.0: - dependencies: - browserslist: 4.24.2 - -@@ -4152,7 +4152,7 @@ snapshots: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.13.0) - ci-info: 4.0.0 - clean-regexp: 1.0.0 -- core-js-compat: 3.38.1 -+ core-js-compat: 3.39.0 - eslint: 9.13.0 - esquery: 1.6.0 - globals: 15.11.0 @@ -5458,7 +5458,7 @@ snapshots: p-try@2.2.0: {} -- p6-cdk-website-plus@1.0.0(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): -+ p6-cdk-website-plus@1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): +- p6-cdk-website-plus@1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): ++ p6-cdk-website-plus@1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): dependencies: aws-cdk-lib: 2.164.1(constructs@10.4.2) constructs: 10.4.2 diff --git a/package.json b/package.json index e0ad6b8..41a199e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "aws-cdk-lib": "2.164.1", "constructs": "^10.4.2", "js-yaml": "^4.1.0", - "p6-cdk-website-plus": "^1.0.1", + "p6-cdk-website-plus": "^1.0.2", "source-map-support": "^0.5.21" }, "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 529f8a0..531a872 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^4.1.0 version: 4.1.0 p6-cdk-website-plus: - specifier: ^1.0.1 - version: 1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) + specifier: ^1.0.2 + version: 1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -2150,8 +2150,8 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - p6-cdk-website-plus@1.0.1: - resolution: {integrity: sha512-VL6Stbg7Fo8Xk6Rrlt1DY8pHLMmsxD7gA/FA7ZUA6IIjwXfYpkZyIuvHx5GcMxXwDBjzHiozYUzxcj0xGbJt4Q==} + p6-cdk-website-plus@1.0.2: + resolution: {integrity: sha512-0rsDeSf2RRSchQpbvTZeM1u/0QuhtG08dX8+kgjBZlSJ2EqjDIdGNCgu63y5RRQhqHWfqO7Bz5gmwyVaegDO2A==} peerDependencies: aws-cdk-lib: 2.164.1 constructs: ^10.4.2 @@ -5458,7 +5458,7 @@ snapshots: p-try@2.2.0: {} - p6-cdk-website-plus@1.0.1(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): + p6-cdk-website-plus@1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): dependencies: aws-cdk-lib: 2.164.1(constructs@10.4.2) constructs: 10.4.2 From eb43c3438d8509db94c7bbe02d321c6e051592ad Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Thu, 31 Oct 2024 18:18:18 -0500 Subject: [PATCH 2/2] ci: move to oidc, all but gollucci.com (#23) --- .github/workflows/build.yml | 14 ++---- .github/workflows/deploy.yml | 14 ++---- cdk.context.json | 4 ++ conf/sites.yml | 16 +++---- package.json | 2 +- pnpm-lock.yaml | 10 ++--- test/__snapshots__/p6-sites.test.ts.snap | 56 +++++++----------------- 7 files changed, 39 insertions(+), 77 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7c6e0f..3762987 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,6 @@ jobs: run: | curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - sudo apt-get install -y nodejs - - name: Install pnpm and dependencies run: | corepack enable @@ -30,19 +29,12 @@ jobs: key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-node- - # - name: Assume role using OIDC - # uses: aws-actions/configure-aws-credentials@v4.0.2 - # env: - # AWS_REGION: ${{ secrets.CDK_DEPLOY_REGION }} - # with: - # role-to-assume: arn:aws:iam::346733622331:role/cdk-hnb659fds-lookup-role-346733622331-us-east-1 - # aws-region: $AWS_REGION - - name: Assume role using AWS credentials + - name: Assume role using OIDC uses: aws-actions/configure-aws-credentials@v4.0.2 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ secrets.CDK_DEPLOY_REGION }} + role-to-assume: ${{ secrets.AWS_ROLE }} + role-session-name: ${{ secrets.AWS_SESSION_NAME }} - name: Run build env: CDK_DEPLOY_ACCOUNT: ${{ secrets.CDK_DEPLOY_ACCOUNT }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8807b2c..ac99d55 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,6 @@ jobs: run: | curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - sudo apt-get install -y nodejs - - name: Install pnpm and dependencies run: | corepack enable @@ -32,19 +31,12 @@ jobs: key: ${{ runner.os }}-node-${{ hashFiles('pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-node- - # - name: Assume role using OIDC - # uses: aws-actions/configure-aws-credentials@v4.0.2 - # env: - # AWS_REGION: ${{ secrets.CDK_DEPLOY_REGION }} - # with: - # role-to-assume: arn:aws:iam::346733622331:role/cdk-hnb659fds-lookup-role-346733622331-us-east-1 - # aws-region: $AWS_REGION - - name: Assume role using AWS credentials + - name: Assume role using OIDC uses: aws-actions/configure-aws-credentials@v4.0.2 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: ${{ secrets.CDK_DEPLOY_REGION }} + role-to-assume: ${{ secrets.AWS_ROLE }} + role-session-name: ${{ secrets.AWS_SESSION_NAME }} - name: Run deploy env: CDK_DEPLOY_ACCOUNT: ${{ secrets.CDK_DEPLOY_ACCOUNT }} diff --git a/cdk.context.json b/cdk.context.json index 9ada5ef..a139949 100644 --- a/cdk.context.json +++ b/cdk.context.json @@ -30,5 +30,9 @@ "hosted-zone:account=346733622331:domainName=gollucci.com:region=us-east-1": { "Id": "/hostedzone/Z0112176FVC0Y83D0WHC", "Name": "gollucci.com." + }, + "hosted-zone:account=346733622331:domainName=p6m7g8.com:region=us-east-1": { + "Id": "/hostedzone/Z24WQH45EYOKGS", + "Name": "p6m7g8.com." } } diff --git a/conf/sites.yml b/conf/sites.yml index 83c2b5c..59133eb 100644 --- a/conf/sites.yml +++ b/conf/sites.yml @@ -7,18 +7,18 @@ hostedZoneName: continuouslearning.training verifyEmail: pgollucci@p6m7g8.com cloudfrontRecordName: www.continuouslearning.training -# - name: p6m7g8.com -# hostedZoneName: p6m7g8.com -# verifyEmail: pgollucci@p6m7g8.com -# cloudfrontRecordName: www.p6m7g8.org +- name: p6m7g8.com + hostedZoneName: p6m7g8.com + verifyEmail: pgollucci@p6m7g8.com + cloudfrontRecordName: www.p6m7g8.com - name: p6m7g8.org hostedZoneName: p6m7g8.org verifyEmail: pgollucci@p6m7g8.com cloudfrontRecordName: www.p6m7g8.org -# - name: p6m7g8.net -# hostedZoneName: p6m7g8.net -# verifyEmail: pgollucci@p6m7g8.com -# cloudfrontRecordName: www.p6m7g8.net +- name: p6m7g8.net + hostedZoneName: p6m7g8.net + verifyEmail: pgollucci@p6m7g8.com + cloudfrontRecordName: www.p6m7g8.net - name: gollucci.us hostedZoneName: gollucci.us verifyEmail: pgollucci@p6m7g8.com diff --git a/package.json b/package.json index 41a199e..ace9b83 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "aws-cdk-lib": "2.164.1", "constructs": "^10.4.2", "js-yaml": "^4.1.0", - "p6-cdk-website-plus": "^1.0.2", + "p6-cdk-website-plus": "^1.0.3", "source-map-support": "^0.5.21" }, "keywords": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 531a872..7e818d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^4.1.0 version: 4.1.0 p6-cdk-website-plus: - specifier: ^1.0.2 - version: 1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) + specifier: ^1.0.3 + version: 1.0.3(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2) source-map-support: specifier: ^0.5.21 version: 0.5.21 @@ -2150,8 +2150,8 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - p6-cdk-website-plus@1.0.2: - resolution: {integrity: sha512-0rsDeSf2RRSchQpbvTZeM1u/0QuhtG08dX8+kgjBZlSJ2EqjDIdGNCgu63y5RRQhqHWfqO7Bz5gmwyVaegDO2A==} + p6-cdk-website-plus@1.0.3: + resolution: {integrity: sha512-C5iG8Ovh/1OW3nXswklOqRzokT9B8lMNUXxaHGr0j1WzoyoubIl8upxatglSm2FA09oiP/d7WuIufAaSKFkNfA==} peerDependencies: aws-cdk-lib: 2.164.1 constructs: ^10.4.2 @@ -5458,7 +5458,7 @@ snapshots: p-try@2.2.0: {} - p6-cdk-website-plus@1.0.2(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): + p6-cdk-website-plus@1.0.3(aws-cdk-lib@2.164.1(constructs@10.4.2))(constructs@10.4.2): dependencies: aws-cdk-lib: 2.164.1(constructs@10.4.2) constructs: 10.4.2 diff --git a/test/__snapshots__/p6-sites.test.ts.snap b/test/__snapshots__/p6-sites.test.ts.snap index 30f4eb4..314d175 100644 --- a/test/__snapshots__/p6-sites.test.ts.snap +++ b/test/__snapshots__/p6-sites.test.ts.snap @@ -124,7 +124,6 @@ exports[`myStack Snapshot Test should match the synthesized CloudFormation templ "Properties": { "DistributionConfig": { "Aliases": [ - "p6m7g8.org", "www.p6m7g8.org", ], "Comment": "www.p6m7g8.org", @@ -315,42 +314,25 @@ exports[`myStack Snapshot Test should match the synthesized CloudFormation templ "PolicyDocument": { "Statement": [ { - "Action": [ - "s3:GetObject*", - "s3:GetBucket*", - "s3:List*", - ], + "Action": "s3:GetObject", "Effect": "Allow", "Principal": { - "CanonicalUser": { - "Fn::GetAtt": [ - "p6m7g8orgOAI2F0DBA21", - "S3CanonicalUserId", - ], - }, + "AWS": "*", }, - "Resource": [ - { - "Fn::GetAtt": [ - "p6m7g8orgMyBucket9D229790", - "Arn", - ], - }, - { - "Fn::Join": [ - "", - [ - { - "Fn::GetAtt": [ - "p6m7g8orgMyBucket9D229790", - "Arn", - ], - }, - "/*", - ], + "Resource": { + "Fn::Join": [ + "", + [ + { + "Fn::GetAtt": [ + "p6m7g8orgMyBucket9D229790", + "Arn", + ], + }, + "/*", ], - }, - ], + ], + }, }, ], "Version": "2012-10-17", @@ -358,14 +340,6 @@ exports[`myStack Snapshot Test should match the synthesized CloudFormation templ }, "Type": "AWS::S3::BucketPolicy", }, - "p6m7g8orgOAI2F0DBA21": { - "Properties": { - "CloudFrontOriginAccessIdentityConfig": { - "Comment": "Allows CloudFront to reach the bucket", - }, - }, - "Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity", - }, "p6m7g8orgRedirectRedirectAliasRecord0c386926F4066A": { "Properties": { "AliasTarget": {