diff --git a/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip new file mode 100644 index 000000000..7ef5a4897 Binary files /dev/null and b/.yarn/cache/@eslint-community-regexpp-npm-4.10.0-6bfb984c81-2a6e345429.zip differ diff --git a/.yarn/cache/@types-semver-npm-7.5.6-9d2637fc95-563a0120ec.zip b/.yarn/cache/@types-semver-npm-7.5.6-9d2637fc95-563a0120ec.zip new file mode 100644 index 000000000..7d7ba194f Binary files /dev/null and b/.yarn/cache/@types-semver-npm-7.5.6-9d2637fc95-563a0120ec.zip differ diff --git a/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.13.2-c060495a4b-e50cbbe710.zip b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.13.2-c060495a4b-e50cbbe710.zip new file mode 100644 index 000000000..bc3701d9b Binary files /dev/null and b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.13.2-c060495a4b-e50cbbe710.zip differ diff --git a/.yarn/cache/@typescript-eslint-parser-npm-6.13.2-9c530a45b0-aeafc414d2.zip b/.yarn/cache/@typescript-eslint-parser-npm-6.13.2-9c530a45b0-aeafc414d2.zip new file mode 100644 index 000000000..3e20076d9 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-parser-npm-6.13.2-9c530a45b0-aeafc414d2.zip differ diff --git a/.yarn/cache/@typescript-eslint-scope-manager-npm-6.13.2-55a7e50cba-ff8fd64ddf.zip b/.yarn/cache/@typescript-eslint-scope-manager-npm-6.13.2-55a7e50cba-ff8fd64ddf.zip new file mode 100644 index 000000000..e9fbf7028 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-scope-manager-npm-6.13.2-55a7e50cba-ff8fd64ddf.zip differ diff --git a/.yarn/cache/@typescript-eslint-type-utils-npm-6.13.2-8f2d61b409-ba54e57461.zip b/.yarn/cache/@typescript-eslint-type-utils-npm-6.13.2-8f2d61b409-ba54e57461.zip new file mode 100644 index 000000000..ffec8f613 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-type-utils-npm-6.13.2-8f2d61b409-ba54e57461.zip differ diff --git a/.yarn/cache/@typescript-eslint-types-npm-6.13.2-a52f397aba-4493ff06fa.zip b/.yarn/cache/@typescript-eslint-types-npm-6.13.2-a52f397aba-4493ff06fa.zip new file mode 100644 index 000000000..aea820c7e Binary files /dev/null and b/.yarn/cache/@typescript-eslint-types-npm-6.13.2-a52f397aba-4493ff06fa.zip differ diff --git a/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.13.2-044930d241-0c18ee5ef5.zip b/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.13.2-044930d241-0c18ee5ef5.zip new file mode 100644 index 000000000..898b666e4 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.13.2-044930d241-0c18ee5ef5.zip differ diff --git a/.yarn/cache/@typescript-eslint-utils-npm-6.13.2-246994db2d-b66bcf2a94.zip b/.yarn/cache/@typescript-eslint-utils-npm-6.13.2-246994db2d-b66bcf2a94.zip new file mode 100644 index 000000000..ad6ce3d74 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-utils-npm-6.13.2-246994db2d-b66bcf2a94.zip differ diff --git a/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.13.2-6c18cdb3be-4b4def7acd.zip b/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.13.2-6c18cdb3be-4b4def7acd.zip new file mode 100644 index 000000000..903381caf Binary files /dev/null and b/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.13.2-6c18cdb3be-4b4def7acd.zip differ diff --git a/.yarn/cache/constructs-npm-10.3.0-5bd9fbc3a8-d8d4ea4e46.zip b/.yarn/cache/constructs-npm-10.3.0-5bd9fbc3a8-d8d4ea4e46.zip new file mode 100644 index 000000000..0d0a31bf8 Binary files /dev/null and b/.yarn/cache/constructs-npm-10.3.0-5bd9fbc3a8-d8d4ea4e46.zip differ diff --git a/.yarn/cache/ignore-npm-5.3.0-fb0f5fa062-2736da6621.zip b/.yarn/cache/ignore-npm-5.3.0-fb0f5fa062-2736da6621.zip new file mode 100644 index 000000000..87f79cff1 Binary files /dev/null and b/.yarn/cache/ignore-npm-5.3.0-fb0f5fa062-2736da6621.zip differ diff --git a/.yarn/cache/projen-npm-0.71.112-dbdddfe331-5f3a88939f.zip b/.yarn/cache/projen-npm-0.77.1-7b94860840-61d5c7f4da.zip similarity index 63% rename from .yarn/cache/projen-npm-0.71.112-dbdddfe331-5f3a88939f.zip rename to .yarn/cache/projen-npm-0.77.1-7b94860840-61d5c7f4da.zip index 26cc2b851..67744ee28 100644 Binary files a/.yarn/cache/projen-npm-0.71.112-dbdddfe331-5f3a88939f.zip and b/.yarn/cache/projen-npm-0.77.1-7b94860840-61d5c7f4da.zip differ diff --git a/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip new file mode 100644 index 000000000..f8689471f Binary files /dev/null and b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip differ diff --git a/.yarn/cache/ts-api-utils-npm-1.0.3-992f360d9b-441cc4489d.zip b/.yarn/cache/ts-api-utils-npm-1.0.3-992f360d9b-441cc4489d.zip new file mode 100644 index 000000000..8a44e1f5f Binary files /dev/null and b/.yarn/cache/ts-api-utils-npm-1.0.3-992f360d9b-441cc4489d.zip differ diff --git a/package.json b/package.json index 8ec87b01f..cf4a202a3 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "webpack-cli": "^4.9.1" }, "resolutions": { - "projen": "0.71.112" + "projen": "0.77.1" }, "engines": { "npm": "6.14.13" diff --git a/packages/blueprints/blueprint-builder/.gitattributes b/packages/blueprints/blueprint-builder/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/blueprints/blueprint-builder/.gitattributes +++ b/packages/blueprints/blueprint-builder/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/blueprints/blueprint-builder/.gitignore b/packages/blueprints/blueprint-builder/.gitignore index 2309f5919..284720a31 100644 --- a/packages/blueprints/blueprint-builder/.gitignore +++ b/packages/blueprints/blueprint-builder/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/blueprints/blueprint-builder/.projen/deps.json b/packages/blueprints/blueprint-builder/.projen/deps.json index bb0f4e964..f024fe880 100644 --- a/packages/blueprints/blueprint-builder/.projen/deps.json +++ b/packages/blueprints/blueprint-builder/.projen/deps.json @@ -7,16 +7,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { @@ -63,7 +64,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "override" }, { @@ -106,7 +107,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "runtime" }, { diff --git a/packages/blueprints/blueprint-builder/.projen/files.json b/packages/blueprints/blueprint-builder/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/blueprints/blueprint-builder/.projen/files.json +++ b/packages/blueprints/blueprint-builder/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/blueprints/blueprint-builder/.projen/tasks.json b/packages/blueprints/blueprint-builder/.projen/tasks.json index bfa2e1985..03903996b 100644 --- a/packages/blueprints/blueprint-builder/.projen/tasks.json +++ b/packages/blueprints/blueprint-builder/.projen/tasks.json @@ -189,25 +189,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='camelcase,decamelize,projen,typescript'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='camelcase,decamelize,projen,typescript'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='camelcase,decamelize,projen,typescript'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='camelcase,decamelize,projen,typescript'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='camelcase,decamelize,projen,typescript'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprint-component.dev-environments,@amazon-codecatalyst/blueprint-component.environments,@amazon-codecatalyst/blueprint-component.source-repositories,@amazon-codecatalyst/blueprint-component.workflows,@amazon-codecatalyst/blueprint-util.cli,@amazon-codecatalyst/blueprint-util.projen-blueprint,@amazon-codecatalyst/blueprints.blueprint" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprint-component.dev-environments @amazon-codecatalyst/blueprint-component.environments @amazon-codecatalyst/blueprint-component.source-repositories @amazon-codecatalyst/blueprint-component.workflows @amazon-codecatalyst/blueprint-util.cli @amazon-codecatalyst/blueprint-util.projen-blueprint @amazon-codecatalyst/blueprints.blueprint" }, { "exec": "npx projen" diff --git a/packages/blueprints/blueprint-builder/package.json b/packages/blueprints/blueprint-builder/package.json index ee48dd185..ae46d10bf 100644 --- a/packages/blueprints/blueprint-builder/package.json +++ b/packages/blueprints/blueprint-builder/package.json @@ -35,14 +35,14 @@ }, "devDependencies": { "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-node": "^10", "typescript": "^4.x" @@ -57,12 +57,12 @@ "@amazon-codecatalyst/blueprints.blueprint": "*", "camelcase": "1.x", "decamelize": "5.0.x", - "projen": "0.71.112", + "projen": "0.77.1", "typescript": "4.x" }, "resolutions": { "@aws-sdk/client-codecatalyst": "3.414.0", - "projen": "0.71.112" + "projen": "0.77.1" }, "keywords": [ "blueprint" diff --git a/packages/blueprints/blueprint/.gitattributes b/packages/blueprints/blueprint/.gitattributes index 205e20191..b461952f5 100644 --- a/packages/blueprints/blueprint/.gitattributes +++ b/packages/blueprints/blueprint/.gitattributes @@ -5,7 +5,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/blueprints/blueprint/.gitignore b/packages/blueprints/blueprint/.gitignore index eca8528d9..1272581ca 100644 --- a/packages/blueprints/blueprint/.gitignore +++ b/packages/blueprints/blueprint/.gitignore @@ -35,7 +35,6 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/blueprints/blueprint/.projen/deps.json b/packages/blueprints/blueprint/.projen/deps.json index c9139fd79..c48cb1a09 100644 --- a/packages/blueprints/blueprint/.projen/deps.json +++ b/packages/blueprints/blueprint/.projen/deps.json @@ -24,16 +24,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { @@ -93,7 +94,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "override" }, { @@ -111,7 +112,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "runtime" }, { diff --git a/packages/blueprints/blueprint/.projen/files.json b/packages/blueprints/blueprint/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/blueprints/blueprint/.projen/files.json +++ b/packages/blueprints/blueprint/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/blueprints/blueprint/.projen/tasks.json b/packages/blueprints/blueprint/.projen/tasks.json index a1f825c5c..818b78fc7 100644 --- a/packages/blueprints/blueprint/.projen/tasks.json +++ b/packages/blueprints/blueprint/.projen/tasks.json @@ -212,25 +212,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='@types/diff-match-patch,diff-match-patch,projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='@types/diff-match-patch,diff-match-patch,projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='@types/diff-match-patch,diff-match-patch,projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='@types/diff-match-patch,diff-match-patch,projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='@types/diff-match-patch,diff-match-patch,projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.cli,@amazon-codecatalyst/blueprint-util.projen-blueprint,@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,jest,jest-junit,npm-check-updates,projen,standard-version,ts-jest,ts-node,typescript,globule,yaml" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.cli @amazon-codecatalyst/blueprint-util.projen-blueprint @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit npm-check-updates projen standard-version ts-jest ts-node typescript globule yaml" }, { "exec": "npx projen" diff --git a/packages/blueprints/blueprint/package.json b/packages/blueprints/blueprint/package.json index bf52c590d..984124639 100644 --- a/packages/blueprints/blueprint/package.json +++ b/packages/blueprints/blueprint/package.json @@ -41,16 +41,16 @@ "@types/diff-match-patch": "1.x", "@types/jest": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "jest": "*", "jest-junit": "^15", "npm-check-updates": "^16", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-jest": "*", "ts-node": "^10", @@ -62,12 +62,12 @@ "dependencies": { "diff-match-patch": "1.x", "globule": "*", - "projen": "0.71.112", + "projen": "0.77.1", "yaml": "*" }, "resolutions": { "@aws-sdk/client-codecatalyst": "3.414.0", - "projen": "0.71.112" + "projen": "0.77.1" }, "keywords": [ "blueprint" diff --git a/packages/blueprints/sam-serverless-app/.gitattributes b/packages/blueprints/sam-serverless-app/.gitattributes index 36d6fb3c2..880cab51c 100644 --- a/packages/blueprints/sam-serverless-app/.gitattributes +++ b/packages/blueprints/sam-serverless-app/.gitattributes @@ -5,7 +5,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/blueprints/sam-serverless-app/.gitignore b/packages/blueprints/sam-serverless-app/.gitignore index 89225e782..a63abb2d4 100644 --- a/packages/blueprints/sam-serverless-app/.gitignore +++ b/packages/blueprints/sam-serverless-app/.gitignore @@ -35,7 +35,6 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/blueprints/sam-serverless-app/.projen/deps.json b/packages/blueprints/sam-serverless-app/.projen/deps.json index c5997da9d..cd6e662ec 100644 --- a/packages/blueprints/sam-serverless-app/.projen/deps.json +++ b/packages/blueprints/sam-serverless-app/.projen/deps.json @@ -24,16 +24,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { @@ -102,7 +103,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "override" }, { @@ -140,7 +141,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "runtime" }, { diff --git a/packages/blueprints/sam-serverless-app/.projen/files.json b/packages/blueprints/sam-serverless-app/.projen/files.json index 641d02b0d..75e23137b 100644 --- a/packages/blueprints/sam-serverless-app/.projen/files.json +++ b/packages/blueprints/sam-serverless-app/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/blueprints/sam-serverless-app/.projen/tasks.json b/packages/blueprints/sam-serverless-app/.projen/tasks.json index 675d99ade..609054077 100644 --- a/packages/blueprints/sam-serverless-app/.projen/tasks.json +++ b/packages/blueprints/sam-serverless-app/.projen/tasks.json @@ -212,25 +212,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.cli,@amazon-codecatalyst/blueprint-util.projen-blueprint,@types/jest,@types/node,@types/pino,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,jest,jest-junit,npm-check-updates,pino,pino-pretty,projen,standard-version,ts-jest,ts-node,typescript,@amazon-codecatalyst/blueprint-component.dev-environments,@amazon-codecatalyst/blueprint-component.environments,@amazon-codecatalyst/blueprint-component.source-repositories,@amazon-codecatalyst/blueprint-component.workflows,@amazon-codecatalyst/blueprints.blueprint,globule,ts-deepmerge" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.cli @amazon-codecatalyst/blueprint-util.projen-blueprint @types/jest @types/node @types/pino @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit npm-check-updates pino pino-pretty projen standard-version ts-jest ts-node typescript @amazon-codecatalyst/blueprint-component.dev-environments @amazon-codecatalyst/blueprint-component.environments @amazon-codecatalyst/blueprint-component.source-repositories @amazon-codecatalyst/blueprint-component.workflows @amazon-codecatalyst/blueprints.blueprint globule ts-deepmerge" }, { "exec": "npx projen" diff --git a/packages/blueprints/sam-serverless-app/package.json b/packages/blueprints/sam-serverless-app/package.json index ccb1ef6a6..a263b0888 100644 --- a/packages/blueprints/sam-serverless-app/package.json +++ b/packages/blueprints/sam-serverless-app/package.json @@ -41,10 +41,10 @@ "@types/jest": "*", "@types/node": "^18", "@types/pino": "^6.3.12", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "jest": "*", @@ -52,7 +52,7 @@ "npm-check-updates": "^16", "pino": "^6.13.4", "pino-pretty": "^4.8.0", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-jest": "*", "ts-node": "^10", @@ -69,12 +69,12 @@ "@amazon-codecatalyst/blueprints.blueprint": "*", "globule": "*", "pino": "^6.13.4", - "projen": "0.71.112", + "projen": "0.77.1", "ts-deepmerge": "*" }, "resolutions": { "@aws-sdk/client-codecatalyst": "3.414.0", - "projen": "0.71.112" + "projen": "0.77.1" }, "keywords": [ "aws lambda", diff --git a/packages/blueprints/test-blueprint/.gitattributes b/packages/blueprints/test-blueprint/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/blueprints/test-blueprint/.gitattributes +++ b/packages/blueprints/test-blueprint/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/blueprints/test-blueprint/.gitignore b/packages/blueprints/test-blueprint/.gitignore index 2309f5919..284720a31 100644 --- a/packages/blueprints/test-blueprint/.gitignore +++ b/packages/blueprints/test-blueprint/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/blueprints/test-blueprint/.projen/deps.json b/packages/blueprints/test-blueprint/.projen/deps.json index 4fc23503c..e49fd9005 100644 --- a/packages/blueprints/test-blueprint/.projen/deps.json +++ b/packages/blueprints/test-blueprint/.projen/deps.json @@ -15,16 +15,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { @@ -71,7 +72,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "override" }, { @@ -92,7 +93,7 @@ }, { "name": "projen", - "version": "0.71.112", + "version": "0.77.1", "type": "runtime" } ], diff --git a/packages/blueprints/test-blueprint/.projen/files.json b/packages/blueprints/test-blueprint/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/blueprints/test-blueprint/.projen/files.json +++ b/packages/blueprints/test-blueprint/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/blueprints/test-blueprint/.projen/tasks.json b/packages/blueprints/test-blueprint/.projen/tasks.json index 5704980a6..f0324948f 100644 --- a/packages/blueprints/test-blueprint/.projen/tasks.json +++ b/packages/blueprints/test-blueprint/.projen/tasks.json @@ -189,25 +189,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.cli,@amazon-codecatalyst/blueprint-util.projen-blueprint,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprint-component.environments,@amazon-codecatalyst/blueprint-component.source-repositories,@amazon-codecatalyst/blueprint-component.workflows,@amazon-codecatalyst/blueprints.blueprint" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.cli @amazon-codecatalyst/blueprint-util.projen-blueprint @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprint-component.environments @amazon-codecatalyst/blueprint-component.source-repositories @amazon-codecatalyst/blueprint-component.workflows @amazon-codecatalyst/blueprints.blueprint" }, { "exec": "npx projen" diff --git a/packages/blueprints/test-blueprint/package.json b/packages/blueprints/test-blueprint/package.json index 67dec1b29..d628c277c 100644 --- a/packages/blueprints/test-blueprint/package.json +++ b/packages/blueprints/test-blueprint/package.json @@ -37,14 +37,14 @@ "@amazon-codecatalyst/blueprint-util.cli": "*", "@amazon-codecatalyst/blueprint-util.projen-blueprint": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "^2.25.4", "npm-check-updates": "^16", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-node": "^10", "typescript": "^4.x" @@ -54,11 +54,11 @@ "@amazon-codecatalyst/blueprint-component.source-repositories": "*", "@amazon-codecatalyst/blueprint-component.workflows": "*", "@amazon-codecatalyst/blueprints.blueprint": "*", - "projen": "0.71.112" + "projen": "0.77.1" }, "resolutions": { "@aws-sdk/client-codecatalyst": "3.414.0", - "projen": "0.71.112" + "projen": "0.77.1" }, "keywords": [ "no-tag" diff --git a/packages/components/dev-environments/.gitattributes b/packages/components/dev-environments/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/components/dev-environments/.gitattributes +++ b/packages/components/dev-environments/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/components/dev-environments/.gitignore b/packages/components/dev-environments/.gitignore index aac50671f..9b6bdbb24 100644 --- a/packages/components/dev-environments/.gitignore +++ b/packages/components/dev-environments/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/components/dev-environments/.projen/deps.json b/packages/components/dev-environments/.projen/deps.json index 025c9a54d..4ecd4b40f 100644 --- a/packages/components/dev-environments/.projen/deps.json +++ b/packages/components/dev-environments/.projen/deps.json @@ -1,17 +1,9 @@ { "dependencies": [ - { - "name": "@amazon-codecatalyst/blueprint-component.source-repositories", - "type": "build" - }, { "name": "@amazon-codecatalyst/blueprint-util.projen-blueprint-component", "type": "build" }, - { - "name": "@amazon-codecatalyst/blueprints.blueprint", - "type": "build" - }, { "name": "@types/node", "version": "^18", @@ -19,16 +11,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/components/dev-environments/.projen/files.json b/packages/components/dev-environments/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/components/dev-environments/.projen/files.json +++ b/packages/components/dev-environments/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/components/dev-environments/.projen/tasks.json b/packages/components/dev-environments/.projen/tasks.json index f369f1eeb..d96e71f25 100644 --- a/packages/components/dev-environments/.projen/tasks.json +++ b/packages/components/dev-environments/.projen/tasks.json @@ -181,25 +181,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.projen-blueprint-component,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprint-component.source-repositories,@amazon-codecatalyst/blueprints.blueprint,yaml" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.projen-blueprint-component @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprint-component.source-repositories @amazon-codecatalyst/blueprints.blueprint yaml" }, { "exec": "npx projen" diff --git a/packages/components/dev-environments/package.json b/packages/components/dev-environments/package.json index 452139bf7..3a19bc7e9 100644 --- a/packages/components/dev-environments/package.json +++ b/packages/components/dev-environments/package.json @@ -27,10 +27,10 @@ "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*", "@amazon-codecatalyst/blueprints.blueprint": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", diff --git a/packages/components/environments/.gitattributes b/packages/components/environments/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/components/environments/.gitattributes +++ b/packages/components/environments/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/components/environments/.gitignore b/packages/components/environments/.gitignore index aac50671f..9b6bdbb24 100644 --- a/packages/components/environments/.gitignore +++ b/packages/components/environments/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/components/environments/.projen/deps.json b/packages/components/environments/.projen/deps.json index f880c1f72..8cbd239b2 100644 --- a/packages/components/environments/.projen/deps.json +++ b/packages/components/environments/.projen/deps.json @@ -4,10 +4,6 @@ "name": "@amazon-codecatalyst/blueprint-util.projen-blueprint-component", "type": "build" }, - { - "name": "@amazon-codecatalyst/blueprints.blueprint", - "type": "build" - }, { "name": "@types/node", "version": "^18", @@ -15,16 +11,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/components/environments/.projen/files.json b/packages/components/environments/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/components/environments/.projen/files.json +++ b/packages/components/environments/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/components/environments/.projen/tasks.json b/packages/components/environments/.projen/tasks.json index f369f1eeb..1dd0cc242 100644 --- a/packages/components/environments/.projen/tasks.json +++ b/packages/components/environments/.projen/tasks.json @@ -181,25 +181,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.projen-blueprint-component,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprints.blueprint" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.projen-blueprint-component @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprints.blueprint" }, { "exec": "npx projen" diff --git a/packages/components/environments/package.json b/packages/components/environments/package.json index 0100ffe73..e8f15fe79 100644 --- a/packages/components/environments/package.json +++ b/packages/components/environments/package.json @@ -26,10 +26,10 @@ "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*", "@amazon-codecatalyst/blueprints.blueprint": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", diff --git a/packages/components/source-repositories/.gitattributes b/packages/components/source-repositories/.gitattributes index 205e20191..b461952f5 100644 --- a/packages/components/source-repositories/.gitattributes +++ b/packages/components/source-repositories/.gitattributes @@ -5,7 +5,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/components/source-repositories/.gitignore b/packages/components/source-repositories/.gitignore index d48f5d152..712581627 100644 --- a/packages/components/source-repositories/.gitignore +++ b/packages/components/source-repositories/.gitignore @@ -35,7 +35,6 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/components/source-repositories/.projen/deps.json b/packages/components/source-repositories/.projen/deps.json index 1d42a4c21..266599f0c 100644 --- a/packages/components/source-repositories/.projen/deps.json +++ b/packages/components/source-repositories/.projen/deps.json @@ -4,10 +4,6 @@ "name": "@amazon-codecatalyst/blueprint-util.projen-blueprint-component", "type": "build" }, - { - "name": "@amazon-codecatalyst/blueprints.blueprint", - "type": "build" - }, { "name": "@types/jest", "type": "build" @@ -19,16 +15,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/components/source-repositories/.projen/files.json b/packages/components/source-repositories/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/components/source-repositories/.projen/files.json +++ b/packages/components/source-repositories/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/components/source-repositories/.projen/tasks.json b/packages/components/source-repositories/.projen/tasks.json index 9aa930998..2bed27975 100644 --- a/packages/components/source-repositories/.projen/tasks.json +++ b/packages/components/source-repositories/.projen/tasks.json @@ -194,25 +194,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.projen-blueprint-component,@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,jest,jest-junit,npm-check-updates,projen,standard-version,ts-jest,ts-node,typescript,@amazon-codecatalyst/blueprints.blueprint,camelcase,decamelize,glob,minimatch,mustache" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.projen-blueprint-component @types/jest @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit npm-check-updates projen standard-version ts-jest ts-node typescript @amazon-codecatalyst/blueprints.blueprint camelcase decamelize glob minimatch mustache" }, { "exec": "npx projen" diff --git a/packages/components/source-repositories/package.json b/packages/components/source-repositories/package.json index 11e45013f..6876e56e2 100644 --- a/packages/components/source-repositories/package.json +++ b/packages/components/source-repositories/package.json @@ -28,10 +28,10 @@ "@amazon-codecatalyst/blueprints.blueprint": "*", "@types/jest": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "jest": "*", diff --git a/packages/components/workflows/.gitattributes b/packages/components/workflows/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/components/workflows/.gitattributes +++ b/packages/components/workflows/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/components/workflows/.gitignore b/packages/components/workflows/.gitignore index aac50671f..9b6bdbb24 100644 --- a/packages/components/workflows/.gitignore +++ b/packages/components/workflows/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/components/workflows/.projen/deps.json b/packages/components/workflows/.projen/deps.json index f9c763097..5336cad67 100644 --- a/packages/components/workflows/.projen/deps.json +++ b/packages/components/workflows/.projen/deps.json @@ -1,21 +1,9 @@ { "dependencies": [ - { - "name": "@amazon-codecatalyst/blueprint-component.environments", - "type": "build" - }, - { - "name": "@amazon-codecatalyst/blueprint-component.source-repositories", - "type": "build" - }, { "name": "@amazon-codecatalyst/blueprint-util.projen-blueprint-component", "type": "build" }, - { - "name": "@amazon-codecatalyst/blueprints.blueprint", - "type": "build" - }, { "name": "@types/node", "version": "^18", @@ -23,16 +11,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/components/workflows/.projen/files.json b/packages/components/workflows/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/components/workflows/.projen/files.json +++ b/packages/components/workflows/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/components/workflows/.projen/tasks.json b/packages/components/workflows/.projen/tasks.json index f369f1eeb..f89bcc267 100644 --- a/packages/components/workflows/.projen/tasks.json +++ b/packages/components/workflows/.projen/tasks.json @@ -181,25 +181,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.projen-blueprint-component,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprint-component.environments,@amazon-codecatalyst/blueprint-component.source-repositories,@amazon-codecatalyst/blueprints.blueprint,@aws/codecatalyst-workflows-sdk,yaml" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.projen-blueprint-component @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprint-component.environments @amazon-codecatalyst/blueprint-component.source-repositories @amazon-codecatalyst/blueprints.blueprint @aws/codecatalyst-workflows-sdk yaml" }, { "exec": "npx projen" diff --git a/packages/components/workflows/package.json b/packages/components/workflows/package.json index 584ec8319..42a4c5352 100644 --- a/packages/components/workflows/package.json +++ b/packages/components/workflows/package.json @@ -28,10 +28,10 @@ "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*", "@amazon-codecatalyst/blueprints.blueprint": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", diff --git a/packages/top-level/codecatalyst-blueprints/.gitattributes b/packages/top-level/codecatalyst-blueprints/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/top-level/codecatalyst-blueprints/.gitattributes +++ b/packages/top-level/codecatalyst-blueprints/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/top-level/codecatalyst-blueprints/.gitignore b/packages/top-level/codecatalyst-blueprints/.gitignore index aac50671f..9b6bdbb24 100644 --- a/packages/top-level/codecatalyst-blueprints/.gitignore +++ b/packages/top-level/codecatalyst-blueprints/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/top-level/codecatalyst-blueprints/.projen/deps.json b/packages/top-level/codecatalyst-blueprints/.projen/deps.json index 5ae4066a8..7847a958d 100644 --- a/packages/top-level/codecatalyst-blueprints/.projen/deps.json +++ b/packages/top-level/codecatalyst-blueprints/.projen/deps.json @@ -11,16 +11,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/top-level/codecatalyst-blueprints/.projen/files.json b/packages/top-level/codecatalyst-blueprints/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/top-level/codecatalyst-blueprints/.projen/files.json +++ b/packages/top-level/codecatalyst-blueprints/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/top-level/codecatalyst-blueprints/.projen/tasks.json b/packages/top-level/codecatalyst-blueprints/.projen/tasks.json index f369f1eeb..2e57a8847 100644 --- a/packages/top-level/codecatalyst-blueprints/.projen/tasks.json +++ b/packages/top-level/codecatalyst-blueprints/.projen/tasks.json @@ -181,25 +181,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.projen-blueprint-component,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprint-component.dev-environments,@amazon-codecatalyst/blueprint-component.environments,@amazon-codecatalyst/blueprint-component.source-repositories,@amazon-codecatalyst/blueprint-component.workflows,@amazon-codecatalyst/blueprints.blueprint" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.projen-blueprint-component @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprint-component.dev-environments @amazon-codecatalyst/blueprint-component.environments @amazon-codecatalyst/blueprint-component.source-repositories @amazon-codecatalyst/blueprint-component.workflows @amazon-codecatalyst/blueprints.blueprint" }, { "exec": "npx projen" diff --git a/packages/top-level/codecatalyst-blueprints/package.json b/packages/top-level/codecatalyst-blueprints/package.json index ce2f448b2..1a931d0b8 100644 --- a/packages/top-level/codecatalyst-blueprints/package.json +++ b/packages/top-level/codecatalyst-blueprints/package.json @@ -25,14 +25,14 @@ "devDependencies": { "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-node": "^10", "typescript": "^4.x" diff --git a/packages/utils/blueprint-cli/.gitattributes b/packages/utils/blueprint-cli/.gitattributes index 205e20191..b461952f5 100644 --- a/packages/utils/blueprint-cli/.gitattributes +++ b/packages/utils/blueprint-cli/.gitattributes @@ -5,7 +5,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/utils/blueprint-cli/.gitignore b/packages/utils/blueprint-cli/.gitignore index d48f5d152..712581627 100644 --- a/packages/utils/blueprint-cli/.gitignore +++ b/packages/utils/blueprint-cli/.gitignore @@ -35,7 +35,6 @@ junit.xml /coverage/ /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/utils/blueprint-cli/.projen/deps.json b/packages/utils/blueprint-cli/.projen/deps.json index 37f842a69..a81f3cbf5 100644 --- a/packages/utils/blueprint-cli/.projen/deps.json +++ b/packages/utils/blueprint-cli/.projen/deps.json @@ -27,16 +27,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/utils/blueprint-cli/.projen/files.json b/packages/utils/blueprint-cli/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/utils/blueprint-cli/.projen/files.json +++ b/packages/utils/blueprint-cli/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/utils/blueprint-cli/.projen/tasks.json b/packages/utils/blueprint-cli/.projen/tasks.json index 6974a7354..7b4a7f362 100644 --- a/packages/utils/blueprint-cli/.projen/tasks.json +++ b/packages/utils/blueprint-cli/.projen/tasks.json @@ -207,25 +207,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='@aws-sdk/client-codecatalyst,projen'" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='@aws-sdk/client-codecatalyst,projen'" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='@aws-sdk/client-codecatalyst,projen'" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='@aws-sdk/client-codecatalyst,projen'" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='@aws-sdk/client-codecatalyst,projen'" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@amazon-codecatalyst/blueprint-util.projen-blueprint-component,@types/jest,@types/jmespath,@types/node,@types/pino,@types/yargs,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,jest,jest-junit,npm-check-updates,pino-pretty,projen,standard-version,ts-jest,ts-json-schema-generator,ts-loader,ts-node,typescript,@aws-sdk/client-cloudfront,@aws-sdk/client-s3,@aws-sdk/client-sts,ajv,axios,deepmerge,esbuild,jmespath,pino,yargs" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @amazon-codecatalyst/blueprint-util.projen-blueprint-component @types/jest @types/jmespath @types/node @types/pino @types/yargs @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint jest jest-junit npm-check-updates pino-pretty projen standard-version ts-jest ts-json-schema-generator ts-loader ts-node typescript @aws-sdk/client-cloudfront @aws-sdk/client-s3 @aws-sdk/client-sts ajv axios deepmerge esbuild jmespath pino yargs" }, { "exec": "npx projen" diff --git a/packages/utils/blueprint-cli/package.json b/packages/utils/blueprint-cli/package.json index f0ce5d536..78edcfe06 100644 --- a/packages/utils/blueprint-cli/package.json +++ b/packages/utils/blueprint-cli/package.json @@ -34,17 +34,17 @@ "@types/node": "^18", "@types/pino": "^6.3.12", "@types/yargs": "17.0.8", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "^0.3.7", "eslint-import-resolver-typescript": "^3.5.5", "eslint-plugin-import": "^2.27.5", "jest": "27.0.x", "jest-junit": "^15", "npm-check-updates": "^16", "pino-pretty": "^4.8.0", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-jest": "^29.1.0", "ts-json-schema-generator": "^1.2.0", diff --git a/packages/utils/projen-blueprint-component/.gitattributes b/packages/utils/projen-blueprint-component/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/utils/projen-blueprint-component/.gitattributes +++ b/packages/utils/projen-blueprint-component/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/utils/projen-blueprint-component/.gitignore b/packages/utils/projen-blueprint-component/.gitignore index aac50671f..9b6bdbb24 100644 --- a/packages/utils/projen-blueprint-component/.gitignore +++ b/packages/utils/projen-blueprint-component/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/utils/projen-blueprint-component/.projen/deps.json b/packages/utils/projen-blueprint-component/.projen/deps.json index 736d063a7..d339a2d00 100644 --- a/packages/utils/projen-blueprint-component/.projen/deps.json +++ b/packages/utils/projen-blueprint-component/.projen/deps.json @@ -7,16 +7,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/utils/projen-blueprint-component/.projen/files.json b/packages/utils/projen-blueprint-component/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/utils/projen-blueprint-component/.projen/files.json +++ b/packages/utils/projen-blueprint-component/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/utils/projen-blueprint-component/.projen/tasks.json b/packages/utils/projen-blueprint-component/.projen/tasks.json index 0ff5b0487..13a0b6ef5 100644 --- a/packages/utils/projen-blueprint-component/.projen/tasks.json +++ b/packages/utils/projen-blueprint-component/.projen/tasks.json @@ -181,25 +181,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript" }, { "exec": "npx projen" diff --git a/packages/utils/projen-blueprint-component/package.json b/packages/utils/projen-blueprint-component/package.json index e810d7cf4..577c8547b 100644 --- a/packages/utils/projen-blueprint-component/package.json +++ b/packages/utils/projen-blueprint-component/package.json @@ -24,14 +24,14 @@ }, "devDependencies": { "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-node": "^10", "typescript": "^4.x" diff --git a/packages/utils/projen-blueprint/.gitattributes b/packages/utils/projen-blueprint/.gitattributes index 0d5b25011..10f45b1cf 100644 --- a/packages/utils/projen-blueprint/.gitattributes +++ b/packages/utils/projen-blueprint/.gitattributes @@ -4,7 +4,6 @@ /.gitattributes linguist-generated /.gitignore linguist-generated /.npmignore linguist-generated -/.npmrc linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated /.projen/files.json linguist-generated diff --git a/packages/utils/projen-blueprint/.gitignore b/packages/utils/projen-blueprint/.gitignore index aac50671f..9b6bdbb24 100644 --- a/packages/utils/projen-blueprint/.gitignore +++ b/packages/utils/projen-blueprint/.gitignore @@ -32,7 +32,6 @@ jspm_packages/ !/.projenrc.js /dist/changelog.md /dist/version.txt -!/.npmrc !/test/ !/tsconfig.json !/tsconfig.dev.json diff --git a/packages/utils/projen-blueprint/.projen/deps.json b/packages/utils/projen-blueprint/.projen/deps.json index 485dc104a..fde11bfdb 100644 --- a/packages/utils/projen-blueprint/.projen/deps.json +++ b/packages/utils/projen-blueprint/.projen/deps.json @@ -1,9 +1,5 @@ { "dependencies": [ - { - "name": "@amazon-codecatalyst/blueprint-util.cli", - "type": "build" - }, { "name": "@types/node", "version": "^18", @@ -11,16 +7,17 @@ }, { "name": "@typescript-eslint/eslint-plugin", - "version": "^5", + "version": "^6", "type": "build" }, { "name": "@typescript-eslint/parser", - "version": "^5", + "version": "^6", "type": "build" }, { - "name": "eslint-import-resolver-node", + "name": "constructs", + "version": "^10.0.0", "type": "build" }, { diff --git a/packages/utils/projen-blueprint/.projen/files.json b/packages/utils/projen-blueprint/.projen/files.json index 27ceb2193..8811211db 100644 --- a/packages/utils/projen-blueprint/.projen/files.json +++ b/packages/utils/projen-blueprint/.projen/files.json @@ -4,7 +4,6 @@ ".gitattributes", ".gitignore", ".npmignore", - ".npmrc", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/packages/utils/projen-blueprint/.projen/tasks.json b/packages/utils/projen-blueprint/.projen/tasks.json index 0ff5b0487..bfc2898b5 100644 --- a/packages/utils/projen-blueprint/.projen/tasks.json +++ b/packages/utils/projen-blueprint/.projen/tasks.json @@ -181,25 +181,13 @@ "exec": "yarn upgrade npm-check-updates" }, { - "exec": "npm-check-updates --dep dev --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep optional --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep peer --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep prod --upgrade --target=minor" - }, - { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor" + "exec": "npm-check-updates --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,eslint-import-resolver-typescript,eslint-plugin-import,eslint,npm-check-updates,projen,standard-version,ts-node,typescript,@amazon-codecatalyst/blueprint-util.cli" }, { "exec": "yarn install --check-files" }, { - "exec": "yarn upgrade" + "exec": "yarn upgrade @types/node @typescript-eslint/eslint-plugin @typescript-eslint/parser constructs eslint-import-resolver-typescript eslint-plugin-import eslint npm-check-updates projen standard-version ts-node typescript @amazon-codecatalyst/blueprint-util.cli" }, { "exec": "npx projen" diff --git a/packages/utils/projen-blueprint/package.json b/packages/utils/projen-blueprint/package.json index 4aa0a7cd6..6c90f8fd6 100644 --- a/packages/utils/projen-blueprint/package.json +++ b/packages/utils/projen-blueprint/package.json @@ -25,14 +25,14 @@ "devDependencies": { "@amazon-codecatalyst/blueprint-util.cli": "*", "@types/node": "^18", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", + "@typescript-eslint/eslint-plugin": "^6", + "@typescript-eslint/parser": "^6", + "constructs": "^10.0.0", "eslint": "^8", - "eslint-import-resolver-node": "*", "eslint-import-resolver-typescript": "*", "eslint-plugin-import": "*", "npm-check-updates": "^16", - "projen": "0.71.112", + "projen": "0.77.1", "standard-version": "^9", "ts-node": "^10", "typescript": "^4.x" diff --git a/packages/utils/projen-blueprint/src/blueprint.ts b/packages/utils/projen-blueprint/src/blueprint.ts index 9aecc33f2..de17ef254 100644 --- a/packages/utils/projen-blueprint/src/blueprint.ts +++ b/packages/utils/projen-blueprint/src/blueprint.ts @@ -118,7 +118,7 @@ export class ProjenBlueprint extends typescript.TypeScriptProject { * this.package.addDeps('projen@something-else'); * this.addPackageResolutions('projen@something-else') in their package */ - const projenVersion = options.projenVersion || '0.71.112'; + const projenVersion = options.projenVersion || '0.77.1'; this.package.addDeps(`projen@${projenVersion}`); this.package.addPackageResolutions(`projen@${projenVersion}`); @@ -147,7 +147,8 @@ export class ProjenBlueprint extends typescript.TypeScriptProject { this.setScript('blueprint:validate-options', 'blueprint validate-options ./lib/ast.json ./lib/defaults.json'); //set local synthing - this.setScript('build:lib', 'rm -rf ./lib/ && yarn build && yarn blueprint:build-ast && yarn blueprint:validate-options'); + const pkgMgrCmd = this.getPackageManagerCommand(); + this.setScript('build:lib', `rm -rf ./lib/ && ${pkgMgrCmd} build && ${pkgMgrCmd} blueprint:build-ast && ${pkgMgrCmd} blueprint:validate-options`); //ignore synths this.gitignore.addPatterns('synth'); @@ -158,25 +159,31 @@ export class ProjenBlueprint extends typescript.TypeScriptProject { this.package.addField('publishingSpace', space); this.setScript('package', 'rm -rf ./dist/js/ && npx projen package'); - this.setScript('blueprint:package', ['yarn build:lib', 'yarn blueprint:synth --cache --clean-up false', 'yarn package'].join(' && ')); + this.setScript( + 'blueprint:package', + [`${pkgMgrCmd} build:lib`, `${pkgMgrCmd} blueprint:synth --cache --clean-up false`, `${pkgMgrCmd} package`].join(' && '), + ); this.setScript('npm:publish', 'npm publish dist/js/*.tgz'); - this.setScript('blueprint:preview', ['yarn bump:preview', 'yarn blueprint:package', `blueprint publish ./ --publisher ${space} $*`].join(' && ')); + this.setScript( + 'blueprint:preview', + [`${pkgMgrCmd} bump:preview`, `${pkgMgrCmd} blueprint:package`, `blueprint publish ./ --publisher ${space} $*`].join(' && '), + ); this.setScript( 'blueprint:release', [ - 'yarn build:lib', - 'yarn bump', - 'yarn blueprint:synth --cache --clean-up false', - 'yarn package', + `${pkgMgrCmd} build:lib`, + `${pkgMgrCmd} bump`, + `${pkgMgrCmd} blueprint:synth --cache --clean-up false`, + `${pkgMgrCmd} package`, `blueprint publish ./ --publisher ${space} $*`, ].join(' && '), ); if (finalOpts.blueprintHealthConfiguration) { - this.setScript('blueprint:generate-assessment', 'yarn blueprint generate-assessment --wizard-option ./src/defaults.json $*'); - this.setScript('blueprint:validate-assessment', 'yarn blueprint validate-assessment $*'); + this.setScript('blueprint:generate-assessment', `${pkgMgrCmd} blueprint generate-assessment --wizard-option ./src/defaults.json $*`); + this.setScript('blueprint:validate-assessment', `${pkgMgrCmd} blueprint validate-assessment $*`); } //add additional metadata fields to package.json @@ -232,4 +239,21 @@ export class ProjenBlueprint extends typescript.TypeScriptProject { synth(): void { super.synth(); } + + private getPackageManagerCommand() { + switch (this.package.packageManager) { + case javascript.NodePackageManager.NPM: + return 'npm'; + case javascript.NodePackageManager.PNPM: + return 'pnpm'; + case javascript.NodePackageManager.BUN: + return 'bun'; + case javascript.NodePackageManager.YARN: + case javascript.NodePackageManager.YARN2: + case javascript.NodePackageManager.YARN_CLASSIC: + case javascript.NodePackageManager.YARN_BERRY: + default: + return 'yarn'; + } + } } diff --git a/yarn.lock b/yarn.lock index 6b144353a..1289c4793 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,10 +20,10 @@ __metadata: "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*" "@amazon-codecatalyst/blueprints.blueprint": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 @@ -46,10 +46,10 @@ __metadata: "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*" "@amazon-codecatalyst/blueprints.blueprint": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 @@ -71,12 +71,12 @@ __metadata: "@amazon-codecatalyst/blueprints.blueprint": "*" "@types/jest": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 camelcase: 5.3.x + constructs: ^10.0.0 decamelize: 5.0.x eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" glob: ^10 @@ -106,10 +106,10 @@ __metadata: "@amazon-codecatalyst/blueprints.blueprint": "*" "@aws/codecatalyst-workflows-sdk": 0.1.5-preview.6 "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 @@ -140,14 +140,14 @@ __metadata: "@types/node": ^18 "@types/pino": ^6.3.12 "@types/yargs": 17.0.8 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 ajv: ^8.12.0 axios: ^0.25.0 + constructs: ^10.0.0 deepmerge: ^4.3.1 esbuild: 0.19.3 eslint: ^8 - eslint-import-resolver-node: ^0.3.7 eslint-import-resolver-typescript: ^3.5.5 eslint-plugin-import: ^2.27.5 jest: 27.0.x @@ -156,7 +156,7 @@ __metadata: npm-check-updates: ^16 pino: ^6.13.4 pino-pretty: ^4.8.0 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-jest: ^29.1.0 ts-json-schema-generator: ^1.2.0 @@ -174,14 +174,14 @@ __metadata: resolution: "@amazon-codecatalyst/blueprint-util.projen-blueprint-component@workspace:packages/utils/projen-blueprint-component" dependencies: "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-node: ^10 typescript: ^4.x @@ -196,14 +196,14 @@ __metadata: dependencies: "@amazon-codecatalyst/blueprint-util.cli": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-node: ^10 typescript: ^4.x @@ -225,16 +225,16 @@ __metadata: "@amazon-codecatalyst/blueprint-util.projen-blueprint": "*" "@amazon-codecatalyst/blueprints.blueprint": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 camelcase: 1.x + constructs: ^10.0.0 decamelize: 5.0.x eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-node: ^10 typescript: ^4.x @@ -250,18 +250,18 @@ __metadata: "@types/diff-match-patch": 1.x "@types/jest": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 diff-match-patch: 1.x eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" globule: "*" jest: "*" jest-junit: ^15 npm-check-updates: ^16 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-jest: "*" ts-node: ^10 @@ -286,10 +286,10 @@ __metadata: "@types/jest": "*" "@types/node": ^18 "@types/pino": ^6.3.12 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" globule: "*" @@ -298,7 +298,7 @@ __metadata: npm-check-updates: ^16 pino: ^6.13.4 pino-pretty: ^4.8.0 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-deepmerge: "*" ts-jest: "*" @@ -320,14 +320,14 @@ __metadata: "@amazon-codecatalyst/blueprint-util.projen-blueprint": "*" "@amazon-codecatalyst/blueprints.blueprint": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: ^2.25.4 npm-check-updates: ^16 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-node: ^10 typescript: ^4.x @@ -345,14 +345,14 @@ __metadata: "@amazon-codecatalyst/blueprint-util.projen-blueprint-component": "*" "@amazon-codecatalyst/blueprints.blueprint": "*" "@types/node": ^18 - "@typescript-eslint/eslint-plugin": ^5 - "@typescript-eslint/parser": ^5 + "@typescript-eslint/eslint-plugin": ^6 + "@typescript-eslint/parser": ^6 + constructs: ^10.0.0 eslint: ^8 - eslint-import-resolver-node: "*" eslint-import-resolver-typescript: "*" eslint-plugin-import: "*" npm-check-updates: ^16 - projen: 0.71.112 + projen: 0.77.1 standard-version: ^9 ts-node: ^10 typescript: ^4.x @@ -1810,7 +1810,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -1828,6 +1828,13 @@ __metadata: languageName: node linkType: hard +"@eslint-community/regexpp@npm:^4.5.1": + version: 4.10.0 + resolution: "@eslint-community/regexpp@npm:4.10.0" + checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^2.0.3": version: 2.0.3 resolution: "@eslint/eslintrc@npm:2.0.3" @@ -3603,6 +3610,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:^7.5.0": + version: 7.5.6 + resolution: "@types/semver@npm:7.5.6" + checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037 + languageName: node + linkType: hard + "@types/stack-utils@npm:^2.0.0": version: 2.0.1 resolution: "@types/stack-utils@npm:2.0.1" @@ -3653,7 +3667,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:*, @typescript-eslint/eslint-plugin@npm:^5": +"@typescript-eslint/eslint-plugin@npm:*": version: 5.60.1 resolution: "@typescript-eslint/eslint-plugin@npm:5.60.1" dependencies: @@ -3677,7 +3691,32 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:*, @typescript-eslint/parser@npm:^5": +"@typescript-eslint/eslint-plugin@npm:^6": + version: 6.13.2 + resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2" + dependencies: + "@eslint-community/regexpp": ^4.5.1 + "@typescript-eslint/scope-manager": 6.13.2 + "@typescript-eslint/type-utils": 6.13.2 + "@typescript-eslint/utils": 6.13.2 + "@typescript-eslint/visitor-keys": 6.13.2 + debug: ^4.3.4 + graphemer: ^1.4.0 + ignore: ^5.2.4 + natural-compare: ^1.4.0 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 + peerDependencies: + "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: e50cbbe7104eecef59faf3355ab981d9f353b19327f0b4607dfd829b4726f9e694b536fe43ab55f50bb00fbfdd2e4268a7e2a568b28d5fcd0d2a32a8d2466218 + languageName: node + linkType: hard + +"@typescript-eslint/parser@npm:*": version: 5.60.1 resolution: "@typescript-eslint/parser@npm:5.60.1" dependencies: @@ -3694,6 +3733,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/parser@npm:^6": + version: 6.13.2 + resolution: "@typescript-eslint/parser@npm:6.13.2" + dependencies: + "@typescript-eslint/scope-manager": 6.13.2 + "@typescript-eslint/types": 6.13.2 + "@typescript-eslint/typescript-estree": 6.13.2 + "@typescript-eslint/visitor-keys": 6.13.2 + debug: ^4.3.4 + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: aeafc414d295d7855384f10d57abb4f5f2ff35b57991b5c8854f43268761b3cc995e62af585dea1dc48295d762f466b565b5ae5699bfe642585d3f83ba8e1515 + languageName: node + linkType: hard + "@typescript-eslint/scope-manager@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/scope-manager@npm:5.60.1" @@ -3704,6 +3761,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:6.13.2": + version: 6.13.2 + resolution: "@typescript-eslint/scope-manager@npm:6.13.2" + dependencies: + "@typescript-eslint/types": 6.13.2 + "@typescript-eslint/visitor-keys": 6.13.2 + checksum: ff8fd64ddf324e296e2e0e34a8f73149c9a5f14d1761ea8e8665fc5998faa2b0bbbd1a5d416aa10d725f13c804032d532f68e39a0ca6cc36d1c9b9c0aea94311 + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/type-utils@npm:5.60.1" @@ -3721,6 +3788,23 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/type-utils@npm:6.13.2": + version: 6.13.2 + resolution: "@typescript-eslint/type-utils@npm:6.13.2" + dependencies: + "@typescript-eslint/typescript-estree": 6.13.2 + "@typescript-eslint/utils": 6.13.2 + debug: ^4.3.4 + ts-api-utils: ^1.0.1 + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: ba54e5746139f778c35e4058e523ec8c20b68cf6472b3a7784170328e48c228f0761d2fc7e43dab053ca7d85ac4378b6965567774e6afedf551e600638404215 + languageName: node + linkType: hard + "@typescript-eslint/types@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/types@npm:5.60.1" @@ -3728,6 +3812,13 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/types@npm:6.13.2": + version: 6.13.2 + resolution: "@typescript-eslint/types@npm:6.13.2" + checksum: 4493ff06fa07c68c5adbcbd842f6dd6f5c88f14d160b53c3379b6b703e6f62808fab7fdebcc06ff06a56f20ab432b6ceeb0afb8931dc97d4061cb417e787f2c1 + languageName: node + linkType: hard + "@typescript-eslint/typescript-estree@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/typescript-estree@npm:5.60.1" @@ -3746,6 +3837,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:6.13.2": + version: 6.13.2 + resolution: "@typescript-eslint/typescript-estree@npm:6.13.2" + dependencies: + "@typescript-eslint/types": 6.13.2 + "@typescript-eslint/visitor-keys": 6.13.2 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 + peerDependenciesMeta: + typescript: + optional: true + checksum: 0c18ee5ef594a2411a788fe9d7bc6d51a03bce38d9d764bcb24ab557e5bc1942c2ddf9bd6fb4877eb102b0ae488974fb7b7fe72daa70a2054bf04d3cc6803546 + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/utils@npm:5.60.1" @@ -3764,6 +3873,23 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/utils@npm:6.13.2": + version: 6.13.2 + resolution: "@typescript-eslint/utils@npm:6.13.2" + dependencies: + "@eslint-community/eslint-utils": ^4.4.0 + "@types/json-schema": ^7.0.12 + "@types/semver": ^7.5.0 + "@typescript-eslint/scope-manager": 6.13.2 + "@typescript-eslint/types": 6.13.2 + "@typescript-eslint/typescript-estree": 6.13.2 + semver: ^7.5.4 + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + checksum: b66bcf2a945e9c55f3dccb48af49565863d974837ee23b2f01ce7f3fb2462eb8a5871784d4a2fcc80dac7d5cd4ed90c8d01431cd177c0249de89a448f6663fc8 + languageName: node + linkType: hard + "@typescript-eslint/visitor-keys@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/visitor-keys@npm:5.60.1" @@ -3774,6 +3900,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:6.13.2": + version: 6.13.2 + resolution: "@typescript-eslint/visitor-keys@npm:6.13.2" + dependencies: + "@typescript-eslint/types": 6.13.2 + eslint-visitor-keys: ^3.4.1 + checksum: 4b4def7acd7451e6a18dab3ee13f06504b3d23e51f195fced7c544f2203ee8a83426c82fa57ab6b58725c70fdedaf7a3eccb69793180be35756eed0f2c69fe04 + languageName: node + linkType: hard + "@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5": version: 1.11.6 resolution: "@webassemblyjs/ast@npm:1.11.6" @@ -5199,6 +5335,13 @@ __metadata: languageName: node linkType: hard +"constructs@npm:^10.0.0": + version: 10.3.0 + resolution: "constructs@npm:10.3.0" + checksum: d8d4ea4e4614914e119b1fd5fc6da0deac909a22b0dbe09423cefb3da54a2866cb9986b371649dadd90b09c56fe69ec22fe3eaab475f8914ac702ed8205e13ca + languageName: node + linkType: hard + "conventional-changelog-angular@npm:^5.0.12": version: 5.0.13 resolution: "conventional-changelog-angular@npm:5.0.13" @@ -6261,7 +6404,7 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-node@npm:*, eslint-import-resolver-node@npm:^0.3.7": +"eslint-import-resolver-node@npm:^0.3.7": version: 0.3.7 resolution: "eslint-import-resolver-node@npm:0.3.7" dependencies: @@ -7875,6 +8018,13 @@ __metadata: languageName: node linkType: hard +"ignore@npm:^5.2.4": + version: 5.3.0 + resolution: "ignore@npm:5.3.0" + checksum: 2736da6621f14ced652785cb05d86301a66d70248597537176612bd0c8630893564bd5f6421f8806b09e8472e75c591ef01672ab8059c07c6eb2c09cefe04bf9 + languageName: node + linkType: hard + "import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" @@ -11170,26 +11320,29 @@ __metadata: languageName: node linkType: hard -"projen@npm:0.71.112": - version: 0.71.112 - resolution: "projen@npm:0.71.112" +"projen@npm:0.77.1": + version: 0.77.1 + resolution: "projen@npm:0.77.1" dependencies: "@iarna/toml": ^2.2.5 case: ^1.6.3 chalk: ^4.1.2 comment-json: 4.2.2 + constructs: ^10.0.0 conventional-changelog-config-spec: ^2.1.0 fast-json-patch: ^3.1.1 glob: ^8 ini: ^2.0.0 - semver: ^7.5.3 + semver: ^7.5.4 shx: ^0.3.4 xmlbuilder2: ^3.1.1 yaml: ^2.2.2 yargs: ^17.7.2 + peerDependencies: + constructs: ^10.0.0 bin: projen: bin/projen - checksum: 5f3a88939f77d8e57086839a0a40bb2415d8d00b180c7e28982afcd6bd7d4eca72685ec9f063b3f8b497304fc0c8713c569418027e404c09fd2de52c8e64246b + checksum: 61d5c7f4da9bf0699f381f4d81c896f0f99e2cb71a81ee5c81a79cc020b7ceddbbe7a95ef23344ed78066ad6cd73c111467b2c7f0edc02537a78ea24e44a3265 languageName: node linkType: hard @@ -11972,6 +12125,17 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.5.4": + version: 7.5.4 + resolution: "semver@npm:7.5.4" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 + languageName: node + linkType: hard + "serialize-javascript@npm:^6.0.1": version: 6.0.1 resolution: "serialize-javascript@npm:6.0.1" @@ -12834,6 +12998,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.0.1": + version: 1.0.3 + resolution: "ts-api-utils@npm:1.0.3" + peerDependencies: + typescript: ">=4.2.0" + checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6 + languageName: node + linkType: hard + "ts-deepmerge@npm:*": version: 6.1.0 resolution: "ts-deepmerge@npm:6.1.0"