Bump NPM to v7 (#922)

* Bump NPM to v7

* Bump npm in build

* Add NPM v7 to readme

* Update node-gyp
This commit is contained in:
Oscar Hinton 2021-05-26 22:44:48 +02:00 committed by GitHub
parent b16f8bc253
commit 42d280ac09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19883 additions and 2212 deletions

View File

@ -32,6 +32,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@ -116,6 +122,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
shell: pwsh shell: pwsh
@ -247,6 +259,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV

View File

@ -60,6 +60,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
@ -106,6 +112,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
shell: pwsh shell: pwsh
@ -201,6 +213,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append run: echo "NODE_OPTIONS=--max_old_space_size=4096" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
shell: pwsh shell: pwsh
@ -271,6 +289,12 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- name: Update NPM
run: |
npm install -g npm@7
npm install -g node-gyp
node-gyp install $(node -v)
- name: Set Node options - name: Set Node options
run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV

View File

@ -15,6 +15,7 @@ The Bitwarden desktop app is written using Electron and Angular. The application
**Requirements** **Requirements**
- [Node.js](https://nodejs.org) v14.17 or greater - [Node.js](https://nodejs.org) v14.17 or greater
- NPM v7
- Windows users: To compile the native node modules used in the app you will need the *Visual C++ toolset*, available through the standard Visual Studio installer. You will also need to install the *Microsoft Build Tools 2015* and *Windows 10 SDK 17134* as additional dependencies in the Visual Studio installer. - Windows users: To compile the native node modules used in the app you will need the *Visual C++ toolset*, available through the standard Visual Studio installer. You will also need to install the *Microsoft Build Tools 2015* and *Windows 10 SDK 17134* as additional dependencies in the Visual Studio installer.

2
jslib

@ -1 +1 @@
Subproject commit c8eca37183c5fa67d0b0988402aea49d0f0f505c Subproject commit 2c297e2f45cd42c1260bb5d49d22d0ddae27d8f0

22024
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -22,7 +22,7 @@
"sub:update": "git submodule update --remote", "sub:update": "git submodule update --remote",
"sub:pull": "git submodule foreach git pull origin master", "sub:pull": "git submodule foreach git pull origin master",
"sub:commit": "npm run sub:pull && git commit -am \"update submodule\"", "sub:commit": "npm run sub:pull && git commit -am \"update submodule\"",
"postinstall": "./node_modules/.bin/electron-rebuild && npm run sub:init && patch-package", "postinstall": "electron-rebuild && npm run sub:init && patch-package",
"symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib", "symlink:win": "rm -rf ./jslib && cmd /c mklink /J .\\jslib ..\\jslib",
"symlink:mac": "npm run symlink:lin", "symlink:mac": "npm run symlink:lin",
"symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib", "symlink:lin": "rm -rf ./jslib && ln -s ../jslib ./jslib",
@ -329,6 +329,6 @@
}, },
"engines": { "engines": {
"node": "~14", "node": "~14",
"npm": "~6" "npm": "~7"
} }
} }