From 71075cf87849c44eb51d45f84a2359610d8dadbc Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Mon, 13 Dec 2021 17:16:57 +0100 Subject: [PATCH] Bump node to v16 (#1336) * Pull in jslib * Bump engines required to node 16 and npm 8 * Bump @types/node to 16 * Modify build.yml to build with node 16 and npm 8 * Update requirements in README.md * Removed step to install npm8 npm8 is included in node v16 * Pull jslib --- .github/workflows/build.yml | 30 +++++------------------------- README.md | 4 ++-- jslib | 2 +- package-lock.json | 24 ++++++++++++------------ package.json | 8 ++++---- 5 files changed, 24 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc16ffbb78..b5a2840eb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,11 +54,7 @@ jobs: - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: - node-version: '14' - - - name: Update NPM - run: | - npm install -g npm@7 + node-version: '16' - name: Cache npm id: npm-cache @@ -106,11 +102,7 @@ jobs: - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: - node-version: '14' - - - name: Update NPM - run: | - npm install -g npm@7 + node-version: '16' - name: Cache npm id: npm-cache @@ -158,11 +150,7 @@ jobs: - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: - node-version: '14' - - - name: Update NPM - run: | - npm install -g npm@7 + node-version: '16' - name: Cache npm id: npm-cache @@ -269,11 +257,7 @@ jobs: - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: - node-version: '14' - - - name: Update NPM - run: | - npm install -g npm@7 + node-version: '16' - name: Cache npm id: npm-cache @@ -384,11 +368,7 @@ jobs: - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: - node-version: '14' - - - name: Update NPM - run: | - npm install -g npm@7 + node-version: '16' - name: Print environment run: | diff --git a/README.md b/README.md index 811c14aca4..9c81aa2e2e 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ ### Requirements -- [Node.js](https://nodejs.org) v14.17 or greater -- NPM v7 +- [Node.js](https://nodejs.org) v16.13.1 or greater +- NPM v8 ### Run the app diff --git a/jslib b/jslib index 6a179ab2df..8fc3cf50d2 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 6a179ab2dfacbc1dbd5dd4c185bc57cbac168994 +Subproject commit 8fc3cf50d2967212ffbbf0d57cac71d0774aa2a8 diff --git a/package-lock.json b/package-lock.json index ad5cca128f..e97b9e9fea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "@angular/compiler-cli": "^12.2.13", "@ngtools/webpack": "^12.2.13", "@types/jquery": "^3.5.5", - "@types/node": "^14.17.2", + "@types/node": "^16.11.12", "@types/webcrypto": "^0.0.28", "@types/webpack": "^5.28.0", "buffer": "^6.0.3", @@ -69,8 +69,8 @@ "webpack-dev-server": "^4.6.0" }, "engines": { - "node": "~14", - "npm": "~7" + "node": "~16", + "npm": "~8" } }, "jslib/angular": { @@ -117,7 +117,7 @@ }, "devDependencies": { "@types/lunr": "^2.3.3", - "@types/node": "^14.17.1", + "@types/node": "^16.11.12", "@types/node-forge": "^0.9.7", "@types/papaparse": "^5.2.5", "@types/tldjs": "^2.3.0", @@ -896,9 +896,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.18.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz", - "integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==", + "version": "16.11.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", + "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", "dev": true }, "node_modules/@types/node-forge": { @@ -7701,7 +7701,7 @@ "@microsoft/signalr": "5.0.10", "@microsoft/signalr-protocol-msgpack": "5.0.10", "@types/lunr": "^2.3.3", - "@types/node": "^14.17.1", + "@types/node": "^16.11.12", "@types/node-forge": "^0.9.7", "@types/papaparse": "^5.2.5", "@types/tldjs": "^2.3.0", @@ -7926,9 +7926,9 @@ "dev": true }, "@types/node": { - "version": "14.18.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz", - "integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==", + "version": "16.11.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", + "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", "dev": true }, "@types/node-forge": { @@ -12775,4 +12775,4 @@ "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA=" } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 865fc30e63..337b276996 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@angular/compiler-cli": "^12.2.13", "@ngtools/webpack": "^12.2.13", "@types/jquery": "^3.5.5", - "@types/node": "^14.17.2", + "@types/node": "^16.11.12", "@types/webcrypto": "^0.0.28", "@types/webpack": "^5.28.0", "buffer": "^6.0.3", @@ -92,7 +92,7 @@ "whatwg-fetch": "3.6.2" }, "engines": { - "node": "~14", - "npm": "~7" + "node": "~16", + "npm": "~8" } -} \ No newline at end of file +}