mirror of
https://github.com/bitwarden/browser.git
synced 2024-10-04 05:08:06 +02:00
Update dependencies (#292)
* 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
GitHub
parent
679ad19561
commit
9c55d78ffc
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
@ -44,19 +44,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: Setup Version Info
|
||||
shell: pwsh
|
||||
|
||||
10
.github/workflows/release.yml
vendored
10
.github/workflows/release.yml
vendored
@ -79,19 +79,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: Setup Version Info
|
||||
shell: pwsh
|
||||
|
||||
2
jslib
2
jslib
@ -1 +1 @@
|
||||
Subproject commit 3c872e56f27ae78fb922b765d7601886b5c39f78
|
||||
Subproject commit b6f102938fe7c17631cb1b2e356438c5e4456529
|
||||
5786
package-lock.json
generated
5786
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
46
package.json
46
package.json
@ -49,45 +49,43 @@
|
||||
"assets": "./build/**/*"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/commander": "^2.12.2",
|
||||
"@types/form-data": "^2.2.1",
|
||||
"@types/inquirer": "^0.0.43",
|
||||
"@types/jsdom": "^12.2.1",
|
||||
"@types/lowdb": "^1.0.5",
|
||||
"@types/inquirer": "^7.3.1",
|
||||
"@types/jsdom": "^16.2.10",
|
||||
"@types/lowdb": "^1.0.9",
|
||||
"@types/lunr": "^2.3.3",
|
||||
"@types/node": "^10.17.28",
|
||||
"@types/node-fetch": "^2.1.2",
|
||||
"@types/node": "^10.17.57",
|
||||
"@types/node-fetch": "^2.5.10",
|
||||
"@types/node-forge": "^0.9.7",
|
||||
"@types/papaparse": "^5.2.0",
|
||||
"@types/tldjs": "^2.3.0",
|
||||
"@types/zxcvbn": "4.4.0",
|
||||
"clean-webpack-plugin": "^0.1.19",
|
||||
"copy-webpack-plugin": "^5.1.1",
|
||||
"cross-env": "^5.2.0",
|
||||
"pkg": "4.3.8",
|
||||
"ts-loader": "^8.0.2",
|
||||
"@types/zxcvbn": "^4.4.1",
|
||||
"clean-webpack-plugin": "^3.0.0",
|
||||
"copy-webpack-plugin": "^6.4.0",
|
||||
"cross-env": "^7.0.3",
|
||||
"pkg": "^4.5.1",
|
||||
"ts-loader": "^8.1.0",
|
||||
"tslint": "^6.1.3",
|
||||
"tslint-loader": "^3.5.4",
|
||||
"typescript": "3.8.3",
|
||||
"webpack": "^4.29.0",
|
||||
"webpack-cli": "^3.2.1",
|
||||
"webpack-node-externals": "^1.7.2"
|
||||
"typescript": "4.1.5",
|
||||
"webpack": "^4.46.0",
|
||||
"webpack-cli": "^4.6.0",
|
||||
"webpack-node-externals": "^3.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"big-integer": "1.6.48",
|
||||
"browser-hrtime": "^1.1.8",
|
||||
"chalk": "2.4.1",
|
||||
"commander": "7.0.0",
|
||||
"form-data": "2.3.2",
|
||||
"chalk": "^4.1.1",
|
||||
"commander": "^7.2.0",
|
||||
"form-data": "^4.0.0",
|
||||
"https-proxy-agent": "5.0.0",
|
||||
"inquirer": "6.2.0",
|
||||
"jsdom": "13.2.0",
|
||||
"inquirer": "7.3.3",
|
||||
"jsdom": "^16.5.3",
|
||||
"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",
|
||||
"papaparse": "5.2.0",
|
||||
"papaparse": "^5.3.0",
|
||||
"tldjs": "2.3.1",
|
||||
"zxcvbn": "4.4.2"
|
||||
}
|
||||
|
||||
@ -33,7 +33,6 @@ import { FolderView } from 'jslib/models/view/folderView';
|
||||
import { EncString } from 'jslib/models/domain/encString';
|
||||
|
||||
import { Response } from 'jslib/cli/models/response';
|
||||
import { MessageResponse } from 'jslib/cli/models/response/messageResponse';
|
||||
import { StringResponse } from 'jslib/cli/models/response/stringResponse';
|
||||
|
||||
import { SendType } from 'jslib/enums/sendType';
|
||||
@ -43,9 +42,7 @@ import { CollectionResponse } from '../models/response/collectionResponse';
|
||||
import { FolderResponse } from '../models/response/folderResponse';
|
||||
import { OrganizationCollectionResponse } from '../models/response/organizationCollectionResponse';
|
||||
import { OrganizationResponse } from '../models/response/organizationResponse';
|
||||
import { SendFileResponse } from '../models/response/sendFileResponse';
|
||||
import { SendResponse } from '../models/response/sendResponse';
|
||||
import { SendTextResponse } from '../models/response/sendTextResponse';
|
||||
import { TemplateResponse } from '../models/response/templateResponse';
|
||||
|
||||
import { OrganizationCollectionRequest } from '../models/request/organizationCollectionRequest';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import * as chk from 'chalk';
|
||||
import * as chalk from 'chalk';
|
||||
import * as program from 'commander';
|
||||
|
||||
import { Main } from './bw';
|
||||
@ -25,7 +25,6 @@ import { CliUtils } from './utils';
|
||||
|
||||
import { BaseProgram } from 'jslib/cli/baseProgram';
|
||||
|
||||
const chalk = chk.default;
|
||||
const writeLn = CliUtils.writeLn;
|
||||
|
||||
export class Program extends BaseProgram {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import * as chk from 'chalk';
|
||||
import * as chalk from 'chalk';
|
||||
import * as program from 'commander';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
@ -26,7 +26,6 @@ import { Main } from './bw';
|
||||
import { Program } from './program';
|
||||
import { CliUtils } from './utils';
|
||||
|
||||
const chalk = chk.default;
|
||||
const writeLn = CliUtils.writeLn;
|
||||
|
||||
export class SendProgram extends Program {
|
||||
@ -100,7 +99,7 @@ export class SendProgram extends Program {
|
||||
return new program.Command('list')
|
||||
|
||||
.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) => {
|
||||
await this.exitIfLocked();
|
||||
const cmd = new SendListCommand(this.main.sendService, this.main.environmentService,
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import * as chk from 'chalk';
|
||||
import * as chalk from 'chalk';
|
||||
import * as program from 'commander';
|
||||
|
||||
import { Main } from './bw';
|
||||
@ -18,7 +18,6 @@ import { CliUtils } from './utils';
|
||||
|
||||
import { Program } from './program';
|
||||
|
||||
const chalk = chk.default;
|
||||
const writeLn = CliUtils.writeLn;
|
||||
|
||||
export class VaultProgram extends Program {
|
||||
|
||||
@ -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');
|
||||
|
||||
@ -23,12 +23,12 @@ const moduleRules = [
|
||||
];
|
||||
|
||||
const plugins = [
|
||||
new CleanWebpackPlugin([
|
||||
path.resolve(__dirname, 'build/*'),
|
||||
]),
|
||||
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),
|
||||
}),
|
||||
@ -57,8 +57,6 @@ const config = {
|
||||
extensions: ['.ts', '.js'],
|
||||
alias: {
|
||||
jslib: path.join(__dirname, 'jslib/src'),
|
||||
// ref: https://github.com/bitinn/node-fetch/issues/493
|
||||
'node-fetch$': 'node-fetch/lib/index.js',
|
||||
},
|
||||
symlinks: false,
|
||||
modules: [path.resolve('node_modules')],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user