bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Update dependencies (#292)

Browse Source 
* Update dependencies

* Remove types which are no longer needed

* Bump jslib

* Revert pkg to 4.5.1 since 5.0.0 does not compile on linux.

* Bump pkg-fetch in build pipeline
This commit is contained in:
Oscar Hinton
2021-04-23 21:04:11 +02:00
committed by GitHub
parent 679ad19561
commit 9c55d78ffc
10 changed files with 2907 additions and 2977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,19 +44,19 @@ jobs:
echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "version: $env:pkgVersion" echo "version: $env:pkgVersion"
env: 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 - name: get pkg-fetch
shell: pwsh shell: pwsh
run: | run: |
cd $HOME 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
New-Item -ItemType directory -Path .\.pkg-cache\v2.5 New-Item -ItemType directory -Path .\.pkg-cache\v2.6
Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v2.5\fetched-v10.4.1-win-x64" Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v2.6\fetched-v10.21.0-win-x64"
env: 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: Setup Version Info - name: Setup Version Info
shell: pwsh shell: pwsh

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

@@ -79,19 +79,19 @@ jobs:
echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "WIN_PKG=$env:WIN_PKG" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "version: $env:pkgVersion" echo "version: $env:pkgVersion"
env: 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 - name: get pkg-fetch
shell: pwsh shell: pwsh
run: | run: |
cd $HOME 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
New-Item -ItemType directory -Path .\.pkg-cache\v2.5 New-Item -ItemType directory -Path .\.pkg-cache\v2.6
Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v2.5\fetched-v10.4.1-win-x64" Invoke-RestMethod -Uri $fetchedUrl -OutFile ".\.pkg-cache\v2.6\fetched-v10.21.0-win-x64"
env: 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: Setup Version Info - name: Setup Version Info
shell: pwsh shell: pwsh

2
jslib

Submodule jslib updated: 3c872e56f2...b6f102938f

5786
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

46
package.json
View File

@@ -49,45 +49,43 @@
"assets": "./build/**/*" "assets": "./build/**/*"
}, },
"devDependencies": { "devDependencies": {
"@types/commander": "^2.12.2", "@types/inquirer": "^7.3.1",
"@types/form-data": "^2.2.1", "@types/jsdom": "^16.2.10",
"@types/inquirer": "^0.0.43", "@types/lowdb": "^1.0.9",
"@types/jsdom": "^12.2.1",
"@types/lowdb": "^1.0.5",
"@types/lunr": "^2.3.3", "@types/lunr": "^2.3.3",
"@types/node": "^10.17.28", "@types/node": "^10.17.57",
"@types/node-fetch": "^2.1.2", "@types/node-fetch": "^2.5.10",
"@types/node-forge": "^0.9.7", "@types/node-forge": "^0.9.7",
"@types/papaparse": "^5.2.0", "@types/papaparse": "^5.2.0",
"@types/tldjs": "^2.3.0", "@types/tldjs": "^2.3.0",
"@types/zxcvbn": "4.4.0", "@types/zxcvbn": "^4.4.1",
"clean-webpack-plugin": "^0.1.19", "clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^6.4.0",
"cross-env": "^5.2.0", "cross-env": "^7.0.3",
"pkg": "4.3.8", "pkg": "^4.5.1",
"ts-loader": "^8.0.2", "ts-loader": "^8.1.0",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "3.8.3", "typescript": "4.1.5",
"webpack": "^4.29.0", "webpack": "^4.46.0",
"webpack-cli": "^3.2.1", "webpack-cli": "^4.6.0",
"webpack-node-externals": "^1.7.2" "webpack-node-externals": "^3.0.0"
}, },
"dependencies": { "dependencies": {
"big-integer": "1.6.48", "big-integer": "1.6.48",
"browser-hrtime": "^1.1.8", "browser-hrtime": "^1.1.8",
"chalk": "2.4.1", "chalk": "^4.1.1",
"commander": "7.0.0", "commander": "^7.2.0",
"form-data": "2.3.2", "form-data": "^4.0.0",
"https-proxy-agent": "5.0.0", "https-proxy-agent": "5.0.0",
"inquirer": "6.2.0", "inquirer": "7.3.3",
"jsdom": "13.2.0", "jsdom": "^16.5.3",
"lowdb": "1.0.0", "lowdb": "1.0.0",
"lunr": "2.3.3", "lunr": "^2.3.9",
"node-fetch": "2.6.1", "node-fetch": "2.6.1",
"node-forge": "0.10.0", "node-forge": "0.10.0",
"open": "7.1.0", "open": "7.1.0",
"papaparse": "5.2.0", "papaparse": "^5.3.0",
"tldjs": "2.3.1", "tldjs": "2.3.1",
"zxcvbn": "4.4.2" "zxcvbn": "4.4.2"
} }

3
src/commands/get.command.ts
View File

@@ -33,7 +33,6 @@ import { FolderView } from 'jslib/models/view/folderView';
import { EncString } from 'jslib/models/domain/encString'; import { EncString } from 'jslib/models/domain/encString';
import { Response } from 'jslib/cli/models/response'; import { Response } from 'jslib/cli/models/response';
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
import { StringResponse } from 'jslib/cli/models/response/stringResponse'; import { StringResponse } from 'jslib/cli/models/response/stringResponse';
import { SendType } from 'jslib/enums/sendType'; import { SendType } from 'jslib/enums/sendType';
@@ -43,9 +42,7 @@ import { CollectionResponse } from '../models/response/collectionResponse';
import { FolderResponse } from '../models/response/folderResponse'; import { FolderResponse } from '../models/response/folderResponse';
import { OrganizationCollectionResponse } from '../models/response/organizationCollectionResponse'; import { OrganizationCollectionResponse } from '../models/response/organizationCollectionResponse';
import { OrganizationResponse } from '../models/response/organizationResponse'; import { OrganizationResponse } from '../models/response/organizationResponse';
import { SendFileResponse } from '../models/response/sendFileResponse';
import { SendResponse } from '../models/response/sendResponse'; import { SendResponse } from '../models/response/sendResponse';
import { SendTextResponse } from '../models/response/sendTextResponse';
import { TemplateResponse } from '../models/response/templateResponse'; import { TemplateResponse } from '../models/response/templateResponse';
import { OrganizationCollectionRequest } from '../models/request/organizationCollectionRequest'; import { OrganizationCollectionRequest } from '../models/request/organizationCollectionRequest';

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 program from 'commander';
import { Main } from './bw'; import { Main } from './bw';
@@ -25,7 +25,6 @@ import { CliUtils } from './utils';
import { BaseProgram } from 'jslib/cli/baseProgram'; import { BaseProgram } from 'jslib/cli/baseProgram';
const chalk = chk.default;
const writeLn = CliUtils.writeLn; const writeLn = CliUtils.writeLn;
export class Program extends BaseProgram { export class Program extends BaseProgram {

5
src/send.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 program from 'commander';
import * as fs from 'fs'; import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
@@ -26,7 +26,6 @@ import { Main } from './bw';
import { Program } from './program'; import { Program } from './program';
import { CliUtils } from './utils'; import { CliUtils } from './utils';
const chalk = chk.default;
const writeLn = CliUtils.writeLn; const writeLn = CliUtils.writeLn;
export class SendProgram extends Program { export class SendProgram extends Program {
@@ -100,7 +99,7 @@ export class SendProgram extends Program {
return new program.Command('list') return new program.Command('list')
.description('List all the Sends owned by you') .description('List all the Sends owned by you')
.on('--help', () => { writeLn(chk.default('This is in the list command')); }) .on('--help', () => { writeLn(chalk('This is in the list command')); })
.action(async (options: program.OptionValues) => { .action(async (options: program.OptionValues) => {
await this.exitIfLocked(); await this.exitIfLocked();
const cmd = new SendListCommand(this.main.sendService, this.main.environmentService, const cmd = new SendListCommand(this.main.sendService, this.main.environmentService,

3
src/vault.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 program from 'commander';
import { Main } from './bw'; import { Main } from './bw';
@@ -18,7 +18,6 @@ import { CliUtils } from './utils';
import { Program } from './program'; import { Program } from './program';
const chalk = chk.default;
const writeLn = CliUtils.writeLn; const writeLn = CliUtils.writeLn;
export class VaultProgram extends Program { export class VaultProgram extends Program {

16
webpack.config.js
View File

@@ -1,6 +1,6 @@
const path = require('path'); const path = require('path');
const webpack = require('webpack'); const webpack = require('webpack');
const CleanWebpackPlugin = require('clean-webpack-plugin'); const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin'); const CopyWebpackPlugin = require('copy-webpack-plugin');
const nodeExternals = require('webpack-node-externals'); const nodeExternals = require('webpack-node-externals');
@@ -23,12 +23,12 @@ const moduleRules = [
]; ];
const plugins = [ const plugins = [
new CleanWebpackPlugin([ new CleanWebpackPlugin(),
path.resolve(__dirname, 'build/*'), new CopyWebpackPlugin({
]), patterns: [
new CopyWebpackPlugin([ { from: './src/locales', to: 'locales' },
{ from: './src/locales', to: 'locales' }, ]
]), }),
new webpack.DefinePlugin({ new webpack.DefinePlugin({
'process.env.BWCLI_ENV': JSON.stringify(ENV), 'process.env.BWCLI_ENV': JSON.stringify(ENV),
}), }),
@@ -57,8 +57,6 @@ const config = {
extensions: ['.ts', '.js'], extensions: ['.ts', '.js'],
alias: { alias: {
jslib: path.join(__dirname, 'jslib/src'), jslib: path.join(__dirname, 'jslib/src'),
// ref: https://github.com/bitinn/node-fetch/issues/493
'node-fetch$': 'node-fetch/lib/index.js',
}, },
symlinks: false, symlinks: false,
modules: [path.resolve('node_modules')], modules: [path.resolve('node_modules')],