From 58434bc807dfddedc897886daf7ca4060cb19916 Mon Sep 17 00:00:00 2001
From: Andrea Amorosi <dreamorosi@gmail.com>
Date: Tue, 14 Nov 2023 11:36:32 +0100
Subject: [PATCH] feat(maintenance): add support for nodejs20.x runtime (#1790)

* feat(maintenance): support nodejs20.x runtime

* tests(metrics): fix object ordering in tests

* build(testing): bump cdk

* build(maintenance): revert aws-cdk-lib to support nodejs14

* tests(maintenance): set runtime with family

* chore(docs): patch runtime in cdk

* chore(docs): patch runtime in cdk

* chore(maintenance): increment version in commons ahead of release
---
 .devcontainer/Dockerfile        | 18 +++++++++++++++++-
 examples/cdk/package.json       |  5 -----
 packages/commons/src/version.ts |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fa8bafd432..dafb08c87a 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,11 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.212.0/containers/javascript-node/.devcontainer/base.Dockerfile
+<<<<<<< HEAD
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node@sha256:ff7fcaf39a616aed41b7e9af6ebedfee1c605e89ba9416c6fa79f33762345aa7
+=======
+# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
+ARG VARIANT="20-bullseye"
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
+>>>>>>> 5d382569 (feat(maintenance): add support for nodejs20.x runtime (#1790))
 
 # Install fnm to manage Node.js versions
 RUN curl -fsSL https://fnm.vercel.app/install -o /tmp/install \
@@ -7,8 +13,18 @@ RUN curl -fsSL https://fnm.vercel.app/install -o /tmp/install \
   && /tmp/install \
   && rm /tmp/install
 
+<<<<<<< HEAD
 # Install AWS SAM CLI
 RUN curl -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
   && unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation \
   && sudo ./sam-installation/install \
-  && rm -rf sam-installation aws-sam-cli-linux-*
\ No newline at end of file
+  && rm -rf sam-installation aws-sam-cli-linux-*
+=======
+# Install fnm to manage Node.js versions
+RUN curl -fsSL https://fnm.vercel.app/install | bash -s
+
+RUN wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
+    && unzip aws-sam-cli-linux-x86_64.zip -d sam-installation \
+    && sudo ./sam-installation/install \
+    && rm -rf sam-installation aws-sam-cli-linux-*
+>>>>>>> 5d382569 (feat(maintenance): add support for nodejs20.x runtime (#1790))
diff --git a/examples/cdk/package.json b/examples/cdk/package.json
index 21d7422011..77fc3045cf 100644
--- a/examples/cdk/package.json
+++ b/examples/cdk/package.json
@@ -1,11 +1,6 @@
 {
   "name": "cdk-sample",
-<<<<<<< HEAD
   "version": "1.18.0",
-=======
-  "version": "1.14.2",
->>>>>>> 38bc54f0 (chore(release): v1.14.2 [skip ci
-  ])
   "author": {
     "name": "Amazon Web Services",
     "url": "https://aws.amazon.com"
diff --git a/packages/commons/src/version.ts b/packages/commons/src/version.ts
index fbc8a9d373..ca142c14cf 100644
--- a/packages/commons/src/version.ts
+++ b/packages/commons/src/version.ts
@@ -1,2 +1,2 @@
 // this file is auto generated, do not modify
-export const PT_VERSION = '1.17.0';
+export const PT_VERSION = '1.18.0';