GitHub-Bitwarden
/
directory-connector
mirror of https://github.com/bitwarden/directory-connector.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Bump node to v16 (#187) 

* Pull in jslib

* Bump engines required to node 16 and npm 8

* Bump @types/node to 16
The dep on node 14.18 will get cleaned up once we bump electron

* Modify build.yml to build with node 16 and npm 8

* Update requirements in README.md

* Use pkg-fetch 3.2.5 to retrieve node 16.13.0

* Change pkg-fetch version back to 3.2

* Bump keytar to 7.7.0

* Add missing package-lock.json for src-cli

* Bump keytar to 7.7.0 in src/package.json

* Add missing package-lock.json in src/

* Bump pkg to 5.5.1

* Modify download url for keytar

* Replace Mac and Win keytar download urls
pull/189/head
Daniel James Smith 4 years ago committed by GitHub
parent
13572b94ee
commit
6b98a46b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2819 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      .github/workflows/build.yml
  2. 2
      README.md
  3. 2
      jslib
  4. 46
      package-lock.json
  5. 8
      package.json
  6. 1006
      src-cli/package-lock.json
  7. 2
      src-cli/package.json
  8. 1757
      src/package-lock.json
  9. 2
      src/package.json

39
.github/workflows/build.yml
Unescape View File

@ -46,7 +46,7 @@ jobs: @@ -46,7 +46,7 @@ jobs:
needs: setup
env:
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
_PKG_FETCH_NODE_VERSION: 14.17.6
_PKG_FETCH_NODE_VERSION: 16.13.0
_PKG_FETCH_VERSION: 3.2
steps:
- name: Checkout repo
@ -55,11 +55,11 @@ jobs: @@ -55,11 +55,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
npm install -g node-gyp
node-gyp install $(node -v)
@ -74,8 +74,7 @@ jobs: @@ -74,8 +74,7 @@ jobs:
- name: Keytar
run: |
keytarVersion=$(cat src/package.json | jq -r '.dependencies.keytar')
nodeModVersion=$(node -e "console.log(process.config.variables.node_module_version)")
keytarTar="keytar-v$keytarVersion-node-v$nodeModVersion-linux-x64.tar"
keytarTar="keytar-v$keytarVersion-napi-v3-linux-x64.tar"
keytarTarGz="$keytarTar.gz"
keytarUrl="https://github.com/atom/node-keytar/releases/download/v$keytarVersion/$keytarTarGz"
@ -136,7 +135,7 @@ jobs: @@ -136,7 +135,7 @@ jobs:
needs: setup
env:
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
_PKG_FETCH_NODE_VERSION: 14.17.6
_PKG_FETCH_NODE_VERSION: 16.13.0
_PKG_FETCH_VERSION: 3.2
steps:
- name: Checkout repo
@ -145,11 +144,11 @@ jobs: @@ -145,11 +144,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
npm install -g node-gyp
node-gyp install $(node -v)
@ -164,8 +163,7 @@ jobs: @@ -164,8 +163,7 @@ jobs:
- name: Keytar
run: |
keytarVersion=$(cat src/package.json | jq -r '.dependencies.keytar')
nodeModVersion=$(node -e "console.log(process.config.variables.node_module_version)")
keytarTar="keytar-v$keytarVersion-node-v$nodeModVersion-darwin-x64.tar"
keytarTar="keytar-v$keytarVersion-napi-v3-darwin-x64.tar"
keytarTarGz="$keytarTar.gz"
keytarUrl="https://github.com/atom/node-keytar/releases/download/v$keytarVersion/$keytarTarGz"
@ -224,7 +222,7 @@ jobs: @@ -224,7 +222,7 @@ jobs:
needs: setup
env:
_PACKAGE_VERSION: ${{ needs.setup.outputs.package_version }}
_WIN_PKG_FETCH_VERSION: 14.17.6
_WIN_PKG_FETCH_VERSION: 16.13.0
_WIN_PKG_VERSION: 3.2
steps:
- name: Checkout repo
@ -238,11 +236,11 @@ jobs: @@ -238,11 +236,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
npm install -g node-gyp
node-gyp install $(node -v)
@ -261,8 +259,7 @@ jobs: @@ -261,8 +259,7 @@ jobs:
shell: pwsh
run: |
$keytarVersion = (Get-Content -Raw -Path ./src/package.json | ConvertFrom-Json).dependencies.keytar
$nodeModVersion = node -e "console.log(process.config.variables.node_module_version)"
$keytarTar = "keytar-v${keytarVersion}-node-v${nodeModVersion}-{0}-x64.tar"
$keytarTar = "keytar-v${keytarVersion}-napi-v3-{0}-x64.tar"
$keytarTarGz = "${keytarTar}.gz"
$keytarUrl = "https://github.com/atom/node-keytar/releases/download/v${keytarVersion}/${keytarTarGz}"
@ -378,11 +375,11 @@ jobs: @@ -378,11 +375,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
npm install -g node-gyp
node-gyp install $(node -v)
@ -457,11 +454,11 @@ jobs: @@ -457,11 +454,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
npm install -g node-gyp
node-gyp install $(node -v)
@ -511,11 +508,11 @@ jobs: @@ -511,11 +508,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
npm install -g node-gyp
node-gyp install $(node -v)

2
README.md
Unescape View File

@ -47,7 +47,7 @@ We provide detailed documentation and examples for using the Directory Connector @@ -47,7 +47,7 @@ We provide detailed documentation and examples for using the Directory Connector
**Requirements**
- [Node.js](https://nodejs.org) v14
- [Node.js](https://nodejs.org) v16.13.1 (LTS)
- 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 (recommended) or by installing [`windows-build-tools`](https://github.com/felixrieseberg/windows-build-tools) through `npm`. See more at [Compiling native Addon modules](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules).
**Run the app**

2
jslib

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit 6a179ab2dfacbc1dbd5dd4c185bc57cbac168994
Subproject commit f6c4ee9e0e1df985b5abf5a058eca49d838eccdf

46
package-lock.json generated
Unescape View File

@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
"@microsoft/microsoft-graph-types": "^1.4.0",
"@ngtools/webpack": "^12.2.13",
"@types/ldapjs": "^1.0.10",
"@types/node": "^14.14.43",
"@types/node": "^16.11.12",
"@types/proper-lockfile": "^4.1.1",
"clean-webpack-plugin": "^4.0.0",
"concurrently": "^6.0.2",
@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
"html-webpack-plugin": "^5.5.0",
"mini-css-extract-plugin": "^2.4.5",
"node-loader": "^2.0.0",
"pkg": "^5.1.0",
"pkg": "^5.5.1",
"prebuild-install": "^5.0.0",
"rimraf": "^3.0.2",
"sass": "^1.32.11",
@ -77,8 +77,8 @@ @@ -77,8 +77,8 @@
"webpack-node-externals": "^3.0.0"
},
"engines": {
"node": "~14",
"npm": "~7"
"node": "~16",
"npm": "~8"
}
},
"jslib/angular": {
@ -125,7 +125,7 @@ @@ -125,7 +125,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",
@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
"keytar": "7.7.0"
},
"devDependencies": {
"@types/node": "^14.17.1",
"@types/node": "^16.11.12",
"rimraf": "^3.0.2",
"typescript": "4.3.5"
}
@ -171,7 +171,7 @@ @@ -171,7 +171,7 @@
"devDependencies": {
"@types/inquirer": "^7.3.1",
"@types/lowdb": "^1.0.10",
"@types/node": "^14.17.1",
"@types/node": "^16.11.12",
"@types/node-fetch": "^2.5.10",
"rimraf": "^3.0.2",
"typescript": "4.3.5"
@ -1456,9 +1456,10 @@ @@ -1456,9 +1456,10 @@
"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-fetch": {
"version": "2.5.12",
@ -4082,6 +4083,11 @@ @@ -4082,6 +4083,11 @@
"node": ">=12.0.0"
}
},
"node_modules/electron/node_modules/@types/node": {
"version": "14.18.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz",
"integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ=="
},
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@ -10986,7 +10992,7 @@ @@ -10986,7 +10992,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",
@ -11008,7 +11014,7 @@ @@ -11008,7 +11014,7 @@
"requires": {
"@bitwarden/jslib-common": "file:../common",
"@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",
"@types/node": "^14.17.1",
"@types/node": "^16.11.12",
"electron": "14.2.0",
"electron-log": "4.4.1",
"electron-store": "8.0.1",
@ -11025,7 +11031,7 @@ @@ -11025,7 +11031,7 @@
"@bitwarden/jslib-common": "file:../common",
"@types/inquirer": "^7.3.1",
"@types/lowdb": "^1.0.10",
"@types/node": "^14.17.1",
"@types/node": "^16.11.12",
"@types/node-fetch": "^2.5.10",
"chalk": "^4.1.1",
"commander": "7.2.0",
@ -11588,9 +11594,10 @@ @@ -11588,9 +11594,10 @@
"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-fetch": {
"version": "2.5.12",
@ -13423,6 +13430,13 @@ @@ -13423,6 +13430,13 @@
"@electron/get": "^1.0.1",
"@types/node": "^14.6.2",
"extract-zip": "^1.0.3"
},
"dependencies": {
"@types/node": {
"version": "14.18.0",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz",
"integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ=="
}
}
},
"electron-builder": {

8
package.json
Unescape View File

@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
"@microsoft/microsoft-graph-types": "^1.4.0",
"@ngtools/webpack": "^12.2.13",
"@types/ldapjs": "^1.0.10",
"@types/node": "^14.14.43",
"@types/node": "^16.11.12",
"@types/proper-lockfile": "^4.1.1",
"clean-webpack-plugin": "^4.0.0",
"concurrently": "^6.0.2",
@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
"html-webpack-plugin": "^5.5.0",
"mini-css-extract-plugin": "^2.4.5",
"node-loader": "^2.0.0",
"pkg": "^5.1.0",
"pkg": "^5.5.1",
"prebuild-install": "^5.0.0",
"rimraf": "^3.0.2",
"sass": "^1.32.11",
@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
"rxjs": "^7.4.0"
},
"engines": {
"node": "~14",
"npm": "~7"
"node": "~16",
"npm": "~8"
}
}

1006
src-cli/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
src-cli/package.json
Unescape View File

@ -19,6 +19,6 @@ @@ -19,6 +19,6 @@
},
"dependencies": {
"browser-hrtime": "^1.1.8",
"keytar": "7.6.0"
"keytar": "^7.7.0"
}
}

1757
src/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
src/package.json
Unescape View File

@ -16,6 +16,6 @@ @@ -16,6 +16,6 @@
"electron-log": "4.3.5",
"electron-store": "8.0.0",
"electron-updater": "4.3.9",
"keytar": "7.6.0"
"keytar": "7.7.0"
}
}

Write Preview
Loading…
Cancel
Save