From bbe50cee9ec47b42441d46053697693560c84c8b Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Fri, 30 Sep 2022 01:06:48 -0400 Subject: [PATCH 1/3] Add node and npm engine requirements --- package-lock.json | 2 ++ package.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package-lock.json b/package-lock.json index 047ed7d5bc..b3d6511897 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,6 +112,8 @@ "worker-loader": "3.0.8" }, "engines": { + "node": ">=16.13.1", + "npm": ">=8.1.2", "yarn": "YARN NO LONGER USED - use npm instead." } }, diff --git a/package.json b/package.json index dffd79b6db..87a62cb38c 100644 --- a/package.json +++ b/package.json @@ -135,6 +135,8 @@ "stylelint:scss": "stylelint --config=\".stylelintrc.scss.json\" \"src/**/*.scss\"" }, "engines": { + "node": ">=16.13.1", + "npm": ">=8.1.2", "yarn": "YARN NO LONGER USED - use npm instead." } } From 26a702c9ea7e994745f9ad60f7112af20b9fa5b3 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Fri, 30 Sep 2022 01:20:49 -0400 Subject: [PATCH 2/3] Use engine-strict --- .npmrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmrc b/.npmrc index 95d3df9dfc..23f619956d 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,3 @@ +engine-strict=true fund=false save-exact=true From aebc3729669119b319a883198637167d1a417577 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Fri, 30 Sep 2022 01:53:04 -0400 Subject: [PATCH 3/3] Bump node build versions --- .ci/azure-pipelines-build.yml | 2 +- .github/workflows/lint.yml | 6 +++--- deployment/Dockerfile.centos | 2 +- deployment/Dockerfile.debian | 2 +- deployment/Dockerfile.portable | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci/azure-pipelines-build.yml b/.ci/azure-pipelines-build.yml index 6feccad108..021b6471cd 100644 --- a/.ci/azure-pipelines-build.yml +++ b/.ci/azure-pipelines-build.yml @@ -16,7 +16,7 @@ jobs: - task: NodeTool@0 displayName: 'Install Node' inputs: - versionSpec: '12.x' + versionSpec: '16.x' - task: Cache@2 displayName: 'Cache node_modules' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2a405aa5f4..4d7e82e8fb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,7 @@ jobs: - name: Setup node environment uses: actions/setup-node@969bd2663942d722d85b6a8626225850c2f7be4b # tag=v3.5.0 with: - node-version: 12 + node-version: 16 check-latest: true - name: Get npm cache directory path @@ -53,7 +53,7 @@ jobs: - name: Setup node environment uses: actions/setup-node@969bd2663942d722d85b6a8626225850c2f7be4b # tag=v3.5.0 with: - node-version: 12 + node-version: 16 check-latest: true - name: Get npm cache directory path @@ -91,7 +91,7 @@ jobs: - name: Setup node environment uses: actions/setup-node@969bd2663942d722d85b6a8626225850c2f7be4b # tag=v3.5.0 with: - node-version: 12 + node-version: 16 check-latest: true - name: Get npm cache directory path diff --git a/deployment/Dockerfile.centos b/deployment/Dockerfile.centos index 9a97c2bc5f..cb8bd35932 100644 --- a/deployment/Dockerfile.centos +++ b/deployment/Dockerfile.centos @@ -13,7 +13,7 @@ ENV IS_DOCKER=YES RUN yum update -y \ && yum install -y epel-release \ && yum install -y @buildsys-build rpmdevtools git yum-plugins-core autoconf automake glibc-devel gcc-c++ make \ - && curl -fsSL https://rpm.nodesource.com/setup_12.x | bash - \ + && curl -fsSL https://rpm.nodesource.com/setup_16.x | bash - \ && yum install -y nodejs # Link to build script diff --git a/deployment/Dockerfile.debian b/deployment/Dockerfile.debian index a1a3a18deb..1d39d5b591 100644 --- a/deployment/Dockerfile.debian +++ b/deployment/Dockerfile.debian @@ -13,7 +13,7 @@ ENV IS_DOCKER=YES # Prepare Debian build environment RUN apt-get update \ && apt-get install -y debhelper mmv git curl \ - && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ + && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && apt-get install -y nodejs diff --git a/deployment/Dockerfile.portable b/deployment/Dockerfile.portable index da7b9c8a04..7044cca623 100644 --- a/deployment/Dockerfile.portable +++ b/deployment/Dockerfile.portable @@ -12,7 +12,7 @@ ENV IS_DOCKER=YES # Prepare Debian build environment RUN apt-get update \ && apt-get install -y mmv curl git \ - && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ + && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \ && apt-get install -y nodejs # Link to build script