bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

Bump dependencies (#114)

Browse Source 
* Upgrade angular and webpack dependencies

* Bump microsoft-graph-client and googleapis

* Bump pkg-fetch in pipeline

* Bump jslib
This commit is contained in:
Oscar Hinton
2021-04-23 21:03:59 +02:00
committed by GitHub
parent 0c92a97054
commit f6b249836e
14 changed files with 6375 additions and 8665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View File

@@ -63,19 +63,19 @@ jobs:
echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "version: $env:pkgVersion"
env:
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.5\fetched-v10.4.1-win-x64
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.6\fetched-v10.21.0-win-x64
- name: get pkg-fetch
shell: pwsh
run: |
cd $HOME
$fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v2.5/uploaded-v2.5-node-v10.4.1-win-x64"
$fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v2.6/uploaded-v2.6-node-v10.21.0-win-x64"
New-Item -ItemType directory -Path ./.pkg-cache
New-Item -ItemType directory -Path ./.pkg-cache/v2.5
Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v2.5/fetched-v10.4.1-win-x64"
New-Item -ItemType directory -Path ./.pkg-cache/v2.6
Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v2.6/fetched-v10.21.0-win-x64"
env:
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.5\fetched-v10.4.1-win-x64
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.6\fetched-v10.21.0-win-x64
- name: Keytar
shell: pwsh

10
.github/workflows/release.yml vendored
View File

@@ -77,19 +77,19 @@ jobs:
run: |
echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
env:
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.5\fetched-v10.4.1-win-x64
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.6\fetched-v10.21.0-win-x64
- name: get pkg-fetch
shell: pwsh
run: |
cd $HOME
$fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v2.5/uploaded-v2.5-node-v10.4.1-win-x64"
$fetchedUrl = "https://github.com/vercel/pkg-fetch/releases/download/v2.6/uploaded-v2.6-node-v10.21.0-win-x64"
New-Item -ItemType directory -Path ./.pkg-cache
New-Item -ItemType directory -Path ./.pkg-cache/v2.5
Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v2.5/fetched-v10.4.1-win-x64"
New-Item -ItemType directory -Path ./.pkg-cache/v2.6
Invoke-RestMethod -Uri $fetchedUrl -OutFile "./.pkg-cache/v2.6/fetched-v10.21.0-win-x64"
env:
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.5\fetched-v10.4.1-win-x64
WIN_PKG: C:\Users\runneradmin\.pkg-cache\v2.6\fetched-v10.21.0-win-x64
- name: Keytar
shell: pwsh

8
gulpfile.js
View File

@@ -20,12 +20,6 @@ function webfonts() {
.pipe(gulp.dest(paths.cssDir));
}
// ref: https://github.com/angular/angular/issues/22524
function cleanupAotIssue() {
return del(['./node_modules/@types/uglify-js/node_modules/source-map/source-map.d.ts']);
}
exports.clean = clean;
exports.cleanupAotIssue = cleanupAotIssue;
exports.webfonts = gulp.series(clean, webfonts);
exports['prebuild:renderer'] = gulp.parallel(webfonts, cleanupAotIssue);;
exports['prebuild:renderer'] = webfonts;;

2
jslib

Submodule jslib updated: 3c872e56f2...b6f102938f

14834
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

121
package.json
View File

@@ -132,95 +132,94 @@
}
},
"devDependencies": {
"@angular/compiler-cli": "^9.1.12",
"@angular/compiler-cli": "^11.2.11",
"@microsoft/microsoft-graph-types": "^1.4.0",
"@ngtools/webpack": "^9.1.12",
"@ngtools/webpack": "^11.2.10",
"@types/commander": "^2.12.2",
"@types/form-data": "^2.2.1",
"@types/inquirer": "^0.0.43",
"@types/form-data": "^2.5.0",
"@types/inquirer": "^7.3.1",
"@types/ldapjs": "^1.0.10",
"@types/lowdb": "^1.0.5",
"@types/lowdb": "^1.0.9",
"@types/lunr": "^2.3.3",
"@types/node": "^10.17.28",
"@types/node-fetch": "^2.5.10",
"@types/node-forge": "^0.9.7",
"@types/papaparse": "^5.2.0",
"@types/proper-lockfile": "^4.1.1",
"@types/semver": "^5.5.0",
"@types/source-map": "0.5.2",
"@types/webcrypto": "^0.0.28",
"@types/webpack": "^4.4.11",
"@types/zxcvbn": "4.4.0",
"clean-webpack-plugin": "^0.1.19",
"concurrently": "^4.0.1",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^5.2.0",
"css-loader": "^1.0.0",
"del": "^3.0.0",
"electron": "11.3.0",
"electron-builder": "22.9.1",
"@types/zxcvbn": "^4.4.1",
"clean-webpack-plugin": "^3.0.0",
"concurrently": "^6.0.2",
"copy-webpack-plugin": "^6.4.0",
"cross-env": "^7.0.3",
"css-loader": "^5.2.4",
"del": "^6.0.0",
"electron": "11.4.3",
"electron-builder": "^22.10.5",
"electron-notarize": "^1.0.0",
"electron-rebuild": "^2.3.5",
"electron-reload": "^1.5.0",
"file-loader": "^2.0.0",
"file-loader": "^6.2.0",
"font-awesome": "4.7.0",
"gulp": "^4.0.0",
"gulp-google-webfonts": "^2.0.0",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.9.0",
"node-abi": "^2.9.0",
"node-loader": "^0.6.0",
"node-sass": "^4.13.1",
"pkg": "4.3.8",
"rimraf": "^2.6.2",
"sass-loader": "^7.1.0",
"ts-loader": "^7.0.5",
"tslint": "^5.12.1",
"gulp": "^4.0.2",
"gulp-google-webfonts": "^4.0.0",
"html-loader": "^1.3.2",
"html-webpack-plugin": "^4.5.1",
"mini-css-extract-plugin": "^1.5.0",
"node-loader": "^1.0.3",
"pkg": "^4.5.1",
"rimraf": "^3.0.2",
"sass": "^1.32.11",
"sass-loader": "^10.1.1",
"tapable": "^1.1.3",
"ts-loader": "^8.1.0",
"tslint": "~6.1.0",
"tslint-loader": "^3.5.4",
"typescript": "3.8.3",
"webpack": "^4.29.0",
"webpack-cli": "^3.2.1",
"webpack-merge": "^4.2.1",
"webpack-node-externals": "^1.7.2"
"typescript": "4.1.5",
"webpack": "^4.46.0",
"webpack-cli": "^4.6.0",
"webpack-merge": "^5.7.3",
"webpack-node-externals": "^3.0.0"
},
"dependencies": {
"@angular/animations": "9.1.12",
"@angular/common": "9.1.12",
"@angular/compiler": "9.1.12",
"@angular/core": "9.1.12",
"@angular/forms": "9.1.12",
"@angular/platform-browser": "9.1.12",
"@angular/platform-browser-dynamic": "9.1.12",
"@angular/router": "9.1.12",
"@angular/upgrade": "9.1.12",
"@microsoft/microsoft-graph-client": "1.2.0",
"angular2-toaster": "8.0.0",
"@angular/animations": "11.2.11",
"@angular/cli": "^11.2.10",
"@angular/common": "11.2.11",
"@angular/compiler": "11.2.11",
"@angular/core": "11.2.11",
"@angular/forms": "11.2.11",
"@angular/platform-browser": "11.2.11",
"@angular/platform-browser-dynamic": "11.2.11",
"@angular/router": "11.2.11",
"@angular/upgrade": "11.2.11",
"@microsoft/microsoft-graph-client": "^2.2.1",
"angular2-toaster": "^11.0.1",
"big-integer": "1.6.48",
"bootstrap": "4.3.1",
"bootstrap": "^4.6.0",
"browser-hrtime": "^1.1.8",
"chalk": "2.4.1",
"commander": "7.0.0",
"core-js": "2.6.2",
"chalk": "^4.1.1",
"commander": "^7.2.0",
"core-js": "^3.11.0",
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"electron-log": "4.3.0",
"electron-store": "6.0.1",
"electron-updater": "4.3.5",
"form-data": "2.3.2",
"googleapis": "43.0.0",
"electron-log": "^4.3.4",
"electron-store": "^8.0.0",
"electron-updater": "^4.3.8",
"form-data": "^4.0.0",
"googleapis": "^72.0.0",
"https-proxy-agent": "5.0.0",
"inquirer": "6.2.0",
"keytar": "7.3.0",
"inquirer": "7.3.3",
"keytar": "^7.6.0",
"ldapjs": "2.2.4",
"lowdb": "1.0.0",
"lunr": "2.3.3",
"lunr": "^2.3.9",
"node-fetch": "2.6.1",
"node-forge": "0.10.0",
"open": "7.1.0",
"proper-lockfile": "^4.1.2",
"rxjs": "6.6.2",
"tslib": "^2.0.1",
"zone.js": "0.10.3",
"rxjs": "^6.6.7",
"tslib": "^2.2.0",
"zone.js": "^0.11.4",
"zxcvbn": "4.4.2"
}
}

2
src-cli/package.json
View File

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

2
src/app/app.module.ts
View File

@@ -1,4 +1,4 @@
import 'core-js';
import 'core-js/stable';
import 'zone.js/dist/zone';
import { ToasterModule } from 'angular2-toaster';

8
src/package.json
View File

@@ -13,9 +13,9 @@
},
"dependencies": {
"browser-hrtime": "^1.1.8",
"electron-log": "4.3.0",
"electron-store": "6.0.1",
"electron-updater": "4.3.5",
"keytar": "7.3.0"
"electron-log": "4.3.4",
"electron-store": "8.0.0",
"electron-updater": "4.3.8",
"keytar": "7.6.0"
}
}

3
src/program.ts
View File

@@ -1,4 +1,4 @@
import * as chk from 'chalk';
import * as chalk from 'chalk';
import * as program from 'commander';
import * as path from 'path';
@@ -19,7 +19,6 @@ import { BaseProgram } from 'jslib/cli/baseProgram';
import { Response } from 'jslib/cli/models/response';
import { StringResponse } from 'jslib/cli/models/response/stringResponse';
const chalk = chk.default;
const writeLn = (s: string, finalLine: boolean = false, error: boolean = false) => {
const stream = error ? process.stderr : process.stdout;
if (finalLine && process.platform === 'win32') {

4
src/services/ldap-directory.service.ts
View File

@@ -324,7 +324,7 @@ export class LdapDirectoryService implements IDirectoryService {
}
private async bind(): Promise<any> {
return new Promise((resolve, reject) => {
return new Promise<void>((resolve, reject) => {
if (this.dirConfig.hostname == null || this.dirConfig.port == null) {
reject(this.i18nService.t('dirConfigIncomplete'));
return;
@@ -403,7 +403,7 @@ export class LdapDirectoryService implements IDirectoryService {
});
}
private async unbind(): Promise<any> {
private async unbind(): Promise<void> {
return new Promise((resolve, reject) => {
this.client.unbind(err => {
if (err != null) {

14
webpack.cli.js
View File

@@ -1,6 +1,6 @@
const path = require('path');
const webpack = require('webpack');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const nodeExternals = require('webpack-node-externals');
@@ -27,12 +27,12 @@ const moduleRules = [
];
const plugins = [
new CleanWebpackPlugin([
path.resolve(__dirname, 'build-cli/*'),
]),
new CopyWebpackPlugin([
{ from: './src/locales', to: 'locales' },
]),
new CleanWebpackPlugin(),
new CopyWebpackPlugin({
patterns: [
{ from: './src/locales', to: 'locales' },
],
}),
new webpack.DefinePlugin({
'process.env.BWCLI_ENV': JSON.stringify(ENV),
}),

20
webpack.main.js
View File

@@ -1,7 +1,7 @@
const path = require('path');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const CleanWebpackPlugin = require('clean-webpack-plugin');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const nodeExternals = require('webpack-node-externals');
const common = {
@@ -55,14 +55,14 @@ const main = {
],
},
plugins: [
new CleanWebpackPlugin([
path.resolve(__dirname, 'build/*'),
]),
new CopyWebpackPlugin([
'./src/package.json',
{ from: './src/images', to: 'images' },
{ from: './src/locales', to: 'locales' },
]),
new CleanWebpackPlugin(),
new CopyWebpackPlugin({
patterns: [
'./src/package.json',
{ from: './src/images', to: 'images' },
{ from: './src/locales', to: 'locales' },
],
}),
],
externals: [nodeExternals()],
};

2
webpack.renderer.js
View File

@@ -1,6 +1,6 @@
const path = require('path');
const webpack = require('webpack');
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const AngularCompilerPlugin = require('@ngtools/webpack').AngularCompilerPlugin;