From 3aa64639df935a7e2d67ecf29e851a4fa1b233fe Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Thu, 8 Jul 2021 20:18:53 +1000 Subject: [PATCH 1/3] Force `@jest/types` resolution in templates A clean install of `@jest/types` is currently failing because it specifies a `@types/node` range of `*`, and the latest v16 release removes some globals that Jest depends on. This is a hack to get CI healthy again, until `@jest/types` is properly patched. --- .changeset/clean-needles-remember.md | 5 +++++ template/express-rest-api/package.json | 3 +++ template/greeter/package.json | 3 +++ template/koa-rest-api/package.json | 3 +++ template/lambda-sqs-worker-cdk/package.json | 3 +++ template/lambda-sqs-worker/package.json | 3 +++ template/oss-npm-package/_package.json | 3 +++ template/private-npm-package/_package.json | 3 +++ 8 files changed, 26 insertions(+) create mode 100644 .changeset/clean-needles-remember.md diff --git a/.changeset/clean-needles-remember.md b/.changeset/clean-needles-remember.md new file mode 100644 index 000000000..740a5620f --- /dev/null +++ b/.changeset/clean-needles-remember.md @@ -0,0 +1,5 @@ +--- +'skuba': patch +--- + +**template:** Force `@jest/types` resolution to fix clean installs diff --git a/template/express-rest-api/package.json b/template/express-rest-api/package.json index 6b47b2ecd..3e607dc69 100644 --- a/template/express-rest-api/package.json +++ b/template/express-rest-api/package.json @@ -17,6 +17,9 @@ }, "license": "UNLICENSED", "private": true, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build", "format": "skuba format", diff --git a/template/greeter/package.json b/template/greeter/package.json index 0e022c37e..4d3736a93 100644 --- a/template/greeter/package.json +++ b/template/greeter/package.json @@ -11,6 +11,9 @@ }, "license": "UNLICENSED", "private": true, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build", "format": "skuba format", diff --git a/template/koa-rest-api/package.json b/template/koa-rest-api/package.json index 829988f27..612cad005 100644 --- a/template/koa-rest-api/package.json +++ b/template/koa-rest-api/package.json @@ -31,6 +31,9 @@ }, "license": "UNLICENSED", "private": true, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build", "format": "skuba format", diff --git a/template/lambda-sqs-worker-cdk/package.json b/template/lambda-sqs-worker-cdk/package.json index df618e805..d082b69f8 100644 --- a/template/lambda-sqs-worker-cdk/package.json +++ b/template/lambda-sqs-worker-cdk/package.json @@ -20,6 +20,9 @@ }, "license": "UNLICENSED", "private": true, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build", "format": "skuba format", diff --git a/template/lambda-sqs-worker/package.json b/template/lambda-sqs-worker/package.json index 91bbba5bf..5fecc3dd6 100644 --- a/template/lambda-sqs-worker/package.json +++ b/template/lambda-sqs-worker/package.json @@ -23,6 +23,9 @@ }, "license": "UNLICENSED", "private": true, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build", "deploy": "yarn build && serverless deploy --force --verbose", diff --git a/template/oss-npm-package/_package.json b/template/oss-npm-package/_package.json index f9f454c0a..4e0ef1fe3 100644 --- a/template/oss-npm-package/_package.json +++ b/template/oss-npm-package/_package.json @@ -19,6 +19,9 @@ "type": "git", "url": "git+https://github.com/<%- orgName %>/<%- repoName %>.git" }, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build-package", "commit": "cz", diff --git a/template/private-npm-package/_package.json b/template/private-npm-package/_package.json index 2786e4d6c..708e07806 100644 --- a/template/private-npm-package/_package.json +++ b/template/private-npm-package/_package.json @@ -19,6 +19,9 @@ "type": "git", "url": "git+https://github.com/<%- orgName %>/<%- repoName %>.git" }, + "resolutions": { + "**/@jest/types/@types/node": "^15.0.0" + }, "scripts": { "build": "skuba build-package", "commit": "cz", From 8eac6358d8a035a7e63bb920d17ba5c1d03a8f7a Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Thu, 8 Jul 2021 20:27:58 +1000 Subject: [PATCH 2/3] Update CDK snapshot --- .../infra/__snapshots__/appStack.test.ts.snap | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap index 1c533e86a..b7005f97b 100644 --- a/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +++ b/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap @@ -133,6 +133,17 @@ Object { }, "Resource": "*", }, + Object { + "Action": Array [ + "kms:Decrypt", + "kms:GenerateDataKey", + ], + "Effect": "Allow", + "Principal": Object { + "Service": "sns.amazonaws.com", + }, + "Resource": "*", + }, ], "Version": "2012-10-17", }, @@ -543,6 +554,17 @@ Object { }, "Resource": "*", }, + Object { + "Action": Array [ + "kms:Decrypt", + "kms:GenerateDataKey", + ], + "Effect": "Allow", + "Principal": Object { + "Service": "sns.amazonaws.com", + }, + "Resource": "*", + }, ], "Version": "2012-10-17", }, From 43dcb6b695a51c4f6188ffc2da80cc027805a104 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Thu, 8 Jul 2021 20:28:31 +1000 Subject: [PATCH 3/3] Try adding direct `@types/node` deps --- template/oss-npm-package/_package.json | 1 + template/private-npm-package/_package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/template/oss-npm-package/_package.json b/template/oss-npm-package/_package.json index 4e0ef1fe3..b422f780b 100644 --- a/template/oss-npm-package/_package.json +++ b/template/oss-npm-package/_package.json @@ -2,6 +2,7 @@ "dependencies": {}, "description": "<%- description %>", "devDependencies": { + "@types/node": "^15.0.0", "commitizen": "^4.2.3", "skuba": "*" }, diff --git a/template/private-npm-package/_package.json b/template/private-npm-package/_package.json index 708e07806..88262ef0a 100644 --- a/template/private-npm-package/_package.json +++ b/template/private-npm-package/_package.json @@ -2,6 +2,7 @@ "dependencies": {}, "description": "<%- description %>", "devDependencies": { + "@types/node": "^15.0.0", "commitizen": "^4.2.3", "skuba": "*" },