From 43426355ec69f131eb872e16f233853437c4176d Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 10 Dec 2021 16:04:22 +0100 Subject: [PATCH 1/7] Pull in jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index 6a179ab2df..f6c4ee9e0e 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 6a179ab2dfacbc1dbd5dd4c185bc57cbac168994 +Subproject commit f6c4ee9e0e1df985b5abf5a058eca49d838eccdf From a545150faa2f8cbc32abb2eb7fc8d15c7710f6f3 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 10 Dec 2021 16:07:04 +0100 Subject: [PATCH 2/7] Bump engines required to node 16 and npm 8 --- package-lock.json | 22 ++++++++++++++++++---- package.json | 4 ++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac35948692..c00b521c5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -75,8 +75,8 @@ "webpack-cli": "^4.9.1" }, "engines": { - "node": "~14", - "npm": "~7" + "node": "~16", + "npm": "~8" } }, "jslib/angular": { @@ -123,7 +123,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", @@ -132,6 +132,12 @@ "typescript": "4.3.5" } }, + "jslib/common/node_modules/@types/node": { + "version": "16.11.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", + "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", + "dev": true + }, "node_modules/@angular/animations": { "version": "12.2.14", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.14.tgz", @@ -11140,7 +11146,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", @@ -11155,6 +11161,14 @@ "tldjs": "^2.3.1", "typescript": "4.3.5", "zxcvbn": "^4.4.2" + }, + "dependencies": { + "@types/node": { + "version": "16.11.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", + "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", + "dev": true + } } }, "@discoveryjs/json-ext": { diff --git a/package.json b/package.json index 40c2560889..ba9461d7e6 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "web-animations-js": "^2.3.2" }, "engines": { - "node": "~14", - "npm": "~7" + "node": "~16", + "npm": "~8" } } From 8c0b7b88f08f27ffa162ec8a9bb59b3f63383455 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 10 Dec 2021 16:11:28 +0100 Subject: [PATCH 3/7] Bump @types/node to 16 --- package-lock.json | 42 +++++++++++++++++++++--------------------- package.json | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index c00b521c5f..83f3014b66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "@types/firefox-webext-browser": "^82.0.0", "@types/jasmine": "^3.7.6", "@types/mousetrap": "^1.6.8", - "@types/node": "^14.17.2", + "@types/node": "^16.11.12", "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^10.0.0", @@ -132,12 +132,6 @@ "typescript": "4.3.5" } }, - "jslib/common/node_modules/@types/node": { - "version": "16.11.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", - "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", - "dev": true - }, "node_modules/@angular/animations": { "version": "12.2.14", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.2.14.tgz", @@ -909,9 +903,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": { @@ -4972,6 +4966,12 @@ "node": ">=10" } }, + "node_modules/gulp-replace/node_modules/@types/node": { + "version": "14.18.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz", + "integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==", + "dev": true + }, "node_modules/gulp-zip": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.1.0.tgz", @@ -11161,14 +11161,6 @@ "tldjs": "^2.3.1", "typescript": "4.3.5", "zxcvbn": "^4.4.2" - }, - "dependencies": { - "@types/node": { - "version": "16.11.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", - "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", - "dev": true - } } }, "@discoveryjs/json-ext": { @@ -11381,9 +11373,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": { @@ -14624,6 +14616,14 @@ "istextorbinary": "^3.0.0", "replacestream": "^4.0.3", "yargs-parser": ">=5.0.0-security.0" + }, + "dependencies": { + "@types/node": { + "version": "14.18.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz", + "integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==", + "dev": true + } } }, "gulp-zip": { diff --git a/package.json b/package.json index ba9461d7e6..dde7fdc06a 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@types/firefox-webext-browser": "^82.0.0", "@types/jasmine": "^3.7.6", "@types/mousetrap": "^1.6.8", - "@types/node": "^14.17.2", + "@types/node": "^16.11.12", "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^10.0.0", From d35d7c821ee7569fa3cd744be36e4a77a828cbe0 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 10 Dec 2021 16:11:44 +0100 Subject: [PATCH 4/7] Modify build.yml to build with node 16 and npm 8 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99618c1033..7a5ace180b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,11 +91,11 @@ jobs: - name: Set up Node uses: actions/setup-node@46071b5c7a2e0c34e49c3cb8a0e792e86e18d5ea with: - node-version: '14' + node-version: '16' - name: Update NPM run: | - npm install -g npm@7 + npm install -g npm@8 - name: Print environment run: | From 85491ebd1833b5739007e11926f12a78e21168a3 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Fri, 10 Dec 2021 16:11:59 +0100 Subject: [PATCH 5/7] Update requirements in README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5946346a92..15dd72e76d 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ The Bitwarden browser extension is written using the Web Extension API and Angul **Requirements** -- [Node.js](https://nodejs.org) v14.17 or greater -- NPM v7 +- [Node.js](https://nodejs.org) v16.13.1 or greater +- NPM v8 - [Gulp](https://gulpjs.com/) (`npm install --global gulp-cli`) - Chrome (preferred), Opera, or Firefox browser From fd14ccc86bb6a7edf4db21d677c50b345ca1854f Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Mon, 13 Dec 2021 10:57:35 +0100 Subject: [PATCH 6/7] Removed action step that installs npm8 npm 8 is included in node v16 --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a5ace180b..8c9d9ed670 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,10 +93,6 @@ jobs: with: node-version: '16' - - name: Update NPM - run: | - npm install -g npm@8 - - name: Print environment run: | node --version From 0199b638d1a0143eb36c91744cd3353e221e2c5f Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Mon, 13 Dec 2021 11:50:08 +0100 Subject: [PATCH 7/7] Pull jslib --- jslib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jslib b/jslib index f6c4ee9e0e..8fc3cf50d2 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit f6c4ee9e0e1df985b5abf5a058eca49d838eccdf +Subproject commit 8fc3cf50d2967212ffbbf0d57cac71d0774aa2a8