From 9125fc60dba43534e1eb9a82bf7221298d869596 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 22:05:26 +0000 Subject: [PATCH 1/9] template: node 18 --- template/express-rest-api/.nvmrc | 2 +- template/greeter/.nvmrc | 2 +- template/koa-rest-api/.nvmrc | 2 +- template/lambda-sqs-worker-cdk/.nvmrc | 2 +- template/lambda-sqs-worker/.nvmrc | 2 +- template/oss-npm-package/.nvmrc | 2 +- template/private-npm-package/.nvmrc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/template/express-rest-api/.nvmrc b/template/express-rest-api/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/express-rest-api/.nvmrc +++ b/template/express-rest-api/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/template/greeter/.nvmrc b/template/greeter/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/greeter/.nvmrc +++ b/template/greeter/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/template/koa-rest-api/.nvmrc b/template/koa-rest-api/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/koa-rest-api/.nvmrc +++ b/template/koa-rest-api/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/template/lambda-sqs-worker-cdk/.nvmrc b/template/lambda-sqs-worker-cdk/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/lambda-sqs-worker-cdk/.nvmrc +++ b/template/lambda-sqs-worker-cdk/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/template/lambda-sqs-worker/.nvmrc b/template/lambda-sqs-worker/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/lambda-sqs-worker/.nvmrc +++ b/template/lambda-sqs-worker/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/template/oss-npm-package/.nvmrc b/template/oss-npm-package/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/oss-npm-package/.nvmrc +++ b/template/oss-npm-package/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/template/private-npm-package/.nvmrc b/template/private-npm-package/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/template/private-npm-package/.nvmrc +++ b/template/private-npm-package/.nvmrc @@ -1 +1 @@ -16 +18 From 07a5f03910fc68ccbe31ef620d968de7e57996e9 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 26 Oct 2022 15:50:10 +1100 Subject: [PATCH 2/9] Roll back Lambda templates --- template/lambda-sqs-worker-cdk/.nvmrc | 2 +- template/lambda-sqs-worker/.nvmrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/lambda-sqs-worker-cdk/.nvmrc b/template/lambda-sqs-worker-cdk/.nvmrc index 3c032078a..b6a7d89c6 100644 --- a/template/lambda-sqs-worker-cdk/.nvmrc +++ b/template/lambda-sqs-worker-cdk/.nvmrc @@ -1 +1 @@ -18 +16 diff --git a/template/lambda-sqs-worker/.nvmrc b/template/lambda-sqs-worker/.nvmrc index 3c032078a..b6a7d89c6 100644 --- a/template/lambda-sqs-worker/.nvmrc +++ b/template/lambda-sqs-worker/.nvmrc @@ -1 +1 @@ -18 +16 From fe2854242fcd0245e5ea8466419f63388da55777 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 26 Oct 2022 15:51:48 +1100 Subject: [PATCH 3/9] Upgrade Docker images --- template/express-rest-api/Dockerfile | 2 +- template/express-rest-api/Dockerfile.dev-deps | 2 +- template/greeter/Dockerfile | 2 +- template/koa-rest-api/Dockerfile | 2 +- template/koa-rest-api/Dockerfile.dev-deps | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/template/express-rest-api/Dockerfile b/template/express-rest-api/Dockerfile index 12bc7da9f..119df2004 100644 --- a/template/express-rest-api/Dockerfile +++ b/template/express-rest-api/Dockerfile @@ -17,7 +17,7 @@ RUN yarn build ### -FROM --platform=arm64 gcr.io/distroless/nodejs:16 AS runtime +FROM --platform=arm64 gcr.io/distroless/nodejs:18 AS runtime WORKDIR /workdir diff --git a/template/express-rest-api/Dockerfile.dev-deps b/template/express-rest-api/Dockerfile.dev-deps index af86b881a..3d71de16c 100644 --- a/template/express-rest-api/Dockerfile.dev-deps +++ b/template/express-rest-api/Dockerfile.dev-deps @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.2 -FROM --platform=arm64 node:16-alpine AS dev-deps +FROM --platform=arm64 node:18-alpine AS dev-deps WORKDIR /workdir diff --git a/template/greeter/Dockerfile b/template/greeter/Dockerfile index af86b881a..3d71de16c 100644 --- a/template/greeter/Dockerfile +++ b/template/greeter/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.2 -FROM --platform=arm64 node:16-alpine AS dev-deps +FROM --platform=arm64 node:18-alpine AS dev-deps WORKDIR /workdir diff --git a/template/koa-rest-api/Dockerfile b/template/koa-rest-api/Dockerfile index 826c7b6e2..1e69a4932 100644 --- a/template/koa-rest-api/Dockerfile +++ b/template/koa-rest-api/Dockerfile @@ -17,7 +17,7 @@ RUN yarn build ### -FROM --platform=arm64 gcr.io/distroless/nodejs:16 AS runtime +FROM --platform=arm64 gcr.io/distroless/nodejs:18 AS runtime WORKDIR /workdir diff --git a/template/koa-rest-api/Dockerfile.dev-deps b/template/koa-rest-api/Dockerfile.dev-deps index af86b881a..3d71de16c 100644 --- a/template/koa-rest-api/Dockerfile.dev-deps +++ b/template/koa-rest-api/Dockerfile.dev-deps @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.2 -FROM --platform=arm64 node:16-alpine AS dev-deps +FROM --platform=arm64 node:18-alpine AS dev-deps WORKDIR /workdir From 1ccb1926db2348b9d587b182e16beed3c870271e Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 26 Oct 2022 15:55:13 +1100 Subject: [PATCH 4/9] Bump TypeScript target --- template/base/tsconfig.json | 4 ++-- template/lambda-sqs-worker-cdk/tsconfig.json | 13 +++++++++++++ template/lambda-sqs-worker/tsconfig.json | 13 +++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 template/lambda-sqs-worker-cdk/tsconfig.json create mode 100644 template/lambda-sqs-worker/tsconfig.json diff --git a/template/base/tsconfig.json b/template/base/tsconfig.json index c71b04e50..04898243f 100644 --- a/template/base/tsconfig.json +++ b/template/base/tsconfig.json @@ -1,12 +1,12 @@ { "compilerOptions": { "baseUrl": ".", - "lib": ["ES2020"], + "lib": ["ES2022"], "outDir": "lib", "paths": { "src": ["src"] }, - "target": "ES2020" + "target": "ES2022" }, "exclude": ["lib*/**/*"], "extends": "skuba/config/tsconfig.json" diff --git a/template/lambda-sqs-worker-cdk/tsconfig.json b/template/lambda-sqs-worker-cdk/tsconfig.json new file mode 100644 index 000000000..c71b04e50 --- /dev/null +++ b/template/lambda-sqs-worker-cdk/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "lib": ["ES2020"], + "outDir": "lib", + "paths": { + "src": ["src"] + }, + "target": "ES2020" + }, + "exclude": ["lib*/**/*"], + "extends": "skuba/config/tsconfig.json" +} diff --git a/template/lambda-sqs-worker/tsconfig.json b/template/lambda-sqs-worker/tsconfig.json new file mode 100644 index 000000000..c71b04e50 --- /dev/null +++ b/template/lambda-sqs-worker/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "lib": ["ES2020"], + "outDir": "lib", + "paths": { + "src": ["src"] + }, + "target": "ES2020" + }, + "exclude": ["lib*/**/*"], + "extends": "skuba/config/tsconfig.json" +} From f30fea9d530c11fb1156c5f2b8336f792f359f46 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 26 Oct 2022 15:56:42 +1100 Subject: [PATCH 5/9] Bump `@types/node` --- template/express-rest-api/package.json | 2 +- template/greeter/package.json | 2 +- template/koa-rest-api/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/express-rest-api/package.json b/template/express-rest-api/package.json index 8b2568114..241db5834 100644 --- a/template/express-rest-api/package.json +++ b/template/express-rest-api/package.json @@ -6,7 +6,7 @@ }, "devDependencies": { "@types/express": "^4.17.13", - "@types/node": "16.11.64", + "@types/node": "^18.11.5", "@types/supertest": "^2.0.11", "pino-pretty": "^9.0.0", "skuba": "*", diff --git a/template/greeter/package.json b/template/greeter/package.json index 2320be636..d6bfc40a5 100644 --- a/template/greeter/package.json +++ b/template/greeter/package.json @@ -3,7 +3,7 @@ "skuba-dive": "^2.0.0" }, "devDependencies": { - "@types/node": "16.11.64", + "@types/node": "^18.11.5", "skuba": "*" }, "engines": { diff --git a/template/koa-rest-api/package.json b/template/koa-rest-api/package.json index f1812d28e..d17bca472 100644 --- a/template/koa-rest-api/package.json +++ b/template/koa-rest-api/package.json @@ -22,7 +22,7 @@ "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^5.0.2", "@types/koa__router": "^12.0.0", - "@types/node": "16.11.64", + "@types/node": "^18.11.5", "@types/supertest": "^2.0.11", "chance": "^1.1.8", "pino-pretty": "^9.0.0", From 76b9e5e9997414b38a0cceeea11916d8708271af Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 26 Oct 2022 16:03:50 +1100 Subject: [PATCH 6/9] Update test snapshot --- src/cli/configure/analysis/__snapshots__/project.test.ts.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/configure/analysis/__snapshots__/project.test.ts.snap b/src/cli/configure/analysis/__snapshots__/project.test.ts.snap index 43c8cf245..13a570dcd 100644 --- a/src/cli/configure/analysis/__snapshots__/project.test.ts.snap +++ b/src/cli/configure/analysis/__snapshots__/project.test.ts.snap @@ -173,7 +173,7 @@ export {}; "data": "{ "compilerOptions": { "baseUrl": ".", - "lib": ["ES2020"], + "lib": ["ES2022"], "outDir": "lib", "paths": { "src": ["src"] From 6662d1b6a8e7dd60f5918a2ab442e2875a498518 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 26 Oct 2022 16:13:52 +1100 Subject: [PATCH 7/9] Create giant-badgers-do.md --- .changeset/giant-badgers-do.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/giant-badgers-do.md diff --git a/.changeset/giant-badgers-do.md b/.changeset/giant-badgers-do.md new file mode 100644 index 000000000..23511dd26 --- /dev/null +++ b/.changeset/giant-badgers-do.md @@ -0,0 +1,7 @@ +--- +'skuba': patch +--- + +template: Bump greeter and API templates to Node.js 18 + +Node.js 18 is now in active LTS. The Lambda templates are stuck on Node.js 16 until the new AWS Lambda runtime is released. From 66abefe72952b76bf14291dcc99393bb95274ed8 Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 2 Nov 2022 09:04:12 +1100 Subject: [PATCH 8/9] Upgrade API engines --- template/express-rest-api/package.json | 2 +- template/koa-rest-api/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template/express-rest-api/package.json b/template/express-rest-api/package.json index dd0047af1..f3d8f0f6c 100644 --- a/template/express-rest-api/package.json +++ b/template/express-rest-api/package.json @@ -25,6 +25,6 @@ "supertest": "^6.1.6" }, "engines": { - "node": ">=16" + "node": ">=18" } } diff --git a/template/koa-rest-api/package.json b/template/koa-rest-api/package.json index 9c452dd3d..e77636a90 100644 --- a/template/koa-rest-api/package.json +++ b/template/koa-rest-api/package.json @@ -42,6 +42,6 @@ "supertest": "^6.1.6" }, "engines": { - "node": ">=16" + "node": ">=18" } } From c6920e949c9eb130a78b38b55f4fb3c9a30e7c8f Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Wed, 2 Nov 2022 09:04:55 +1100 Subject: [PATCH 9/9] Upgrade CI --- .github/workflows/release.yml | 4 ++-- .github/workflows/validate.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6e648d04..e8cb73016 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,10 +21,10 @@ jobs: fetch-depth: 0 token: ${{ secrets.SEEK_OSS_CI_GITHUB_TOKEN }} - - name: Set up Node.js 16.x + - name: Set up Node.js 18.x uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install dependencies run: yarn install --frozen-lockfile diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 17998af39..2c4e5a904 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -44,10 +44,10 @@ jobs: git config user.name seek-oss-ci git config user.email 34733141+seek-oss-ci@users.noreply.github.com - - name: Set up Node.js 16.x + - name: Set up Node.js 18.x uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - name: Install dependencies run: yarn install --frozen-lockfile @@ -83,10 +83,10 @@ jobs: - name: Check out repo uses: actions/checkout@v3 - - name: Set up Node.js 16.x + - name: Set up Node.js 18.x uses: actions/setup-node@v3 with: - node-version: 16.x + node-version: 18.x - if: github.head_ref != 'beta' && github.head_ref != 'changeset-release/master' && github.ref_name != 'beta' && github.ref_name != 'changeset-release/master' name: Test template