diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d280beac2..523819ec3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: - node-version: [10.x, 12.x, 14.x] + node-version: [12.x, 14.x, 16.x] steps: - uses: actions/checkout@v2.3.4 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1779bb3a2..680bf59e0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your corr The RFDK is written in Typescript and converted, using [jsii](https://github.com/aws/jsii), into Python. Thus, the minimal development environment must include: -- Node.js >= 10.21.0 +- Node.js >= 12.18.3 - docker >= 18 We also recommend developing on a Linux system. diff --git a/README.md b/README.md index e370b755a..0ab8d1a8c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ It offers high-level object-oriented abstractions to define render farm infrastr using the power of Python and Typescript. The RFDK is available in: -- Javascript, Typescript ([Node.js >= 10.21.0](https://nodejs.org/download/release/latest-v10.x/)) +- Javascript, Typescript ([Node.js >= 12.18.3](https://nodejs.org/download/release/latest-v12.x/)) - We recommend using an [Active LTS Release](https://nodejs.org/en/about/releases/) - Python ([Python >= 3.6](https://www.python.org/downloads/)) diff --git a/integ/package.json b/integ/package.json index ebdc13814..9cdaf067f 100644 --- a/integ/package.json +++ b/integ/package.json @@ -107,6 +107,6 @@ "aws-sdk": "^2.928.0" }, "engines": { - "node": ">= 10.13.0 <13 || >=13.7.0" + "node": ">= 12.18.3 <13 || >=13.7.0" } } \ No newline at end of file diff --git a/lambda-layers/layers/openssl-al2/Dockerfile b/lambda-layers/layers/openssl-al2/Dockerfile index d61ccad55..bbec2ef46 100644 --- a/lambda-layers/layers/openssl-al2/Dockerfile +++ b/lambda-layers/layers/openssl-al2/Dockerfile @@ -1,4 +1,4 @@ -FROM amazonlinux +FROM public.ecr.aws/amazonlinux/amazonlinux:2 RUN yum install -y openssl zip RUN mkdir -p /tmp/layer @@ -13,4 +13,4 @@ CMD cd /tmp/layer && \ rm -rf bin lib && \ echo "OpenSSL $(openssl version | cut -d ' ' -f 2) for Amazon Linux 2" > description.txt && \ echo "OpenSSL ( https://spdx.org/licenses/OpenSSL.html#licenseText )" > license.txt && \ - echo "nodejs10.x nodejs12.x" > runtimes.txt + echo "nodejs12.x nodejs14.x" > runtimes.txt diff --git a/lambda-layers/package.json b/lambda-layers/package.json index 7b3a76a3c..8ef8548f8 100644 --- a/lambda-layers/package.json +++ b/lambda-layers/package.json @@ -24,7 +24,7 @@ "watch": "tsc -w" }, "engines": { - "node": ">= 10.13.0 <13 || >=13.7.0" + "node": ">= 12.18.3 <13 || >=13.7.0" }, "stability": "stable", "maturity": "stable", diff --git a/packages/aws-rfdk/package.json b/packages/aws-rfdk/package.json index 66580413e..802ec91eb 100644 --- a/packages/aws-rfdk/package.json +++ b/packages/aws-rfdk/package.json @@ -207,7 +207,7 @@ "constructs": "^3.3.69" }, "engines": { - "node": ">= 10.13.0 <13 || >=13.7.0" + "node": ">= 12.18.3 <13 || >=13.7.0" }, "stability": "stable", "maturity": "stable" diff --git a/tools/cdk-build-tools/package.json b/tools/cdk-build-tools/package.json index 45c9d5ac1..3177f38a9 100644 --- a/tools/cdk-build-tools/package.json +++ b/tools/cdk-build-tools/package.json @@ -70,7 +70,7 @@ ], "homepage": "https://github.com/aws/aws-cdk", "engines": { - "node": ">= 10.13.0 <13 || >=13.7.0" + "node": ">= 12.18.3 <13 || >=13.7.0" }, "pkglint": { "exclude": [ diff --git a/tools/pkglint/lib/rules.ts b/tools/pkglint/lib/rules.ts index c72c2fcd0..6ec983d1c 100644 --- a/tools/pkglint/lib/rules.ts +++ b/tools/pkglint/lib/rules.ts @@ -376,11 +376,11 @@ export class NodeCompatibility extends ValidationRule { public validate(pkg: PackageJson): void { const atTypesNode = pkg.getDevDependency('@types/node'); - if (atTypesNode && !atTypesNode.startsWith('^10.')) { + if (atTypesNode && !atTypesNode.startsWith('^12.')) { pkg.report({ ruleName: this.name, - message: `packages must support node version 10 and up, but ${atTypesNode} is declared`, - fix: () => pkg.addDevDependency('@types/node', '^10.17.5'), + message: `packages must support node version 12 and up, but ${atTypesNode} is declared`, + fix: () => pkg.addDevDependency('@types/node', '^12.18.3'), }); } } @@ -629,7 +629,7 @@ export class MustHaveNodeEnginesDeclaration extends ValidationRule { public readonly name = 'package-info/engines'; public validate(pkg: PackageJson): void { - expectJSON(this.name, pkg, 'engines.node', '>= 10.13.0 <13 || >=13.7.0'); + expectJSON(this.name, pkg, 'engines.node', '>= 12.18.3 <13 || >=13.7.0'); } }