Skip to content

Commit 52c65cd

Browse files
committed
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
1 parent 60faa14 commit 52c65cd

File tree

4 files changed

+58
-26
lines changed

4 files changed

+58
-26
lines changed

Diff for: .devcontainer/Dockerfile

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.212.0/containers/javascript-node/.devcontainer/base.Dockerfile
2+
<<<<<<< HEAD
23
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node@sha256:ff7fcaf39a616aed41b7e9af6ebedfee1c605e89ba9416c6fa79f33762345aa7
4+
=======
5+
# [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
6+
ARG VARIANT="20-bullseye"
7+
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
8+
>>>>>>> 5d382569 (feat(maintenance): add support for nodejs20.x runtime (#1790))
39

410
# Install fnm to manage Node.js versions
511
RUN curl -fsSL https://fnm.vercel.app/install -o /tmp/install \
612
&& chmod a+x /tmp/install \
713
&& /tmp/install \
814
&& rm /tmp/install
915

16+
<<<<<<< HEAD
1017
# Install AWS SAM CLI
1118
RUN curl -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
1219
&& unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation \
1320
&& sudo ./sam-installation/install \
14-
&& rm -rf sam-installation aws-sam-cli-linux-*
21+
&& rm -rf sam-installation aws-sam-cli-linux-*
22+
=======
23+
# Install fnm to manage Node.js versions
24+
RUN curl -fsSL https://fnm.vercel.app/install | bash -s
25+
26+
RUN wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
27+
&& unzip aws-sam-cli-linux-x86_64.zip -d sam-installation \
28+
&& sudo ./sam-installation/install \
29+
&& rm -rf sam-installation aws-sam-cli-linux-*
30+
>>>>>>> 5d382569 (feat(maintenance): add support for nodejs20.x runtime (#1790))

Diff for: examples/cdk/package.json

-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"name": "cdk-sample",
3-
<<<<<<< HEAD
43
"version": "1.18.0",
5-
=======
6-
"version": "1.14.2",
7-
>>>>>>> 38bc54f0 (chore(release): v1.14.2 [skip ci
8-
])
94
"author": {
105
"name": "Amazon Web Services",
116
"url": "https://aws.amazon.com"

Diff for: package-lock.json

+40-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/commons/src/version.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// this file is auto generated, do not modify
2-
export const PT_VERSION = '1.17.0';
2+
export const PT_VERSION = '1.18.0';

0 commit comments

Comments
 (0)